diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index efa01fc0e..6a79047d5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,7 +30,13 @@ jobs:
         with:
           node-version: 16
 
+      - run: npm config set //npm.pkg.github.com/:_authToken $NODE_AUTH_TOKEN
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - run: npm install
+
+
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1.0.6
 
diff --git a/.gitignore b/.gitignore
index c3ffcbbf6..46bd4e399 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,6 @@ grails-app/assets/vendor-ext
 /build/
 /.gradle/
 /grails-app/assets/components/compile/templates.js
+/ehcache/.lock
+/ehcache/file/homePageStatistics_c96622e3da276e1ccd3532e6f1f975756232b01a/offheap-disk-store/ehcache-disk-store.data
+/ehcache/file/homePageStatistics_c96622e3da276e1ccd3532e6f1f975756232b01a/offheap-disk-store/ehcache-disk-store.meta
diff --git a/.npmrc b/.npmrc
new file mode 100644
index 000000000..737d3ce72
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1 @@
+@atlasoflivingaustralia:registry=https://npm.pkg.github.com
\ No newline at end of file
diff --git a/README.md b/README.md
index b82d59bda..bceac21ce 100644
--- a/README.md
+++ b/README.md
@@ -28,10 +28,14 @@ It is currently in use by the Australian Government.
 This configuration file largely specifies URLs to MERIT dependencies.  See https://github.com/AtlasOfLivingAustralia/fieldcapture/wiki/MERIT-Dependencies for information about these.
 Note that you will need to obtain an ALA API key to use ALA services and a Google Maps API key and specify them in this file.
 
+npm / nodejs are used to run javascript unit tests.  There is a dependency on the ecodata-client-plugin for some javascript which is published to github packages which requires an access token to read.
+
 * Install npm and nodejs (see https://www.npmjs.com/get-npm)
+* Authenticate to github packages using your github username and access token setup for package:read
 * Install the node dependencies for MERIT.  Note these are currently only used for testing.
 
 ```
+npm login --scope=@atlasoflivingaustralia --auth-type=legacy --registry=https://npm.pkg.github.com
 npm install
 npm install -g karma
 ```
diff --git a/build.gradle b/build.gradle
index 3dbad12d5..b039b7c2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -97,8 +97,7 @@ dependencies {
     implementation "org.grails.plugins:gsp"
     implementation 'dk.glasius:external-config:3.0.0'
     implementation "org.grails.plugins:ala-auth:$alaSecurityLibsVersion"
-    // Needs to be left at 2.0 until we finish replacing pdfgen HTML report generation
-    implementation "org.grails.plugins:ala-ws-security-plugin:2.0"
+    implementation "org.grails.plugins:ala-ws-security-plugin:$alaSecurityLibsVersion"
     implementation "org.grails.plugins:ala-ws-plugin:$alaSecurityLibsVersion"
     implementation "au.org.ala:userdetails-service-client:$alaSecurityLibsVersion"
     implementation "com.github.ben-manes.caffeine:caffeine:3.1.6"
@@ -150,6 +149,7 @@ dependencies {
     implementation "commons-io:commons-io:2.6"
     implementation "org.seleniumhq.selenium:selenium-chrome-driver:3.14.0"
     implementation "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
+    implementation group: 'com.googlecode.owasp-java-html-sanitizer', name: 'owasp-java-html-sanitizer', version: '20220608.1'
 
     compileOnly "io.micronaut:micronaut-inject-groovy"
     console "org.grails:grails-console"
@@ -186,7 +186,7 @@ dependencies {
     providedCompile "io.methvin:directory-watcher:0.4.0"
 
     if (!Boolean.valueOf(inplace)) {
-        implementation "org.grails.plugins:ecodata-client-plugin:6.1.2"
+        implementation "org.grails.plugins:ecodata-client-plugin:6.2"
     }
 }
 
@@ -244,15 +244,16 @@ clientDependencies {
         'underscore'('1.12.1') {
             include 'underscore.js'
         }
-        'datatables.net-bs4'("1.10.25")
-        "datatables.net-buttons-dt"("1.7.1")
-        'datatables.net-buttons-bs4'("1.7.1")
+        'datatables.net'("1.13.6")
+        'datatables.net-bs4'("1.13.6")
+        "datatables.net-buttons-dt"("2.4.2")
+        'datatables.net-buttons-bs4'("2.4.2")
         '@danielfarrell/bootstrap-combobox'('1.1.8', transitive:false)
         'fancybox'('3.0.1')
         "fuelux"("3.17.2", transitive:false)
         "fuse.js"("6.4.6", transitive:false)
         "leaflet"("0.7.7")
-        "select2-theme-bootstrap4"("1.0.0")
+        "select2-theme-bootstrap4"("1.0.2")
         "slickgrid"("2.4.38")
         "slider-pro"("1.6.0", transitive:false)
         "jquery-appear-original"("0.4.1", transitive:false)
diff --git a/forms/bushfires/bushfiresStatesProgressReport.json b/forms/bushfires/bushfiresStatesProgressReport.json
index aab43862d..444389452 100644
--- a/forms/bushfires/bushfiresStatesProgressReport.json
+++ b/forms/bushfires/bushfiresStatesProgressReport.json
@@ -9968,52 +9968,39 @@
                 "name": "sitesTested"
               },
               {
-                "defaultValue": {
-                  "type": "computed",
+                "computed": {
                   "expression": "$geom.areaHa(sitesTested)"
                 },
                 "dataType": "number",
                 "name": "areaTestedHa",
-                "units": "Ha",
-                "validate": [
-                  {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.areaHa(sitesTested)*0.9"
-                    }
-                  },
+                "units": "ha",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.areaHa(sitesTested)*1.1"
+                    "condition": "areaTestedChangeHa > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "",
+                      "validate": "required,min[0.0001]"
                     }
                   }
                 ]
               },
               {
-                "defaultValue": {
-                  "type": "computed",
+                "computed": {
                   "expression": "$geom.lengthKm(sitesTested)"
                 },
                 "dataType": "number",
                 "name": "lengthTestedKm",
-                "units": "Km",
-                "validate": [
-                  {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTested)*0.9",
-                      "errorMessages": "Please Select"
-                    }
-                  },
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTested)*1.1"
+                    "condition": "lengthTestedChangeKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "",
+                      "validate": "required,min[0.0001]"
                     }
                   }
                 ]
diff --git a/forms/nht/nhtOutputReport.json b/forms/nht/nhtOutputReport.json
index a793fc5e1..15cbb1f9a 100644
--- a/forms/nht/nhtOutputReport.json
+++ b/forms/nht/nhtOutputReport.json
@@ -1,13 +1,15 @@
 {
-  "id": "62b005e698aff40faac38c16",
-  "dateCreated": "2022-06-20T05:30:14Z",
+  "id": "64bf6c1ac9126a73736284ff",
+  "dateCreated": "2023-07-25T06:30:50Z",
   "minOptionalSectionsCompleted": 0,
   "supportsSites": true,
-  "lastUpdated": "2023-03-16T12:49:16Z",
+  "lastUpdated": "2023-10-04T11:46:09Z",
   "createdUserId": "1493",
+  "external": false,
   "activationDate": null,
   "supportsPhotoPoints": false,
   "publicationStatus": "published",
+  "externalIds": null,
   "gmsId": null,
   "name": "NHT Output Report",
   "sections": [
@@ -20,7 +22,7 @@
           {
             "name": "nhtCommunications",
             "dataType": "text",
-            "description": "This <u>does not</u> include communication activities undertaken under the 'Communication Materials' Project Service or regional capacity service. All Communication Materials must correctly acknowledge Australian Government funding.",
+            "description": "This <u>does not</u> include communication activities undertaken under the 'Communication Materials' Project Service or regional capacity service. Refer to the Project Services  and Overheads (PS&O) service summary to clarify what type of communications activity is paid under the PS&O service. All Communication Materials must correctly acknowledge Australian Government funding.",
             "validate": "required",
             "constraints": [
               "Yes",
@@ -31,12 +33,18 @@
             "name": "yesCommunicationsMaterial",
             "dataType": "text",
             "validate": "required,maxSize[300]",
+            "description": "Upload documents by clicking onto the 'Attach Document' button or provide a link in the free text field.",
             "behaviour": [
               {
                 "condition": "nhtCommunications == \"Yes\"",
                 "type": "enable"
               }
             ]
+          },
+          {
+            "dataType": "document",
+            "name": "attachments",
+            "description": "Please attach any Evidence of Service Delivery here."
           }
         ],
         "viewModel": [
@@ -60,6 +68,27 @@
                 "preLabel": "If yes, please provide link or copy of the material."
               }
             ]
+          },
+          {
+            "type": "row",
+            "behaviour": [
+              {
+                "type": "if_expression",
+                "condition": "nhtCommunications == \"Yes\""
+              }
+            ],
+            "items": [
+              {
+                "type": "col",
+                "items": [
+                  {
+                    "title": "Attached documents",
+                    "source": "attachments",
+                    "type": "document"
+                  }
+                ]
+              }
+            ]
           }
         ]
       },
@@ -108,6 +137,27 @@
                 "dataType": "number",
                 "name": "engagementNoParticipants",
                 "validate": "required"
+              },
+              {
+                "dataType": "date",
+                "name": "activityDateFrom",
+                "validate": "required"
+              },
+              {
+                "dataType": "date",
+                "name": "activityDateTo",
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "future",
+                    "param": {
+                      "expression": "formatDateForValidation(activityDateFrom)",
+                      "type": "computed"
+                    }
+                  }
+                ]
               }
             ]
           },
@@ -117,14 +167,14 @@
             "validate": "maxSize[1500]"
           },
           {
-            "dataType": "text",
-            "name": "projectAssuranceDetails",
+            "dataType": "boolean",
+            "name": "dataUploaded",
             "description": ""
           },
           {
-            "dataType": "boolean",
-            "name": "booleanField",
-            "description": ""
+            "name": "projectAssuranceDetails",
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -133,7 +183,7 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
@@ -144,12 +194,13 @@
               {
                 "type": "table",
                 "source": "engagementDetails",
-                "title": "<b>Please list community engagement activities undertaken, including the title, description, and the number of participants for each activity undertaken in this reporting period, if any.</b>",
+                "title": "<b>Please list community engagement activities undertaken, including the title, description, and the number of participants for each activity undertaken in this reporting period, if any.</b><br><br><b>Each activity must be reported in a separate row.</b><br>This does not include engagement activities undertaken in community/stakeholder engagement service or regional capacity service. The Register of Engagement must be retained as evidence.",
+                "preLabel": "If yes, please provide link or copy of the material.",
                 "userAddedRows": true,
                 "columns": [
                   {
                     "source": "engagementType",
-                    "type": "select2Many",
+                    "type": "selectOne",
                     "width": "20%",
                     "title": "Type"
                   },
@@ -162,6 +213,7 @@
                   {
                     "type": "textarea",
                     "source": "engagementPurpose",
+                    "width": "25%",
                     "title": "Purpose",
                     "rows": 4
                   },
@@ -170,6 +222,18 @@
                     "type": "number",
                     "width": "10%",
                     "title": "Number of participants"
+                  },
+                  {
+                    "title": "Activity Date from",
+                    "source": "activityDateFrom",
+                    "type": "date",
+                    "width": "10%"
+                  },
+                  {
+                    "title": "Activity Date to",
+                    "source": "activityDateTo",
+                    "type": "date",
+                    "width": "10%"
                   }
                 ]
               }
@@ -206,7 +270,7 @@
           {
             "name": "yesUndergoneReview",
             "dataType": "text",
-            "validate": "required,maxSize[300]",
+            "validate": "required,maxSize[4000]",
             "behaviour": [
               {
                 "condition": "undergoneReview == \"Yes\"",
@@ -227,7 +291,7 @@
             "constraints": [
               "Yes",
               "No",
-              "NA"
+              "Not Applicable"
             ]
           },
           {
@@ -237,11 +301,22 @@
             "constraints": [
               "Yes",
               "No",
-              "NA"
+              "Not Applicable"
+            ]
+          },
+          {
+            "name": "planName",
+            "dataType": "text",
+            "validate": "required,maxSize[100]",
+            "behaviour": [
+              {
+                "condition": "plansDeveloped == \"Yes\"",
+                "type": "enable"
+              }
             ]
           },
           {
-            "name": "yesPlansDeveloped",
+            "name": "planPurpose",
             "dataType": "text",
             "validate": "required,maxSize[300]",
             "behaviour": [
@@ -258,7 +333,7 @@
             "constraints": [
               "Yes",
               "No",
-              "NA"
+              "Not Applicable"
             ]
           },
           {
@@ -273,9 +348,41 @@
                     "condition": "facilitatedPlanningMeetings == \"Yes\""
                   }
                 ],
-                "name": "meetingDate",
+                "name": "meetingDateFrom",
                 "validate": "required"
               },
+              {
+                "dataType": "date",
+                "behaviour": [
+                  {
+                    "type": "enable_and_clear",
+                    "condition": "facilitatedPlanningMeetings == \"Yes\""
+                  }
+                ],
+                "name": "meetingDateTo",
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "future",
+                    "param": {
+                      "expression": "formatDateForValidation(meetingDateFrom)",
+                      "type": "computed"
+                    }
+                  }]
+              },
+              {
+                "dataType": "text",
+                "behaviour": [
+                  {
+                    "type": "enable_and_clear",
+                    "condition": "facilitatedPlanningMeetings == \"Yes\""
+                  }
+                ],
+                "name": "meetingName",
+                "validate": "required,maxSize[100]"
+              },
               {
                 "dataType": "text",
                 "behaviour": [
@@ -285,7 +392,7 @@
                   }
                 ],
                 "name": "meetingDescription",
-                "validate": "required"
+                "validate": "required,maxSize[4000]"
               }
             ]
           },
@@ -295,14 +402,14 @@
             "validate": "maxSize[1500]"
           },
           {
-            "dataType": "text",
-            "name": "projectAssuranceDetails",
+            "dataType": "boolean",
+            "name": "dataUploaded",
             "description": ""
           },
           {
-            "dataType": "boolean",
-            "name": "booleanField",
-            "description": ""
+            "name": "projectAssuranceDetails",
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -311,7 +418,7 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
@@ -364,9 +471,16 @@
             "type": "row",
             "items": [
               {
+                "css": "span3",
+                "type": "text",
+                "source": "planName",
+                "preLabel": "Name of plan"
+              },
+              {
+                "css": "span6",
                 "type": "textarea",
-                "source": "yesPlansDeveloped",
-                "preLabel": "If yes, please provide name and purpose of plan."
+                "source": "planPurpose",
+                "preLabel": "Purpose of plan"
               }
             ]
           },
@@ -389,10 +503,22 @@
                 "userAddedRows": true,
                 "columns": [
                   {
-                    "source": "meetingDate",
+                    "source": "meetingDateFrom",
                     "type": "date",
                     "width": "10%",
-                    "title": "Meeting/Workshop Date"
+                    "title": "Date from"
+                  },
+                  {
+                    "source": "meetingDateTo",
+                    "type": "date",
+                    "width": "10%",
+                    "title": "Date to"
+                  },
+                  {
+                    "type": "text",
+                    "source": "meetingName",
+                    "title": "Name of event",
+                    "rows": 4
                   },
                   {
                     "type": "textarea",
@@ -421,9 +547,7 @@
       "template": {
         "name": "NHT - Project Commencement",
         "title": "Project Commencement",
-        "dataModel": [
-
-        ],
+        "dataModel": [],
         "viewModel": [
           {
             "type": "row",
@@ -455,7 +579,7 @@
             "name": "undergoneWhsReview",
             "dataType": "text",
             "validate": "required",
-            "description":"The WHS risk register for project services must be reviewed and updated where new risks are identified, or control measures have changed.",
+            "description": "The WHS risk register for project services must be reviewed and updated where new risks are identified, or control measures have changed.",
             "constraints": [
               "Yes",
               "No"
@@ -476,7 +600,7 @@
             "name": "hasNotifiableIncident",
             "dataType": "text",
             "validate": "required",
-            "description":"A WHS Notifiable incident is defined within Work Health and Safety Act (Cth) 2011 Part 3 – Incident Notification. (https://www.legislation.gov.au/Details/C2018C00293). Refer to Deed of Standing offer clause 42 Work Health and Safety for further information on these requirements.",
+            "description": "A WHS Notifiable incident is defined within Work Health and Safety Act (Cth) 2011 Part 3 – Incident Notification. (https://www.legislation.gov.au/Details/C2018C00293). Refer to Deed of Standing offer clause 42 Work Health and Safety for further information on these requirements.",
             "constraints": [
               "Yes",
               "No"
@@ -500,11 +624,11 @@
             "name": "hasVerifiedSubContractors",
             "dataType": "text",
             "validate": "required",
-            "description":"If there have been no current or new subcontracting arrangement during this reporting period, please report as Not Applicable. Refer to Deed of standing offer clause 20 Subcontracting and 42 Work Health and Safety for further information on these requirements.",
+            "description": "If there have been no current or new subcontracting arrangement during this reporting period, please report as Not Applicable. Refer to Deed of standing offer clause 20 Subcontracting and 42 Work Health and Safety for further information on these requirements.",
             "constraints": [
               "Yes",
               "No",
-              "NA"
+              "Not Applicable"
             ]
           },
           {
@@ -573,7 +697,7 @@
             ],
             "items": [
               {
-                "source": "<span class=\"preLabel required\"><label><i>If not, provide notification as outlined in the Deed of Standing offer clause 42.3 Notifying the customer.</i>",
+                "source": "<span class=\"preLabel required\"><label><i>If no, provide notification as outlined in the Deed of Standing offer clause 42.3 Notifying the customer.</i>",
                 "type": "literal"
               }
             ]
@@ -612,360 +736,533 @@
     },
     {
       "collapsedByDefault": false,
-      "template": {
-        "title": "Synthesising and finalising baseline data",
-        "modelName": "NHT - Baseline data",
+      "template":   {
         "dataModel": [
           {
-            "dataType": "list",
-            "name": "baselineDetails",
+            "allowRowDelete": "false",
             "columns": [
               {
                 "dataType": "text",
-                "name": "datasetName",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
                 "validate": "required"
               },
               {
-                "name": "projectBaseline",
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
                 "dataType": "text",
-                "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "baseline",
-                  "valueProperty": "baseline",
-                  "type": "pre-populated",
-                  "excludePath": "baselineDetails.projectBaseline",
-                  "config": {
-                    "source": {
-                      "context-path": "owner.custom.details.baseline.rows"
-                    }
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
-                }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
               },
               {
-                "name": "datasetSupports",
                 "dataType": "text",
-                "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableCbp"
+          },
+          {
+            "columns": [
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
                 "validate": "required",
                 "constraints": {
-                  "textProperty": "name",
-                  "valueProperty": "dataSetId",
+                  "textProperty": "label",
+                  "valueProperty": "value",
                   "type": "pre-populated",
                   "config": {
                     "source": {
-                      "context-path": "owner.custom.dataSets"
+                      "context-path": "outcomes"
                     }
                   }
                 }
               },
               {
+                "name": "investmentPriorities2",
                 "dataType": "text",
-                "name": "baselineDescription",
-                "validate": "required,maxSize[500]"
-              },
-              {
-                "name": "relatedOutcomes",
-                "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
+                "description": "",
                 "validate": "required",
                 "constraints": {
                   "textProperty": "label",
-                  "valueProperty": "label",
+                  "valueProperty": "value",
                   "type": "pre-populated",
                   "config": {
                     "source": {
-                      "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
-                      }
-                      ]
+                      "context-path": "owner.investmentPriorities"
                     }
                   }
                 }
               },
               {
                 "dataType": "text",
-                "description": "",
-                "name": "outcomeStatementNew"
-              }
-            ]
-          },
-          {
-            "name": "numberBaselineDataSets",
-            "type": "number",
-            "decimalPlaces": 0,
-            "computed": {
-              "expression": "count(baselineDetails, \"projectBaseline\")"
-            }
-          },
-          {
-            "dataType": "text",
-            "name": "comments",
-            "validate": "maxSize[1500]"
-          },
-          {
-            "dataType": "text",
-            "name": "projectAssuranceDetails",
-            "description": ""
-          },
-          {
-            "dataType": "boolean",
-            "name": "booleanField",
-            "description": ""
-          },
-          {
-            "dataType": "list",
-            "name": "assuranceDocuments",
-            "columns": [
+                "name": "otherInvestmentPriority",
+                "behaviour": [
+                  {
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
+                  }
+                ]
+              },
               {
-                "dataType": "document",
-                "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
-              }
-            ]
-          }
-        ],
-        "viewModel": [
-          {
-            "items": [
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
+              },
               {
-                "preLabel": "Total number of baseline datasets synthesised and finalised:",
-                "noEdit": true,
-                "type": "number",
-                "source": "numberBaselineDataSets"
+                "dataType": "text",
+                "name": "activityType",
+                "constraints": [
+                  "Captive Breeding",
+                  "Release",
+                  "Translocation",
+                  "Re-introduction"
+                ],
+                "validate": "required"
               },
               {
-                "type": "table",
-                "source": "baselineDetails",
-                "userAddedRows": true,
-                "columns": [
-                  {
-                    "source": "datasetName",
-                    "type": "text",
-                    "width": "20%",
-                    "title": "Name of Baseline Dataset"
-                  },
-                  {
-                    "source": "projectBaseline",
-                    "type": "selectOne",
-                    "width": "15%",
-                    "title": "Which Project Baseline are you reporting on?"
-                  },
-                  {
-                    "source": "datasetSupports",
-                    "type": "select2Many",
-                    "width": "15%",
-                    "title": "What dataset supports this Project Baseline?"
-                  },
-                  {
-                    "preLabel": "",
-                    "source": "baselineDescription",
-                    "type": "textarea",
-                    "width": "25%",
-                    "rows": 3,
-                    "placeholder": "",
-                    "title": "Briefly describe the baseline you have established under this service and its purpose."
-                  },
-                  {
-                    "source": "relatedOutcomes",
-                    "type": "selectOne",
-                    "width": "25%",
-                    "title": "Which outcome statement/s aligns with this Baseline Dataset?"
-                  }
-                ]
+                "dataType": "text",
+                "name": "activityPermit",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
               },
               {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Clarification, if needed",
-                    "type": "textarea",
-                    "rows": 4,
-                    "css": "span8",
-                    "source": "comments",
-                    "placeholder": "Clarification comments include information for your project manager about the service like:\n• any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
-                  }
-                ]
+                "dataType": "text",
+                "name": "inSituExSitu",
+                "constraints": [
+                  "Ex-situ",
+                  "In-situ"
+                ],
+                "validate": "required"
               },
               {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please attach any evidence you have available for this service and/or provide information (e.g. links) to where the evidence is stored. This field will help the Department and Service Providers during assurance activities or audits. Refer to the Evidence Guide for details of the types of acceptable evidence."
-                  },
+                "dataType": "text",
+                "name": "newOrMaintained",
+                "constraints": [
+                  "Newly established",
+                  "Maintained"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfCaptiveBreeding",
+                "validate": "required"
+              },
+              {
+                "dataType": "feature",
+                "name": "areaOfSourceSite",
+                "description": "Mapping field to be done and Area (ha) field be auto-calculated from mapping."
+              },
+              {
+                "computed": {
+                  "expression": "$geom.areaHa(areaOfSourceSite)"
+                },
+                "dataType": "number",
+                "name": "calculatedAreaOfSourceSiteAreaHa",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaOfSourceSiteAreaHa"
+                },
+                "dataType": "number",
+                "name": "areaOfSourceSiteTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedReasonSourceSite",
+                "constraints": [
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                  "Other"
+                ],
+                "validate": "required",
+                "behaviour": [
                   {
-                    "preLabel": "Data have been uploaded",
-                    "source": "booleanField",
-                    "type": "boolean"
+                    "condition": "not (within(areaOfSourceSiteTreatedHa, calculatedAreaOfSourceSiteAreaHa, 0.1))",
+                    "type": "if"
                   }
                 ]
               },
               {
-                "type": "row",
-                "items": [
+                "dataType": "text",
+                "name": "mappingNotAlignedCommentsSourceSite",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
                   {
-                    "preLabel": "",
-                    "source": "projectAssuranceDetails",
-                    "type": "textarea",
-                    "rows": 4,
-                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReasonSourceSite"
                   }
                 ]
               },
               {
-                "type": "table",
-                "source": "assuranceDocuments",
-                "userAddedRows": true,
-                "disableTableUpload": true,
-                "columns": [
+                "dataType": "document",
+                "name": "extraMappingDetailsSourceSite",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
                   {
-                    "title": "Attached documents",
-                    "source": "attachments",
-                    "type": "document"
+                    "condition": "not (within(areaOfSourceSiteTreatedHa, calculatedAreaOfSourceSiteAreaHa, 0.1))",
+                    "type": "if"
                   }
                 ]
-              }
-            ],
-            "type": "section"
-          }
-        ]
-      },
-      "modelName": null,
-      "templateName": "nhtBaselineData",
-      "optional": true,
-      "optionalQuestionText": null,
-      "title": "Collecting, or synthesising baseline data",
-      "collapsibleHeading": null,
-      "name": "NHT - Baseline data",
-      "description": null
-    },
-    {
-      "collapsedByDefault": false,
-      "template": {
-        "dataModel": [
-          {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
+              },
+
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+                "dataType": "feature",
+                "name": "areaOfReleaseSite",
+                "description": "Mapping field to be done and Area (ha) field be auto-calculated from mapping."
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
+                "computed": {
+                  "expression": "$geom.areaHa(areaOfReleaseSite)"
+                },
+                "dataType": "number",
+                "name": "calculatedAreaOfReleaseSiteHa",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "columns": [
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaOfReleaseSiteHa"
+                },
+                "dataType": "number",
+                "name": "areaOfReleaseSiteTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
               {
                 "dataType": "text",
-                "name": "communicationMaterialType",
+                "name": "mappingNotAlignedReasonReleaseSite",
                 "constraints": [
-                  "Advertising",
-                  "Book",
-                  "Brochures",
-                  "Extension materials",
-                  "Fliers",
-                  "Media release",
-                  "Report",
-                  "Social media posts",
-                  "Videos",
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
                   "Other"
                 ],
-                "validate": "required"
+                "validate": "required",
+                "behaviour": [
+                  {
+                    "condition": "not (within(areaOfReleaseSiteTreatedHa, calculatedAreaOfReleaseSiteHa, 0.1))",
+                    "type": "if"
+                  }
+                ]
               },
               {
                 "dataType": "text",
-                "name": "otherCommunicationMaterialType",
+                "name": "mappingNotAlignedCommentsReleaseSite",
+                "validate": "required,maxSize[100]",
                 "behaviour": [
                   {
-                    "condition": "communicationMaterialType == \"Other\"",
-                    "type": "enable"
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReasonReleaseSite"
                   }
-                ],
-                "validate": "required,maxSize[100]"
-              },
-              {
-                "dataType": "number",
-                "name": "numberOfCommunicationMaterialsPublished",
-                "description": "Refers to unique publications not number printed",
-                "validate": "required,min[0]"
+                ]
               },
               {
-                "dataType": "text",
-                "name": "communicationMaterialPurpose",
-                "validate": "required,maxSize[300]"
+                "dataType": "document",
+                "name": "extraMappingDetailsReleaseSite",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
+                  {
+                    "condition": "not (within(areaOfReleaseSiteTreatedHa, calculatedAreaOfReleaseSiteHa, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+
+              {
+                "columns": [
+                  {
+                    "dataType": "date",
+                    "name": "activitiesStartDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "date",
+                    "name": "activitiesEndDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": [
+                      {
+                        "rule": "required"
+                      },
+                      {
+                        "rule": "future",
+                        "param": {
+                          "expression": "formatDateForValidation(activitiesStartDate)",
+                          "type": "computed"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "breedingTechnique",
+                    "constraints": [
+                      "Captive breeding",
+                      "Fauna captive breeding program",
+                      "Fauna wild breeding program",
+                      "Other"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "otherBreedingTechnique",
+                    "description": "",
+                    "behaviour": [
+                      {
+                        "condition": "breedingTechnique == \"Other\"",
+                        "type": "enable"
+                      }
+                    ],
+                    "validate": "required,maxSize[300]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "individualsOrGroups",
+                    "constraints": [
+                      "Individuals",
+                      "Groups"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "number",
+                    "name": "numberOfIndividualsOrGroups",
+                    "validate": "required,min[0]"
+                  },
+                  {
+                    "dataType": "number",
+                    "name": "numberOfIndividualsReleased",
+                    "validate": "required,min[0]"
+                  },
+                  {
+                    "dataType": "number",
+                    "name": "numberOfAdnimalDiedPreReleased",
+                    "validate": "required,min[0]"
+                  },
+                  {
+                    "name": "projectBaseline",
+                    "dataType": "text",
+                    "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
+                    "validate": "required",
+                    "constraints": {
+                      "textProperty": "baseline",
+                      "valueProperty": "code",
+                      "type": "pre-populated",
+                      "excludePath": "projectBaseline",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.details.baseline.rows"
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "name": "datasetSupports",
+                    "dataType": "text",
+                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
+                    "validate": "required",
+                    "constraints": {
+                      "textProperty": "name",
+                      "valueProperty": "dataSetId",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.dataSets"
+                        }
+                      }
+                    }
+                  }
+                ],
+                "dataType": "list",
+                "name": "speciesInBreedingProgram"
               }
             ],
             "dataType": "list",
-            "name": "communicationMaterials"
+            "name": "breedingProgramDetails"
+          },
+          {
+            "name": "numberOfBreedingProgramsSurveysConducted",
+            "type": "number",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "count(breedingProgramDetails, \"numberOfIndividualsReleased\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalCaptiveBreedingEstablished",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(breedingProgramDetails, \"newOrMaintained == 'Newly established' ? numberOfCaptiveBreeding : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalCaptiveBreedingEstablishedInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalCaptiveBreedingEstablished",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalCaptiveBreedingMaintained",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(breedingProgramDetails, \"newOrMaintained == 'Maintained' ? numberOfCaptiveBreeding : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalCaptiveBreedingMaintainedInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalCaptiveBreedingMaintained",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedCaptiveBreedingMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalCaptiveBreedingEstablishedInvoiced < +totalCaptiveBreedingEstablished or +totalCaptiveBreedingMaintainedInvoiced < +totalCaptiveBreedingMaintained",
+                "type": "enable"
+              }
+            ]
           },
           {
             "dataType": "text",
@@ -979,12 +1276,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -993,26 +1290,37 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Communication Materials",
-        "title": "Communication Materials",
+        "modelName": "NHT - Establishing ex-situ breeding programs",
+        "title": "Captive Breeding, Translocation or Re-introduction Program",
         "viewModel": [
           {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
             "columns": [
               {
                 "width": "10%",
                 "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
+                "title": "Are individuals or groups delivering this service?",
                 "type": "selectOne"
               },
               {
                 "width": "20%",
                 "type": "col",
-                "title": "Total Number of people delivering this service",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "participationIndividualNumber",
@@ -1027,7 +1335,8 @@
               {
                 "type": "col",
                 "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "firstNationIndividualNumber",
@@ -1040,962 +1349,4250 @@
                 ]
               },
               {
+                "width": "20%",
                 "source": "participationDetails",
                 "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
                 "type": "textarea"
               }
             ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
+            "source": "participationInformationTableCbp",
             "type": "table"
           },
           {
-            "type": "section",
+            "type": "row",
             "items": [
               {
-                "columns": [
-                  {
-                    "width": "25%",
-                    "source": "communicationMaterialType",
-                    "title": "Type of communication material published",
-                    "type": "select2"
-                  },
-                  {
-                    "width": "25%",
-                    "source": "otherCommunicationMaterialType",
-                    "title": "Type of communication material published (if Other)",
-                    "type": "textarea"
-                  },
-                  {
-                    "width": "15%",
-                    "source": "numberOfCommunicationMaterialsPublished",
-                    "title": "Number of communication materials published",
-                    "type": "number"
-                  },
-                  {
-                    "width": "35%",
-                    "source": "communicationMaterialPurpose",
-                    "title": "Purpose of communication material",
-                    "type": "textarea"
-                  }
-                ],
-                "userAddedRows": true,
-                "source": "communicationMaterials",
-                "type": "table"
-              },
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "type": "row",
+                "type": "col",
+                "css": "span4 col-border-right",
                 "items": [
                   {
-                    "source": "<i>Note: to upload a communication material refer to the documents tab.</i>",
-                    "type": "literal"
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total number of captive breeding and release, translocation or re-introduction programs (established) for this reporting period",
+                        "source": "totalCaptiveBreedingEstablished",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total number of captive breeding and release, translocation or re-introduction programs (established) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalCaptiveBreedingEstablishedInvoiced",
+                        "type": "number"
+                      }
+                    ]
                   }
                 ]
               },
               {
-                "type": "row",
+                "type": "col",
+                "css": "span4 col-border-right",
                 "items": [
                   {
-                    "preLabel": "Optionally attach photos",
-                    "source": "photographicEvidence",
-                    "type": "image"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Clarification, if needed",
-                    "type": "textarea",
-                    "rows": 4,
-                    "css": "span8",
-                    "source": "comments",
-                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii) Total number of captive breeding and release, translocation or re-introduction programs (maintained) for this reporting period",
+                        "source": "totalCaptiveBreedingMaintained",
+                        "type": "number"
+                      }
+                    ]
                   },
                   {
-                    "preLabel": "Data have been uploaded",
-                    "source": "dataUploaded",
-                    "type": "boolean"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "",
-                    "source": "projectAssuranceDetails",
-                    "type": "textarea",
-                    "rows": 4,
-                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-                  }
-                ]
-              },
-              {
-                "type": "table",
-                "source": "assuranceDocuments",
-                "userAddedRows": true,
-                "disableTableUpload": true,
-                "columns": [
-                  {
-                    "title": "Attached documents",
-                    "source": "attachments",
-                    "type": "document"
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total number of captive breeding and release, translocation or re-introduction programs (maintained) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalCaptiveBreedingMaintainedInvoiced",
+                        "type": "number"
+                      }
+                    ]
                   }
                 ]
               }
             ]
-          }
-        ]
-      },
-      "modelName": null,
-      "templateName": "nhtCommunicationMaterials",
-      "optional": true,
-      "optionalQuestionText": null,
-      "title": "Communication materials",
-      "collapsibleHeading": null,
-      "name": "NHT - Communication materials",
-      "description": null
-    },
-    {
-      "collapsedByDefault": false,
-      "template": {
-        "dataModel": [
-          {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
           },
           {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
+            "type": "row",
+            "items": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedCaptiveBreedingMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
               }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
+            ]
           },
           {
-            "columns": [
-              {
-                "dataType": "text",
-                "name": "eventType",
-                "constraints": [
-                  "Field days",
-                  "Training / workshop events",
-                  "Conferences / seminars",
-                  "One-on-one technical advice interactions",
-                  "On-ground trials / demonstrations",
-                  "On-ground works"
-                ],
-                "validate": "required"
-              },
-              {
-                "dataType": "number",
-                "name": "numberOfEvents",
-                "validate": "required"
-              },
-              {
-                "dataType": "number",
-                "name": "numberOfParticipants",
-                "validate": "required,min[0]"
-              },
-              {
-                "dataType": "number",
-                "name": "numberOfIndigenousParticipants",
-                "validate": "required,min[0]"
-              },
-              {
-                "dataType": "number",
-                "name": "numberOfFarmers",
-                "validate": "required,min[0]"
-              },
-              {
-                "dataType": "number",
-                "name": "numberOfGroups",
-                "validate": "required,min[0]"
-              },
-              {
-                "dataType": "stringList",
-                "name": "industryType",
-                "constraints": [
-                  "Cropping",
-                  "Dairy",
-                  "Dryland agriculture",
-                  "Horticulture",
-                  "Grazing",
-                  "Fisheries",
-                  "Aquaculture",
-                  "Environmental"
-                ],
-                "validate": "required"
-              },
-              {
-                "dataType": "text",
-                "name": "eventPurpose",
-                "validate": "required,maxSize[300]"
-              },
-              {
-                "name": "relatedOutcomes",
-                "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "label",
-                  "valueProperty": "label",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
-                      }
-                      ]
-                    }
-                  }
-                }
-              },
-              {
-                "name": "investmentPriorities2",
-                "dataType": "stringList",
-                "validate": "required",
-                "constraints": {
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "params": [
-                        {
-                          "expression": "owner.projectId",
-                          "name": "id",
-                          "type": "computed"
-                        }
-                      ],
-                      "url": "/project/listProjectInvestmentPriorities/"
-                    }
-                  }
-                }
-              },
+            "type": "section",
+            "items": [
               {
-                "dataType": "text",
-                "name": "otherInvestmentPriority",
-                "behaviour": [
+                "addRowText": "Add a new breeding area",
+                "userAddedRows": true,
+                "source": "breedingProgramDetails",
+                "type": "repeat",
+                "items": [
                   {
-                    "type": "enable",
-                    "condition": "\"Other\" in investmentPriorities2"
-                  }
-                ]
-              }
-            ],
-            "dataType": "list",
-            "name": "events"
-          },
-          {
-            "dataType": "text",
-            "name": "comments",
-            "validate": "maxSize[1500]"
-          },
-          {
-            "dataType": "image",
-            "name": "photographicEvidence"
-          },
-          {
-            "dataType": "boolean",
-            "name": "dataUploaded",
-            "description": ""
-          },
-          {
-            "dataType": "text",
-            "name": "projectAssuranceDetails",
-            "description": ""
-          },
-          {
-            "dataType": "list",
-            "name": "assuranceDocuments",
-            "columns": [
-              {
-                "dataType": "document",
-                "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
-              }
-            ]
-          }
-        ],
-        "modelName": "NHT - Community engagement",
-        "title": "Community/stakeholder engagement",
-        "viewModel": [
-          {
-            "type": "section",
-            "items": [
-              {
-                "columns": [
-                  {
-                    "width": "10%",
-                    "source": "participationIndividualsOrGroups",
-                    "title": "Individuals or groups?",
-                    "type": "selectOne"
-                  },
-                  {
-                    "width": "20%",
-                    "type": "col",
-                    "title": "Total Number of people delivering this service",
+                    "type": "row",
                     "items": [
                       {
-                        "source": "participationIndividualNumber",
-                        "type": "number"
+                        "css": "span3",
+                        "type": "col",
+                        "items": [
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "relatedOutcomes",
+                                "type": "selectOne",
+                                "preLabel": "Which outcome statement/s does this activity relate to?"
+                              }
+                            ]
+                          }
+                        ]
                       },
                       {
-                        "source": "participationGroupNumber",
-                        "type": "selectOne"
+                        "type": "col",
+                        "css": "span3 col-border-right",
+                        "items": [
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "investmentPriorities2",
+                                "preLabel": "Which investment priority does this activity relate to?",
+                                "type": "select2Many"
+                              }
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "css": "span3",
+                        "type": "col",
+                        "items": [
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "invoicingThisActivity",
+                                "preLabel": "Are you invoicing for this activity in this reporting period?",
+                                "type": "selectOne"
+                              }
+                            ]
+                          }
+                        ]
                       }
                     ]
                   },
                   {
-                    "type": "col",
-                    "width": "20%",
-                    "title": "Total Number of First Nations people delivering this service ",
+                    "type": "row",
+                    "css": "border-bottom",
                     "items": [
                       {
-                        "source": "firstNationIndividualNumber",
-                        "type": "number"
+                        "type": "col",
+                        "css": "span3 col-border-right",
+                        "items": [
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Type of activity",
+                                "source": "activityType",
+                                "type": "selectOne"
+                              }
+                            ]
+                          }
+                        ]
                       },
                       {
-                        "source": "firstNationGroupNumber",
-                        "type": "selectOne"
-                      }
-                    ]
-                  },
-                  {
-                    "source": "participationDetails",
-                    "rows": 4,
-                    "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                    "type": "textarea"
-                  }
-                ],
-                "userAddedRows": false,
-                "disableTableUpload": false,
-                "source": "",
-                "type": "table"
-              },
-              {
-                "columns": [
-                  {
-                    "width": "10%",
-                    "source": "eventType",
-                    "title": "Type of Community / Stakeholder engagement activity",
-                    "type": "select2"
-                  },
-                  {
-                    "width": "10%",
-                    "source": "numberOfEvents",
-                    "title": "Number of Community / Stakeholder engagement type events",
-                    "type": "number"
-                  },
-                  {
-                    "width": "10%",
-                    "source": "eventPurpose",
-                    "title": "Purpose of engagement",
-                    "type": "textarea"
-                  },
-                  {
-                    "width": "10%",
-                    "source": "numberOfGroups",
-                    "title": "Number of communities or groups engaged",
-                    "type": "number"
-                  },
-                  {
-                    "width": "10%",
-                    "source": "numberOfParticipants",
-                    "title": "Total number of attendees / participants",
-                    "type": "number"
-                  },
-                  {
-                    "width": "10%",
-                    "source": "numberOfIndigenousParticipants",
-                    "title": "Number of Indigenous attendees / participants",
-                    "type": "number"
-                  },
-                  {
-                    "width": "10%",
-                    "source": "numberOfFarmers",
-                    "title": "Number of farmers attending / participating",
-                    "type": "number"
-                  },
-                  {
-                    "width": "10%",
-                    "source": "industryType",
-                    "title": "Industry type engaged",
-                    "type": "select2Many"
-                  },
-                  {
-                    "width": "10%",
-                    "type": "col",
-                    "title": "Which investment priority does this activity relate to?",
-                    "items": [
+                        "type": "col",
+                        "css": "span3 col-border-right",
+                        "items": [
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Is this an established or maintained activity?",
+                                "source": "newOrMaintained",
+                                "type": "selectOne"
+                              }
+                            ]
+                          }
+                        ]
+                      },
                       {
-                        "source": "investmentPriorities2",
-                        "type": "select2Many"
+                        "type": "col",
+                        "css": "span3 col-border-right",
+                        "items": [
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Were permits obtained to support this activity?",
+                                "source": "activityPermit",
+                                "type": "selectOne"
+                              }
+                            ]
+                          }
+                        ]
                       },
                       {
-                        "source": "otherInvestmentPriority",
-                        "type": "text"
-                      }
-                    ]
-                  },
-                  {
-                    "source": "relatedOutcomes",
-                    "type": "selectOne",
-                    "width": "10%",
-                    "title": "Which outcome statement/s relates to this survey?"
-                  }
-                ],
-                "userAddedRows": true,
-                "source": "events",
-                "type": "table"
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Optionally attach photos",
-                    "source": "photographicEvidence",
-                    "type": "image"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Clarification, if needed",
-                    "type": "textarea",
-                    "rows": 4,
-                    "css": "span8",
-                    "source": "comments",
-                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
-                  },
-                  {
-                    "preLabel": "Data have been uploaded",
-                    "source": "dataUploaded",
-                    "type": "boolean"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "",
-                    "source": "projectAssuranceDetails",
-                    "type": "textarea",
-                    "rows": 4,
-                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-                  }
-                ]
-              },
-              {
-                "type": "table",
-                "source": "assuranceDocuments",
-                "userAddedRows": true,
+                        "type": "col",
+                        "css": "span3 col-border-right",
+                        "items": [
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Ex-situ / In-situ",
+                                "source": "inSituExSitu",
+                                "type": "selectOne"
+                              }
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "col",
+                        "css": "span3 col-border-right",
+                        "items": [
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "areaOfSourceSite",
+                                "type": "feature",
+                                "preLabel": "Site/s of captive breeding, pre-translocation capture (source site)"
+                              }
+                            ]
+                          },
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "calculatedAreaOfSourceSiteAreaHa",
+                                "type": "number",
+                                "readonly": true,
+                                "displayOptions": {
+                                  "displayUnits": true
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Please attach mapping details",
+                                "source": "extraMappingDetailsSourceSite",
+                                "type": "document"
+                              }
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "col",
+                        "css": "span3 col-border-right",
+                        "items": [
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Actual area (ha) of captive breeding, pre-translocation capture (source site)",
+                                "source": "areaOfSourceSiteTreatedHa",
+                                "type": "number",
+                                "displayOptions": {
+                                  "displayUnits": true
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Reason for actual being different to mapped amount",
+                                "source": "mappingNotAlignedReasonSourceSite",
+                                "type": "selectOne"
+                              }
+                            ]
+                          },
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                                "source": "mappingNotAlignedCommentsSourceSite",
+                                "type": "textarea",
+                                "rows": 5
+                              }
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "col",
+                        "css": "span3 col-border-right",
+                        "items": [
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "areaOfReleaseSite",
+                                "type": "feature",
+                                "preLabel": " Site/s of release of captive breeding, re-introduced or translocated animals (release site)"
+                              }
+                            ]
+                          },
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "readonly": "readonly",
+                                "source": "calculatedAreaOfReleaseSiteHa",
+                                "type": "number",
+                                "displayOptions": {
+                                  "displayUnits": true
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Please attach mapping details",
+                                "source": "extraMappingDetailsReleaseSite",
+                                "type": "document"
+                              }
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "col",
+                        "css": "span3 col-border-right",
+                        "items": [
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Actual area (ha) of release of captive breeding, re-introduced or translocated animals (release site)",
+                                "source": "areaOfReleaseSiteTreatedHa",
+                                "type": "number",
+                                "displayOptions": {
+                                  "displayUnits": true
+                                }
+                              }
+                            ]
+                          },
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Reason for actual being different to mapped amount",
+                                "source": "mappingNotAlignedReasonReleaseSite",
+                                "type": "selectOne"
+                              }
+                            ]
+                          },
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                                "source": "mappingNotAlignedCommentsReleaseSite",
+                                "type": "textarea",
+                                "rows": 5
+                              }
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "col",
+                        "css": "span3 col-border-right",
+                        "items": [
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Number of captive breeding, release, translocation, or re-introduction sites established/ maintained",
+                                "source": "numberOfCaptiveBreeding",
+                                "type": "number"
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "addRowText": "Add a species",
+                    "columns": [
+                      {
+                        "width": "15%",
+                        "source": "activitiesStartDate",
+                        "type": "date",
+                        "title": "Activity start date"
+                      },
+                      {
+                        "width": "15%",
+                        "source": "activitiesEndDate",
+                        "type": "date",
+                        "title": "Activity end date"
+                      },
+                      {
+                        "width": "15%",
+                        "source": "individualsOrGroups",
+                        "type": "selectOne",
+                        "title": "Individuals or groups?"
+                      },
+                      {
+                        "width": "10%",
+                        "source": "numberOfIndividualsOrGroups",
+                        "title": "Number of groups/individuals of the investment priority species in captive breeding, release, translocation or re-introduction program",
+                        "type": "number"
+                      },
+                      {
+                        "width": "10%",
+                        "source": "numberOfAdnimalDiedPreReleased",
+                        "title": "Number of groups/individuals of the investment priority species that died (pre-release)",
+                        "type": "number"
+                      },
+                      {
+                        "width": "10%",
+                        "source": "numberOfIndividualsReleased",
+                        "title": "Number of groups/individuals released, translocated or re-introduced to the wild",
+                        "type": "number"
+                      },
+                      {
+                        "width": "10%",
+                        "type": "col",
+                        "title": "Technique of captive breeding, release, translocation or re-introduction used",
+                        "items": [
+                          {
+                            "source": "breedingTechnique",
+                            "type": "selectOne"
+                          },
+                          {
+                            "source": "otherBreedingTechnique",
+                            "type": "text"
+                          }
+                        ]
+                      },
+                      {
+                        "source": "projectBaseline",
+                        "type": "selectOne",
+                        "width": "15%",
+                        "title": "Which project baseline relates to this activity?"
+                      }
+                    ],
+                    "userAddedRows": true,
+                    "disableTableUpload": true,
+                    "source": "speciesInBreedingProgram",
+                    "type": "table"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Optionally attach photos",
+                    "source": "photographicEvidence",
+                    "type": "image"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Clarification, if needed",
+                    "type": "textarea",
+                    "rows": 4,
+                    "css": "span8",
+                    "source": "comments",
+                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
+                  },
+                  {
+                    "preLabel": "Data have been uploaded",
+                    "source": "dataUploaded",
+                    "type": "boolean"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "",
+                    "source": "projectAssuranceDetails",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                  }
+                ]
+              },
+              {
+                "type": "table",
+                "source": "assuranceDocuments",
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "columns": [
+                  {
+                    "title": "Attached documents",
+                    "source": "attachments",
+                    "type": "document"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "modelName": null,
+      "templateName": "nhtExSituBreedingSites",
+      "optional": true,
+      "optionalQuestionText": null,
+      "title": "Establishing ex-situ breeding program",
+      "collapsibleHeading": null,
+      "name": "NHT - Establishing ex-situ breeding programs",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
+          {
+            "allowRowDelete": "false",
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableCom"
+          },
+          {
+            "name": "relatedOutcomes",
+            "dataType": "text",
+            "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+            "validate": "required",
+            "constraints": {
+              "textProperty": "label",
+              "valueProperty": "value",
+              "type": "pre-populated",
+              "config": {
+                "source": {
+                  "context-path": "outcomes"
+                }
+              }
+            }
+          },
+          {
+            "name": "investmentPriorities2",
+            "dataType": "text",
+            "description": "",
+            "validate": "required",
+            "constraints": {
+              "textProperty": "label",
+              "valueProperty": "value",
+              "type": "pre-populated",
+              "config": {
+                "source": {
+                  "context-path": "owner.investmentPriorities"
+                }
+              }
+            }
+          },
+          {
+            "dataType": "text",
+            "name": "otherInvestmentPriority",
+            "behaviour": [
+              {
+                "type": "enable",
+                "condition": "\"Other\" in investmentPriorities2"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "invoicingThisActivity",
+            "constraints": [
+              "Yes",
+              "No"
+            ],
+            "validate": "required"
+          },
+          {
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "communicationMaterialType",
+                "constraints": [
+                  "Booklets",
+                  "Educational/Interpretive Signage",
+                  "Fact Sheets/Brochures",
+                  "Videos"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "date",
+                "name": "communicationDate",
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfCommunicationMaterialsPublished",
+                "description": "Refers to unique publications not number printed.",
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "communicationMaterialPurpose",
+                "validate": "required,maxSize[300]",
+                "description": "e.g. public awareness, warnings, advertisements"
+              }
+            ],
+            "dataType": "list",
+            "name": "communicationMaterials"
+          },
+          {
+            "dataType": "number",
+            "name": "totalMaterialsPublished",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "defaultValue": 1,
+            "computed": {
+              "expression": "sum(communicationMaterials, \"numberOfCommunicationMaterialsPublished\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalMaterialsPublishedInvoiced",
+            "defaultValue": "",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalMaterialsPublished",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedCommunicationMaterialsMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required,min[0]",
+            "behaviour": [
+              {
+                "condition": "+totalMaterialsPublishedInvoiced < +totalMaterialsPublished",
+                "type": "enable"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "comments",
+            "validate": "maxSize[1500]"
+          },
+          {
+            "dataType": "image",
+            "name": "photographicEvidence"
+          },
+          {
+            "dataType": "boolean",
+            "name": "dataUploaded",
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
+          },
+          {
+            "name": "projectAssuranceDetails",
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
+          },
+          {
+            "dataType": "list",
+            "name": "assuranceDocuments",
+            "columns": [
+              {
+                "dataType": "document",
+                "name": "attachments",
+                "description": "Please attach any Evidence of Service Delivery here."
+              }
+            ]
+          }
+        ],
+        "modelName": "NHT - Communication Materials",
+        "title": "Communication Materials",
+        "viewModel": [
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "width": "10%",
+                "source": "participationIndividualsOrGroups",
+                "title": "Are individuals or groups delivering this service?",
+                "type": "selectOne"
+              },
+              {
+                "width": "20%",
+                "type": "col",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "participationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "participationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "width": "20%",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "firstNationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "firstNationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
+              }
+            ],
+            "source": "participationInformationTableCom",
+            "type": "table"
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total Number of communication materials published for this reporting period",
+                        "source": "totalMaterialsPublished",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total Number of communication materials <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalMaterialsPublishedInvoiced",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedCommunicationMaterialsMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "css": "span3",
+                "type": "col",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "source": "relatedOutcomes",
+                        "type": "selectOne",
+                        "preLabel": "Which outcome statement/s does this activity relate to?"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span3 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "source": "investmentPriorities2",
+                        "preLabel": "Which investment priority does this activity relate to?",
+                        "type": "select2Many"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "css": "span3",
+                "type": "col",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "source": "invoicingThisActivity",
+                        "preLabel": "Are you invoicing for this activity in this reporting period?",
+                        "type": "selectOne"
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "section",
+            "items": [
+              {
+                "columns": [
+                  {
+                    "width": "25%",
+                    "source": "communicationMaterialType",
+                    "title": "Type of communication material published",
+                    "type": "select2"
+                  },
+                  {
+                    "width": "15%",
+                    "source": "communicationDate",
+                    "title": "Date",
+                    "type": "date"
+                  },
+                  {
+                    "width": "20%",
+                    "source": "numberOfCommunicationMaterialsPublished",
+                    "title": "Number of communication materials published",
+                    "type": "number"
+                  },
+                  {
+                    "width": "40%",
+                    "source": "communicationMaterialPurpose",
+                    "title": "Purpose of communication material",
+                    "type": "textarea"
+                  }
+                ],
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "source": "communicationMaterials",
+                "type": "table"
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "source": "<i>Note: to upload a communication material refer to the documents tab.</i>",
+                    "type": "literal"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Optionally attach photos",
+                    "source": "photographicEvidence",
+                    "type": "image"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Clarification, if needed",
+                    "type": "textarea",
+                    "rows": 4,
+                    "css": "span8",
+                    "source": "comments",
+                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
+                  },
+                  {
+                    "preLabel": "Data have been uploaded",
+                    "source": "dataUploaded",
+                    "type": "boolean"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "",
+                    "source": "projectAssuranceDetails",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                  }
+                ]
+              },
+              {
+                "type": "table",
+                "source": "assuranceDocuments",
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "columns": [
+                  {
+                    "title": "Attached documents",
+                    "source": "attachments",
+                    "type": "document"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "modelName": null,
+      "templateName": "nhtCommunicationMaterials",
+      "optional": true,
+      "optionalQuestionText": null,
+      "title": "Communication materials",
+      "collapsibleHeading": null,
+      "name": "NHT - Communication materials",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
+          {
+            "allowRowDelete": "false",
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableCse"
+          },
+          {
+            "name": "relatedOutcomes",
+            "dataType": "text",
+            "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+            "validate": "required",
+            "constraints": {
+              "textProperty": "label",
+              "valueProperty": "value",
+              "type": "pre-populated",
+              "config": {
+                "source": {
+                  "context-path": "outcomes"
+                }
+              }
+            }
+          },
+          {
+            "name": "investmentPriorities2",
+            "dataType": "text",
+            "description": "",
+            "validate": "required",
+            "constraints": {
+              "textProperty": "label",
+              "valueProperty": "value",
+              "type": "pre-populated",
+              "config": {
+                "source": {
+                  "context-path": "owner.investmentPriorities"
+                }
+              }
+            }
+          },
+          {
+            "dataType": "text",
+            "name": "otherInvestmentPriority",
+            "behaviour": [
+              {
+                "type": "enable",
+                "condition": "\"Other\" in investmentPriorities2"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "invoicingThisActivity",
+            "constraints": [
+              "Yes",
+              "No"
+            ],
+            "validate": "required"
+          },
+          {
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "eventType",
+                "description": "Type of engagement events are training/workshops, on-ground trials/demonstrations and field days. Note field days should be reported as an event e.g, 3 field days is considered 1 event NOT 3 days",
+                "constraints": [
+                  "Field days",
+                  "On-ground trials / demonstrations facilitated or hosted",
+                  "Training workshops hosted"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfEvents",
+                "validate": "required",
+                "description": "This field can contribute to Number of the engagement event types: <li>training/workshops,</li> <li>on-ground trials/demonstrations and</li> <li>field days</li>"
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfParticipants",
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfIndigenousParticipants",
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfFarmers",
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfGroups",
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "stringList",
+                "name": "industryType",
+                "constraints": [
+                  "Cropping",
+                  "Dairy",
+                  "Dryland agriculture",
+                  "Horticulture",
+                  "Grazing",
+                  "Fisheries",
+                  "Aquaculture",
+                  "Environmental"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "text",
+                "name": "eventPurpose",
+                "validate": "required,maxSize[300]"
+              },
+              {
+                "dataType": "date",
+                "name": "dateFrom",
+                "validate": "required"
+              },
+              {
+                "dataType": "date",
+                "name": "dateTo",
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "future",
+                    "param": {
+                      "expression": "formatDateForValidation(dateFrom)",
+                      "type": "computed"
+                    }
+                  }
+                ]
+              }
+            ],
+            "dataType": "list",
+            "name": "events"
+          },
+          {
+            "dataType": "number",
+            "name": "totalNumberEngagementHeld",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "defaultValue": 1,
+            "computed": {
+              "expression": "sum(events, \"numberOfEvents\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalNumberEngagementHeldInvoiced",
+            "description": "Number of events invoiced for this reporting period.",
+            "defaultValue": "",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalNumberEngagementHeld",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "totalNumberEngagementInvoicedMismatched",
+            "description": "Please explain why the Total invoiced field is different from the Totals tally field.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalNumberEngagementHeldInvoiced < +totalNumberEngagementHeld",
+                "type": "enable"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "otherInvestmentPriority",
+            "behaviour": [
+              {
+                "type": "enable",
+                "condition": "\"Other\" in investmentPriorities2"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "comments",
+            "validate": "maxSize[1500]"
+          },
+          {
+            "dataType": "image",
+            "name": "photographicEvidence"
+          },
+          {
+            "dataType": "boolean",
+            "name": "dataUploaded",
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
+          },
+          {
+            "name": "projectAssuranceDetails",
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
+          },
+          {
+            "dataType": "list",
+            "name": "assuranceDocuments",
+            "columns": [
+              {
+                "dataType": "document",
+                "name": "attachments",
+                "description": "Please attach any Evidence of Service Delivery here."
+              }
+            ]
+          }
+        ],
+        "modelName": "NHT - Community engagement",
+        "title": "Community/Stakeholder Engagement",
+        "viewModel": [
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "width": "10%",
+                "source": "participationIndividualsOrGroups",
+                "title": "Are individuals or groups delivering this service?",
+                "type": "selectOne"
+              },
+              {
+                "width": "20%",
+                "type": "col",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "participationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "participationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "width": "20%",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "firstNationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "firstNationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
+              }
+            ],
+            "source": "participationInformationTableCse",
+            "type": "table"
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total number of events held/attended",
+                        "source": "totalNumberEngagementHeld",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span5 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total number of events <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalNumberEngagementHeldInvoiced",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalNumberEngagementInvoicedMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "type": "section",
+            "items": [
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "columns": [
+                  {
+                    "width": "10%",
+                    "source": "dateFrom",
+                    "title": "Date from",
+                    "type": "date"
+                  },
+                  {
+                    "width": "10%",
+                    "source": "dateTo",
+                    "title": "Date to",
+                    "type": "date"
+                  },
+                  {
+                    "width": "10%",
+                    "source": "eventType",
+                    "title": "Type of Community / Stakeholder engagement event",
+                    "type": "selectOne"
+                  },
+                  {
+                    "width": "10%",
+                    "source": "numberOfEvents",
+                    "title": "Number of engagement events",
+                    "type": "number"
+                  },
+                  {
+                    "width": "10%",
+                    "source": "eventPurpose",
+                    "title": "Purpose of engagement",
+                    "type": "textarea"
+                  },
+                  {
+                    "width": "10%",
+                    "source": "numberOfGroups",
+                    "title": "Number of communities or groups engaged",
+                    "type": "number"
+                  },
+                  {
+                    "width": "10%",
+                    "source": "numberOfParticipants",
+                    "title": "Total number of attendees / participants",
+                    "type": "number"
+                  },
+                  {
+                    "width": "10%",
+                    "source": "numberOfIndigenousParticipants",
+                    "title": "Number of Indigenous attendees / participants",
+                    "type": "number"
+                  },
+                  {
+                    "width": "10%",
+                    "source": "numberOfFarmers",
+                    "title": "Number of farmers attending / participating",
+                    "type": "number"
+                  },
+                  {
+                    "width": "10%",
+                    "source": "industryType",
+                    "title": "Industry/Stakeholder type engaged",
+                    "type": "select2Many"
+                  }
+                ],
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "source": "events",
+                "type": "table"
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Optionally attach photos",
+                    "source": "photographicEvidence",
+                    "type": "image"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Clarification, if needed",
+                    "type": "textarea",
+                    "rows": 4,
+                    "css": "span8",
+                    "source": "comments",
+                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
+                  },
+                  {
+                    "preLabel": "Data have been uploaded",
+                    "source": "dataUploaded",
+                    "type": "boolean"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "",
+                    "source": "projectAssuranceDetails",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                  }
+                ]
+              },
+              {
+                "type": "table",
+                "source": "assuranceDocuments",
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "columns": [
+                  {
+                    "title": "Attached documents",
+                    "source": "attachments",
+                    "type": "document"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "modelName": null,
+      "templateName": "nhtCommunityEngagement",
+      "optional": true,
+      "optionalQuestionText": null,
+      "title": "Community/stakeholder engagement",
+      "collapsibleHeading": null,
+      "name": "NHT - Community engagement",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
+          {
+            "allowRowDelete": "false",
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableCoa"
+          },
+          {
+            "columns": [
+              {
+                "columns": [
+                  {
+                    "dataType": "feature",
+                    "name": "protectedSites"
+                  },
+                  {
+                    "computed": {
+                      "expression": "$geom.areaHa(protectedSites)"
+                    },
+                    "dataType": "number",
+                    "decimalPlaces": 3,
+                    "name": "areaProtectedHa",
+                    "units": "ha"
+                  },
+                  {
+                    "defaultValue": {
+                      "expression": "$geom.lengthKm(protectedSites)",
+                      "type": "computed"
+                    },
+                    "dataType": "number",
+                    "name": "lengthProtectedKm",
+                    "units": "km",
+                    "decimalPlaces": 3
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "accessControlType",
+                    "description": "",
+                    "constraints": [
+                      "Boardwalks",
+                      "Bollards & barriers",
+                      "Constructed parking bays",
+                      "Fencing, styles, gates & grids",
+                      "Formed traffic ways",
+                      "Signage",
+                      "Other"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "otherAccessControlType",
+                    "description": "Please specify the type of access control if Other (specify in notes) was selected in the Type of Access Control Installed column.",
+                    "behaviour": [
+                      {
+                        "condition": "accessControlType == \"Other\"",
+                        "type": "enable"
+                      }
+                    ],
+                    "validate": "required,maxSize[100]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "controlObjective",
+                    "description": "What is your access control method? and/or What do you intend to achieve by using your structure/s?",
+                    "validate": "required,maxSize[300]"
+                  },
+                  {
+                    "dataType": "date",
+                    "name": "dateFrom",
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "date",
+                    "name": "dateTo",
+                    "validate": [
+                      {
+                        "rule": "required"
+                      },
+                      {
+                        "rule": "future",
+                        "param": {
+                          "expression": "formatDateForValidation(dateFrom)",
+                          "type": "computed"
+                        }
+                      }
+                    ]
+                  }
+                ],
+                "dataType": "list",
+                "name": "accessControlDetails"
+              },
+              {
+                "dataType": "number",
+                "name": "numberInstalled",
+                "validate": "required,min[0]"
+              },
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "investmentPriorities2",
+                "dataType": "text",
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
+                  }
+                }
+              },
+              {
+                "dataType": "text",
+                "name": "otherInvestmentPriority",
+                "behaviour": [
+                  {
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "feature",
+                "name": "sitesCoveredForControlAccess",
+                "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
+              },
+              {
+                "computed": {
+                  "expression": "$geom.areaHa(sitesCoveredForControlAccess)"
+                },
+                "dataType": "number",
+                "name": "calculatedAreaTreatedHa",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesCoveredForControlAccess)"
+                },
+                "dataType": "number",
+                "name": "calculatedLengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
+                  {
+                    "condition": "lengthTreatedKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
+                    }
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaTreatedHa"
+                },
+                "dataType": "number",
+                "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedReason",
+                "constraints": [
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                  "Other"
+                ],
+                "validate": "required",
+                "behaviour": [
+                  {
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedComments",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
+                  {
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReason"
+                  }
+                ]
+              },
+              {
+                "dataType": "document",
+                "name": "extraMappingDetails",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
+                  {
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKm"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
+              }
+            ],
+            "dataType": "list",
+            "name": "controllingAccessAreasControlled"
+          },
+          {
+            "dataType": "number",
+            "name": "totalStructuresInstalled",
+            "decimalPlaces": 0,
+            "validate": "min[0]",
+            "computed": {
+              "expression": "sum(controllingAccessAreasControlled, \"numberInstalled\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalStructuresInstalledInvoiced",
+            "defaultValue": "",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalStructuresInstalled",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ]
+          },
+          {
+            "dataType": "number",
+            "name": "totalLengthStructuresInstalled",
+            "decimalPlaces": 3,
+            "validate": "min[0]",
+            "computed": {
+              "expression": "sum(controllingAccessAreasControlled, \"lengthTreatedKm\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalLengthStructuresInstalledInvoiced",
+            "decimalPlaces": 3,
+            "defaultValue": "",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalLengthStructuresInstalled",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ]
+          },
+          {
+            "dataType": "number",
+            "name": "totalAreaStructuresInstalled",
+            "decimalPlaces": 3,
+            "validate": "min[0]",
+            "computed": {
+              "expression": "sum(controllingAccessAreasControlled, \"areaTreatedHa\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalAreaStructuresInstalledInvoiced",
+            "decimalPlaces": 3,
+            "defaultValue": "",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaStructuresInstalled",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedControllingAccessMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required,min[0]",
+            "behaviour": [
+              {
+                "condition": "+totalStructuresInstalledInvoiced < +totalStructuresInstalled or +totalLengthStructuresInstalledInvoiced < +totalLengthStructuresInstalled or +totalAreaStructuresInstalledInvoiced < +totalAreaStructuresInstalled",
+                "type": "enable"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "comments",
+            "validate": "maxSize[1500]"
+          },
+          {
+            "dataType": "image",
+            "name": "photographicEvidence"
+          },
+          {
+            "dataType": "boolean",
+            "name": "dataUploaded",
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
+          },
+          {
+            "name": "projectAssuranceDetails",
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
+          },
+          {
+            "dataType": "list",
+            "name": "assuranceDocuments",
+            "columns": [
+              {
+                "dataType": "document",
+                "name": "attachments",
+                "description": "Please attach any Evidence of Service Delivery here."
+              }
+            ]
+          }
+        ],
+        "modelName": "NHT - Controlling access",
+        "title": "Controlling Access",
+        "viewModel": [
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "width": "10%",
+                "source": "participationIndividualsOrGroups",
+                "title": "Are individuals or groups delivering this service?",
+                "type": "selectOne"
+              },
+              {
+                "width": "20%",
+                "type": "col",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "participationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "participationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "width": "20%",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "firstNationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "firstNationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
+              }
+            ],
+            "source": "participationInformationTableCoa",
+            "type": "table"
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total number of structures installed that control access for this reporting period",
+                        "source": "totalStructuresInstalled",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total number of structures that control access <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalStructuresInstalledInvoiced",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii) Total area (ha) of structures installed that control access for this reporting period",
+                        "source": "totalAreaStructuresInstalled",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total area (ha) of structures installed that control access <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalAreaStructuresInstalledInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(v) Total length (km) of structures installed that control access for this reporting period",
+                        "source": "totalLengthStructuresInstalled",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vi) Total length (km) of structures installed that control access <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalLengthStructuresInstalledInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedControllingAccessMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "addRowText": "Add a new controlled area",
+            "userAddedRows": true,
+            "source": "controllingAccessAreasControlled",
+            "type": "repeat",
+            "items": [
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "css": "border-bottom",
+                "items": [
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "numberInstalled",
+                            "preLabel": "Number of structures installed",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Site/s where structures have been installed to control access",
+                            "source": "sitesCoveredForControlAccess",
+                            "type": "feature"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "calculatedAreaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "calculatedLengthTreatedKm",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Please attach mapping details",
+                            "source": "extraMappingDetails",
+                            "type": "document"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Actual area (ha) / length (km) where access has been controlled",
+                            "source": "areaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "lengthTreatedKm",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Reason for actual being different to mapped amount",
+                            "source": "mappingNotAlignedReason",
+                            "type": "selectOne"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                            "source": "mappingNotAlignedComments",
+                            "type": "textarea",
+                            "rows": 5
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "columns": [
+                  {
+                    "width": "20%",
+                    "type": "col",
+                    "title": "Site/s protected by access control structures",
+                    "items": [
+                      {
+                        "source": "protectedSites",
+                        "type": "feature"
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "readonly": true,
+                            "source": "areaProtectedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "readonly": true,
+                            "source": "lengthProtectedKm",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "width": "20%",
+                    "type": "col",
+                    "title": "Type of access control installed",
+                    "items": [
+                      {
+                        "source": "accessControlType",
+                        "type": "selectOne"
+                      },
+                      {
+                        "source": "otherAccessControlType",
+                        "type": "text"
+                      }
+                    ]
+                  },
+                  {
+                    "width": "30%",
+                    "source": "controlObjective",
+                    "title": "Control objective",
+                    "type": "textarea",
+                    "rows": 5
+                  },
+                  {
+                    "width": "15%",
+                    "source": "dateFrom",
+                    "title": "Date from",
+                    "type": "date"
+                  },
+                  {
+                    "width": "15%",
+                    "source": "dateTo",
+                    "title": "Date to",
+                    "type": "date"
+                  }
+                ],
+                "userAddedRows": true,
                 "disableTableUpload": true,
+                "source": "accessControlDetails",
+                "type": "table"
+              }
+
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "Optionally attach photos",
+                "source": "photographicEvidence",
+                "type": "image"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "Clarification, if needed",
+                "type": "textarea",
+                "rows": 4,
+                "css": "span8",
+                "source": "comments",
+                "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
+              },
+              {
+                "preLabel": "Data have been uploaded",
+                "source": "dataUploaded",
+                "type": "boolean"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "",
+                "source": "projectAssuranceDetails",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+              }
+            ]
+          },
+          {
+            "type": "table",
+            "source": "assuranceDocuments",
+            "userAddedRows": true,
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "title": "Attached documents",
+                "source": "attachments",
+                "type": "document"
+              }
+            ]
+          }
+        ]
+      },
+      "modelName": null,
+      "templateName": "nhtControllingAccess",
+      "optional": true,
+      "optionalQuestionText": null,
+      "title": "Controlling access",
+      "collapsibleHeading": null,
+      "name": "NHT - Controlling access",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
+          {
+            "allowRowDelete": "false",
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableCpa"
+          },
+          {
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "initialOrFollowup",
+                "constraints": [
+                  "Initial",
+                  "Follow-up"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "feature",
+                "name": "sitesTreatedForPestAnimal",
+                "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping.",
+                "validate": "required"
+              },
+              {
+                "computed": {
+                  "expression": "$geom.areaHa(sitesTreatedForPestAnimal)"
+                },
+                "dataType": "number",
+                "name": "calculatedAreaTreatedHa",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesTreatedForPestAnimal)"
+                },
+                "dataType": "number",
+                "name": "calculatedLengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
+                  {
+                    "condition": "lengthTreatedKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
+                    }
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaTreatedHa"
+                },
+                "dataType": "number",
+                "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedReason",
+                "constraints": [
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                  "Other"
+                ],
+                "validate": "required",
+                "behaviour": [
+                  {
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedComments",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
+                  {
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReason"
+                  }
+                ]
+              },
+              {
+                "dataType": "document",
+                "name": "extraMappingDetails",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
+                  {
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKm"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
+              },
+              {
                 "columns": [
                   {
-                    "title": "Attached documents",
-                    "source": "attachments",
-                    "type": "document"
+                    "dataType": "species",
+                    "name": "pestSpecies",
+                    "dwcAttribute": "scientificName",
+                    "description": "Pest species targeted for treatment (start typing a  scientific or common name for a species).",
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "pestManagementMethod",
+                    "dwcAttribute": "treatmentMethod",
+                    "description": "The method used in this activity to manage pests.",
+                    "constraints": [
+                      "Aerial shoot",
+                      "Bait & trap",
+                      "Bait only",
+                      "Feral free enclosure",
+                      "Exclusion fencing",
+                      "Fumigation",
+                      "Ground shoot",
+                      "Trap & cull",
+                      "Trap & remove",
+                      "Other"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "otherManagementMethod",
+                    "description": "Please specify the management method used if Other was selected in the Management Method column.",
+                    "behaviour": [
+                      {
+                        "condition": "pestManagementMethod == \"Other\"",
+                        "type": "enable"
+                      }
+                    ],
+                    "validate": "required,maxSize[100]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "treatmentObjective",
+                    "validate": "required,maxSize[300]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "individualsOrColonies",
+                    "constraints": [
+                      "Colonies",
+                      "Individuals"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "number",
+                    "name": "individualsOrColoniesRemoved",
+                    "validate": "required"
+                  }
+                ],
+                "dataType": "list",
+                "name": "pestAnimalsControlled"
+              },
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "investmentPriorities2",
+                "dataType": "text",
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
+                  }
+                }
+              },
+              {
+                "dataType": "text",
+                "name": "otherInvestmentPriority",
+                "behaviour": [
+                  {
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
+              }
+            ],
+            "dataType": "list",
+            "name": "areasControlled"
+          },
+          {
+            "dataType": "number",
+            "name": "totalAreaPestAnimalsTreatedInitial",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(areasControlled, \"initialOrFollowup == 'Initial' ? areaTreatedHa : 0\")"
+            }
+          },
+          {
+            "decimalPlaces": 3,
+            "defaultValue": "",
+            "dataType": "number",
+            "name": "totalAreaPestAnimalsTreatedInitialInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaPestAnimalsTreatedInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ]
+          },
+
+          {
+            "dataType": "number",
+            "name": "totalAreaPestAnimalsTreatedFollowUp",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(areasControlled, \"initialOrFollowup == 'Follow-up' ? areaTreatedHa : 0\")"
+            }
+          },
+          {
+            "decimalPlaces": 3,
+            "defaultValue": "",
+            "dataType": "number",
+            "name": "totalAreaPestAnimalsTreatedFollowUpInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaPestAnimalsTreatedFollowUp",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ]
+          },
+          {
+            "dataType": "number",
+            "name": "totalLengthPestAnimalsTreatedInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(areasControlled, \"initialOrFollowup == 'Initial' ? lengthTreatedKm : 0\")"
+            }
+          },
+          {
+            "decimalPlaces": 3,
+            "defaultValue": "",
+            "dataType": "number",
+            "name": "totalLengthPestAnimalsTreatedInitialInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalLengthPestAnimalsTreatedInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ]
+          },
+          {
+            "dataType": "number",
+            "name": "totalLengthPestAnimalsTreatedFollowUp",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(areasControlled, \"initialOrFollowup == 'Follow-up' ? lengthTreatedKm : 0\")"
+            }
+          },
+          {
+            "decimalPlaces": 3,
+            "defaultValue": "",
+            "dataType": "number",
+            "name": "totalLengthPestAnimalsTreatedFollowUpInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalLengthPestAnimalsTreatedFollowUp",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedControllingPestMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required,min[0]",
+            "behaviour": [
+              {
+                "condition": "+totalAreaPestAnimalsTreatedInitialInvoiced < +totalAreaPestAnimalsTreatedInitial or +totalAreaPestAnimalsTreatedFollowUpInvoiced < +totalAreaPestAnimalsTreatedFollowUp or +totalLengthPestAnimalsTreatedInitialInvoiced < +totalLengthPestAnimalsTreatedInitial or +totalLengthPestAnimalsTreatedFollowUpInvoiced < +totalLengthPestAnimalsTreatedFollowUp",
+                "type": "enable"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "comments",
+            "validate": "maxSize[1500]"
+          },
+          {
+            "dataType": "image",
+            "name": "photographicEvidence"
+          },
+          {
+            "dataType": "boolean",
+            "name": "dataUploaded",
+            "description": ""
+          },
+          {
+            "dataType": "text",
+            "name": "projectAssuranceDetails",
+            "description": "",
+            "validate": "required,maxSize[5000]"
+          },
+          {
+            "dataType": "list",
+            "name": "assuranceDocuments",
+            "columns": [
+              {
+                "dataType": "document",
+                "name": "attachments",
+                "description": "Please attach any Evidence of Service Delivery here."
+              }
+            ]
+          }
+        ],
+        "modelName": "NHT - Pest animal management",
+        "title": "Controlling Pest Animals",
+        "viewModel": [
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "width": "10%",
+                "source": "participationIndividualsOrGroups",
+                "title": "Are individuals or groups delivering this service?",
+                "type": "selectOne"
+              },
+              {
+                "width": "20%",
+                "type": "col",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "participationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "participationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "width": "20%",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "firstNationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "firstNationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
+              }
+            ],
+            "source": "participationInformationTableCpa",
+            "type": "table"
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total area (ha) treated for pest animals (initial) for this reporting period",
+                        "source": "totalAreaPestAnimalsTreatedInitial",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total area (ha) treated for pest animals (initial) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalAreaPestAnimalsTreatedInitialInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii) Total area (ha) treated for pest animals (follow up) for this reporting period",
+                        "source": "totalAreaPestAnimalsTreatedFollowUp",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total area (ha) treated for pest animals (follow up) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalAreaPestAnimalsTreatedFollowUpInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(v) Total length (km) treated for pest animals (initial) for this reporting period",
+                        "source": "totalLengthPestAnimalsTreatedInitial",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vi) Total length (km) treated for pest animals (initial) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalLengthPestAnimalsTreatedInitialInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vii) Total length (km) treated for pest animals (follow up) for this reporting period",
+                        "source": "totalLengthPestAnimalsTreatedFollowUp",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(viii) Total length (km) treated for pest animals (follow up) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalLengthPestAnimalsTreatedFollowUpInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedControllingPestMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "addRowText": "Add a new area",
+            "userAddedRows": true,
+            "source": "areasControlled",
+            "type": "repeat",
+            "items": [
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "css": "border-bottom",
+                "items": [
+                  {
+                    "preLabel": "Initial or follow-up control?",
+                    "css": "span3",
+                    "source": "initialOrFollowup",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "css": "border-bottom",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Site/s where pest control was undertaken",
+                            "source": "sitesTreatedForPestAnimal",
+                            "type": "feature"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "calculatedAreaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "calculatedLengthTreatedKm",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Please attach mapping details",
+                            "source": "extraMappingDetails",
+                            "type": "document"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Actual area (ha) / length (km) treated for pest animals",
+                            "source": "areaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "lengthTreatedKm",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Reason for actual being different to mapped amount",
+                            "source": "mappingNotAlignedReason",
+                            "type": "selectOne"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                            "source": "mappingNotAlignedComments",
+                            "type": "textarea",
+                            "rows": 5
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "addRowText": "Add a species",
+                    "columns": [
+                      {
+                        "width": "20%",
+                        "source": "pestSpecies",
+                        "title": "Target pest species",
+                        "type": "speciesSelect"
+                      },
+                      {
+                        "width": "20%",
+                        "type": "col",
+                        "title": "Type of control",
+                        "items": [
+                          {
+                            "source": "pestManagementMethod",
+                            "type": "selectOne"
+                          },
+                          {
+                            "source": "otherManagementMethod",
+                            "type": "text"
+                          }
+                        ]
+                      },
+                      {
+                        "width": "30%",
+                        "source": "treatmentObjective",
+                        "title": "Treatment objective",
+                        "type": "textarea"
+                      },
+                      {
+                        "width": "15%",
+                        "source": "individualsOrColonies",
+                        "title": "Individuals or colonies?",
+                        "type": "selectOne"
+                      },
+                      {
+                        "width": "15%",
+                        "source": "individualsOrColoniesRemoved",
+                        "title": "Number of individuals or colonies removed / destroyed",
+                        "type": "number"
+                      }
+                    ],
+                    "userAddedRows": true,
+                    "disableTableUpload": true,
+                    "source": "pestAnimalsControlled",
+                    "type": "table"
                   }
                 ]
               }
             ]
-          }
-        ]
-      },
-      "modelName": null,
-      "templateName": "nhtCommunityEngagement",
-      "optional": true,
-      "optionalQuestionText": null,
-      "title": "Community/stakeholder engagement",
-      "collapsibleHeading": null,
-      "name": "NHT - Community engagement",
-      "description": null
-    },
-    {
-      "collapsedByDefault": false,
-      "template": {
-        "dataModel": [
-          {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
           },
           {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "type": "row",
+            "items": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "preLabel": "Optionally attach photos",
+                "source": "photographicEvidence",
+                "type": "image"
               }
-            ],
-            "validate": "required,min[0]"
+            ]
           },
           {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
+            "type": "row",
+            "items": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
+                "preLabel": "Clarification, if needed",
+                "type": "textarea",
+                "rows": 4,
+                "css": "span8",
+                "source": "comments",
+                "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
               }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            ]
           },
           {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+            "type": "row",
+            "items": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "type": "literal",
+                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
+              },
+              {
+                "preLabel": "Data have been uploaded",
+                "source": "dataUploaded",
+                "type": "boolean"
               }
-            ],
-            "validate": "required,min[0]"
+            ]
           },
           {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
+            "type": "row",
+            "items": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
+                "preLabel": "",
+                "source": "projectAssuranceDetails",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
               }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            ]
           },
           {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
+            "type": "table",
+            "source": "assuranceDocuments",
+            "userAddedRows": true,
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "title": "Attached documents",
+                "source": "attachments",
+                "type": "document"
+              }
+            ]
+          }
+        ]
+      },
+      "modelName": null,
+      "templateName": "nhtPestAnimalManagement",
+      "optional": true,
+      "optionalQuestionText": null,
+      "title": "Controlling pest animals",
+      "collapsibleHeading": null,
+      "name": "NHT - Pest animal management",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
           {
+            "allowRowDelete": "false",
             "columns": [
               {
-                "columns": [
-                  {
-                    "dataType": "number",
-                    "name": "numberInstalled",
-                    "validate": "required,min[0]"
-                  },
-                  {
-                    "dataType": "feature",
-                    "name": "sitesInstalled"
-                  },
-                  {
-                    "computed": {
-                      "expression": "$geom.areaHa(sitesInstalled)"
-                    },
-                    "dataType": "number",
-                    "decimalPlaces": 3,
-                    "name": "sitesInstalledCalculatedAreaHa",
-                    "units": "ha",
-                    "behaviour": [
-                      {
-                        "condition": "areaInvoicedHa > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "The controlled area must be mapped",
-                          "validate": "required,min[0.0001]"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "computed": {
-                      "expression": "$geom.lengthKm(sitesInstalled)"
-                    },
-                    "dataType": "number",
-                    "decimalPlaces": 3,
-                    "name": "sitesInstalledCalculatedLengthKm",
-                    "units": "km",
-                    "behaviour": [
-                      {
-                        "condition": "lengthInvoicedKm > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "The length controlled must be mapped",
-                          "validate": "required,min[0.001]"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "dataType": "document",
-                    "name": "extraMappingDetails",
-                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
-                    "behaviour": [
-                      {
-                        "condition": "not (within(areaInstalledHa, sitesInstalledCalculatedAreaHa, 0.1) and within(lengthInstalledKm, sitesInstalledCalculatedLengthKm, 0.1)) or roundTo(areaInstalledHa, 2) != roundTo(areaInvoicedHa, 2) or roundTo(lengthInstalledKm, 2) != roundTo(lengthInvoicedKm, 2)",
-                        "type": "visible"
-                      }
-                    ],
-                    "validate": "required"
-                  },
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
                   {
-                    "defaultValue": {
-                      "expression": "$geom.areaHa(sitesInstalled)",
-                      "type": "computed"
-                    },
-                    "dataType": "number",
-                    "name": "areaInstalledHa",
-                    "decimalPlaces": 3,
-                    "units": "ha",
-                    "validate": "required,min[0]"
-                  },
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
                   {
-                    "defaultValue": {
-                      "expression": "$geom.lengthKm(sitesInstalled)",
-                      "type": "computed"
-                    },
-                    "dataType": "number",
-                    "name": "lengthInstalledKm",
-                    "decimalPlaces": 3,
-                    "units": "km",
-                    "validate": "required,min[0]"
-                  },
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
                   {
-                    "dataType": "number",
-                    "name": "areaInvoicedHa",
-                    "decimalPlaces": 3,
-                    "units": "ha",
-                    "validate": [
-                      {
-                        "rule": "required"
-                      },
-                      {
-                        "rule": "min[0]"
-                      },
-                      {
-                        "param": {
-                          "expression": "areaInstalledHa",
-                          "type": "computed"
-                        },
-                        "rule": "max"
-                      }
-                    ]
-                  },
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
                   {
-                    "dataType": "number",
-                    "name": "lengthInvoicedKm",
-                    "decimalPlaces": 3,
-                    "units": "km",
-                    "validate": [
-                      {
-                        "rule": "required"
-                      },
-                      {
-                        "rule": "min[0]"
-                      },
-                      {
-                        "param": {
-                          "expression": "lengthInstalledKm",
-                          "type": "computed"
-                        },
-                        "rule": "max"
-                      }
-                    ]
+                    "rule": "required"
                   },
                   {
-                    "dataType": "text",
-                    "name": "mappingNotAlignedReason",
-                    "behaviour": [
-                      {
-                        "condition": "not (within(areaInstalledHa, sitesInstalledCalculatedAreaHa, 0.1) and within(lengthInstalledKm, sitesInstalledCalculatedLengthKm, 0.1))",
-                        "type": "visible"
-                      }
-                    ],
-                    "constraints": [
-                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                      "Other"
-                    ],
-                    "validate": "required"
+                    "rule": "min[0]"
                   },
                   {
-                    "dataType": "text",
-                    "name": "mappingNotAlignedComments",
-                    "behaviour": [
-                      {
-                        "condition": "\"Other\" == mappingNotAlignedReason",
-                        "type": "visible"
-                      }
-                    ],
-                    "validate": "required,maxSize[300]"
-                  },
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "invoicedNotActualReason",
-                    "behaviour": [
-                      {
-                        "condition": "roundTo(areaInstalledHa, 2) != roundTo(areaInvoicedHa, 2) or roundTo(lengthInstalledKm, 2) != roundTo(lengthInvoicedKm, 2)",
-                        "type": "visible"
-                      }
-                    ],
-                    "constraints": [
-                      "Work was undertaken over a greater area than will be invoiced for",
-                      "Other"
-                    ],
-                    "validate": "required"
-                  },
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
                   {
-                    "dataType": "text",
-                    "name": "invoicedNotActualComments",
-                    "behaviour": [
-                      {
-                        "condition": "\"Other\" == invoicedNotActualReason",
-                        "type": "visible"
-                      }
-                    ],
-                    "validate": "required,maxSize[300]"
+                    "rule": "required"
                   },
                   {
-                    "name": "relatedOutcomes",
-                    "dataType": "text",
-                    "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                    "validate": "required",
-                    "constraints": {
-                      "textProperty": "label",
-                      "valueProperty": "label",
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "url": "/project/outcomesByScores",
-                          "params": [{
-                            "expression": "owner.projectId",
-                            "name": "id",
-                            "type": "computed"
-                          }, {
-                            "expression": "scores",
-                            "name": "scoreIds",
-                            "type": "computed"
-                          }
-                          ]
-                        }
-                      }
-                    }
-                  },
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableDer"
+          },
+          {
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "initialOrFollowup",
+                "constraints": [
+                  "Initial",
+                  "Follow-up"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "feature",
+                "name": "sitesOfDebrisRemoved",
+                "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
+              },
+              {
+                "computed": {
+                  "expression": "$geom.areaHa(sitesOfDebrisRemoved)"
+                },
+                "dataType": "number",
+                "name": "calculatedAreaTreatedHa",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesOfDebrisRemoved)"
+                },
+                "dataType": "number",
+                "name": "calculatedLengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "name": "investmentPriorities2",
-                    "dataType": "stringList",
-                    "validate": "required",
-                    "constraints": {
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "params": [
-                            {
-                              "expression": "owner.projectId",
-                              "name": "id",
-                              "type": "computed"
-                            }
-                          ],
-                          "url": "/project/listProjectInvestmentPriorities/"
-                        }
-                      }
+                    "condition": "lengthTreatedKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
                     }
-                  },
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaTreatedHa"
+                },
+                "dataType": "number",
+                "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedReason",
+                "constraints": [
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                  "Other"
+                ],
+                "validate": "required",
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "otherInvestmentPriority",
-                    "behaviour": [
-                      {
-                        "type": "enable",
-                        "condition": "\"Other\" in investmentPriorities2"
-                      }
-                    ]
-                  },
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedComments",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
+                  {
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReason"
+                  }
+                ]
+              },
+              {
+                "dataType": "document",
+                "name": "extraMappingDetails",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
+                  {
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKm"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
+              },
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "investmentPriorities2",
+                "dataType": "text",
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
+                  }
+                }
+              },
+              {
+                "dataType": "text",
+                "name": "otherInvestmentPriority",
+                "behaviour": [
                   {
-                    "dataType": "feature",
-                    "name": "protectedSites"
-                  },
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
+              },
+              {
+                "columns": [
                   {
-                    "defaultValue": {
-                      "expression": "$geom.areaHa(protectedSites)",
-                      "type": "computed"
-                    },
-                    "dataType": "number",
-                    "name": "areaProtectedHa",
-                    "decimalPlaces": 3,
-                    "units": "ha"
+                    "dataType": "text",
+                    "name": "teqDebrisRemoval",
+                    "description": "",
+                    "validate": "required,maxSize[300]"
                   },
                   {
                     "dataType": "text",
-                    "name": "accessControlType",
+                    "name": "debrisType",
                     "description": "",
                     "constraints": [
-                      "Boardwalks",
-                      "Bollards & barriers",
-                      "Constructed parking bays",
-                      "Fencing, styles, gates & grids",
-                      "Formed traffic ways",
-                      "Signage",
+                      "Building & Industrial waste",
+                      "Domestic waste",
+                      "Green waste",
                       "Other"
                     ],
                     "validate": "required"
                   },
                   {
                     "dataType": "text",
-                    "name": "otherAccessControlType",
-                    "description": "Please specify the type of access control if Other (specify in notes) was selected in the Type of Access Control Installed column.",
+                    "name": "otherDebrisType",
+                    "description": "if Other",
                     "behaviour": [
                       {
-                        "condition": "accessControlType == \"Other\"",
+                        "condition": "debrisType == \"Other\"",
                         "type": "enable"
                       }
                     ],
-                    "validate": "required"
+                    "validate": "required,maxSize[100]"
                   },
                   {
-                    "dataType": "text",
-                    "name": "controlObjective",
-                    "description": "What is your access control method? and/or What do you intend to achieve by using your structure/s?",
-                    "validate": "required,maxSize[300]"
+                    "validated": "required,min[0]",
+                    "dataType": "number",
+                    "name": "weightOfDebrisTonnes",
+                    "units": "tonnes"
+                  },
+                  {
+                    "validated": "required,min[0]",
+                    "dataType": "number",
+                    "name": "volumeRemovedM3",
+                    "units": "m3"
                   }
                 ],
                 "dataType": "list",
-                "name": "accessControlDetails"
+                "name": "debrisRemovalDetails"
               }
             ],
             "dataType": "list",
-            "name": "controllingAccessSurveys",
-            "minSize": 1
+            "name": "debrisRemovalAreasControlled"
           },
           {
-            "name": "surveyCountHeader",
-            "type": "number",
-            "decimalPlaces": 0,
+            "dataType": "number",
+            "name": "totalAreaDebrisRemovedInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(debrisRemovalAreasControlled, \"initialOrFollowup == 'Initial' ? areaTreatedHa : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalAreaDebrisRemovedInitialInvoiced",
+            "decimalPlaces": 3,
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaDebrisRemovedInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalLengthDebrisRemovedInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(debrisRemovalAreasControlled, \"initialOrFollowup == 'Initial' ? lengthTreatedKm : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalLengthDebrisRemovedInvoicedInitial",
+            "decimalPlaces": 3,
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalLengthDebrisRemovedInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalAreaDebrisRemovedFollowup",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(debrisRemovalAreasControlled, \"initialOrFollowup == 'Follow-up' ? areaTreatedHa : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalAreaDebrisRemovedInvoicedFollowup",
+            "decimalPlaces": 3,
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaDebrisRemovedFollowup",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalLengthDebrisRemovedFollowup",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
             "computed": {
-              "expression": "count(controllingAccessSurveys, \"numberInstalled\")"
+              "expression": "sum(debrisRemovalAreasControlled, \"initialOrFollowup == 'Follow-up' ? lengthTreatedKm : 0\")"
             }
           },
+          {
+            "dataType": "number",
+            "name": "totalLengthDebrisRemovedInvoicedFollowup",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "decimalPlaces": 3,
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalLengthDebrisRemovedFollowup",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedDebrisRemovedMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required,min[0]",
+            "behaviour": [
+              {
+                "condition": "+totalAreaDebrisRemovedInitialInvoiced < +totalAreaDebrisRemovedInitial or +totalLengthDebrisRemovedInvoicedInitial < +totalLengthDebrisRemovedInitial or +totalAreaDebrisRemovedInvoicedFollowup < +totalAreaDebrisRemovedFollowup or +totalLengthDebrisRemovedInvoicedFollowup < +totalLengthDebrisRemovedFollowup",
+                "type": "enable"
+              }
+            ]
+          },
           {
             "dataType": "text",
             "name": "comments",
@@ -2008,12 +5605,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -2022,252 +5619,367 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Controlling access",
-        "title": "Controlling access",
+        "modelName": "NHT - Debris removal",
+        "title": "Debris Removal",
         "viewModel": [
           {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
             "columns": [
               {
                 "width": "10%",
                 "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
+                "title": "Are individuals or groups delivering this service?",
                 "type": "selectOne"
               },
               {
-                "width": "20%",
+                "width": "20%",
+                "type": "col",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "participationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "participationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "width": "20%",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "firstNationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "firstNationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
+              }
+            ],
+            "source": "participationInformationTableDer",
+            "type": "table"
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total area (ha) of debris removal (initial) for this reporting period",
+                        "source": "totalAreaDebrisRemovedInitial",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total area (ha) of debris removal (initial) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalAreaDebrisRemovedInitialInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
                 "type": "col",
-                "title": "Total Number of people delivering this service",
+                "css": "span4 col-border-right",
                 "items": [
                   {
-                    "source": "participationIndividualNumber",
-                    "type": "number"
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii) Total area (ha) of debris removal (follow up) for this reporting period",
+                        "source": "totalAreaDebrisRemovedFollowup",
+                        "type": "number"
+                      }
+                    ]
                   },
                   {
-                    "source": "participationGroupNumber",
-                    "type": "selectOne"
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total area (ha) of debris removal (follow up) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalAreaDebrisRemovedInvoicedFollowup",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
                   }
                 ]
               },
               {
                 "type": "col",
-                "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
+                "css": "span4 col-border-right",
                 "items": [
                   {
-                    "source": "firstNationIndividualNumber",
-                    "type": "number"
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(v) Total length (km) of debris removal (initial) for this reporting period",
+                        "source": "totalLengthDebrisRemovedInitial",
+                        "type": "number"
+                      }
+                    ]
                   },
                   {
-                    "source": "firstNationGroupNumber",
-                    "type": "selectOne"
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vi) Total length (km) of debris removal (initial) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalLengthDebrisRemovedInvoicedInitial",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
                   }
                 ]
               },
               {
-                "source": "participationDetails",
-                "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                "type": "textarea"
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vii) Total length (km) of debris removal (follow up) for this reporting period",
+                        "source": "totalLengthDebrisRemovedFollowup",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(viii) Total length (km) of debris removal (follow up) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalLengthDebrisRemovedInvoicedFollowup",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
               }
-            ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
-            "type": "table"
+            ]
           },
           {
-            "type": "section",
+            "type": "row",
             "items": [
               {
-                "preLabel": "Number of Controlling Access surveys conducted:",
-                "noEdit": true,
-                "type": "number",
-                "source": "surveyCountHeader"
-              },
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedDebrisRemovedMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "addRowText": "Add a new debris removal activity",
+            "userAddedRows": true,
+            "source": "debrisRemovalAreasControlled",
+            "type": "repeat",
+            "items": [
               {
-                "addRowText": "New survey site",
-                "userAddedRows": true,
-                "source": "controllingAccessSurveys",
-                "type": "repeat",
+                "type": "row",
                 "items": [
                   {
-                    "columns": [
-                      {
-                        "width": "5%",
-                        "source": "numberInstalled",
-                        "type": "number",
-                        "title": "Number of structures installed"
-                      },
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
                       {
-                        "width": "10%",
-                        "type": "col",
-                        "title": "Site/s where access has been controlled",
+                        "type": "row",
                         "items": [
                           {
-                            "source": "sitesInstalled",
-                            "type": "feature"
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "readonly": true,
-                                "source": "sitesInstalledCalculatedAreaHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "readonly": true,
-                                "source": "sitesInstalledCalculatedLengthKm",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Please attach mapping details",
-                                "source": "extraMappingDetails",
-                                "type": "document"
-                              }
-                            ]
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "helpText": "May be changed manually if different to the calculated areas",
-                        "width": "10%",
-                        "type": "col",
-                        "title": "Actual length (km) / area (ha) where access has been controlled",
+                        "type": "row",
                         "items": [
                           {
-                            "source": "areaInstalledHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          },
-                          {
-                            "source": "lengthInstalledKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Reason for actual being different to mapped amount",
-                                "source": "mappingNotAlignedReason",
-                                "type": "selectOne"
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "mappingNotAlignedComments",
-                                "type": "textarea",
-                                "rows": 5
-                              }
-                            ]
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
                       {
-                        "helpText": "Enter the amount you will invoice for during this reporting period.",
-                        "width": "10%",
-                        "type": "col",
-                        "title": "Invoiced area (ha)/length (km) where access has been controlled",
+                        "type": "row",
                         "items": [
                           {
-                            "source": "areaInvoicedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          },
-                          {
-                            "source": "lengthInvoicedKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Reason for invoiced amount being different to actual amount",
-                                "source": "invoicedNotActualReason",
-                                "type": "selectOne"
-                              }
-                            ]
-                          },
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "css": "border-bottom",
+                "items": [
+                  {
+                    "preLabel": "Initial or follow-up activity?",
+                    "css": "span3",
+                    "source": "initialOrFollowup",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "css": "border-bottom",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "invoicedNotActualComments",
-                                "type": "textarea",
-                                "rows": 5
-                              }
-                            ]
+                            "preLabel": "Site/s where debris removal was implemented",
+                            "source": "sitesOfDebrisRemoved",
+                            "type": "feature"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "calculatedAreaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
                           }
                         ]
                       },
                       {
-                        "source": "relatedOutcomes",
-                        "type": "selectOne",
-                        "width": "10%",
-                        "title": "Which outcome statement/s relates to this survey?"
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "calculatedLengthTreatedKm",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
+                          }
+                        ]
                       },
                       {
-                        "width": "15%",
-                        "type": "col",
-                        "title": "Which investment priority does this activity relate to?",
+                        "type": "row",
                         "items": [
                           {
-                            "source": "investmentPriorities2",
-                            "type": "select2Many"
-                          },
+                            "preLabel": "Please attach mapping details",
+                            "source": "extraMappingDetails",
+                            "type": "document"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
                           {
-                            "source": "otherInvestmentPriority",
-                            "type": "text"
+                            "preLabel": "Actual area (ha) / length (km) of debris removal",
+                            "source": "areaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
                           }
                         ]
                       },
                       {
-                        "width": "10%",
-                        "type": "col",
-                        "title": "Site/s protected by access control structures",
+                        "type": "row",
                         "items": [
                           {
-                            "source": "protectedSites",
-                            "type": "feature"
-                          },
-                          {
-                            "source": "areaProtectedHa",
+                            "source": "lengthTreatedKm",
                             "type": "number",
                             "displayOptions": {
                               "displayUnits": true
@@ -2276,476 +5988,210 @@
                         ]
                       },
                       {
-                        "width": "10%",
-                        "type": "col",
-                        "title": "Type of access control installed",
+                        "type": "row",
                         "items": [
                           {
-                            "source": "accessControlType",
-                            "type": "select2"
-                          },
-                          {
-                            "source": "otherAccessControlType",
-                            "type": "text"
+                            "preLabel": "Reason for actual being different to mapped amount",
+                            "source": "mappingNotAlignedReason",
+                            "type": "selectOne"
                           }
                         ]
                       },
                       {
-                        "width": "20%",
-                        "source": "controlObjective",
-                        "title": "Control objective",
-                        "type": "textarea",
-                        "rows": 5
-                      }
-                    ],
-                    "userAddedRows": true,
-                    "source": "accessControlDetails",
-                    "type": "table"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Optionally attach photos",
-                    "source": "photographicEvidence",
-                    "type": "image"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Clarification, if needed",
-                    "type": "textarea",
-                    "rows": 4,
-                    "css": "span8",
-                    "source": "comments",
-                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
-                  },
-                  {
-                    "preLabel": "Data have been uploaded",
-                    "source": "dataUploaded",
-                    "type": "boolean"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "",
-                    "source": "projectAssuranceDetails",
-                    "type": "textarea",
-                    "rows": 4,
-                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-                  }
-                ]
-              },
-              {
-                "type": "table",
-                "source": "assuranceDocuments",
-                "userAddedRows": true,
-                "disableTableUpload": true,
-                "columns": [
-                  {
-                    "title": "Attached documents",
-                    "source": "attachments",
-                    "type": "document"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      "modelName": null,
-      "templateName": "nhtControllingAccess",
-      "optional": true,
-      "optionalQuestionText": null,
-      "title": "Controlling access",
-      "collapsibleHeading": null,
-      "name": "NHT - Controlling access",
-      "description": null
-    },
-    {
-      "collapsedByDefault": false,
-      "template": {
-        "dataModel": [
-          {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "columns": [
-              {
-                "dataType": "text",
-                "name": "initialOrFollowup",
-                "constraints": [
-                  "Initial",
-                  "Follow-up"
-                ],
-                "validate": "required"
-              },
-              {
-                "dataType": "feature",
-                "name": "site",
-                "validate": "required"
-              },
-              {
-                "dataType": "number",
-                "name": "siteCalculatedAreaHa",
-                "computed": {
-                  "expression": "$geom.areaHa(site)"
-                },
-                "units": "ha",
-                "decimalPlaces": 3,
-                "behaviour": [
-                  {
-                    "condition": "areaInvoicedHa > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The controlled area must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
-                  }
-                ]
-              },
-              {
-                "dataType": "number",
-                "name": "siteCalculatedLengthKm",
-                "computed": {
-                  "expression": "$geom.lengthKm(site)"
-                },
-                "units": "km",
-                "decimalPlaces": 3,
-                "behaviour": [
-                  {
-                    "condition": "lengthInvoicedKm > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The controlled length must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
+                        "type": "row",
+                        "items": [
+                          {
+                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                            "source": "mappingNotAlignedComments",
+                            "type": "textarea",
+                            "rows": 5
+                          }
+                        ]
+                      }
+                    ]
                   }
                 ]
               },
               {
-                "dataType": "number",
-                "name": "areaControlledHa",
-                "validate": "required,min[0]",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "$geom.areaHa(site)"
-                }
-              },
-              {
-                "dataType": "number",
-                "name": "lengthControlledKm",
-                "validate": "required,min[0]",
-                "units": "km",
-                "decimalPlaces": 3,
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "$geom.lengthKm(site)"
-                }
-              },
-              {
-                "dataType": "number",
-                "name": "areaInvoicedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": [
-                  {
-                    "rule": "required"
-                  },
+                "columns": [
                   {
-                    "rule": "min[0]"
+                    "width": "20%",
+                    "title": "Type of debris removed",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "debrisType",
+                            "type": "selectOne"
+                          }
+                        ]
+                      },
+                      {
+                        "source": "otherDebrisType",
+                        "type": "text"
+                      }
+                    ]
                   },
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "areaControlledHa"
-                    }
-                  }
-                ]
-              },
-              {
-                "dataType": "number",
-                "name": "lengthInvoicedKm",
-                "units": "km",
-                "decimalPlaces": 3,
-                "validate": [
-                  {
-                    "rule": "required"
+                    "width": "20%",
+                    "source": "weightOfDebrisTonnes",
+                    "title": "Weight (tonnes) of debris removed",
+                    "type": "number"
                   },
                   {
-                    "rule": "min[0]"
+                    "width": "20%",
+                    "source": "volumeRemovedM3",
+                    "title": "Volume (m3) of debris removed",
+                    "type": "number"
                   },
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "lengthControlledKm"
-                    }
+                    "width": "40%",
+                    "source": "teqDebrisRemoval",
+                    "title": "Technique used to remove debris",
+                    "type": "textarea",
+                    "rows": 5
                   }
-                ]
-              },
-              {
-                "dataType": "text",
-                "name": "mappingNotAlignedReason",
-                "constraints": [
-                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                  "Other"
                 ],
-                "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "not (within(areaControlledHa, siteCalculatedAreaHa, 0.1))",
-                    "type": "if"
-                  }
-                ]
-              },
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "source": "debrisRemovalDetails",
+                "type": "table"
+              }
+            ]
+          },
+
+          {
+            "type": "row",
+            "items": [
               {
-                "dataType": "text",
-                "name": "mappingNotAlignedComments",
-                "validate": "required,maxSize[300]",
-                "behaviour": [
-                  {
-                    "type": "if",
-                    "condition": "not within(areaControlledHa, siteCalculatedAreaHa, 0.1) and \"Other\" == mappingNotAlignedReason"
-                  }
-                ]
-              },
+                "preLabel": "Optionally attach photos",
+                "source": "photographicEvidence",
+                "type": "image"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "dataType": "text",
-                "name": "mappingLengthNotAlignedReason",
-                "constraints": [
-                  "Mapped area simplifies more complex length/s where work was undertaken during this period",
-                  "Other"
-                ],
-                "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "not (within(lengthControlledKm, siteCalculatedLengthKm, 0.1))",
-                    "type": "if"
-                  }
-                ]
-              },
+                "preLabel": "Clarification, if needed",
+                "type": "textarea",
+                "rows": 4,
+                "css": "span8",
+                "source": "comments",
+                "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "dataType": "text",
-                "name": "mappingLengthNotAlignedComments",
-                "validate": "required,maxSize[300]",
-                "behaviour": [
-                  {
-                    "type": "if",
-                    "condition": "not (within(lengthControlledKm, siteCalculatedLengthKm, 0.1)) and \"Other\" == mappingLengthNotAlignedReason"
-                  }
-                ]
+                "type": "literal",
+                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
               },
               {
-                "dataType": "text",
-                "name": "invoicedNotActualReason",
-                "constraints": [
-                  "Work was undertaken over a greater area than will be invoiced for",
-                  "Other"
-                ],
-                "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "roundTo(areaControlledHa, 2) != roundTo(areaInvoicedHa, 2)",
-                    "type": "if"
-                  }
-                ]
-              },
+                "preLabel": "Data have been uploaded",
+                "source": "dataUploaded",
+                "type": "boolean"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "dataType": "text",
-                "name": "invoicedNotActualComments",
-                "behaviour": [
-                  {
-                    "type": "if",
-                    "condition": "roundTo(areaControlledHa, 2) != roundTo(areaInvoicedHa, 2) and \"Other\" == invoicedNotActualReason"
-                  }
-                ],
-                "validate": "required,maxSize[300]"
-              },
+                "preLabel": "",
+                "source": "projectAssuranceDetails",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+              }
+            ]
+          },
+          {
+            "type": "table",
+            "source": "assuranceDocuments",
+            "userAddedRows": true,
+            "disableTableUpload": true,
+            "columns": [
               {
-                "dataType": "text",
-                "name": "invoicedLengthNotActualReason",
-                "constraints": [
-                  "Work was undertaken over a greater length than will be invoiced for",
-                  "Other"
-                ],
-                "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "roundTo(lengthControlledKm, 2) != roundTo(lengthInvoicedKm, 2)",
-                    "type": "if"
-                  }
-                ]
-              },
+                "title": "Attached documents",
+                "source": "attachments",
+                "type": "document"
+              }
+            ]
+          }
+        ]
+      },
+      "modelName": null,
+      "templateName": "nhtDebrisRemoval",
+      "optional": true,
+      "optionalQuestionText": null,
+      "title": "Debris removal",
+      "collapsibleHeading": null,
+      "name": "NHT - Debris removal",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
+          {
+            "allowRowDelete": "false",
+            "columns": [
               {
                 "dataType": "text",
-                "name": "invoicedLengthNotActualComments",
-                "behaviour": [
-                  {
-                    "type": "if",
-                    "condition": "roundTo(lengthControlledKm, 2) != roundTo(lengthInvoicedKm, 2) and \"Other\" == invoicedLengthNotActualReason"
-                  }
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
                 ],
-                "validate": "required,maxSize[300]"
-              },
-              {
-                "dataType": "document",
-                "name": "extraMappingDetails",
-                "validate": "required",
-                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
-                "behaviour": [
-                  {
-                    "condition": "not (within(areaControlledHa, siteCalculatedAreaHa, 0.1) and within(lengthControlledKm, siteCalculatedLengthKm, 0.1)) or roundTo(areaControlledHa, 2) != roundTo(areaInvoicedHa, 2)",
-                    "type": "if"
-                  }
-                ]
-              },
-              {
-                "dataType": "number",
-                "name": "areaControlledHa",
-                "validate": "required,min[0]",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "$geom.areaHa(site)"
-                }
-              },
-              {
-                "dataType": "number",
-                "name": "lengthControlledKm",
-                "validate": "required,min[0]",
-                "units": "km",
-                "decimalPlaces": 3,
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "$geom.lengthKm(site)"
-                }
+                "validate": "required"
               },
               {
                 "dataType": "number",
-                "name": "areaInvoicedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": [
-                  {
-                    "rule": "required"
-                  },
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
                   {
-                    "rule": "min[0]"
-                  },
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "areaControlledHa"
-                    }
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
                 ]
               },
               {
                 "dataType": "number",
-                "name": "lengthInvoicedKm",
-                "units": "km",
-                "decimalPlaces": 3,
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
                 "validate": [
                   {
                     "rule": "required"
@@ -2754,108 +6200,115 @@
                     "rule": "min[0]"
                   },
                   {
-                    "rule": "max",
                     "param": {
-                      "type": "computed",
-                      "expression": "lengthControlledKm"
-                    }
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
                   }
                 ]
               },
               {
                 "dataType": "text",
-                "name": "mappingNotAlignedReason",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
                 "constraints": [
-                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                  "Other"
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
                 ],
-                "validate": "required",
-                "behaviour": [
+                "validate": [
                   {
-                    "condition": "not (within(areaControlledHa, siteCalculatedAreaHa, 0.1))",
-                    "type": "if"
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
                   }
                 ]
               },
               {
                 "dataType": "text",
-                "name": "mappingNotAlignedComments",
-                "validate": "required,maxSize[300]",
-                "behaviour": [
-                  {
-                    "type": "if",
-                    "condition": "not within(areaControlledHa, siteCalculatedAreaHa, 0.1) and \"Other\" == mappingNotAlignedReason"
-                  }
-                ]
-              },
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableErm"
+          },
+          {
+            "columns": [
               {
                 "dataType": "text",
-                "name": "mappingLengthNotAlignedReason",
+                "name": "initialOrFollowup",
                 "constraints": [
-                  "Mapped area simplifies more complex length/s where work was undertaken during this period",
-                  "Other"
+                  "Initial",
+                  "Follow-up"
                 ],
-                "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "not (within(lengthControlledKm, siteCalculatedLengthKm, 0.1))",
-                    "type": "if"
-                  }
-                ]
+                "validate": "required"
               },
               {
-                "dataType": "text",
-                "name": "mappingLengthNotAlignedComments",
-                "validate": "required,maxSize[300]",
-                "behaviour": [
-                  {
-                    "type": "if",
-                    "condition": "not (within(lengthControlledKm, siteCalculatedLengthKm, 0.1)) and \"Other\" == mappingLengthNotAlignedReason"
-                  }
-                ]
+                "dataType": "number",
+                "name": "numberInstalled",
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "feature",
+                "name": "sitesOfErosionControl",
+                "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
               },
               {
+                "computed": {
+                  "expression": "$geom.areaHa(sitesOfErosionControl)"
+                },
                 "dataType": "number",
-                "name": "areaInvoicedHa",
+                "name": "calculatedAreaTreatedHa",
                 "units": "ha",
-                "decimalPlaces": 3,
-                "validate": [
-                  {
-                    "rule": "required"
-                  },
-                  {
-                    "rule": "min[0]"
-                  },
-                  {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "areaControlledHa"
-                    }
-                  }
-                ]
+                "decimalPlaces": 3
               },
               {
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesOfErosionControl)"
+                },
                 "dataType": "number",
-                "name": "lengthInvoicedKm",
+                "name": "calculatedLengthTreatedKm",
                 "units": "km",
                 "decimalPlaces": 3,
-                "validate": [
-                  {
-                    "rule": "required"
-                  },
-                  {
-                    "rule": "min[0]"
-                  },
+                "behaviour": [
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "lengthControlledKm"
+                    "condition": "lengthTreatedKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
                     }
                   }
                 ]
               },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaTreatedHa"
+                },
+                "dataType": "number",
+                "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
               {
                 "dataType": "text",
                 "name": "mappingNotAlignedReason",
@@ -2866,7 +6319,7 @@
                 "validate": "required",
                 "behaviour": [
                   {
-                    "condition": "not (within(areaControlledHa, siteCalculatedAreaHa, 0.1))",
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
                     "type": "if"
                   }
                 ]
@@ -2874,141 +6327,109 @@
               {
                 "dataType": "text",
                 "name": "mappingNotAlignedComments",
-                "validate": "required,maxSize[300]",
+                "validate": "required,maxSize[100]",
                 "behaviour": [
                   {
-                    "type": "if",
-                    "condition": "not within(areaControlledHa, siteCalculatedAreaHa, 0.1) and \"Other\" == mappingNotAlignedReason"
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReason"
                   }
                 ]
               },
               {
-                "dataType": "text",
-                "name": "mappingLengthNotAlignedReason",
-                "constraints": [
-                  "Mapped area simplifies more complex length/s where work was undertaken during this period",
-                  "Other"
-                ],
+                "dataType": "document",
+                "name": "extraMappingDetails",
                 "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
                 "behaviour": [
                   {
-                    "condition": "not (within(lengthControlledKm, siteCalculatedLengthKm, 0.1))",
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
                     "type": "if"
                   }
                 ]
               },
               {
-                "dataType": "text",
-                "name": "mappingLengthNotAlignedComments",
-                "validate": "required,maxSize[300]",
-                "behaviour": [
-                  {
-                    "type": "if",
-                    "condition": "not (within(lengthControlledKm, siteCalculatedLengthKm, 0.1)) and \"Other\" == mappingLengthNotAlignedReason"
-                  }
-                ]
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKm"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
               },
               {
+                "name": "relatedOutcomes",
                 "dataType": "text",
-                "name": "invoicedNotActualReason",
-                "constraints": [
-                  "Work was undertaken over a greater area than will be invoiced for",
-                  "Other"
-                ],
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
                 "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "roundTo(areaControlledHa, 2) != roundTo(areaInvoicedHa, 2)",
-                    "type": "if"
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
                   }
-                ]
+                }
               },
               {
+                "name": "investmentPriorities2",
                 "dataType": "text",
-                "name": "invoicedNotActualComments",
-                "behaviour": [
-                  {
-                    "type": "if",
-                    "condition": "roundTo(areaControlledHa, 2) != roundTo(areaInvoicedHa, 2) and \"Other\" == invoicedNotActualReason"
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
                   }
-                ],
-                "validate": "required,maxSize[300]"
+                }
               },
               {
                 "dataType": "text",
-                "name": "invoicedLengthNotActualReason",
-                "constraints": [
-                  "Work was undertaken over a greater length than will be invoiced for",
-                  "Other"
-                ],
-                "validate": "required",
+                "name": "otherInvestmentPriority",
                 "behaviour": [
                   {
-                    "condition": "roundTo(lengthControlledKm, 2) != roundTo(lengthInvoicedKm, 2)",
-                    "type": "if"
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
                   }
                 ]
               },
               {
                 "dataType": "text",
-                "name": "invoicedLengthNotActualComments",
-                "behaviour": [
-                  {
-                    "type": "if",
-                    "condition": "roundTo(lengthControlledKm, 2) != roundTo(lengthInvoicedKm, 2) and \"Other\" == invoicedLengthNotActualReason"
-                  }
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
                 ],
-                "validate": "required,maxSize[300]"
-              },
-              {
-                "dataType": "number",
-                "name": "noStructuresInstalled",
-                "validate": "required"
-              },
-              {
-                "dataType": "number",
-                "name": "invoiceLocationsStructures",
                 "validate": "required"
               },
               {
                 "columns": [
                   {
-                    "dataType": "species",
-                    "name": "pestSpecies",
-                    "dwcAttribute": "scientificName",
-                    "description": "Pest species targeted for treatment (start typing a  scientific or common name for a species)",
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "pestManagementMethod",
-                    "dwcAttribute": "treatmentMethod",
-                    "description": "The method used in this activity to manage pests",
-                    "constraints": [
-                      "Aerial shoot",
-                      "Bait & trap",
-                      "Bait only",
-                      "Feral free enclosure",
-                      "Exclusion fencing",
-                      "Fumigation",
-                      "Ground shoot",
-                      "Trap & cull",
-                      "Trap & remove",
-                      "Other"
-                    ],
+                    "dataType": "date",
+                    "name": "dateFrom",
                     "validate": "required"
                   },
                   {
-                    "dataType": "text",
-                    "name": "otherManagementMethod",
-                    "description": "Please specify the management method used if Other was selected in the Management Method column.",
-                    "behaviour": [
+                    "dataType": "date",
+                    "name": "dateTo",
+                    "validate": [
                       {
-                        "condition": "pestManagementMethod == \"Other\"",
-                        "type": "enable"
+                        "rule": "required"
+                      },
+                      {
+                        "rule": "future",
+                        "param": {
+                          "expression": "formatDateForValidation(dateFrom)",
+                          "type": "computed"
+                        }
                       }
-                    ],
-                    "validate": "required,maxSize[100]"
+                    ]
                   },
                   {
                     "dataType": "text",
@@ -3017,90 +6438,241 @@
                   },
                   {
                     "dataType": "text",
-                    "name": "individualsOrColonies",
+                    "name": "erosionManagementMethod",
                     "constraints": [
-                      "Colonies",
-                      "Individuals"
+                      "Alternative watering point",
+                      "Erosion control structures",
+                      "Farming practice change",
+                      "Fencing",
+                      "Revegetation",
+                      "Terracing",
+                      "Vegetated waterway (bioswale)",
+                      "Windbreaks",
+                      "Other"
                     ],
                     "validate": "required"
                   },
-                  {
-                    "dataType": "number",
-                    "name": "individualsOrColoniesRemoved",
-                    "validate": "required"
-                  },
-                  {
-                    "name": "investmentPriorities2",
-                    "dataType": "stringList",
-                    "validate": "required",
-                    "constraints": {
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "params": [
-                            {
-                              "expression": "owner.projectId",
-                              "name": "id",
-                              "type": "computed"
-                            }
-                          ],
-                          "url": "/project/listProjectInvestmentPriorities/"
-                        }
-                      }
-                    }
-                  },
                   {
                     "dataType": "text",
-                    "name": "otherInvestmentPriority",
+                    "name": "otherErosionManagementMethod",
                     "behaviour": [
                       {
-                        "type": "enable",
-                        "condition": "\"Other\" in investmentPriorities2"
+                        "condition": "erosionManagementMethod == \"Other\"",
+                        "type": "enable"
                       }
-                    ]
+                    ],
+                    "validate": "required,max[300]"
+                  },
+                  {
+                    "dataType": "number",
+                    "name": "numberDaysCollecting",
+                    "validate": "required,min[0]"
                   },
                   {
-                    "name": "relatedOutcomes",
                     "dataType": "text",
-                    "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                    "validate": "required",
-                    "constraints": {
-                      "textProperty": "label",
-                      "valueProperty": "label",
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "url": "/project/outcomesByScores",
-                          "params": [{
-                            "expression": "owner.projectId",
-                            "name": "id",
-                            "type": "computed"
-                          }, {
-                            "expression": "scores",
-                            "name": "scoreIds",
-                            "type": "computed"
-                          }
-                          ]
-                        }
-                      }
-                    }
+                    "name": "threatenedEcologicalCommunity",
+                    "validate": "maxSize[300]"
                   }
                 ],
                 "dataType": "list",
-                "name": "pestAnimalsControlled"
+                "name": "erosionManagementDetails",
+                "minSize": 0
               }
             ],
             "dataType": "list",
-            "name": "areasControlled"
+            "name": "erosionManagementAreasControlled"
           },
           {
-            "name": "pestSurveyCountHeader",
-            "type": "number",
-            "decimalPlaces": 0,
+            "name": "relatedOutcomes",
+            "dataType": "text",
+            "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+            "validate": "required",
+            "constraints": {
+              "textProperty": "label",
+              "valueProperty": "value",
+              "type": "pre-populated",
+              "config": {
+                "source": {
+                  "context-path": "outcomes"
+                }
+              }
+            }
+          },
+          {
+            "name": "investmentPriorities2",
+            "dataType": "text",
+            "description": "",
+            "validate": "required",
+            "constraints": {
+              "textProperty": "label",
+              "valueProperty": "value",
+              "type": "pre-populated",
+              "config": {
+                "source": {
+                  "context-path": "owner.investmentPriorities"
+                }
+              }
+            }
+          },
+          {
+            "dataType": "text",
+            "name": "otherInvestmentPriority",
+            "behaviour": [
+              {
+                "type": "enable",
+                "condition": "\"Other\" in investmentPriorities2"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "invoicingThisActivity",
+            "constraints": [
+              "Yes",
+              "No"
+            ],
+            "validate": "required"
+          },
+          {
+            "dataType": "number",
+            "name": "totalLengthStreamCoastlineInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(erosionManagementAreasControlled, \"initialOrFollowup == 'Initial' ? lengthTreatedKm : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalLengthStreamCoastlineInitialInvoice",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalLengthStreamCoastlineInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalLengthStreamCoastlineFollowup",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(erosionManagementAreasControlled, \"initialOrFollowup == 'Follow-up' ? lengthTreatedKm : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalLengthStreamCoastlineInvoicedFollowup",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalLengthStreamCoastlineFollowup",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalAreaErosionControlInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(erosionManagementAreasControlled, \"initialOrFollowup == 'Initial' ? areaTreatedHa : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalAreaErosionControlInvoicedInitial",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaErosionControlInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalAreaErosionControlFollowup",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
             "computed": {
-              "expression": "count(areasControlled, \"relatedOutcomes\")"
+              "expression": "sum(erosionManagementAreasControlled, \"initialOrFollowup == 'Follow-up' ? areaTreatedHa : 0\")"
             }
           },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalAreaErosionControlInvoicedFollowup",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaErosionControlFollowup",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedErosionMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required,min[0]",
+            "behaviour": [
+              {
+                "condition": "+totalLengthStreamCoastlineInitialInvoice < +totalLengthStreamCoastlineInitial or +totalLengthStreamCoastlineInvoicedFollowup < +totalLengthStreamCoastlineFollowup or +totalAreaErosionControlInvoicedInitial < +totalAreaErosionControlInitial or +totalAreaErosionControlInvoicedFollowup < +totalAreaErosionControlFollowup",
+                "type": "enable"
+              }
+            ]
+          },
           {
             "dataType": "text",
             "name": "comments",
@@ -3113,12 +6685,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -3127,139 +6699,292 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Pest animal management",
-        "title": "Controlling pest animals",
+        "modelName": "NHT - Erosion Management",
+        "title": "Erosion Management",
         "viewModel": [
           {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
             "columns": [
               {
                 "width": "10%",
                 "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
+                "title": "Are individuals or groups delivering this service?",
                 "type": "selectOne"
               },
               {
-                "width": "20%",
+                "width": "20%",
+                "type": "col",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "participationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "participationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "width": "20%",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "firstNationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "firstNationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
+              }
+            ],
+            "source": "participationInformationTableErm",
+            "type": "table"
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vii) Total area (ha) of erosion control (initial) for this reporting period",
+                        "source": "totalAreaErosionControlInitial",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(viii) Total area (ha) of erosion control (initial) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalAreaErosionControlInvoicedInitial",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
                 "type": "col",
-                "title": "Total Number of people delivering this service",
+                "css": "span4 col-border-right",
                 "items": [
                   {
-                    "source": "participationIndividualNumber",
-                    "type": "number"
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ix) Total area (ha) of erosion control (follow up) for this reporting period",
+                        "source": "totalAreaErosionControlFollowup",
+                        "type": "number"
+                      }
+                    ]
                   },
                   {
-                    "source": "participationGroupNumber",
-                    "type": "selectOne"
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(x) Total area (ha) of erosion control <u><i>invoiced</i></u> (follow up) for this reporting period",
+                        "source": "totalAreaErosionControlInvoicedFollowup",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
                   }
                 ]
               },
               {
                 "type": "col",
-                "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
+                "css": "span4 col-border-right",
                 "items": [
                   {
-                    "source": "firstNationIndividualNumber",
-                    "type": "number"
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii) Total length (km) of stream/coastline treated for erosion (initial) for this reporting period",
+                        "source": "totalLengthStreamCoastlineInitial",
+                        "type": "number"
+                      }
+                    ]
                   },
                   {
-                    "source": "firstNationGroupNumber",
-                    "type": "selectOne"
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total length (km) of stream/coastline treated for erosion (initial) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalLengthStreamCoastlineInitialInvoice",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
                   }
                 ]
               },
               {
-                "source": "participationDetails",
-                "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                "type": "textarea"
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(v) Total length (km) of stream/coastline treated for erosion (follow up) for this reporting period",
+                        "source": "totalLengthStreamCoastlineFollowup",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vi) Total length (km) of stream/coastline treated for erosion (follow up) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalLengthStreamCoastlineInvoicedFollowup",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
               }
-            ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
-            "type": "table"
+            ]
           },
           {
-            "preLabel": "Number of Pest Animals surveys conducted:",
-            "noEdit": true,
-            "type": "number",
-            "source": "pestSurveyCountHeader"
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedErosionMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
           },
           {
-            "addRowText": "Add a new controlled area",
+            "addRowText": "Add a new erosion control area",
             "userAddedRows": true,
-            "source": "areasControlled",
+            "source": "erosionManagementAreasControlled",
             "type": "repeat",
             "items": [
               {
                 "type": "row",
-                "css": "border-bottom",
                 "items": [
                   {
-                    "preLabel": "Initial or follow-up control?",
                     "css": "span3",
-                    "source": "initialOrFollowup",
-                    "type": "selectOne"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "css": "border-bottom",
-                "items": [
-                  {
                     "type": "col",
-                    "css": "span2 col-border-right",
                     "items": [
                       {
                         "type": "row",
                         "items": [
                           {
-                            "source": "site",
-                            "type": "feature",
-                            "preLabel": "Site/s where pest control was undertaken"
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
                         "type": "row",
                         "items": [
                           {
-                            "source": "siteCalculatedAreaHa",
-                            "type": "number",
-                            "readonly": true,
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
                       {
                         "type": "row",
                         "items": [
                           {
-                            "source": "siteCalculatedLengthKm",
-                            "type": "number",
-                            "readonly": true,
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "css": "border-bottom",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Please attach mapping details",
-                            "source": "extraMappingDetails",
-                            "type": "document"
+                            "source": "initialOrFollowup",
+                            "preLabel": "Initial or follow-up control?",
+                            "type": "selectOne"
                           }
                         ]
                       }
@@ -3273,33 +6998,31 @@
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Actual area (ha) treated for pest animals",
-                            "source": "areaControlledHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Reason for actual area being different to mapped amount",
-                            "source": "mappingNotAlignedReason",
-                            "type": "selectOne"
+                            "source": "numberInstalled",
+                            "preLabel": "Number of erosion control structures installed",
+                            "type": "number"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "css": "border-bottom",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
                         "type": "row",
                         "items": [
                           {
-                            "placeholder": "Please enter the reason/s the mapping area didn't align with the invoiced amount",
-                            "source": "mappingNotAlignedComments",
-                            "type": "textarea",
-                            "rows": 5
+                            "preLabel": "Site/s where erosion has been controlled",
+                            "source": "sitesOfErosionControl",
+                            "type": "feature"
                           }
                         ]
                       },
@@ -3307,13 +7030,12 @@
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Actual length (km) treated for pest animals",
-                            "source": "lengthControlledKm",
+                            "source": "calculatedAreaTreatedHa",
                             "type": "number",
-                            "validate": "required",
                             "displayOptions": {
                               "displayUnits": true
-                            }
+                            },
+                            "readonly": "readonly"
                           }
                         ]
                       },
@@ -3321,9 +7043,12 @@
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Reason for actual length being different to mapped amount",
-                            "source": "mappingLengthNotAlignedReason",
-                            "type": "selectOne"
+                            "source": "calculatedLengthTreatedKm",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
                           }
                         ]
                       },
@@ -3331,10 +7056,9 @@
                         "type": "row",
                         "items": [
                           {
-                            "placeholder": "Please enter the reason/s the mapping length didn't align with the invoiced amount",
-                            "source": "mappingLengthNotAlignedComments",
-                            "type": "textarea",
-                            "rows": 5
+                            "preLabel": "Please attach mapping details",
+                            "source": "extraMappingDetails",
+                            "type": "document"
                           }
                         ]
                       }
@@ -3348,9 +7072,8 @@
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Invoiced area (ha) treated for pest animals",
-                            "helpText": "",
-                            "source": "areaInvoicedHa",
+                            "preLabel": "Actual area (ha) / length (km) of erosion control",
+                            "source": "areaTreatedHa",
                             "type": "number",
                             "displayOptions": {
                               "displayUnits": true
@@ -3362,30 +7085,7 @@
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Reason for invoiced amount being different to actual amount",
-                            "source": "invoicedNotActualReason",
-                            "type": "selectOne"
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "invoicedNotActualComments",
-                            "type": "textarea",
-                            "rows": 5
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Invoiced length (km) treated for pest animals",
-                            "helpText": "",
-                            "source": "lengthInvoicedKm",
+                            "source": "lengthTreatedKm",
                             "type": "number",
                             "displayOptions": {
                               "displayUnits": true
@@ -3397,8 +7097,8 @@
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Reason for invoiced amount being different to actual amount",
-                            "source": "invoicedLengthNotActualReason",
+                            "preLabel": "Reason for actual being different to mapped amount",
+                            "source": "mappingNotAlignedReason",
                             "type": "selectOne"
                           }
                         ]
@@ -3408,45 +7108,91 @@
                         "items": [
                           {
                             "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "invoicedLengthNotActualComments",
+                            "source": "mappingNotAlignedComments",
                             "type": "textarea",
                             "rows": 5
                           }
                         ]
                       }
                     ]
+                  }
+                ]
+              },
+
+              {
+                "columns": [
+                  {
+                    "title": "Date from",
+                    "source": "dateFrom",
+                    "type": "date",
+                    "width": "15%"
+                  },
+                  {
+                    "title": "Date to",
+                    "source": "dateTo",
+                    "type": "date",
+                    "width": "15%"
+                  },
+                  {
+                    "width": "20%",
+                    "source": "treatmentObjective",
+                    "title": "Treatment objective",
+                    "type": "textarea"
                   },
                   {
+                    "width": "20%",
                     "type": "col",
-                    "css": "span2 col-border-right",
+                    "title": "Type of treatment being used",
                     "items": [
                       {
                         "type": "row",
                         "items": [
                           {
-                            "source": "noStructuresInstalled",
-                            "preLabel": "Number of structures installed/maintained",
-                            "type": "number"
+                            "source": "erosionManagementMethod",
+                            "type": "selectOne"
                           }
                         ]
-                      }
-                    ]
-                  },
-                  {
-                    "type": "col",
-                    "css": "span2 col-border-right",
-                    "items": [
+                      },
                       {
                         "type": "row",
                         "items": [
                           {
-                            "source": "invoiceLocationsStructures",
-                            "preLabel": "Invoiced number of locations where structures were installed/maintained",
-                            "type": "number"
+                            "source": "otherErosionManagementMethod",
+                            "placeholder": "Type of treatment method",
+                            "type": "textarea"
                           }
                         ]
                       }
                     ]
+                  },
+                  {
+                    "width": "10%",
+                    "source": "numberDaysCollecting",
+                    "title": "Number of days collecting seeds/propagating plants ",
+                    "type": "number"
+                  },
+                  {
+                    "width": "20%",
+                    "source": "threatenedEcologicalCommunity",
+                    "title": "Threatened Ecological Community (TEC) benefitting from this activity",
+                    "type": "textarea"
+                  }
+                ],
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "source": "erosionManagementDetails",
+                "type": "table"
+              }
+            ]
+          },
+
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Optionally attach photos",
+                    "source": "photographicEvidence",
+                    "type": "image"
                   }
                 ]
               },
@@ -3454,145 +7200,64 @@
                 "type": "row",
                 "items": [
                   {
-                    "addRowText": "Add a species",
-                    "columns": [
-                      {
-                        "width": "15%",
-                        "source": "pestSpecies",
-                        "title": "Target pest species",
-                        "type": "speciesSelect"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "pestManagementMethod",
-                        "title": "Type of control",
-                        "type": "selectOne"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "otherManagementMethod",
-                        "title": "Type of control (if other)",
-                        "type": "text"
-                      },
-                      {
-                        "width": "15%",
-                        "source": "treatmentObjective",
-                        "title": "Treatment objective",
-                        "type": "textarea"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "individualsOrColonies",
-                        "title": "Individuals or colonies?",
-                        "type": "selectOne"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "individualsOrColoniesRemoved",
-                        "title": "Number of individuals or colonies removed / destroyed",
-                        "type": "number"
-                      },
-                      {
-                        "width": "15%",
-                        "type": "col",
-                        "title": "Which investment priority does this activity relate to?",
-                        "items": [
-                          {
-                            "source": "investmentPriorities2",
-                            "type": "select2Many"
-                          },
-                          {
-                            "source": "otherInvestmentPriority",
-                            "type": "text"
-                          }
-                        ]
-                      },
-                      {
-                        "width": "15%",
-                        "source": "relatedOutcomes",
-                        "type": "selectOne",
-                        "title": "Which outcome statement/s relates to this survey?"
-                      }
-                    ],
-                    "userAddedRows": true,
-                    "source": "pestAnimalsControlled",
-                    "type": "table"
+                    "preLabel": "Clarification, if needed",
+                    "type": "textarea",
+                    "rows": 4,
+                    "css": "span8",
+                    "source": "comments",
+                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
                   }
                 ]
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
-              {
-                "preLabel": "Optionally attach photos",
-                "source": "photographicEvidence",
-                "type": "image"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
-              {
-                "preLabel": "Clarification, if needed",
-                "type": "textarea",
-                "rows": 4,
-                "css": "span8",
-                "source": "comments",
-                "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
-              {
-                "type": "literal",
-                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
               },
               {
-                "preLabel": "Data have been uploaded",
-                "source": "dataUploaded",
-                "type": "boolean"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
+                  },
+                  {
+                    "preLabel": "Data have been uploaded",
+                    "source": "dataUploaded",
+                    "type": "boolean"
+                  }
+                ]
+              },
               {
-                "preLabel": "",
-                "source": "projectAssuranceDetails",
-                "type": "textarea",
-                "rows": 4,
-                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
-              }
-            ]
-          },
-          {
-            "type": "table",
-            "source": "assuranceDocuments",
-            "userAddedRows": true,
-            "disableTableUpload": true,
-            "columns": [
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "",
+                    "source": "projectAssuranceDetails",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                  }
+                ]
+              },
               {
-                "title": "Attached documents",
-                "source": "attachments",
-                "type": "document"
+                "type": "table",
+                "source": "assuranceDocuments",
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "columns": [
+                  {
+                    "title": "Attached documents",
+                    "source": "attachments",
+                    "type": "document"
+                  }
+                ]
               }
-            ]
-          }
+
         ]
       },
       "modelName": null,
-      "templateName": "nhtPestAnimalManagement",
+      "templateName": "nhtErosionManagement",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Controlling pest animals",
+      "title": "Erosion management",
       "collapsibleHeading": null,
-      "name": "NHT - Pest animal management",
+      "name": "NHT - Erosion Management",
       "description": null
     },
     {
@@ -3600,372 +7265,459 @@
       "template": {
         "dataModel": [
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+            "allowRowDelete": "false",
+            "columns": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "columns": [
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
               {
-                "columns": [
-                  {
-                    "dataType": "text",
-                    "name": "initialOrFollowup",
-                    "constraints": [
-                      "Initial",
-                      "Follow-up"
-                    ],
-                    "validate": "required"
-                  },
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
                   {
-                    "dataType": "feature",
-                    "name": "clearedSites"
-                  },
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
                   {
-                    "computed": {
-                      "expression": "$geom.areaHa(clearedSites)"
-                    },
-                    "dataType": "number",
-                    "name": "calculatedDebrisRemovedHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "behaviour": [
-                      {
-                        "condition": "areaOfRemovedDebrisInvoicedHa > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "The cleared area must be mapped",
-                          "validate": "required,min[0.0001]"
-                        }
-                      }
-                    ]
-                  },
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
                   {
-                    "computed": {
-                      "expression": "$geom.lengthKm(clearedSites)"
-                    },
-                    "dataType": "number",
-                    "name": "calculatedDebrisRemovedKm",
-                    "units": "km",
-                    "decimalPlaces": 3,
-                    "behaviour": [
-                      {
-                        "condition": "debrisRemovedKm > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "",
-                          "validate": "required,min[0.0001]"
-                        }
-                      }
-                    ]
+                    "rule": "required"
                   },
                   {
-                    "defaultValue": {
-                      "type": "computed",
-                      "expression": "calculatedDebrisRemovedHa"
-                    },
-                    "dataType": "number",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "name": "debrisRemovedHa",
-                    "validate": "required,min[0]"
+                    "rule": "min[0]"
                   },
                   {
-                    "defaultValue": {
-                      "type": "computed",
-                      "expression": "calculatedDebrisRemovedKm"
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
                     },
-                    "dataType": "number",
-                    "units": "km",
-                    "decimalPlaces": 3,
-                    "name": "debrisRemovedKm",
-                    "validate": "required,min[0]"
-                  },
-                  {
-                    "dataType": "document",
-                    "name": "extraMappingDetails",
-                    "validate": "required",
-                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
-                    "behaviour": [
-                      {
-                        "condition": "not (within(debrisRemovedHa, calculatedDebrisRemovedHa, 0.1)) or roundTo(debrisRemovedHa, 2) != roundTo(areaOfRemovedDebrisInvoicedHa, 2)",
-                        "type": "visible"
-                      }
-                    ]
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "mappingNotAlignedReason",
-                    "constraints": [
-                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                      "Other"
-                    ],
-                    "validate": "required",
-                    "behaviour": [
-                      {
-                        "condition": "not (within(calculatedDebrisRemovedHa, debrisRemovedHa, 0.1))",
-                        "type": "visible"
-                      }
-                    ]
-                  },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "mappingNotAlignedComments",
-                    "validate": "required,maxSize[300]",
-                    "behaviour": [
-                      {
-                        "type": "visible",
-                        "condition": "\"Other\" == mappingNotAlignedReason"
-                      }
-                    ]
-                  },
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
                   {
-                    "dataType": "number",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "name": "areaOfRemovedDebrisInvoicedHa",
-                    "validate": [
-                      {
-                        "rule": "min[0]"
-                      },
-                      {
-                        "rule": "max",
-                        "param": {
-                          "type": "computed",
-                          "expression": "debrisRemovedHa"
-                        }
-                      }
-                    ]
+                    "rule": "required"
                   },
                   {
-                    "dataType": "number",
-                    "name": "areaOfRemovedDebrisInvoicedKm",
-                    "decimalPlaces": 3,
-                    "units": "km",
-                    "validate": [
-                      {
-                        "rule": "required"
-                      },
-                      {
-                        "rule": "min[0]"
-                      },
-                      {
-                        "param": {
-                          "expression": "debrisRemovedKm",
-                          "type": "computed"
-                        },
-                        "rule": "max"
-                      }
-                    ]
-                  },
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableEmp"
+          },
+          {
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "newOrMaintained",
+                "constraints": [
+                  "Initial",
+                  "Maintained"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfPestFreeEnclosures",
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "daysSpentOnMaintenanceOfEnclosures",
+                "description": "Number of days should be calculated as number of days by number of people (eg. 4.5 days by 3 people is 13.5 days).",
+                "validate": "required, min[0]"
+              },
+              {
+                "dataType": "feature",
+                "name": "sitesOfPestAnimalFreeEnclosure",
+                "description": "Mapping field to be done and Area (ha) field be auto-calculated from mapping.",
+                "validate": "required"
+              },
+              {
+                "computed": {
+                  "expression": "$geom.areaHa(sitesOfPestAnimalFreeEnclosure)"
+                },
+                "dataType": "number",
+                "name": "calculatedAreaTreatedHa",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesOfPestAnimalFreeEnclosure)"
+                },
+                "dataType": "number",
+                "name": "calculatedLengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "invoicedNotActualReason",
-                    "constraints": [
-                      "Work was undertaken over a greater area than will be invoiced for",
-                      "Other"
-                    ],
-                    "validate": "required",
-                    "behaviour": [
-                      {
-                        "condition": "roundTo(debrisRemovedHa, 2) != roundTo(areaOfRemovedDebrisInvoicedHa, 2) or roundTo(debrisRemovedKm, 2) != roundTo(areaOfRemovedDebrisInvoicedKm, 2)",
-                        "type": "visible"
-                      }
-                    ]
-                  },
+                    "condition": "lengthTreatedKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
+                    }
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaTreatedHa"
+                },
+                "dataType": "number",
+                "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedReason",
+                "constraints": [
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                  "Other"
+                ],
+                "validate": "required",
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "invoicedNotActualComments",
-                    "behaviour": [
-                      {
-                        "type": "visible",
-                        "condition": "\"Other\" == invoicedNotActualReason"
-                      }
-                    ],
-                    "validate": "required,maxSize[300]"
-                  },
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedComments",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
                   {
-                    "name": "relatedOutcomes",
-                    "dataType": "text",
-                    "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                    "validate": "required",
-                    "constraints": {
-                      "textProperty": "label",
-                      "valueProperty": "label",
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "url": "/project/outcomesByScores",
-                          "params": [{
-                            "expression": "owner.projectId",
-                            "name": "id",
-                            "type": "computed"
-                          }, {
-                            "expression": "scores",
-                            "name": "scoreIds",
-                            "type": "computed"
-                          }
-                          ]
-                        }
-                      }
-                    }
-                  },
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReason"
+                  }
+                ]
+              },
+              {
+                "dataType": "document",
+                "name": "extraMappingDetails",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
                   {
-                    "name": "investmentPriorities2",
-                    "dataType": "stringList",
-                    "validate": "required",
-                    "constraints": {
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "params": [
-                            {
-                              "expression": "owner.projectId",
-                              "name": "id",
-                              "type": "computed"
-                            }
-                          ],
-                          "url": "/project/listProjectInvestmentPriorities/"
-                        }
-                      }
-                    }
-                  },
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKm"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
+              },
+              {
+                "columns": [
                   {
-                    "dataType": "text",
-                    "name": "otherInvestmentPriority",
-                    "behaviour": [
-                      {
-                        "type": "enable",
-                        "condition": "\"Other\" in investmentPriorities2"
-                      }
-                    ]
+                    "dataType": "species",
+                    "name": "protectedSpecies",
+                    "dwcAttribute": "scientificName",
+                    "description": "The threatened species protected by the enclosure.",
+                    "validate": "required"
                   },
                   {
-                    "dataType": "text",
-                    "name": "teqDebrisRemoval",
+                    "dataType": "species",
+                    "name": "targetFeralSpecies",
+                    "dwcAttribute": "scientificName",
                     "description": "",
                     "validate": "required"
                   },
                   {
                     "dataType": "text",
-                    "name": "debrisType",
-                    "description": "",
+                    "name": "individualsOrPopulations",
                     "constraints": [
-                      "Building & Industrial waste",
-                      "Domestic waste",
-                      "Green waste",
-                      "Other"
+                      "Individuals",
+                      "Populations"
                     ],
                     "validate": "required"
                   },
                   {
-                    "dataType": "text",
-                    "name": "otherDebrisType",
-                    "description": "if Other",
-                    "behaviour": [
-                      {
-                        "condition": "debrisType == \"Other\"",
-                        "type": "visible"
-                      }
-                    ],
-                    "validate": "required,maxSize[300]"
-                  },
-                  {
-                    "validated": "required,min[0]",
-                    "dataType": "number",
-                    "name": "weightOfDebrisTonnes",
-                    "units": "tonnes"
-                  },
-                  {
-                    "validated": "required,min[0]",
                     "dataType": "number",
-                    "name": "volumeRemovedM3",
-                    "units": "m3"
+                    "name": "numberOfPopulationsOrIndividualsProtected",
+                    "validate": "required,min[0]"
                   }
                 ],
                 "dataType": "list",
-                "name": "debrisRemovalDetails"
+                "name": "speciesProtected"
+              },
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "investmentPriorities2",
+                "dataType": "text",
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
+                  }
+                }
+              },
+              {
+                "dataType": "text",
+                "name": "otherInvestmentPriority",
+                "behaviour": [
+                  {
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
               }
             ],
             "dataType": "list",
-            "name": "debrisRemovalSurveys",
-            "minSize": 1
+            "name": "enclosureDetails"
           },
           {
-            "name": "surveyCountHeader",
-            "type": "number",
+            "dataType": "number",
+            "name": "totalNoPestFreeSurveyEstablished",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "defaultValue": 0,
+            "computed": {
+              "expression": "sum(enclosureDetails, \"newOrMaintained == 'Initial' ? numberOfPestFreeEnclosures : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalNoPestFreeSurveyEstablishedInvoiced",
+            "decimalPlaces": 0,
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalNoPestFreeSurveyEstablished",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalNoPestFreeSurveyMaintained",
+            "validate": "required,min[0]",
+            "decimalPlaces": 0,
+            "defaultValue": 0,
+            "computed": {
+              "expression": "sum(enclosureDetails, \"newOrMaintained == 'Maintained' ? numberOfPestFreeEnclosures : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalNoPestFreeSurveyMaintainedInvoiced",
+            "decimalPlaces": 0,
+            "defaultValue": "",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalNoPestFreeSurveyMaintained",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ]
+          },
+          {
+            "dataType": "number",
+            "name": "totalNoDaysMaintainingPestFree",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(enclosureDetails, \"daysSpentOnMaintenanceOfEnclosures\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalNoDaysMaintainingPestFreeInvoiced",
             "decimalPlaces": 0,
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalNoDaysMaintainingPestFree",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalAreaPestFreeSurveyInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "defaultValue": 0,
             "computed": {
-              "expression": "count(debrisRemovalSurveys, \"numberInstalled\")"
+              "expression": "sum(enclosureDetails, \"areaTreatedHa\")"
             }
           },
+          {
+            "dataType": "number",
+            "name": "totalAreaPestFreeSurveyInitialInvoiced",
+            "decimalPlaces": 3,
+            "defaultValue": "",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaPestFreeSurveyInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedPestFreeMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalNoPestFreeSurveyEstablishedInvoiced < +totalNoPestFreeSurveyEstablished or +totalNoPestFreeSurveyMaintainedInvoiced < +totalNoPestFreeSurveyMaintained or +totalNoDaysMaintainingPestFreeInvoiced < +totalNoDaysMaintainingPestFree or +totalAreaPestFreeSurveyInitialInvoiced < +totalAreaPestFreeSurveyInitial",
+                "type": "enable"
+              }
+            ]
+          },
           {
             "dataType": "text",
             "name": "comments",
@@ -3978,12 +7730,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -3992,26 +7744,37 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Debris removal",
-        "title": "Debris removal",
+        "modelName": "NHT - Maintaining feral free enclosures",
+        "title": "Establishing and Maintaining Pest Animal-free Enclosures",
         "viewModel": [
           {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
             "columns": [
               {
                 "width": "10%",
                 "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
+                "title": "Are individuals or groups delivering this service?",
                 "type": "selectOne"
               },
               {
                 "width": "20%",
                 "type": "col",
-                "title": "Total Number of people delivering this service",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "participationIndividualNumber",
@@ -4026,7 +7789,8 @@
               {
                 "type": "col",
                 "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "firstNationIndividualNumber",
@@ -4039,104 +7803,265 @@
                 ]
               },
               {
+                "width": "20%",
                 "source": "participationDetails",
                 "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
                 "type": "textarea"
               }
             ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
+            "source": "participationInformationTableEmp",
             "type": "table"
           },
           {
-            "type": "section",
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
             "items": [
               {
-                "preLabel": "Number of Debris Removal surveys conducted:",
-                "noEdit": true,
-                "type": "number",
-                "source": "surveyCountHeader"
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i)  Total number of pest animal-free enclosures (initial) for this reporting period",
+                        "source": "totalNoPestFreeSurveyEstablished",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total number of pest animal-free enclosures (initial) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalNoPestFreeSurveyEstablishedInvoiced",
+                        "type": "number",
+                        "readonly": false
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii)  Total number of pest animal-free enclosures (maintained) for this reporting period",
+                        "source": "totalNoPestFreeSurveyMaintained",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total number of pest animal-free enclosures (maintained) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalNoPestFreeSurveyMaintainedInvoiced",
+                        "type": "number",
+                        "readonly": false
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(v) Total number of days maintaining pest animal-free enclosures for this reporting period",
+                        "source": "totalNoDaysMaintainingPestFree",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vi) Total number of days maintaining pest animal-free enclosures <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalNoDaysMaintainingPestFreeInvoiced",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
               },
               {
-                "addRowText": "New survey site",
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vii) Total area (ha) of pest animal-free enclosures for this reporting period",
+                        "source": "totalAreaPestFreeSurveyInitial",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(viii) Total area (ha) of pest animal-free enclosures <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalAreaPestFreeSurveyInitialInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedPestFreeMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "type": "section",
+            "items": [
+              {
+                "addRowText": "Add a new pest animal free area",
                 "userAddedRows": true,
-                "source": "debrisRemovalSurveys",
+                "source": "enclosureDetails",
                 "type": "repeat",
                 "items": [
                   {
-                    "columns": [
+                    "type": "row",
+                    "items": [
                       {
-                        "width": "10%",
-                        "source": "initialOrFollowup",
-                        "title": "Initial or follow-up activity?",
-                        "type": "selectOne"
+                        "css": "span3",
+                        "type": "col",
+                        "items": [
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "relatedOutcomes",
+                                "type": "selectOne",
+                                "preLabel": "Which outcome statement/s does this activity relate to?"
+                              }
+                            ]
+                          }
+                        ]
                       },
                       {
-                        "width": "15%",
-                        "title": "Site/s where debris removal was implemented",
                         "type": "col",
+                        "css": "span3 col-border-right",
                         "items": [
-                          {
-                            "type": "feature",
-                            "source": "clearedSites"
-                          },
-                          {
-                            "source": "calculatedDebrisRemovedHa",
-                            "readonly": "readonly",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          },
-                          {
-                            "source": "calculatedDebrisRemovedKm",
-                            "readonly": "readonly",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          },
                           {
                             "type": "row",
                             "items": [
                               {
-                                "preLabel": "Please attach mapping details",
-                                "source": "extraMappingDetails",
-                                "type": "document"
+                                "source": "investmentPriorities2",
+                                "preLabel": "Which investment priority does this activity relate to?",
+                                "type": "select2Many"
                               }
                             ]
                           }
                         ]
                       },
                       {
-                        "width": "15%",
+                        "css": "span3",
                         "type": "col",
-                        "title": "Actual area (ha) / length (km) of debris removed",
-                        "helpText": "Enter the amount which were actually removed during this reporting period.",
                         "items": [
                           {
-                            "source": "debrisRemovedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          },
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "invoicingThisActivity",
+                                "preLabel": "Are you invoicing for this activity in this reporting period?",
+                                "type": "selectOne"
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "border-bottom",
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "Initial or maintained feral free enclosure?",
+                        "css": "span3",
+                        "source": "newOrMaintained",
+                        "type": "selectOne"
+                      },
+                      {
+                        "preLabel": "Number of pest animal-free enclosures",
+                        "css": "span3",
+                        "source": "numberOfPestFreeEnclosures",
+                        "type": "number"
+                      },
+                      {
+                        "preLabel": "Number of days maintaining pest animal-free enclosures",
+                        "css": "span3",
+                        "source": "daysSpentOnMaintenanceOfEnclosures",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "type": "col",
+                        "css": "span3 col-border-right",
+                        "items": [
                           {
-                            "source": "debrisRemovedKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Site/s of pest animal-free enclosure",
+                                "source": "sitesOfPestAnimalFreeEnclosure",
+                                "type": "feature"
+                              }
+                            ]
                           },
                           {
                             "type": "row",
                             "items": [
                               {
-                                "preLabel": "Reason for actual being different to mapped amount",
-                                "source": "mappingNotAlignedReason",
-                                "type": "selectOne"
+                                "source": "calculatedAreaTreatedHa",
+                                "type": "number",
+                                "displayOptions": {
+                                  "displayUnits": true
+                                },
+                                "readonly": "readonly"
                               }
                             ]
                           },
@@ -4144,41 +8069,37 @@
                             "type": "row",
                             "items": [
                               {
-                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "mappingNotAlignedComments",
-                                "type": "textarea",
-                                "rows": 5
+                                "preLabel": "Please attach mapping details",
+                                "source": "extraMappingDetails",
+                                "type": "document"
                               }
                             ]
                           }
                         ]
                       },
                       {
-                        "width": "15%",
                         "type": "col",
-                        "title": "Invoiced area (ha) of debris removed",
-                        "helpText": "Enter the amount you will invoice for during this reporting period.",
+                        "css": "span3 col-border-right",
                         "items": [
                           {
-                            "source": "areaOfRemovedDebrisInvoicedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          },
-                          {
-                            "source": "areaOfRemovedDebrisInvoicedKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Actual area (ha) of pest animal-free enclosure",
+                                "source": "areaTreatedHa",
+                                "type": "number",
+                                "displayOptions": {
+                                  "displayUnits": true
+                                }
+                              }
+                            ]
                           },
                           {
                             "type": "row",
                             "items": [
                               {
-                                "preLabel": "Reason for invoiced amount being different to actual amount",
-                                "source": "invoicedNotActualReason",
+                                "preLabel": "Reason for actual being different to mapped amount",
+                                "source": "mappingNotAlignedReason",
                                 "type": "selectOne"
                               }
                             ]
@@ -4188,347 +8109,496 @@
                             "items": [
                               {
                                 "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "invoicedNotActualComments",
+                                "source": "mappingNotAlignedComments",
                                 "type": "textarea",
                                 "rows": 5
                               }
                             ]
                           }
                         ]
-                      },
-                      {
-                        "source": "relatedOutcomes",
-                        "type": "selectOne",
-                        "width": "10%",
-                        "title": "Which outcome statement/s relates to this survey?"
-                      },
-                      {
-                        "width": "15%",
-                        "type": "col",
-                        "title": "Which investment priority does this activity relate to?",
-                        "items": [
-                          {
-                            "source": "investmentPriorities2",
-                            "type": "select2Many"
-                          },
-                          {
-                            "source": "otherInvestmentPriority",
-                            "type": "text"
-                          }
-                        ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "addRowText": "Add a species",
+                    "columns": [
                       {
-                        "width": "10%",
-                        "source": "teqDebrisRemoval",
-                        "title": "Technique used to remove debris",
-                        "type": "textarea",
-                        "rows": 5
+                        "width": "30%",
+                        "source": "protectedSpecies",
+                        "title": "Targeted species being protected",
+                        "type": "speciesSelect"
                       },
                       {
-                        "width": "10%",
-                        "title": "Type of debris removed",
-                        "type": "col",
-                        "validate": "required",
-                        "items": [
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "debrisType",
-                                "type": "select2"
-                              }
-                            ]
-                          },
-                          {
-                            "source": "otherDebrisType",
-                            "type": "text"
-                          }
-                        ]
+                        "width": "30%",
+                        "source": "targetFeralSpecies",
+                        "title": "Targeted pest animal species being controlled",
+                        "type": "speciesSelect"
                       },
                       {
-                        "width": "5%",
-                        "source": "weightOfDebrisTonnes",
-                        "title": "Weight (tonnes) of debris removed",
-                        "type": "number"
+                        "width": "20%",
+                        "source": "individualsOrPopulations",
+                        "title": "Individuals or populations of species being protected?",
+                        "type": "selectOne"
                       },
                       {
-                        "width": "5%",
-                        "source": "volumeRemovedM3",
-                        "title": "Volume (m3) of debris removed",
+                        "width": "20%",
+                        "source": "numberOfPopulationsOrIndividualsProtected",
+                        "title": "Number of populations (or individuals) within pest animal-free enclosures",
                         "type": "number"
                       }
                     ],
                     "userAddedRows": true,
-                    "source": "debrisRemovalDetails",
+                    "disableTableUpload": true,
+                    "source": "speciesProtected",
                     "type": "table"
                   }
-                ]
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Optionally attach photos",
+                    "source": "photographicEvidence",
+                    "type": "image"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Clarification, if needed",
+                    "type": "textarea",
+                    "rows": 4,
+                    "css": "span8",
+                    "source": "comments",
+                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
+                  },
+                  {
+                    "preLabel": "Data have been uploaded",
+                    "source": "dataUploaded",
+                    "type": "boolean"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "",
+                    "source": "projectAssuranceDetails",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                  }
+                ]
+              },
+              {
+                "type": "table",
+                "source": "assuranceDocuments",
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "columns": [
+                  {
+                    "title": "Attached documents",
+                    "source": "attachments",
+                    "type": "document"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "modelName": null,
+      "templateName": "nhtFeralFreeEnclosures",
+      "optional": true,
+      "optionalQuestionText": null,
+      "title": "Establishing and maintaining feral-free enclosures",
+      "collapsibleHeading": null,
+      "name": "NHT - Maintaining feral free enclosures",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
+          {
+            "allowRowDelete": "false",
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableEsa"
+          },
+          {
+            "columns": [
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "label",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "url": "/project/outcomesByScores",
+                      "params": [
+                        {
+                          "expression": "owner.projectId",
+                          "name": "id",
+                          "type": "computed"
+                        },
+                        {
+                          "expression": "scores",
+                          "name": "scoreIds",
+                          "type": "computed"
+                        }
+                      ]
+                    }
+                  }
+                }
+              },
+              {
+                "name": "investmentPriorities2",
+                "dataType": "text",
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
+                  }
+                }
               },
               {
-                "type": "row",
-                "items": [
+                "dataType": "text",
+                "name": "otherInvestmentPriority",
+                "behaviour": [
                   {
-                    "preLabel": "Optionally attach photos",
-                    "source": "photographicEvidence",
-                    "type": "image"
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
                   }
                 ]
               },
               {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Clarification, if needed",
-                    "type": "textarea",
-                    "rows": 4,
-                    "css": "span8",
-                    "source": "comments",
-                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
-                  }
-                ]
+                "dataType": "text",
+                "name": "establishedOrImplementation",
+                "constraints": [
+                  "Established",
+                  "Implementation"
+                ],
+                "validate": "required"
               },
               {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
-                  },
+                "dataType": "feature",
+                "name": "sitesAgreementsEstablished",
+                "description": "Mapping field to be done and Area (ha) field be auto-calculated from mapping."
+              },
+              {
+                "computed": {
+                  "expression": "$geom.areaHa(sitesAgreementsEstablished)"
+                },
+                "dataType": "number",
+                "name": "calculatedAreaTreatedHa",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesAgreementsEstablished)"
+                },
+                "dataType": "number",
+                "name": "calculatedLengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "preLabel": "Data have been uploaded",
-                    "source": "dataUploaded",
-                    "type": "boolean"
+                    "condition": "lengthTreatedKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
+                    }
                   }
                 ]
               },
               {
-                "type": "row",
-                "items": [
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaTreatedHa"
+                },
+                "dataType": "number",
+                "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedReason",
+                "constraints": [
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                  "Other"
+                ],
+                "validate": "required",
+                "behaviour": [
                   {
-                    "preLabel": "",
-                    "source": "projectAssuranceDetails",
-                    "type": "textarea",
-                    "rows": 4,
-                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
+                    "type": "if"
                   }
                 ]
               },
               {
-                "type": "row",
-                "items": [
+                "dataType": "text",
+                "name": "mappingNotAlignedComments",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
                   {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReason"
                   }
                 ]
               },
               {
-                "type": "table",
-                "source": "assuranceDocuments",
-                "userAddedRows": true,
-                "disableTableUpload": true,
-                "columns": [
+                "dataType": "document",
+                "name": "extraMappingDetails",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
                   {
-                    "title": "Attached documents",
-                    "source": "attachments",
-                    "type": "document"
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
+                    "type": "if"
                   }
                 ]
-              }
-            ]
-          }
-        ]
-      },
-      "modelName": null,
-      "templateName": "nhtDebrisRemoval",
-      "optional": true,
-      "optionalQuestionText": null,
-      "title": "Debris removal",
-      "collapsibleHeading": null,
-      "name": "NHT - Debris removal",
-      "description": null
-    },
-    {
-      "collapsedByDefault": false,
-      "template": {
-        "dataModel": [
-          {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "dataType": "text",
-            "name": "initialOrFollowup",
-            "constraints": [
-              "Initial",
-              "Follow-up"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "feature",
-            "name": "existingErosionSites"
-          },
-          {
-            "defaultValue": {
-              "expression": "$geom.areaHa(existingErosionSites)",
-              "type": "computed"
-            },
-            "dataType": "number",
-            "name": "existingErosionAreaHa",
-            "units": "ha",
-            "decimalPlaces": 3,
-            "validate": "min[0]"
-          },
-          {
-            "dataType": "feature",
-            "name": "sitesManaged"
-          },
-          {
-            "computed": {
-              "expression": "$geom.areaHa(sitesManaged)"
-            },
-            "dataType": "number",
-            "name": "calculatedAreaOfErosionControlHa",
-            "units": "ha",
-            "decimalPlaces": 3,
-            "behaviour": [
-              {
-                "condition": "areaOfErosionControlInvoicedHa > 0",
-                "type": "conditional_validation",
-                "value": {
-                  "message": "The controlled area must be mapped",
-                  "validate": "required,min[0.0001]"
-                }
-              }
-            ]
-          },
-          {
-            "computed": {
-              "expression": "$geom.lengthKm(sitesManaged)"
-            },
-            "dataType": "number",
-            "name": "calculatedLengthOfErosionControlKm",
-            "units": "km",
-            "decimalPlaces": 3,
-            "behaviour": [
+              },
               {
-                "condition": "lengthOfErosionControlInvoicedKm > 0",
-                "type": "conditional_validation",
-                "value": {
-                  "message": "The controlled length must be mapped",
-                  "validate": "required,min[0.0001]"
-                }
-              }
-            ]
-          },
-          {
-            "dataType": "document",
-            "name": "extraMappingDetails",
-            "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
-            "behaviour": [
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKm"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
+              },
               {
-                "condition": "not (within(areaOfErosionControlHa, calculatedAreaOfErosionControlHa, 0.1) and within(lengthOfErosionControlKm, calculatedLengthOfErosionControlKm, 0.1)) or roundTo(areaOfErosionControlHa, 2) != roundTo(areaOfErosionControlInvoicedHa, 2) or roundTo(lengthOfErosionControlKm, 2) != roundTo(lengthOfErosionControlInvoicedKm, 2)",
-                "type": "visible"
+                "columns": [
+                  {
+                    "dataType": "text",
+                    "name": "agreementType",
+                    "description": "",
+                    "constraints": [
+                      "On title in perpetuity (e.g. conservation convenant)",
+                      "Binding agreement not on title in perpetuity (e.g. property vegetation plan)",
+                      "Termed agreement not on title - binding (e.g. land management agreement)",
+                      "Not on title - non-binding (e.g. Wildlife Refuge)",
+                      "No protection mechanism applicable",
+                      "Other"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "otherAgreementType",
+                    "description": "",
+                    "behaviour": [
+                      {
+                        "condition": "agreementType == \"Other\"",
+                        "type": "enable"
+                      }
+                    ],
+                    "validate": "required,maxSize[300]"
+                  },
+                  {
+                    "dataType": "number",
+                    "name": "numberOfAgreements",
+                    "validate": "required,min[0]"
+                  },
+                  {
+                    "dataType": "number",
+                    "name": "numberOfDaysMaintainingAgreements",
+                    "description": "Number of days should be calculated as number of days by number of people (eg. 4.5 days by 3 people is 13.5 days).",
+                    "validate": "required,min[0]"
+                  },
+                  {
+                    "dataType": "number",
+                    "name": "yearsOfTheAgreement",
+                    "validate": "required,min[0]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "agreementPurpose",
+                    "validate": "required,maxSize[300]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "agreementMadeWith",
+                    "validate": "required,maxSize[300]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "implementationType",
+                    "constraints": [
+                      "Managing Sward Height",
+                      "Native Herbivore Management",
+                      "Pest Animal Management",
+                      "Weed Removal/Management",
+                      "Biomass Control",
+                      "Revegetation (including planting and seeding)",
+                      "Regeneration",
+                      "Restoration of Habitat Features",
+                      "Improving Land Management Practices",
+                      "Other (explanation of the activity required)"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "otherImplementationType",
+                    "description": "",
+                    "validate": "maxSize[300]"
+                  }
+                ],
+                "dataType": "list",
+                "name": "agreementsTable"
               }
-            ],
-            "validate": "required"
-          },
-          {
-            "defaultValue": {
-              "expression": "$geom.areaHa(sitesManaged)",
-              "type": "computed"
-            },
-            "dataType": "number",
-            "name": "areaOfErosionControlHa",
-            "units": "ha",
-            "decimalPlaces": 3,
-            "validate": "required,min[0]"
+              ],
+            "dataType": "list",
+            "name": "conservationAgreementsControlled"
           },
           {
-            "defaultValue": {
-              "expression": "$geom.lengthKm(sitesManaged)",
-              "type": "computed"
-            },
             "dataType": "number",
-            "name": "lengthOfErosionControlKm",
-            "units": "km",
+            "name": "totalAreaConservationAgreements",
+            "validate": "min[0]",
             "decimalPlaces": 3,
-            "validate": "required,min[0]"
+            "computed": {
+              "expression": "sum(conservationAgreementsControlled, \"establishedOrImplementation == 'Established' ? areaTreatedHa : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "areaOfErosionControlInvoicedHa",
-            "units": "ha",
             "decimalPlaces": 3,
+            "name": "totalAreaConservationAgreementsInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
             "validate": [
               {
                 "rule": "required"
@@ -4538,18 +8608,29 @@
               },
               {
                 "param": {
-                  "expression": "areaOfErosionControlHa",
-                  "type": "computed"
+                  "expression": "totalAreaConservationAgreements",
+                  "type": "computed",
+                  "decimalPlaces": 3
                 },
                 "rule": "max"
               }
-            ]
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalAreaActivitiesConducted",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(conservationAgreementsControlled, \"establishedOrImplementation == 'Implementation' ? areaTreatedHa : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "lengthOfErosionControlInvoicedKm",
-            "units": "km",
             "decimalPlaces": 3,
+            "name": "totalAreaActivitiesConductedInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
             "validate": [
               {
                 "rule": "required"
@@ -4559,200 +8640,26 @@
               },
               {
                 "param": {
-                  "expression": "lengthOfErosionControlKm",
-                  "type": "computed"
+                  "expression": "totalAreaActivitiesConducted",
+                  "type": "computed",
+                  "decimalPlaces": 3
                 },
                 "rule": "max"
               }
-            ]
-          },
-          {
-            "dataType": "text",
-            "name": "mappingNotAlignedReason",
-            "behaviour": [
-              {
-                "condition": "not (within(areaOfErosionControlHa, calculatedAreaOfErosionControlHa, 0.1) and within(lengthOfErosionControlKm, calculatedLengthOfErosionControlKm, 0.1))",
-                "type": "visible"
-              }
-            ],
-            "constraints": [
-              "Mapped area simplifies more complex area/s where work was undertaken during this period",
-              "Other"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "mappingNotAlignedComments",
-            "behaviour": [
-              {
-                "condition": "\"Other\" == mappingNotAlignedReason",
-                "type": "visible"
-              }
-            ],
-            "validate": "required,maxSize[300]"
-          },
-          {
-            "dataType": "text",
-            "name": "invoicedNotActualReason",
-            "behaviour": [
-              {
-                "condition": "roundTo(areaOfErosionControlHa, 2) != roundTo(areaOfErosionControlInvoicedHa, 2) or roundTo(lengthOfErosionControlKm, 2) != roundTo(lengthOfErosionControlInvoicedKm, 2)",
-                "type": "visible"
-              }
-            ],
-            "constraints": [
-              "Work was undertaken over a greater area than will be invoiced for",
-              "Other"
             ],
-            "validate": "required"
+            "defaultValue": ""
           },
           {
             "dataType": "text",
-            "name": "invoicedNotActualComments",
+            "name": "totalInvoicedActivitiesConductedMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
             "behaviour": [
               {
-                "condition": "\"Other\" == invoicedNotActualReason",
-                "type": "visible"
-              }
-            ],
-            "validate": "required,maxSize[300]"
-          },
-          {
-            "columns": [
-              {
-                "name": "relatedOutcomes",
-                "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "label",
-                  "valueProperty": "label",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
-                      }
-                      ]
-                    }
-                  }
-                }
-              },
-              {
-                "name": "investmentPriorities2",
-                "dataType": "stringList",
-                "validate": "required",
-                "constraints": {
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "params": [
-                        {
-                          "expression": "owner.projectId",
-                          "name": "id",
-                          "type": "computed"
-                        }
-                      ],
-                      "url": "/project/listProjectInvestmentPriorities/"
-                    }
-                  }
-                }
-              },
-              {
-                "dataType": "text",
-                "name": "otherInvestmentPriority",
-                "behaviour": [
-                  {
-                    "type": "enable",
-                    "condition": "\"Other\" in investmentPriorities2"
-                  }
-                ]
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesStartDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesEndDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "dataType": "number",
-                "name": "numberInstalled",
-                "validate": "required,min[0]"
-              },
-              {
-                "dataType": "text",
-                "name": "erosionManagementMethod",
-                "constraints": [
-                  "Alternative watering point",
-                  "Erosion control structures",
-                  "Farming practice change",
-                  "Fencing",
-                  "Revegetation",
-                  "Terracing",
-                  "Vegetated waterway (bioswale)",
-                  "Windbreaks",
-                  "Other"
-                ],
-                "validate": "required"
-              },
-              {
-                "dataType": "text",
-                "name": "otherErosionManagementMethod",
-                "behaviour": [
-                  {
-                    "condition": "erosionManagementMethod == \"Other\"",
-                    "type": "visible"
-                  }
-                ],
-                "validate": "required,max[300]"
-              },
-              {
-                "dataType": "number",
-                "name": "numberDaysCollecting",
-                "validate": "required,min[0]"
-              },
-              {
-                "dataType": "text",
-                "name": "threatenedEcologicalCommunity",
-                "validate": "maxSize[300]"
-              },
-              {
-                "dataType": "feature",
-                "name": "sitesBenefittingFromErosionControl"
-              },
-              {
-                "defaultValue": {
-                  "expression": "$geom.areaHa(sitesBenefittingFromErosionControl)",
-                  "type": "computed"
-                },
-                "dataType": "number",
-                "name": "areaBenefitingHa",
-                "decimalPlaces": 3,
-                "units": "ha"
-              },
-              {
-                "dataType": "text",
-                "name": "evidenceOfBenefit",
-                "validate": "maxSize[300]"
+                "condition": "+totalAreaConservationAgreementsInvoiced < +totalAreaConservationAgreements or +totalAreaActivitiesConductedInvoiced < +totalAreaActivitiesConducted",
+                "type": "enable"
               }
-            ],
-            "dataType": "list",
-            "name": "erosionManagementDetails",
-            "minSize": 0
+            ]
           },
           {
             "dataType": "text",
@@ -4766,12 +8673,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -4780,26 +8687,37 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Erosion Management",
-        "title": "Erosion management",
+        "modelName": "NHT - Establishing Agreements",
+        "title": "Establishing and Implementing Conservation Agreements",
         "viewModel": [
           {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
             "columns": [
               {
                 "width": "10%",
                 "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
+                "title": "Are individuals or groups delivering this service?",
                 "type": "selectOne"
               },
               {
                 "width": "20%",
                 "type": "col",
-                "title": "Total Number of people delivering this service",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "participationIndividualNumber",
@@ -4814,7 +8732,8 @@
               {
                 "type": "col",
                 "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "firstNationIndividualNumber",
@@ -4827,336 +8746,346 @@
                 ]
               },
               {
-                "source": "participationDetails",
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
+              }
+            ],
+            "source": "participationInformationTableEsa",
+            "type": "table"
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total area (ha) covered by conservation agreements during this reporting period (Established)",
+                        "source": "totalAreaConservationAgreements",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total area (ha) covered by conservation agreements <u><i>invoiced</i></u> for during this reporting period (Established)",
+                        "source": "totalAreaConservationAgreementsInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii) Total area (ha) where implementation activities conducted during this reporting period (Implementation/Stewardship)",
+                        "source": "totalAreaActivitiesConducted",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total Area (ha) where implementation activities conducted <u><i>invoiced</i></u> for during this reporting period (Implementation/Stewardship)",
+                        "source": "totalAreaActivitiesConductedInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedActivitiesConductedMismatched",
+                "type": "textarea",
                 "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                "type": "textarea"
+                "placeholder": ""
               }
-            ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
-            "type": "table"
+            ]
           },
           {
             "type": "section",
             "items": [
               {
-                "type": "row",
-                "css": "border-bottom",
-                "items": [
-                  {
-                    "preLabel": "Initial or follow-up activity?",
-                    "css": "span3",
-                    "source": "initialOrFollowup",
-                    "type": "selectOne"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "css": "border-bottom",
+                "addRowText": "Add a new agreement area",
+                "userAddedRows": true,
+                "source": "conservationAgreementsControlled",
+                "type": "repeat",
                 "items": [
                   {
-                    "type": "col",
-                    "css": "span2 col-border-right",
+                    "type": "row",
                     "items": [
                       {
-                        "type": "row",
+                        "css": "span3",
+                        "type": "col",
                         "items": [
                           {
-                            "source": "existingErosionSites",
-                            "type": "feature",
-                            "preLabel": "Site/s where erosion is evident"
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "relatedOutcomes",
+                                "type": "selectOne",
+                                "preLabel": "Which outcome statement/s does this activity relate to?"
+                              }
+                            ]
                           }
                         ]
                       },
                       {
-                        "type": "row",
+                        "type": "col",
+                        "css": "span3 col-border-right",
                         "items": [
                           {
-                            "source": "existingErosionAreaHa",
-                            "type": "number",
-                            "readonly": true,
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "investmentPriorities2",
+                                "preLabel": "Which investment priority does this activity relate to?",
+                                "type": "select2Many"
+                              }
+                            ]
                           }
                         ]
                       }
                     ]
                   },
                   {
-                    "type": "col",
-                    "css": "span2 col-border-right",
+                    "type": "row",
+                    "css": "border-bottom",
                     "items": [
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "sitesManaged",
-                            "type": "feature",
-                            "preLabel": "Site/s of erosion control"
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "readonly": "readonly",
-                            "source": "calculatedAreaOfErosionControlHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "readonly": "readonly",
-                            "source": "calculatedLengthOfErosionControlKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
+                        "type": "col",
+                        "css": "span3 col-border-right",
                         "items": [
                           {
-                            "preLabel": "Please attach mapping details",
-                            "source": "extraMappingDetails",
-                            "type": "document"
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "establishedOrImplementation",
+                                "type": "selectOne",
+                                "preLabel": "Established or implementation?"
+                              }
+                            ]
                           }
                         ]
                       }
                     ]
                   },
                   {
-                    "type": "col",
-                    "css": "span2 col-border-right",
+                    "type": "row",
+                    "css": "border-bottom",
                     "items": [
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "helpText": "Manually enter correct figure for this reporting period if different to mapped value.",
-                            "preLabel": "Actual area (ha) / length (km) of erosion control",
-                            "source": "areaOfErosionControlHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "lengthOfErosionControlKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
+                        "type": "col",
+                        "css": "span3 col-border-right",
                         "items": [
                           {
-                            "preLabel": "Reason for actual being different to mapped amount",
-                            "source": "mappingNotAlignedReason",
-                            "type": "selectOne"
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Site/s where agreements were established",
+                                "source": "sitesAgreementsEstablished",
+                                "type": "feature"
+                              }
+                            ]
+                          },
                           {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "mappingNotAlignedComments",
-                            "type": "textarea",
-                            "rows": 5
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  {
-                    "type": "col",
-                    "css": "span2 col-border-right",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "calculatedAreaTreatedHa",
+                                "type": "number",
+                                "displayOptions": {
+                                  "displayUnits": true
+                                },
+                                "readonly": "readonly"
+                              }
+                            ]
+                          },
                           {
-                            "helpText": "Enter the amount you will invoice for during this reporting period.",
-                            "preLabel": "Invoiced area (ha) / length (km) of erosion control",
-                            "source": "areaOfErosionControlInvoicedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Please attach mapping details",
+                                "source": "extraMappingDetails",
+                                "type": "document"
+                              }
+                            ]
                           }
                         ]
                       },
                       {
-                        "type": "row",
+                        "type": "col",
+                        "css": "span3 col-border-right",
                         "items": [
                           {
-                            "source": "lengthOfErosionControlInvoicedKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Actual area (ha) of site/s agreements",
+                                "source": "areaTreatedHa",
+                                "type": "number",
+                                "displayOptions": {
+                                  "displayUnits": true
+                                }
+                              }
+                            ]
+                          },
                           {
-                            "preLabel": "Reason for invoiced amount being different to actual amount",
-                            "source": "invoicedNotActualReason",
-                            "type": "selectOne"
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Reason for actual being different to mapped amount",
+                                "source": "mappingNotAlignedReason",
+                                "type": "selectOne"
+                              }
+                            ]
+                          },
                           {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "invoicedNotActualComments",
-                            "type": "textarea"
-                          }
-                        ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              {
-                "columns": [
-                  {
-                    "source": "relatedOutcomes",
-                    "type": "selectOne",
-                    "width": "15%",
-                    "title": "Which outcome statement/s relates to this survey?"
-                  },
-                  {
-                    "width": "15%",
-                    "type": "col",
-                    "title": "Which investment priority does this activity relate to?",
-                    "items": [
-                      {
-                        "source": "investmentPriorities2",
-                        "type": "select2Many"
-                      },
-                      {
-                        "source": "otherInvestmentPriority",
-                        "type": "text"
+                            "type": "row",
+                            "items": [
+                              {
+                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                                "source": "mappingNotAlignedComments",
+                                "type": "textarea",
+                                "rows": 5
+                              }
+                            ]
+                          }
+                        ]
                       }
                     ]
                   },
                   {
-                    "title": "Activities start date",
-                    "source": "activitiesStartDate",
-                    "type": "date",
-                    "width": "10%"
-                  },
-                  {
-                    "title": "Activities end date",
-                    "source": "activitiesEndDate",
-                    "type": "date",
-                    "width": "10%"
-                  },
-                  {
-                    "width": "5%",
-                    "source": "numberInstalled",
-                    "title": "Number of erosion control structures installed",
-                    "type": "number"
-                  },
-                  {
-                    "width": "15%",
-                    "type": "col",
-                    "title": "Type of treatment being used",
-                    "items": [
+                    "columns": [
                       {
-                        "type": "row",
+                        "width": "15%",
+                        "title": "Type of agreement",
+                        "type": "col",
                         "items": [
                           {
-                            "source": "erosionManagementMethod",
-                            "type": "select2"
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "agreementType",
+                                "type": "selectOne"
+                              }
+                            ]
+                          },
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "otherAgreementType",
+                                "title": "Type of Agreement (if other)",
+                                "type": "textarea"
+                              }
+                            ]
                           }
                         ]
                       },
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "otherErosionManagementMethod",
-                            "placeholder": "Type of treatment method",
-                            "type": "textarea"
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  {
-                    "width": "5%",
-                    "source": "numberDaysCollecting",
-                    "title": "Number of days collecting seeds/propagating plants ",
-                    "type": "number"
-                  },
-                  {
-                    "width": "15%",
-                    "source": "threatenedEcologicalCommunity",
-                    "title": "Threatened Ecological Community (TEC) benefitting from this activity",
-                    "type": "text"
-                  },
-                  {
-                    "width": "20%",
-                    "title": "Please map any off-site area/s if they benefitted from this erosion management activity",
-                    "type": "col",
-                    "items": [
+                        "width": "10%",
+                        "source": "numberOfAgreements",
+                        "type": "number",
+                        "title": "Number of conservation agreements established"
+                      },
                       {
-                        "source": "sitesBenefittingFromErosionControl",
-                        "type": "feature"
+                        "width": "10%",
+                        "source": "numberOfDaysMaintainingAgreements",
+                        "type": "number",
+                        "title": "Number of days maintaining agreements (if applicable)"
                       },
                       {
-                        "source": "areaBenefitingHa",
+                        "width": "10%",
+                        "source": "yearsOfTheAgreement",
                         "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
+                        "title": "Length (years of the agreement)"
                       },
                       {
-                        "type": "row",
+                        "width": "20%",
+                        "source": "agreementPurpose",
+                        "title": "Purpose of agreement",
+                        "type": "textarea"
+                      },
+                      {
+                        "width": "20%",
+                        "source": "agreementMadeWith",
+                        "title": "Who the agreement was made with?",
+                        "type": "textarea"
+                      },
+                      {
+                        "width": "10%",
+                        "title": "Types of implementation/stewardship activities undertaken",
+                        "type": "col",
                         "items": [
                           {
-                            "source": "evidenceOfBenefit",
-                            "placeholder": "Please describe evidence of off-site benefits",
-                            "type": "textarea"
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "implementationType",
+                                "type": "select2Many"
+                              }
+                            ]
+                          },
+                          {
+                            "source": "otherImplementationType",
+                            "placeholder": "If Other was selected",
+                            "type": "text"
                           }
                         ]
                       }
-                    ]
+                    ],
+                    "userAddedRows": true,
+                    "disableTableUpload": true,
+                    "source": "agreementsTable",
+                    "type": "table"
                   }
-                ],
-                "userAddedRows": true,
-                "source": "erosionManagementDetails",
-                "type": "table"
-              },
+                ]
+              }
+            ]
+          },
+          {
+            "type": "section",
+            "items": [
               {
                 "type": "row",
                 "items": [
@@ -5185,7 +9114,7 @@
                 "items": [
                   {
                     "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
                   },
                   {
                     "preLabel": "Data have been uploaded",
@@ -5206,15 +9135,6 @@
                   }
                 ]
               },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-                  }
-                ]
-              },
               {
                 "type": "table",
                 "source": "assuranceDocuments",
@@ -5233,12 +9153,12 @@
         ]
       },
       "modelName": null,
-      "templateName": "nhtErosionManagement",
+      "templateName": "nhtEstablishingAgreements",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Erosion management",
+      "title": "Establishing and Implementing Conservation Agreements",
       "collapsibleHeading": null,
-      "name": "NHT - Erosion Management",
+      "name": "NHT - Establishing Agreements",
       "description": null
     },
     {
@@ -5246,138 +9166,58 @@
       "template": {
         "dataModel": [
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
+            "allowRowDelete": "false",
             "columns": [
               {
                 "dataType": "text",
-                "name": "newOrMaintained",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
                 "constraints": [
-                  "Newly established",
-                  "Maintained"
+                  "Individuals",
+                  "Groups"
                 ],
                 "validate": "required"
               },
               {
                 "dataType": "number",
-                "name": "numberOfEnclosures",
-                "validate": "required"
-              },
-              {
-                "dataType": "number",
-                "name": "daysSpentOnMaintenanceOfEnclosures",
-                "description": "Number of days should be calculated as number of days by number of people (eg. 4.5 days by 3 people is 13.5 days)",
-                "validate": "min[0]"
-              },
-              {
-                "dataType": "feature",
-                "name": "siteOfEnclosures"
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
               },
               {
-                "computed": {
-                  "expression": "$geom.areaHa(siteOfEnclosures)"
-                },
-                "dataType": "number",
-                "name": "calculatedAreaOfEnclosuresHa",
-                "units": "ha",
-                "decimalPlaces": 3,
+                "dataType": "text",
+                "name": "participationGroupNumber",
                 "behaviour": [
                   {
-                    "condition": "areaInvoicedHa > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The area of the enclosure must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
                 ]
               },
-              {
-                "defaultValue": {
-                  "expression": "$geom.areaHa(siteOfEnclosures)",
-                  "type": "computed"
-                },
-                "dataType": "number",
-                "name": "areaOfEnclosuresHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": "required,min[0]"
-              },
               {
                 "dataType": "number",
-                "name": "areaInvoicedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
                 "validate": [
                   {
                     "rule": "required"
@@ -5387,7 +9227,7 @@
                   },
                   {
                     "param": {
-                      "expression": "areaOfEnclosuresHa",
+                      "expression": "participationIndividualNumber",
                       "type": "computed"
                     },
                     "rule": "max"
@@ -5396,92 +9236,176 @@
               },
               {
                 "dataType": "text",
-                "name": "mappingNotAlignedReason",
+                "name": "firstNationGroupNumber",
                 "behaviour": [
                   {
-                    "condition": "not within(areaOfEnclosuresHa, calculatedAreaOfEnclosuresHa, 0.1)",
-                    "type": "if"
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
                 ],
                 "constraints": [
-                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                  "Other"
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
                 ],
-                "validate": "required"
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
               },
               {
                 "dataType": "text",
-                "name": "mappingNotAlignedComments",
-                "behaviour": [
-                  {
-                    "condition": "\"Other\" == mappingNotAlignedReason",
-                    "type": "if"
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableFms"
+          },
+          {
+            "name": "farmManagementSurveys",
+            "dataType": "list",
+            "minSize": 1,
+            "columns": [
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
                   }
-                ],
-                "validate": "required,maxSize[300]"
+                }
               },
               {
                 "dataType": "text",
-                "name": "invoicedNotActualReason",
-                "behaviour": [
-                  {
-                    "condition": "roundTo(areaOfEnclosuresHa, 2) != roundTo(areaInvoicedHa, 2)",
-                    "type": "visible"
-                  }
-                ],
+                "name": "baselineOrIndicatorSurvey",
+                "description": "",
                 "constraints": [
-                  "Work was undertaken over a greater area than will be invoiced for",
-                  "Other"
+                  "Baseline",
+                  "Indicator"
                 ],
                 "validate": "required"
               },
               {
                 "dataType": "text",
-                "name": "invoicedNotActualComments",
-                "behaviour": [
-                  {
-                    "condition": "\"Other\" == invoicedNotActualReason",
-                    "type": "if"
-                  }
-                ],
-                "validate": "required,maxSize[300]"
-              },
-              {
-                "dataType": "document",
-                "name": "extraMappingDetails",
-                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
-                "behaviour": [
-                  {
-                    "condition": "not within(areaOfEnclosuresHa, calculatedAreaOfEnclosuresHa, 0.1) or roundTo(areaOfEnclosuresHa, 2) != roundTo(areaInvoicedHa, 2)",
-                    "type": "if"
-                  }
-                ],
-                "validate": "required"
+                "name": "surveyObjective",
+                "description": "What the survey aim to capture? How will the information obtained from the survey be used?",
+                "validate": "required,maxSize[3000]"
               },
               {
+                "dataType": "list",
+                "name": "farmManagementDataSets",
                 "columns": [
                   {
-                    "name": "relatedOutcomes",
+                    "name": "dataSetId",
+                    "entityType": "au.org.ala.ecodata.DataSetSummary",
                     "dataType": "text",
-                    "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
+                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
                     "validate": "required",
                     "constraints": {
-                      "textProperty": "label",
-                      "valueProperty": "label",
+                      "textProperty": "name",
+                      "valueProperty": "dataSetId",
+                      "excludePath": "farmManagementSurveys.farmManagementDataSets.dataSetId",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.dataSets"
+                        },
+                        "filter": {
+                          "namespace": "dataSet",
+                          "expression": "dataSet.serviceId == 12 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
+                        }
+                      }
+                    },
+                    "behaviour": [
+                      {
+                        "type": "pre_populate",
+                        "config": {
+                          "waitForInitialisation": true,
+                          "source": {
+                            "url": "/site/geojson",
+                            "params": [
+                              {
+                                "expression": "x=find(owner.custom.dataSets, \"dataSetId\", dataSetId); x.siteId",
+                                "name": "id",
+                                "type": "computed",
+                                "required": true
+                              }
+                            ]
+                          },
+                          "target":  {
+                            "type": "singleValue",
+                            "name": "sitesTreated"
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "columns": [
+                      {
+                        "dataType": "species",
+                        "name": "species",
+                        "validate": "required"
+                      },
+                      {
+                        "dataType": "text",
+                        "name": "threatenedEcologicalCommunity",
+                        "validate": "maxSize[300]"
+                      },
+                      {
+                        "dataType": "text",
+                        "name": "individualsOrGroups",
+                        "constraints": [
+                          "Individuals",
+                          "Groups"
+                        ],
+                        "validate": "required"
+                      },
+                      {
+                        "dataType": "number",
+                        "name": "numberOfIndividualsOrGroups",
+                        "validate": "required,min[0]"
+                      }
+                    ],
+                    "dataType": "list",
+                    "name": "farmManagementSurveySpeciesTable"
+                  },
+                  {
+                    "name": "projectBaselines",
+                    "dataType": "stringList",
+                    "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.baselines"
+                    },
+                    "constraints": {
+                      "textProperty": "baseline",
+                      "valueProperty": "code",
                       "type": "pre-populated",
+                      "excludePath": "projectBaselines",
                       "config": {
                         "source": {
-                          "url": "/project/outcomesByScores",
-                          "params": [{
-                            "expression": "owner.projectId",
-                            "name": "id",
-                            "type": "computed"
-                          }, {
-                            "expression": "scores",
-                            "name": "scoreIds",
-                            "type": "computed"
-                          }
-                          ]
+                          "context-path": "owner.custom.details.baseline.rows"
                         }
                       }
                     }
@@ -5490,6 +9414,9 @@
                     "name": "investmentPriorities2",
                     "dataType": "stringList",
                     "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.investmentPriorities"
+                    },
                     "constraints": {
                       "type": "pre-populated",
                       "config": {
@@ -5517,39 +9444,246 @@
                     ]
                   },
                   {
-                    "dataType": "species",
-                    "name": "protectedSpecies",
-                    "dwcAttribute": "scientificName",
-                    "description": "The threatened species protected by the enclosure",
-                    "validate": "required"
+                    "dataType": "date",
+                    "name": "activitiesStartDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.startDate"
+                    }
                   },
                   {
-                    "dataType": "text",
-                    "name": "targetFeralSpecies",
-                    "description": "",
-                    "validate": "required,maxSize[300]"
+                    "dataType": "date",
+                    "name": "activitiesEndDate",
+                    "description": "Specific the dates these events were held on.",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.endDate"
+                    }
+                  },
+                  {
+                    "dataType": "feature",
+                    "name": "sitesCoveredForFarmSurvey",
+                    "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
+                  },
+                  {
+                    "computed": {
+                      "expression": "$geom.areaHa(sitesCoveredForFarmSurvey)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedAreaTreatedHa",
+                    "units": "ha",
+                    "decimalPlaces": 3
+                  },
+                  {
+                    "computed": {
+                      "expression": "$geom.lengthKm(sitesCoveredForFarmSurvey)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedLengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3,
+                    "behaviour": [
+                      {
+                        "condition": "lengthTreatedKm > 0",
+                        "type": "conditional_validation",
+                        "value": {
+                          "message": "The managed length must be mapped",
+                          "validate": "required,min[0.0001]"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "calculatedAreaTreatedHa"
+                    },
+                    "dataType": "number",
+                    "name": "areaTreatedHa",
+                    "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                    "units": "ha",
+                    "decimalPlaces": 3,
+                    "validate": "required,min[0]"
                   },
                   {
                     "dataType": "text",
-                    "name": "individualsOrPopulations",
+                    "name": "mappingNotAlignedReason",
                     "constraints": [
-                      "Individuals",
-                      "Populations"
+                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                      "Other"
                     ],
-                    "validate": "required"
+                    "validate": "required",
+                    "behaviour": [
+                      {
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "mappingNotAlignedComments",
+                    "validate": "required,maxSize[100]",
+                    "behaviour": [
+                      {
+                        "type": "visible",
+                        "condition": "\"Other\" == mappingNotAlignedReason"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "document",
+                    "name": "extraMappingDetails",
+                    "validate": "required",
+                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                    "behaviour": [
+                      {
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
+                      }
+                    ]
                   },
                   {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "calculatedLengthTreatedKm"
+                    },
                     "dataType": "number",
-                    "name": "numberOfPopulationsOrIndividualsProtected",
-                    "validate": "required,min[0]"
+                    "name": "lengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3
+                  },
+                  {
+                    "dataType": "text",
+                    "description": "Select the technique used to conduct the survey. If the EMSA Application tool was not used, you should select 'Other'.",
+                    "name": "emsaProtocol",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.protocol"
+                    },
+                    "constraints": {
+                      "textProperty": "label",
+                      "valueProperty": "value",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.protocols"
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "dataType": "stringList",
+                    "description": "Describe the technique (if Other) was selected.",
+                    "name": "otherEmsaProtocol",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methods"
+                    }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "surveyMethodology",
+                    "description": "Provide more details on what is being done.",
+                    "validate": "required,maxSize[3000]",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methodDescription"
+                    }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "invoicingThisActivity",
+                    "constraints": [
+                      "Yes",
+                      "No"
+                    ],
+                    "validate": "required"
                   }
                 ],
-                "dataType": "list",
-                "name": "speciesProtected"
+                "minSize": 1
+              }
+            ]
+          },
+          {
+            "dataType": "lookupTable",
+            "name": "baselineIndicatorMapping",
+            "config": {
+              "source": {
+                "literal": {
+                  "Baseline dataset associated with a project outcome": "Baseline",
+                  "Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
+                }
+              }
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyBaseline",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(farmManagementSurveys, \"baselineOrIndicatorSurvey == 'Baseline' ? 1 : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyBaselineInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyBaseline",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyIndicator",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(farmManagementSurveys, \"baselineOrIndicatorSurvey == 'Indicator' ? 1 : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyIndicatorInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyIndicator",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "dataType": "list",
-            "name": "enclosureDetails"
+            "defaultValue": ""
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedFarmMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalSurveyIndicatorInvoiced < +totalSurveyIndicator or +totalSurveyBaselineInvoiced < +totalSurveyBaseline",
+                "type": "enable"
+              }
+            ]
           },
           {
             "dataType": "text",
@@ -5568,7 +9702,8 @@
           {
             "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "description": "",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -5577,94 +9712,195 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Maintaining feral free enclosures",
-        "title": "Establishing and maintaining feral-free enclosures",
+        "modelName": "NHT - Farm Management Survey",
+        "title": "Farm Management Survey",
         "viewModel": [
           {
-            "columns": [
+            "type": "section",
+            "items": [
               {
-                "width": "10%",
-                "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
-                "type": "selectOne"
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Participation information</h3>"
+                  }
+                ]
               },
               {
-                "width": "20%",
-                "type": "col",
-                "title": "Total Number of people delivering this service",
-                "items": [
+                "disableTableUpload": true,
+                "columns": [
                   {
-                    "source": "participationIndividualNumber",
-                    "type": "number"
+                    "width": "10%",
+                    "source": "participationIndividualsOrGroups",
+                    "title": "Are individuals or groups delivering this service?",
+                    "type": "selectOne"
                   },
                   {
-                    "source": "participationGroupNumber",
-                    "type": "selectOne"
+                    "width": "20%",
+                    "type": "col",
+                    "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                    "items": [
+                      {
+                        "source": "participationIndividualNumber",
+                        "type": "number"
+                      },
+                      {
+                        "source": "participationGroupNumber",
+                        "type": "selectOne"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "width": "20%",
+                    "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                    "items": [
+                      {
+                        "source": "firstNationIndividualNumber",
+                        "type": "number"
+                      },
+                      {
+                        "source": "firstNationGroupNumber",
+                        "type": "selectOne"
+                      }
+                    ]
+                  },
+                  {
+                    "width": "20%",
+                    "source": "participationDetails",
+                    "rows": 4,
+                    "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                    "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                    "type": "textarea"
+                  }
+                ],
+                "source": "participationInformationTableFms",
+                "type": "table"
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Survey information</h3><p><b>Before completing this section, please ensure you have created a Data Set Summary information for every data set produced by the surveys you intend to report</b></p><ul><li>Each survey reported must relate to a combination of outcomes as described in your MERI plan</li><li>Each Data Set Summary recorded for a survey must be addressing the same outcomes as selected for the survey</li><li>If a survey produced more than one data set, use the New Data Set button to add each Data Set Summary under your survey</li><li>A single survey can be made up of multiple dataset</li></ul>"
                   }
                 ]
               },
               {
-                "type": "col",
-                "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
+                "type": "row",
                 "items": [
                   {
-                    "source": "firstNationIndividualNumber",
-                    "type": "number"
+                    "type": "literal",
+                    "source": "<h3>Totals Summary</h3>"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(i) Total Number of baseline farm management surveys completed for this reporting period",
+                            "source": "totalSurveyBaseline",
+                            "type": "number"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(ii) Total Number of baseline farm management surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyBaselineInvoiced",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
                   },
                   {
-                    "source": "firstNationGroupNumber",
-                    "type": "selectOne"
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iii)  Total Number of indicator farm management surveys completed for this reporting period",
+                            "source": "totalSurveyIndicator",
+                            "type": "number"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iv) Total Number of indicator farm management surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyIndicatorInvoiced",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
                   }
                 ]
               },
               {
-                "source": "participationDetails",
-                "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                "type": "textarea"
-              }
-            ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
-            "type": "table"
-          },
-          {
-            "type": "section",
-            "items": [
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                    "source": "totalInvoicedFarmMismatched",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": ""
+                  }
+                ]
+              },
               {
-                "addRowText": "Add a new feral free area",
+                "addRowText": "Add survey",
+                "removeRowText": "Delete this survey",
                 "userAddedRows": true,
-                "source": "enclosureDetails",
+                "source": "farmManagementSurveys",
                 "type": "repeat",
                 "items": [
                   {
-                    "css": "border-bottom",
                     "type": "row",
                     "items": [
                       {
-                        "preLabel": "Newly established or maintained feral free enclosure?",
-                        "css": "span4",
-                        "source": "newOrMaintained",
-                        "type": "selectOne"
-                      },
-                      {
-                        "preLabel": "Number of pest animal-free enclosures",
-                        "css": "span3",
-                        "source": "numberOfEnclosures",
-                        "type": "number"
+                        "type": "col",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s relates to this survey?"
+                          }
+                        ]
                       },
                       {
-                        "preLabel": "Number of days maintaining pest animal-free enclosures",
-                        "css": "span3",
-                        "source": "daysSpentOnMaintenanceOfEnclosures",
-                        "type": "number"
+                        "type": "col",
+                        "items": [
+                          {
+                            "source": "baselineOrIndicatorSurvey",
+                            "type": "selectOne",
+                            "preLabel": "Baseline survey or indicator (follow-up) survey?"
+                          }
+                        ]
                       }
                     ]
                   },
@@ -5672,173 +9908,270 @@
                     "type": "row",
                     "items": [
                       {
-                        "css": "span3 col-border-right",
-                        "type": "col",
+                        "source": "surveyObjective",
+                        "preLabel": "Survey objective",
+                        "type": "text"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "repeat",
+                    "source": "farmManagementDataSets",
+                    "userAddedRows": true,
+                    "addRowText": "New data set",
+                    "removeRowText": "Delete this data set",
+                    "items": [
+                      {
+                        "type": "row",
+                        "css": "border-bottom",
                         "items": [
                           {
-                            "type": "row",
+                            "type": "col",
                             "items": [
                               {
-                                "preLabel": "Site/s (ha) of pest animal-free enclosure",
-                                "source": "siteOfEnclosures",
-                                "type": "feature"
+                                "source": "dataSetId",
+                                "type": "selectOne",
+                                "preLabel": "Please select the data set produced by this survey.  Note it must have already been entered on the Data Set Summary tab."
+                              }
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "projectBaselines",
+                                    "type": "selectMany",
+                                    "preLabel": "Which project baseline/s relate to this survey?",
+                                    "readonly": "readonly"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "readonly": "readonly",
-                            "source": "calculatedAreaOfEnclosuresHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "investmentPriorities2",
+                                    "preLabel": "Which investment priority does this activity relate to?",
+                                    "type": "select2Many"
+                                  }
+                                ]
+                              }
+                            ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Please attach mapping details",
-                                "source": "extraMappingDetails",
-                                "type": "document"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity start date",
+                                    "source": "activitiesStartDate",
+                                    "type": "date"
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      },
-                      {
-                        "css": "span4 col-border-right",
-                        "type": "col",
-                        "items": [
+                          },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Actual area (ha) of pest animal-free enclosure",
-                                "source": "areaOfEnclosuresHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity end date",
+                                    "source": "activitiesEndDate",
+                                    "type": "date"
+                                  }
+                                ]
                               }
                             ]
                           },
+
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Reason for actual being different to mapped amount",
-                                "source": "mappingNotAlignedReason",
-                                "type": "selectOne"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Sites covered by farm management survey",
+                                    "source": "sitesCoveredForFarmSurvey",
+                                    "type": "feature"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedAreaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedLengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Please attach mapping details",
+                                    "source": "extraMappingDetails",
+                                    "type": "document"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "mappingNotAlignedComments",
-                                "type": "textarea",
-                                "rows": 5
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Actual area (ha) / length (km) covered by farm management survey",
+                                    "source": "areaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "lengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Reason for actual being different to mapped amount",
+                                    "source": "mappingNotAlignedReason",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                                    "source": "mappingNotAlignedComments",
+                                    "type": "textarea",
+                                    "rows": 5
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      },
-                      {
-                        "css": "span4",
-                        "type": "col",
-                        "items": [
+                          },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Invoiced area (ha) of pest animal-free enclosure",
-                                "source": "areaInvoicedHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique",
+                                    "source": "emsaProtocol",
+                                    "type": "selectOne",
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique (if Other)",
+                                    "source": "otherEmsaProtocol",
+                                    "type": "select2Many"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Reason for invoiced amount being different to actual amount",
-                                "source": "invoicedNotActualReason",
-                                "type": "selectOne"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "surveyMethodology",
+                                    "preLabel": "Survey methodology",
+                                    "type": "text"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "invoicedNotActualComments",
-                                "type": "textarea",
-                                "rows": 5
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "invoicingThisActivity",
+                                    "preLabel": "Are you invoicing for this activity in this reporting period?",
+                                    "type": "selectOne"
+                                  }
+                                ]
                               }
                             ]
                           }
                         ]
                       }
                     ]
-                  },
-                  {
-                    "addRowText": "Add a species",
-                    "columns": [
-                      {
-                        "source": "relatedOutcomes",
-                        "type": "selectOne",
-                        "width": "15%",
-                        "title": "Which outcome statement/s relates to this survey?"
-                      },
-                      {
-                        "width": "20%",
-                        "type": "col",
-                        "title": "Which investment priority does this activity relate to?",
-                        "items": [
-                          {
-                            "source": "investmentPriorities2",
-                            "type": "select2Many"
-                          },
-                          {
-                            "source": "otherInvestmentPriority",
-                            "type": "text"
-                          }
-                        ]
-                      },
-                      {
-                        "width": "20%",
-                        "source": "protectedSpecies",
-                        "title": "Targeted species being protected",
-                        "type": "speciesSelect"
-                      },
-                      {
-                        "width": "20%",
-                        "source": "targetFeralSpecies",
-                        "title": "Targeted pest animal species being controlled",
-                        "type": "text"
-                      },
-                      {
-                        "width": "15%",
-                        "source": "individualsOrPopulations",
-                        "title": "Individuals or populations?",
-                        "type": "selectOne"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "numberOfPopulationsOrIndividualsProtected",
-                        "title": "Number of populations (or individuals) within pest animal-free enclosures",
-                        "type": "number"
-                      }
-                    ],
-                    "userAddedRows": true,
-                    "source": "speciesProtected",
-                    "type": "table"
                   }
                 ]
               },
@@ -5870,7 +10203,7 @@
                 "items": [
                   {
                     "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
                   },
                   {
                     "preLabel": "Data have been uploaded",
@@ -5891,15 +10224,6 @@
                   }
                 ]
               },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-                  }
-                ]
-              },
               {
                 "type": "table",
                 "source": "assuranceDocuments",
@@ -5918,12 +10242,12 @@
         ]
       },
       "modelName": null,
-      "templateName": "nhtFeralFreeEnclosures",
+      "templateName": "nhtFarmManagementSurvey",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Establishing and maintaining feral-free enclosures",
+      "title": "Farm management survey",
       "collapsibleHeading": null,
-      "name": "NHT - Maintaining feral free enclosures",
+      "name": "NHT - Farm Management Survey",
       "description": null
     },
     {
@@ -5931,113 +10255,143 @@
       "template": {
         "dataModel": [
           {
+            "name": "faunaSurveys",
+            "dataType": "list",
+            "minSize": 1,
             "columns": [
               {
+                "name": "relatedOutcomes",
                 "dataType": "text",
-                "name": "activityType",
-                "constraints": [
-                  "Captive Breeding",
-                  "Release"
-                ],
-                "validate": "required"
-              },
-              {
-                "dataType": "text",
-                "name": "activityPermit",
-                "constraints": [
-                  "Yes",
-                  "No"
-                ],
-                "validate": "required"
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
+                  }
+                }
               },
               {
                 "dataType": "text",
-                "name": "inSituExSitu",
+                "name": "baselineOrIndicatorSurvey",
+                "description": "",
                 "constraints": [
-                  "Ex-situ",
-                  "In-situ"
+                  "Baseline",
+                  "Indicator"
                 ],
                 "validate": "required"
               },
               {
                 "dataType": "text",
-                "name": "newOrMaintained",
-                "constraints": [
-                  "Newly established",
-                  "Maintained"
-                ],
-                "validate": "required"
-              },
-              {
-                "dataType": "number",
-                "name": "numberOfCaptiveBreeding",
-                "validate": "required"
-              },
-
-              {
-                "dataType": "feature",
-                "name": "areaOfSourceSite"
+                "name": "surveyObjective",
+                "description": "What the survey aim to capture? How will the information obtained from the survey be used?",
+                "validate": "required,maxSize[3000]"
               },
               {
-                "computed": {
-                  "expression": "$geom.areaHa(areaOfSourceSite)"
-                },
-                "dataType": "number",
-                "name": "areaOfSourceSiteAreaHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "behaviour": [
+                "dataType": "list",
+                "name": "faunaDataSets",
+                "columns": [
                   {
-                    "condition": "areaOfErosionControlInvoicedHa > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The controlled area must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
-                  }
-                ]
-              },
-              {
-                "dataType": "feature",
-                "name": "areaOfReleaseSite"
-              },
-              {
-                "computed": {
-                  "expression": "$geom.areaHa(areaOfReleaseSite)"
-                },
-                "dataType": "number",
-                "name": "calculatedAreaOfReleaseSiteHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "behaviour": [
+                    "name": "dataSetId",
+                    "entityType": "au.org.ala.ecodata.DataSetSummary",
+                    "dataType": "text",
+                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
+                    "validate": "required",
+                    "constraints": {
+                      "textProperty": "name",
+                      "valueProperty": "dataSetId",
+                      "excludePath": "faunaSurveys.faunaDataSets.dataSetId",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.dataSets"
+                        },
+                        "filter": {
+                          "namespace": "dataSet",
+                          "expression": "dataSet.serviceId == 13 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
+                        }
+                      }
+                    },
+                    "behaviour": [
+                      {
+                        "type": "pre_populate",
+                        "config": {
+                          "waitForInitialisation": true,
+                          "source": {
+                            "url": "/site/geojson",
+                            "params": [
+                              {
+                                "expression": "x=find(owner.custom.dataSets, \"dataSetId\", dataSetId); x.siteId",
+                                "name": "id",
+                                "type": "computed",
+                                "required": true
+                              }
+                            ]
+                          },
+                          "target":  {
+                            "type": "singleValue",
+                            "name": "sitesCoveredForFaunaSurvey"
+                          }
+                        }
+                      }
+                    ]
+                  },
                   {
-                    "condition": "areaOfErosionControlInvoicedHa > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The controlled area must be mapped",
-                      "validate": "required,min[0.0001]"
+                    "columns": [
+                      {
+                        "dataType": "species",
+                        "name": "species",
+                        "validate": "required"
+                      },
+                      {
+                        "dataType": "text",
+                        "name": "individualsOrGroups",
+                        "constraints": [
+                          "Individuals",
+                          "Groups"
+                        ],
+                        "validate": "required"
+                      },
+                      {
+                        "dataType": "number",
+                        "name": "numberOfIndividualsOrGroups",
+                        "validate": "required,min[0]"
+                      }
+                    ],
+                    "dataType": "list",
+                    "name": "faunaSurveySpeciesTable"
+                  },
+                  {
+                    "name": "projectBaselines",
+                    "dataType": "stringList",
+                    "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.baselines"
+                    },
+                    "constraints": {
+                      "textProperty": "baseline",
+                      "valueProperty": "code",
+                      "type": "pre-populated",
+                      "excludePath": "projectBaselines",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.details.baseline.rows"
+                        }
+                      }
                     }
-                  }
-                ]
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesStartDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesEndDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "columns": [
+                  },
                   {
                     "name": "investmentPriorities2",
                     "dataType": "stringList",
                     "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.investmentPriorities"
+                    },
                     "constraints": {
                       "type": "pre-populated",
                       "config": {
@@ -6055,141 +10409,365 @@
                     }
                   },
                   {
-                    "dataType": "text",
-                    "name": "otherInvestmentPriority",
+                    "dataType": "text",
+                    "name": "otherInvestmentPriority",
+                    "behaviour": [
+                      {
+                        "type": "enable",
+                        "condition": "\"Other\" in investmentPriorities2"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "date",
+                    "name": "activitiesStartDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.startDate"
+                    }
+                  },
+                  {
+                    "dataType": "date",
+                    "name": "activitiesEndDate",
+                    "description": "Specific the dates these events were held on.",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.endDate"
+                    }
+                  },
+                  {
+                    "dataType": "feature",
+                    "name": "sitesCoveredForFaunaSurvey",
+                    "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
+                  },
+                  {
+                    "computed": {
+                      "expression": "$geom.areaHa(sitesCoveredForFaunaSurvey)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedAreaTreatedHa",
+                    "units": "ha",
+                    "decimalPlaces": 3
+                  },
+                  {
+                    "computed": {
+                      "expression": "$geom.lengthKm(sitesCoveredForFaunaSurvey)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedLengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3,
                     "behaviour": [
                       {
-                        "type": "enable",
-                        "condition": "\"Other\" in investmentPriorities2"
+                        "condition": "lengthTreatedKm > 0",
+                        "type": "conditional_validation",
+                        "value": {
+                          "message": "The managed length must be mapped",
+                          "validate": "required,min[0.0001]"
+                        }
                       }
                     ]
                   },
+                  {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "calculatedAreaTreatedHa"
+                    },
+                    "dataType": "number",
+                    "name": "areaTreatedHa",
+                    "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                    "units": "ha",
+                    "decimalPlaces": 3,
+                    "validate": "required,min[0]"
+                  },
                   {
                     "dataType": "text",
-                    "name": "breedingTechnique",
+                    "name": "mappingNotAlignedReason",
                     "constraints": [
-                      "Seed bank or captive breeding",
-                      "Seed orchard",
-                      "Seed nursery",
-                      "Propagation",
-                      "Seed viability testing",
-                      "Seed genetic testing",
-                      "Fauna captive breeding program",
-                      "Fauna wild breeding program",
+                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
                       "Other"
                     ],
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "otherBreedingTechnique",
-                    "description": "",
+                    "validate": "required",
                     "behaviour": [
                       {
-                        "condition": "breedingTechnique == \"Other\"",
-                        "type": "enable"
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
                       }
-                    ],
-                    "validate": "required,maxSize[300]"
+                    ]
                   },
                   {
                     "dataType": "text",
-                    "name": "individualsOrGroups",
-                    "constraints": [
-                      "Individuals",
-                      "Groups"
-                    ],
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "number",
-                    "name": "numberOfIndividualsOrGroups",
-                    "validate": "required,min[0]"
+                    "name": "mappingNotAlignedComments",
+                    "validate": "required,maxSize[100]",
+                    "behaviour": [
+                      {
+                        "type": "visible",
+                        "condition": "\"Other\" == mappingNotAlignedReason"
+                      }
+                    ]
                   },
                   {
-                    "dataType": "number",
-                    "name": "numberOfIndividualsReleased",
-                    "validate": "required,min[0]"
+                    "dataType": "document",
+                    "name": "extraMappingDetails",
+                    "validate": "required",
+                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                    "behaviour": [
+                      {
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
+                      }
+                    ]
                   },
                   {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "calculatedLengthTreatedKm"
+                    },
                     "dataType": "number",
-                    "name": "numberOfAdnimalDiedPreReleased",
-                    "validate": "required,min[0]"
+                    "name": "lengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3
                   },
                   {
-                    "name": "projectBaseline",
                     "dataType": "text",
-                    "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
+                    "description": "Select the technique used to conduct the survey. If the EMSA Application tool was not used, you should select 'Other'.",
+                    "name": "emsaProtocol",
                     "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.protocol"
+                    },
                     "constraints": {
-                      "textProperty": "baseline",
-                      "valueProperty": "code",
+                      "textProperty": "label",
+                      "valueProperty": "value",
                       "type": "pre-populated",
-                      "excludePath": "projectBaseline",
                       "config": {
                         "source": {
-                          "context-path": "owner.custom.details.baseline.rows"
+                          "context-path": "owner.protocols"
                         }
                       }
                     }
                   },
                   {
-                    "name": "datasetSupports",
-                    "dataType": "text",
-                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
-                    "validate": "required",
-                    "constraints": {
-                      "textProperty": "name",
-                      "valueProperty": "dataSetId",
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "context-path": "owner.custom.dataSets"
-                        }
-                      }
+                    "dataType": "stringList",
+                    "description": "Describe the technique (if Other) was selected.",
+                    "name": "otherEmsaProtocol",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methods"
                     }
                   },
                   {
-                    "name": "relatedOutcomes",
                     "dataType": "text",
-                    "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                    "validate": "required",
-                    "constraints": {
-                      "textProperty": "label",
-                      "valueProperty": "label",
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "url": "/project/outcomesByScores",
-                          "params": [{
-                            "expression": "owner.projectId",
-                            "name": "id",
-                            "type": "computed"
-                          }, {
-                            "expression": "scores",
-                            "name": "scoreIds",
-                            "type": "computed"
-                          }
-                          ]
-                        }
-                      }
+                    "name": "surveyMethodology",
+                    "description": "Provide more details on what is being done.",
+                    "validate": "required,maxSize[3000]",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methodDescription"
                     }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "invoicingThisActivity",
+                    "constraints": [
+                      "Yes",
+                      "No"
+                    ],
+                    "validate": "required"
                   }
                 ],
-                "dataType": "list",
-                "name": "speciesInBreedingProgram"
+                "minSize": 1
+              }
+            ]
+          },
+          {
+            "dataType": "lookupTable",
+            "name": "baselineIndicatorMapping",
+            "config": {
+              "source": {
+                "literal": {
+                  "Baseline dataset associated with a project outcome": "Baseline",
+                  "Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
+                }
+              }
+            }
+          },
+          {
+            "allowRowDelete": "false",
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableFau"
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyBaseline",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(faunaSurveys, \"baselineOrIndicatorSurvey == 'Baseline' ? 1 : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyBaselineInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyBaseline",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyIndicator",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(faunaSurveys, \"baselineOrIndicatorSurvey == 'Indicator' ? 1 : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyIndicatorInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyIndicator",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "dataType": "list",
-            "name": "breedingProgramDetails"
+            "defaultValue": ""
           },
           {
-            "name": "numberOfBreedingProgramsSurveysConducted",
-            "type": "number",
-            "decimalPlaces": 0,
-            "computed": {
-              "expression": "count(breedingProgramDetails, \"numberOfIndividualsReleased\")"
-            }
+            "dataType": "text",
+            "name": "totalInvoicedFaunaMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalSurveyIndicatorInvoiced < +totalSurveyIndicator or +totalSurveyBaselineInvoiced < +totalSurveyBaseline",
+                "type": "enable"
+              }
+            ]
           },
           {
             "dataType": "text",
@@ -6200,10 +10778,16 @@
             "dataType": "image",
             "name": "photographicEvidence"
           },
+          {
+            "dataType": "boolean",
+            "name": "dataUploaded",
+            "description": ""
+          },
           {
             "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "description": "",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -6212,249 +10796,491 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Establishing ex-situ breeding programs",
-        "title": "Establishing and maintaining breeding programs",
+        "modelName": "NHT - Fauna survey",
+        "title": "Fauna Survey",
         "viewModel": [
           {
             "type": "section",
             "items": [
               {
-                "preLabel": "Number of establishing and maintaining breeding programs surveys conducted:",
-                "noEdit": true,
-                "type": "number",
-                "source": "numberOfBreedingProgramsSurveysConducted"
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Participation information</h3>"
+                  }
+                ]
               },
               {
-                "addRowText": "Add a new breeding area",
-                "userAddedRows": true,
-                "source": "breedingProgramDetails",
-                "type": "repeat",
-                "items": [
+                "disableTableUpload": true,
+                "columns": [
                   {
-                    "type": "row",
+                    "width": "10%",
+                    "source": "participationIndividualsOrGroups",
+                    "title": "Are individuals or groups delivering this service?",
+                    "type": "selectOne"
+                  },
+                  {
+                    "width": "20%",
+                    "type": "col",
+                    "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                     "items": [
                       {
-                        "preLabel": "Type of activity",
-                        "css": "span3",
-                        "source": "activityType",
-                        "type": "selectOne"
+                        "source": "participationIndividualNumber",
+                        "type": "number"
                       },
                       {
-                        "preLabel": "Were permits obtained to support this activity?",
-                        "css": "span3",
-                        "source": "activityPermit",
+                        "source": "participationGroupNumber",
                         "type": "selectOne"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "width": "20%",
+                    "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                    "items": [
+                      {
+                        "source": "firstNationIndividualNumber",
+                        "type": "number"
                       },
                       {
-                        "preLabel": "Ex-situ / In-situ",
-                        "css": "span3",
-                        "source": "inSituExSitu",
+                        "source": "firstNationGroupNumber",
                         "type": "selectOne"
+                      }
+                    ]
+                  },
+                  {
+                    "width": "20%",
+                    "source": "participationDetails",
+                    "rows": 4,
+                    "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                    "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                    "type": "textarea"
+                  }
+                ],
+                "source": "participationInformationTableFau",
+                "type": "table"
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Survey information</h3><p><b>Before completing this section, please ensure you have created a Data Set Summary information for every data set produced by the surveys you intend to report</b></p><ul><li>Each survey reported must relate to a combination of outcomes as described in your MERI plan</li><li>Each Data Set Summary recorded for a survey must be addressing the same outcomes as selected for the survey</li><li>If a survey produced more than one data set, use the New Data Set button to add each Data Set Summary under your survey</li><li>A single survey can be made up of multiple dataset</li></ul>"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Totals Summary</h3>"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(i) Total Number of baseline fauna surveys completed for this reporting period",
+                            "source": "totalSurveyBaseline",
+                            "type": "number"
+                          }
+                        ]
                       },
                       {
-                        "preLabel": "Is this an established or maintained activity?",
-                        "css": "span3",
-                        "source": "newOrMaintained",
-                        "type": "selectOne"
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(ii) Total Number of baseline fauna surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyBaselineInvoiced",
+                            "type": "number"
+                          }
+                        ]
                       }
                     ]
                   },
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iii)  Total Number of  indicator fauna surveys completed for this reporting period",
+                            "source": "totalSurveyIndicator",
+                            "type": "number"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iv) Total Number of indicator fauna surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyIndicatorInvoiced",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                    "source": "totalInvoicedFaunaMismatched",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": ""
+                  }
+                ]
+              },
+              {
+                "addRowText": "Add survey",
+                "removeRowText": "Delete this survey",
+                "userAddedRows": true,
+                "source": "faunaSurveys",
+                "type": "repeat",
+                "items": [
                   {
                     "type": "row",
-                    "css": "border-bottom",
                     "items": [
                       {
                         "type": "col",
-                        "css": "span2 col-border-right",
                         "items": [
                           {
-                            "type": "row",
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s relates to this survey?"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "col",
+                        "items": [
+                          {
+                            "source": "baselineOrIndicatorSurvey",
+                            "type": "selectOne",
+                            "preLabel": "Baseline survey or indicator (follow-up) survey?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "source": "surveyObjective",
+                        "preLabel": "Survey objective",
+                        "type": "text"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "repeat",
+                    "source": "faunaDataSets",
+                    "userAddedRows": true,
+                    "addRowText": "New data set",
+                    "removeRowText": "Delete this data set",
+                    "items": [
+                      {
+                        "type": "row",
+                        "css": "border-bottom",
+                        "items": [
+                          {
+                            "type": "col",
                             "items": [
                               {
-                                "preLabel": "Number of captive breeding, releases, translocation or re-introduction sites established or maintained",
-                                "source": "numberOfCaptiveBreeding",
-                                "type": "number"
+                                "source": "dataSetId",
+                                "type": "selectOne",
+                                "preLabel": "Please select the data set produced by this survey.  Note it must have already been entered on the Data Set Summary tab."
                               }
                             ]
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span2 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "source": "areaOfSourceSite",
-                                "type": "feature",
-                                "preLabel": "Site/s of captive breeding, pre-translocation capture (source site)"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "projectBaselines",
+                                    "type": "selectMany",
+                                    "preLabel": "Which project baseline/s relate to this survey?",
+                                    "readonly": "readonly"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "source": "areaOfSourceSiteAreaHa",
-                                "type": "number",
-                                "readonly": true,
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "investmentPriorities2",
+                                    "preLabel": "Which investment priority does this activity relate to?",
+                                    "type": "select2Many"
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span2 col-border-right",
-                        "items": [
+                          },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "source": "areaOfReleaseSite",
-                                "type": "feature",
-                                "preLabel": " Site/s of release of captive breeding, re-introduced or translocated animals (release site)"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity start date",
+                                    "source": "activitiesStartDate",
+                                    "type": "date"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "readonly": "readonly",
-                                "source": "calculatedAreaOfReleaseSiteHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity end date",
+                                    "source": "activitiesEndDate",
+                                    "type": "date"
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span2 col-border-right",
-                        "items": [
+                          },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Activities start date",
-                                "source": "activitiesStartDate",
-                                "type": "date"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Sites covered by fauna survey",
+                                    "source": "sitesCoveredForFaunaSurvey",
+                                    "type": "feature"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedAreaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedLengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Please attach mapping details",
+                                    "source": "extraMappingDetails",
+                                    "type": "document"
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span2 col-border-right",
-                        "items": [
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Actual area (ha) / length (km) covered by fauna survey",
+                                    "source": "areaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "lengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Reason for actual being different to mapped amount",
+                                    "source": "mappingNotAlignedReason",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                                    "source": "mappingNotAlignedComments",
+                                    "type": "textarea",
+                                    "rows": 5
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique",
+                                    "source": "emsaProtocol",
+                                    "type": "selectOne",
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique (if Other)",
+                                    "source": "otherEmsaProtocol",
+                                    "type": "select2Many"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Activities end date",
-                                "source": "activitiesEndDate",
-                                "type": "date"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "surveyMethodology",
+                                    "preLabel": "Survey methodology",
+                                    "type": "text"
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  {
-                    "addRowText": "Add a species",
-                    "columns": [
-                      {
-                        "width": "20%",
-                        "type": "col",
-                        "title": "Investment priority species",
-                        "items": [
-                          {
-                            "source": "investmentPriorities2",
-                            "type": "select2Many"
                           },
                           {
-                            "source": "otherInvestmentPriority",
-                            "type": "text"
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "invoicingThisActivity",
+                                    "preLabel": "Are you invoicing for this activity in this reporting period?",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              }
+                            ]
                           }
                         ]
                       },
                       {
-                        "width": "10%",
-                        "source": "individualsOrGroups",
-                        "type": "selectOne",
-                        "title": "Individuals or groups?"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "numberOfIndividualsOrGroups",
-                        "title": "Number of groups / individuals",
-                        "type": "number"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "numberOfIndividualsReleased",
-                        "title": "Number of individuals released, translocated, or re-introduced to the wild",
-                        "type": "number"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "numberOfAdnimalDiedPreReleased",
-                        "title": "Number of animals bred, died (pre-release), released, translocated, or re-introduced",
-                        "type": "number"
-                      },
-                      {
-                        "width": "10%",
-                        "type": "col",
-                        "title": "Technique used",
-                        "items": [
+                        "columns": [
                           {
-                            "source": "breedingTechnique",
-                            "type": "select2"
+                            "width": "55%",
+                            "source": "species",
+                            "title": "Target species recorded",
+                            "type": "speciesSelect"
                           },
                           {
-                            "source": "otherBreedingTechnique",
-                            "type": "text"
+                            "width": "25%",
+                            "source": "individualsOrGroups",
+                            "title": "Individuals or groups?",
+                            "type": "selectOne"
+                          },
+                          {
+                            "width": "20%",
+                            "source": "numberOfIndividualsOrGroups",
+                            "title": "Number of individuals / groups in fauna survey",
+                            "type": "number"
                           }
-                        ]
-                      },
-                      {
-                        "source": "projectBaseline",
-                        "type": "selectOne",
-                        "width": "10%",
-                        "title": "Which project baseline relates to this survey?"
-                      },
-                      {
-                        "source": "datasetSupports",
-                        "type": "select2Many",
-                        "width": "10%",
-                        "title": "What dataset supports this?"
-                      },
-                      {
-                        "source": "relatedOutcomes",
-                        "type": "selectOne",
-                        "width": "10%",
-                        "title": "Which outcome statement/s relates to this survey?"
+                        ],
+                        "userAddedRows": true,
+                        "disableTableUpload": true,
+                        "source": "faunaSurveySpeciesTable",
+                        "type": "table"
                       }
-                    ],
-                    "userAddedRows": true,
-                    "source": "speciesInBreedingProgram",
-                    "type": "table"
+                    ]
                   }
                 ]
               },
@@ -6486,7 +11312,12 @@
                 "items": [
                   {
                     "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please attach any evidence you have available for this service and/or provide information (e.g. links) to where the evidence is stored. This field will help the Department and Service Providers during assurance activities or audits. Refer to the Evidence Guide for details of the types of acceptable evidence."
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
+                  },
+                  {
+                    "preLabel": "Data have been uploaded",
+                    "source": "dataUploaded",
+                    "type": "boolean"
                   }
                 ]
               },
@@ -6502,15 +11333,6 @@
                   }
                 ]
               },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-                  }
-                ]
-              },
               {
                 "type": "table",
                 "source": "assuranceDocuments",
@@ -6529,12 +11351,12 @@
         ]
       },
       "modelName": null,
-      "templateName": "nhtExSituBreedingSites",
+      "templateName": "nhtFaunaSurvey",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Establishing ex-situ breeding program",
+      "title": "Fauna survey",
       "collapsibleHeading": null,
-      "name": "NHT - Establishing ex-situ breeding programs",
+      "name": "NHT - Fauna survey",
       "description": null
     },
     {
@@ -6542,248 +11364,472 @@
       "template": {
         "dataModel": [
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "allowRowDelete": "false",
+            "columns": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
               }
             ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            "dataType": "list",
+            "name": "participationInformationTableFna"
           },
           {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+            "columns": [
+              {
+                "dataType": "number",
+                "name": "noDaysConductingCulturalPractices",
+                "description": "",
+                "validate": "required"
+              },
+              {
+                "dataType": "text",
+                "name": "individualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "noOfParticipants",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "individualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "groupParticipants",
+                "behaviour": [
+                  {
+                    "condition": "individualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "noOfFirstNationsParticipants",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "individualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "noOfParticipants",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "groupFirstNationsParticipants",
+                "behaviour": [
+                  {
+                    "condition": "individualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "groupParticipants",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
+                "dataType": "date",
+                "name": "activitiesStartDate",
+                "description": "Specific the dates these events were held on.",
+                "validate": "required"
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "dataType": "text",
-            "name": "establishedOrImplementation",
-            "constraints": [
-              "Established",
-              "Implementation"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "feature",
-            "name": "agreementSites"
-          },
-          {
-            "computed": {
-              "expression": "$geom.areaHa(agreementSites)"
-            },
-            "dataType": "number",
-            "name": "calculatedAreaCoveredByAgreementsHa",
-            "units": "ha",
-            "decimalPlaces": 3,
-            "behaviour": [
+                "dataType": "date",
+                "name": "activitiesEndDate",
+                "description": "",
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "future",
+                    "param": {
+                      "expression": "formatDateForValidation(activitiesStartDate)",
+                      "type": "computed"
+                    }
+                  }
+                ]
+              },
               {
-                "condition": "areaOfCoveredByAgreementsInvoicedHa > 0",
-                "type": "conditional_validation",
-                "value": {
-                  "message": "The area must be mapped",
-                  "validate": "required,min[0.0001]"
-                }
-              }
-            ]
-          },
-          {
-            "defaultValue": {
-              "expression": "calculatedAreaCoveredByAgreementsHa",
-              "type": "computed"
-            },
-            "dataType": "number",
-            "name": "areaCoveredByAgreementsHa",
-            "units": "ha",
-            "decimalPlaces": 3,
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "mappingNotAlignedReason",
-            "behaviour": [
+                "dataType": "text",
+                "name": "siteVisit",
+                "constraints": [
+                  "Single",
+                  "Multiple"
+                ],
+                "validate": "required"
+              },
               {
-                "condition": "not (within(areaCoveredByAgreementsHa, calculatedAreaCoveredByAgreementsHa, 0.1))",
-                "type": "visible"
-              }
-            ],
-            "constraints": [
-              "Mapped area simplifies more complex area/s where work was undertaken during this period",
-              "Other"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "mappingNotAlignedComments",
-            "behaviour": [
+                "dataType": "number",
+                "name": "noOfSitesActivityOccurred",
+                "description": "",
+                "validate": "required"
+              },
               {
-                "condition": "\"Other\" == mappingNotAlignedReason",
-                "type": "visible"
-              }
-            ],
-            "validate": "required,maxSize[300]"
-          },
-          {
-            "dataType": "number",
-            "name": "areaOfCoveredByAgreementsInvoicedHa",
-            "units": "ha",
-            "decimalPlaces": 3,
-            "validate": [
+                "dataType": "text",
+                "name": "typeOfSite",
+                "constraints": [
+                  "Sacred",
+                  "Food source",
+                  "Ceremonial",
+                  "Other"
+                ],
+                "validate": "required"
+              },
               {
-                "rule": "required"
+                "dataType": "text",
+                "name": "otherTypeOfSite",
+                "description": "",
+                "behaviour": [
+                  {
+                    "condition": "typeOfSite == \"Other\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,maxSize[100]"
               },
               {
-                "rule": "min[0]"
+                "dataType": "feature",
+                "name": "sitesUndertakeForFirstNations",
+                "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
               },
               {
-                "param": {
-                  "expression": "areaCoveredByAgreementsHa",
-                  "type": "computed"
+                "computed": {
+                  "expression": "$geom.areaHa(sitesUndertakeForFirstNations)"
                 },
-                "rule": "max"
-              }
-            ]
-          },
-          {
-            "dataType": "document",
-            "name": "extraMappingDetails",
-            "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
-            "behaviour": [
-              {
-                "condition": "not (within(calculatedAreaCoveredByAgreementsHa, areaCoveredByAgreementsHa, 0.1)) or roundTo(areaCoveredByAgreementsHa, 2) != roundTo(areaOfCoveredByAgreementsInvoicedHa, 2)",
-                "type": "visible"
-              }
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "invoicedNotActualReason",
-            "behaviour": [
+                "dataType": "number",
+                "name": "calculatedAreaTreatedHa",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
               {
-                "condition": "roundTo(areaOfCoveredByAgreementsInvoicedHa, 2) != roundTo(areaCoveredByAgreementsHa, 2)",
-                "type": "visible"
-              }
-            ],
-            "constraints": [
-              "Work was undertaken over a greater area than will be invoiced for",
-              "Other"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "invoicedNotActualComments",
-            "behaviour": [
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesUndertakeForFirstNations)"
+                },
+                "dataType": "number",
+                "name": "calculatedLengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
+                  {
+                    "condition": "lengthTreatedKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
+                    }
+                  }
+                ]
+              },
               {
-                "condition": "\"Other\" == invoicedNotActualReason",
-                "type": "visible"
-              }
-            ],
-            "validate": "required,maxSize[300]"
-          },
-          {
-            "columns": [
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaTreatedHa"
+                },
+                "dataType": "number",
+                "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
               {
                 "dataType": "text",
-                "name": "agreementType",
-                "description": "",
+                "name": "mappingNotAlignedReason",
                 "constraints": [
-                  "On title in perpetuity (e.g. conservation convenant)",
-                  "Binding agreement not on title in perpetuity (e.g. property vegetation plan)",
-                  "Termed agreement not on title - binding (e.g. land management agreement)",
-                  "Not on title - non-binding (e.g. Wildlife Refuge)",
-                  "No protection mechanism applicable",
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
                   "Other"
                 ],
-                "validate": "required"
+                "validate": "required",
+                "behaviour": [
+                  {
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
+                  }
+                ]
               },
               {
                 "dataType": "text",
-                "name": "otherAgreementType",
-                "description": "",
+                "name": "mappingNotAlignedComments",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
+                  {
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReason"
+                  }
+                ]
+              },
+              {
+                "dataType": "document",
+                "name": "extraMappingDetails",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
                 "behaviour": [
                   {
-                    "condition": "agreementType == \"Other\"",
-                    "type": "enable"
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKm"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
+              },
+              {
+                "columns": [
+                  {
+                    "dataType": "text",
+                    "name": "activityTypeUndertaken",
+                    "constraints": [
+                      "Survey",
+                      "Site management",
+                      "Assessment",
+                      "Cultural event",
+                      "Curation",
+                      "Other"
+                    ]
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "otherActivityTypeUndertaken",
+                    "description": "",
+                    "behaviour": [
+                      {
+                        "condition": "activityTypeUndertaken == \"Other\"",
+                        "type": "enable"
+                      }
+                    ],
+                    "validate": "required,maxSize[100]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "purposeOfActivity",
+                    "description": "",
+                    "validate": "required,maxSize[300]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "activityDescription",
+                    "description": "",
+                    "validate": "maxSize[300]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "surveyObjective",
+                    "description": "",
+                    "validate": "required,maxSize[300]",
+                    "behaviour": [
+                      {
+                        "condition": "activityTypeUndertaken == \"Survey\" or activityTypeUndertaken == \"Assessment\"",
+                        "type": "enable"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "surveyTechnique",
+                    "description": "",
+                    "validate": "required,maxSize[300]",
+                    "behaviour": [
+                      {
+                        "condition": "activityTypeUndertaken == \"Survey\" or activityTypeUndertaken == \"Assessment\"",
+                        "type": "enable"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "siteCondition",
+                    "constraints": [
+                      "Poor",
+                      "Fair",
+                      "Good",
+                      "Excellent"
+                    ],
+                    "validate": "required",
+                    "behaviour": [
+                      {
+                        "condition": "activityTypeUndertaken == \"Survey\" or activityTypeUndertaken == \"Assessment\"",
+                        "type": "enable"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "siteConditionDetails",
+                    "description": "",
+                    "validate": "required,maxSize[300]",
+                    "behaviour": [
+                      {
+                        "condition": "activityTypeUndertaken == \"Survey\" or activityTypeUndertaken == \"Assessment\"",
+                        "type": "enable"
+                      }
+                    ]
                   }
                 ],
-                "validate": "required,maxSize[300]"
-              },
-              {
-                "dataType": "number",
-                "name": "numberOfAgreements",
-                "validate": "required,min[0]"
-              },
-              {
-                "dataType": "number",
-                "name": "numberOfDaysMaintainingAgreements",
-                "description": "Number of days should be calculated as number of days by number of people (eg. 4.5 days by 3 people is 13.5 days)",
-                "validate": "required,min[0]"
+                "dataType": "list",
+                "name": "firstNationsDetails"
               },
               {
                 "name": "relatedOutcomes",
                 "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
                 "validate": "required",
                 "constraints": {
                   "textProperty": "label",
@@ -6792,15 +11838,17 @@
                   "config": {
                     "source": {
                       "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
-                      }
+                      "params": [
+                        {
+                          "expression": "owner.projectId",
+                          "name": "id",
+                          "type": "computed"
+                        },
+                        {
+                          "expression": "scores",
+                          "name": "scoreIds",
+                          "type": "computed"
+                        }
                       ]
                     }
                   }
@@ -6808,20 +11856,16 @@
               },
               {
                 "name": "investmentPriorities2",
-                "dataType": "stringList",
+                "dataType": "text",
+                "description": "",
                 "validate": "required",
                 "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
                   "type": "pre-populated",
                   "config": {
                     "source": {
-                      "params": [
-                        {
-                          "expression": "owner.projectId",
-                          "name": "id",
-                          "type": "computed"
-                        }
-                      ],
-                      "url": "/project/listProjectInvestmentPriorities/"
+                      "context-path": "owner.investmentPriorities"
                     }
                   }
                 }
@@ -6829,6 +11873,7 @@
               {
                 "dataType": "text",
                 "name": "otherInvestmentPriority",
+                "description": "Describe the investment priority (if Other) was selected",
                 "behaviour": [
                   {
                     "type": "enable",
@@ -6836,29 +11881,67 @@
                   }
                 ]
               },
-              {
-                "dataType": "number",
-                "name": "yearsOfTheAgreement",
-                "validate": "required,min[0]"
-              },
               {
                 "dataType": "text",
-                "name": "agreementPurpose",
-                "validate": "required,maxSize[300]"
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
+              }
+            ],
+            "dataType": "list",
+            "name": "firstNationAreasControlled"
+          },
+          {
+            "name": "sitePrepCountHeader",
+            "type": "number",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "count(firstNationAreasControlled, \"threatenedEcologicalCommunity\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalNoDaysCulturalPractices",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(firstNationAreasControlled, \"noDaysConductingCulturalPractices\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalNoDaysCulturalPracticesInvoiced",
+            "validate": [
+              {
+                "rule": "required"
               },
               {
-                "dataType": "text",
-                "name": "agreementMadeWith",
-                "validate": "required,maxSize[300]"
+                "rule": "min[0]"
               },
               {
-                "dataType": "text",
-                "name": "implementationType",
-                "validate": "required,maxSize[300]"
+                "param": {
+                  "expression": "totalNoDaysCulturalPractices",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "dataType": "list",
-            "name": "agreements"
+            "defaultValue": ""
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedFirstNationsMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalNoDaysCulturalPracticesInvoiced < +totalNoDaysCulturalPractices",
+                "type": "enable"
+              }
+            ]
           },
           {
             "dataType": "text",
@@ -6872,12 +11955,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -6886,26 +11969,37 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Establishing Agreements",
-        "title": "Establishing and maintaining agreements",
+        "modelName": "NHT - First nations australians cultural practices",
+        "title": "First Nations Australians Cultural Practices",
         "viewModel": [
           {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
             "columns": [
               {
                 "width": "10%",
                 "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
+                "title": "Are individuals or groups delivering this service?",
                 "type": "selectOne"
               },
               {
                 "width": "20%",
                 "type": "col",
-                "title": "Total Number of people delivering this service",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "participationIndividualNumber",
@@ -6920,7 +12014,8 @@
               {
                 "type": "col",
                 "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "firstNationIndividualNumber",
@@ -6933,20 +12028,134 @@
                 ]
               },
               {
+                "width": "20%",
                 "source": "participationDetails",
                 "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
                 "type": "textarea"
               }
             ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
+            "source": "participationInformationTableFna",
             "type": "table"
           },
           {
-            "type": "section",
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total number of days conducting cultural practices during this reporting period",
+                        "source": "totalNoDaysCulturalPractices",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total number of days conducting cultural practices <u><i>invoiced</i></u> for during this reporting period",
+                        "source": "totalNoDaysCulturalPracticesInvoiced",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedFirstNationsMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "addRowText": "Add new First Nations Cultural Practice",
+            "userAddedRows": true,
+            "source": "firstNationAreasControlled",
+            "type": "repeat",
             "items": [
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
               {
                 "type": "row",
                 "css": "border-bottom",
@@ -6959,9 +12168,67 @@
                         "type": "row",
                         "items": [
                           {
-                            "source": "establishedOrImplementation",
-                            "type": "selectOne",
-                            "preLabel": "Established or implementation?"
+                            "preLabel": "Number of days conducting cultural practices",
+                            "source": "noDaysConductingCulturalPractices",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Site Visit",
+                            "source": "siteVisit",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Number of sites where activity occurred",
+                            "source": "noOfSitesActivityOccurred",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Type of site",
+                            "source": "typeOfSite",
+                            "type": "selectOne"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Type of site (If Other)",
+                            "source": "otherTypeOfSite",
+                            "type": "text"
                           }
                         ]
                       }
@@ -6975,8 +12242,8 @@
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Site/s where agreements were established",
-                            "source": "agreementSites",
+                            "preLabel": "Site/s where activity was undertaken",
+                            "source": "sitesUndertakeForFirstNations",
                             "type": "feature"
                           }
                         ]
@@ -6985,12 +12252,25 @@
                         "type": "row",
                         "items": [
                           {
-                            "readonly": "readonly",
-                            "source": "calculatedAreaCoveredByAgreementsHa",
+                            "source": "calculatedAreaTreatedHa",
                             "type": "number",
                             "displayOptions": {
                               "displayUnits": true
-                            }
+                            },
+                            "readonly": "readonly"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "calculatedLengthTreatedKm",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
                           }
                         ]
                       },
@@ -7014,9 +12294,20 @@
                         "type": "row",
                         "items": [
                           {
-                            "helpText": "Enter the actual amount during this reporting period.",
-                            "preLabel": "Actual area (ha) of site/s agreements",
-                            "source": "areaCoveredByAgreementsHa",
+                            "preLabel": "Actual area (ha) / length (km) where activity has been undertaken",
+                            "source": "areaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "lengthTreatedKm",
                             "type": "number",
                             "displayOptions": {
                               "displayUnits": true
@@ -7028,7 +12319,7 @@
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Reason for actual amount being different to aligned amount",
+                            "preLabel": "Reason for actual being different to mapped amount",
                             "source": "mappingNotAlignedReason",
                             "type": "selectOne"
                           }
@@ -7038,9 +12329,10 @@
                         "type": "row",
                         "items": [
                           {
-                            "placeholder": "Please enter the reason/s the actual didn't align with the agreed amount",
+                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
                             "source": "mappingNotAlignedComments",
-                            "type": "textarea"
+                            "type": "textarea",
+                            "rows": 5
                           }
                         ]
                       }
@@ -7054,13 +12346,57 @@
                         "type": "row",
                         "items": [
                           {
-                            "helpText": "Enter the amount you will invoice for during this reporting period.",
-                            "preLabel": "Invoiced area (ha) of site/s agreements",
-                            "source": "areaOfCoveredByAgreementsInvoicedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
+                            "preLabel": "Activity start date",
+                            "source": "activitiesStartDate",
+                            "type": "date"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Activity end date",
+                            "source": "activitiesEndDate",
+                            "type": "date"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Individuals or groups?",
+                            "source": "individualsOrGroups",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Number of participants",
+                            "source": "noOfParticipants",
+                            "type": "number"
                           }
                         ]
                       },
@@ -7068,20 +12404,33 @@
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Reason for invoiced amount being different to actual amount",
-                            "source": "invoicedNotActualReason",
+                            "source": "groupParticipants",
                             "type": "selectOne"
                           }
                         ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Number of First Nations participants",
+                            "source": "noOfFirstNationsParticipants",
+                            "type": "number"
+                          }
+                        ]
                       },
                       {
                         "type": "row",
                         "items": [
                           {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "invoicedNotActualComments",
-                            "type": "textarea",
-                            "rows": 5
+                            "source": "groupFirstNationsParticipants",
+                            "type": "selectOne"
                           }
                         ]
                       }
@@ -7093,15 +12442,15 @@
                 "columns": [
                   {
                     "width": "15%",
-                    "title": "Type of agreement",
+                    "title": "Type of activity undertaken",
                     "type": "col",
                     "items": [
                       {
                         "type": "row",
                         "items": [
                           {
-                            "source": "agreementType",
-                            "type": "select2"
+                            "source": "activityTypeUndertaken",
+                            "type": "selectOne"
                           }
                         ]
                       },
@@ -7109,8 +12458,8 @@
                         "type": "row",
                         "items": [
                           {
-                            "source": "otherAgreementType",
-                            "title": "Type of Agreement (if other)",
+                            "source": "otherActivityTypeUndertaken",
+                            "title": "Type of activity (if other)",
                             "type": "textarea"
                           }
                         ]
@@ -7118,255 +12467,262 @@
                     ]
                   },
                   {
-                    "width": "10%",
-                    "source": "numberOfAgreements",
-                    "type": "number",
-                    "title": "Number of conservation agreements established"
-                  },
-                  {
-                    "width": "10%",
-                    "source": "numberOfDaysMaintainingAgreements",
-                    "type": "number",
-                    "title": "Number of days maintaining agreements (if applicable)"
-                  },
-                  {
-                    "source": "relatedOutcomes",
-                    "type": "selectOne",
-                    "width": "10%",
-                    "title": "Which outcome statement/s relates to this survey?"
+                    "width": "15%",
+                    "source": "purposeOfActivity",
+                    "title": "Purpose of activity",
+                    "type": "textarea"
                   },
                   {
-                    "width": "10%",
-                    "type": "col",
-                    "title": "Which investment priority does this activity relate to?",
-                    "items": [
-                      {
-                        "source": "investmentPriorities2",
-                        "type": "select2Many"
-                      },
-                      {
-                        "source": "otherInvestmentPriority",
-                        "type": "text"
-                      }
-                    ]
+                    "width": "15%",
+                    "source": "activityDescription",
+                    "title": "Detailed description of activity",
+                    "type": "textarea"
                   },
                   {
-                    "width": "5%",
-                    "source": "yearsOfTheAgreement",
-                    "type": "number",
-                    "title": "Length (years of the agreement)"
+                    "width": "15%",
+                    "source": "surveyObjective",
+                    "title": "Survey/assessment objective (if applicable)",
+                    "type": "textarea"
                   },
                   {
                     "width": "15%",
-                    "source": "agreementPurpose",
-                    "title": "Purpose of agreement",
+                    "source": "surveyTechnique",
+                    "title": "Survey/assessment technique (if applicable)",
                     "type": "textarea"
                   },
                   {
                     "width": "10%",
-                    "source": "agreementMadeWith",
-                    "title": "Who the agreement was made with?",
-                    "type": "textarea"
+                    "source": "siteCondition",
+                    "title": "Site condition (if applicable)",
+                    "type": "selectOne"
                   },
                   {
-                    "width": "10%",
-                    "source": "implementationType",
-                    "title": "Types of implementation/stewardship activities undertaken",
+                    "width": "15%",
+                    "source": "siteConditionDetails",
+                    "title": "Site condition further details (if applicable)",
                     "type": "textarea"
                   }
                 ],
                 "userAddedRows": true,
-                "source": "agreements",
+                "disableTableUpload": true,
+                "source": "firstNationsDetails",
                 "type": "table"
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Optionally attach photos",
-                    "source": "photographicEvidence",
-                    "type": "image"
-                  }
-                ]
-              },
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Clarification, if needed",
-                    "type": "textarea",
-                    "rows": 4,
-                    "css": "span8",
-                    "source": "comments",
-                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
-                  }
-                ]
-              },
+                "preLabel": "Optionally attach photos",
+                "source": "photographicEvidence",
+                "type": "image"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
-                  },
-                  {
-                    "preLabel": "Data have been uploaded",
-                    "source": "dataUploaded",
-                    "type": "boolean"
-                  }
-                ]
-              },
+                "preLabel": "Clarification, if needed",
+                "type": "textarea",
+                "rows": 4,
+                "css": "span8",
+                "source": "comments",
+                "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "",
-                    "source": "projectAssuranceDetails",
-                    "type": "textarea",
-                    "rows": 4,
-                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
-                  }
-                ]
+                "type": "literal",
+                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
               },
               {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-                  }
-                ]
-              },
+                "preLabel": "Data have been uploaded",
+                "source": "dataUploaded",
+                "type": "boolean"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "type": "table",
-                "source": "assuranceDocuments",
-                "userAddedRows": true,
-                "disableTableUpload": true,
-                "columns": [
-                  {
-                    "title": "Attached documents",
-                    "source": "attachments",
-                    "type": "document"
-                  }
-                ]
+                "preLabel": "",
+                "source": "projectAssuranceDetails",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+              }
+            ]
+          },
+          {
+            "type": "table",
+            "source": "assuranceDocuments",
+            "userAddedRows": true,
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "title": "Attached documents",
+                "source": "attachments",
+                "type": "document"
               }
             ]
           }
         ]
       },
       "modelName": null,
-      "templateName": "nhtEstablishingAgreements",
+      "templateName": "nhtFirstNation",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Establishing and maintaining agreements",
+      "title": "First Nations Australians Cultural Practices",
       "collapsibleHeading": null,
-      "name": "NHT - Establishing Agreements",
+      "name": "NHT - First nations australians cultural practices",
       "description": null
     },
     {
       "collapsedByDefault": false,
       "template": {
-        "title": "Farm management surveys",
-        "modelName": "NHT - Farm Management Survey",
         "dataModel": [
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "name": "floraSurveys",
+            "dataType": "list",
+            "minSize": 1,
+            "columns": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
+                  }
+                }
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+                "dataType": "text",
+                "name": "baselineOrIndicatorSurvey",
+                "description": "",
+                "constraints": [
+                  "Baseline",
+                  "Indicator"
+                ],
+                "validate": "required"
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
+                "dataType": "text",
+                "name": "surveyObjective",
+                "description": "What the survey aim to capture? How will the information obtained from the survey be used?",
+                "validate": "required,maxSize[3000]"
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "columns": [
+                "dataType": "number",
+                "name": "numberOfSurveys",
+                "validate": "required,min[1],max[1]",
+                "defaultValue": 1,
+                "readonly": true
+              },
               {
                 "dataType": "list",
-                "name": "surveyBaselineDetails",
+                "name": "floraDataSets",
                 "columns": [
                   {
+                    "name": "dataSetId",
+                    "entityType": "au.org.ala.ecodata.DataSetSummary",
                     "dataType": "text",
-                    "name": "baselineOrIndicatorSurvey",
-                    "description": "",
-                    "constraints": [
-                      "Baseline",
-                      "Indicator"
+                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
+                    "validate": "required",
+                    "constraints": {
+                      "textProperty": "name",
+                      "valueProperty": "dataSetId",
+                      "excludePath": "floraSurveys.floraDataSets.dataSetId",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.dataSets"
+                        },
+                        "filter": {
+                          "namespace": "dataSet",
+                          "expression": "dataSet.serviceId == 15 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
+                        }
+                      }
+                    },
+                    "behaviour": [
+                      {
+                        "type": "pre_populate",
+                        "config": {
+                          "waitForInitialisation": true,
+                          "source": {
+                            "url": "/site/geojson",
+                            "params": [
+                              {
+                                "expression": "x=find(owner.custom.dataSets, \"dataSetId\", dataSetId); x.siteId",
+                                "name": "id",
+                                "type": "computed",
+                                "required": true
+                              }
+                            ]
+                          },
+                          "target":  {
+                            "type": "singleValue",
+                            "name": "sitesCoveredForFloraSurvey"
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "columns": [
+                      {
+                        "dataType": "species",
+                        "name": "species",
+                        "validate": "required"
+                      },
+                      {
+                        "dataType": "text",
+                        "name": "threatenedEcologicalCommunity",
+                        "validate": "maxSize[300]"
+                      },
+                      {
+                        "dataType": "text",
+                        "name": "individualsOrGroups",
+                        "constraints": [
+                          "Individuals",
+                          "Groups"
+                        ],
+                        "validate": "required"
+                      },
+                      {
+                        "dataType": "number",
+                        "name": "numberOfIndividualsOrGroups",
+                        "validate": "required,min[0]"
+                      }
                     ],
-                    "validate": "required"
+                    "dataType": "list",
+                    "name": "floraSurveySpeciesTable"
                   },
                   {
-                    "name": "projectBaseline",
-                    "dataType": "text",
+                    "name": "projectBaselines",
+                    "dataType": "stringList",
                     "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
                     "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.baselines"
+                    },
                     "constraints": {
                       "textProperty": "baseline",
                       "valueProperty": "code",
                       "type": "pre-populated",
-                      "excludePath": "projectBaseline",
+                      "excludePath": "projectBaselines",
                       "config": {
                         "source": {
                           "context-path": "owner.custom.details.baseline.rows"
@@ -7375,109 +12731,391 @@
                     }
                   },
                   {
-                    "name": "datasetSupports",
-                    "dataType": "text",
-                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
-                    "validate": "required",
-                    "constraints": {
-                      "textProperty": "name",
-                      "valueProperty": "dataSetId",
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "context-path": "owner.custom.dataSets"
-                        }
-                      }
-                    }
+                    "name": "investmentPriorities2",
+                    "dataType": "stringList",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.investmentPriorities"
+                    },
+                    "constraints": {
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "params": [
+                            {
+                              "expression": "owner.projectId",
+                              "name": "id",
+                              "type": "computed"
+                            }
+                          ],
+                          "url": "/project/listProjectInvestmentPriorities/"
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "otherInvestmentPriority",
+                    "behaviour": [
+                      {
+                        "type": "enable",
+                        "condition": "\"Other\" in investmentPriorities2"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "date",
+                    "name": "activitiesStartDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.startDate"
+                    }
+                  },
+                  {
+                    "dataType": "date",
+                    "name": "activitiesEndDate",
+                    "description": "Specific the dates these events were held on.",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.endDate"
+                    }
+                  },
+                  {
+                    "dataType": "feature",
+                    "name": "sitesCoveredForFloraSurvey",
+                    "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
+
+
+                  },
+                  {
+                    "computed": {
+                      "expression": "$geom.areaHa(sitesCoveredForFloraSurvey)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedAreaTreatedHa",
+                    "units": "ha",
+                    "decimalPlaces": 3
+                  },
+                  {
+                    "computed": {
+                      "expression": "$geom.lengthKm(sitesCoveredForFloraSurvey)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedLengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3,
+                    "behaviour": [
+                      {
+                        "condition": "lengthTreatedKm > 0",
+                        "type": "conditional_validation",
+                        "value": {
+                          "message": "The managed length must be mapped",
+                          "validate": "required,min[0.0001]"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "calculatedAreaTreatedHa"
+                    },
+                    "dataType": "number",
+                    "name": "areaTreatedHa",
+                    "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                    "units": "ha",
+                    "decimalPlaces": 3,
+                    "validate": "required,min[0]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "mappingNotAlignedReason",
+                    "constraints": [
+                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                      "Other"
+                    ],
+                    "validate": "required",
+                    "behaviour": [
+                      {
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "mappingNotAlignedComments",
+                    "validate": "required,maxSize[100]",
+                    "behaviour": [
+                      {
+                        "type": "visible",
+                        "condition": "\"Other\" == mappingNotAlignedReason"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "document",
+                    "name": "extraMappingDetails",
+                    "validate": "required",
+                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                    "behaviour": [
+                      {
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
+                      }
+                    ]
+                  },
+                  {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "$geom.lengthKm(sitesCoveredForFloraSurvey)"
+                    },
+                    "dataType": "number",
+                    "name": "lengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3
                   },
                   {
-                    "name": "relatedOutcomes",
                     "dataType": "text",
-                    "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
+                    "description": "Select the technique used to conduct the survey. If the EMSA Application tool was not used, you should select 'Other'.",
+                    "name": "emsaProtocol",
                     "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.protocol"
+                    },
                     "constraints": {
                       "textProperty": "label",
-                      "valueProperty": "label",
+                      "valueProperty": "value",
                       "type": "pre-populated",
                       "config": {
                         "source": {
-                          "url": "/project/outcomesByScores",
-                          "params": [{
-                            "expression": "owner.projectId",
-                            "name": "id",
-                            "type": "computed"
-                          }, {
-                            "expression": "scores",
-                            "name": "scoreIds",
-                            "type": "computed"
-                          }
-                          ]
+                          "context-path": "owner.protocols"
                         }
                       }
                     }
                   },
                   {
-                    "dataType": "date",
-                    "name": "activitiesStartDate",
-                    "description": "Specific the dates these events were held on",
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "date",
-                    "name": "activitiesEndDate",
-                    "description": "Specific the dates these events were held on",
-                    "validate": "required"
+                    "dataType": "stringList",
+                    "description": "Describe the technique (if Other) was selected.",
+                    "name": "otherEmsaProtocol",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methods"
+                    }
                   },
                   {
-                    "dataType": "stringList",
-                    "name": "ternSurveyTechnique",
-                    "validate": "required",
-                    "constraints": [
-                      "Tern Survey technique 1",
-                      "Tern Survey technique 1",
-                      "Tern Survey technique 1",
-                      "Other"
-                    ]
+                    "dataType": "text",
+                    "name": "surveyMethodology",
+                    "description": "Provide more details on what is being done.",
+                    "validate": "required,maxSize[3000]",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methodDescription"
+                    }
                   },
                   {
                     "dataType": "text",
-                    "description": "Please describe the Survey technique if other was selected.",
-                    "name": "otherTernSurveyTechnique",
-                    "behaviour": [
-                      {
-                        "condition": "ternSurveyTechnique == \"Other\"",
-                        "type": "enable_and_clear"
-                      }
+                    "name": "invoicingThisActivity",
+                    "constraints": [
+                      "Yes",
+                      "No"
                     ],
                     "validate": "required"
+                  }
+                ],
+                "minSize": 1
+              }
+            ]
+          },
+          {
+            "dataType": "lookupTable",
+            "name": "baselineIndicatorMapping",
+            "config": {
+              "source": {
+                "literal": {
+                  "Baseline dataset associated with a project outcome": "Baseline",
+                  "Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
+                }
+              }
+            }
+          },
+          {
+            "allowRowDelete": "false",
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
                   },
                   {
-                    "dataType": "text",
-                    "name": "surveyMethodology",
-                    "description": "Provide more details on what is being done",
-                    "validate": "required,maxSize[3000]"
+                    "rule": "min[0]"
                   },
                   {
-                    "dataType": "text",
-                    "name": "surveyObjective",
-                    "description": "How will the information obtained from the survey be used",
-                    "validate": "required,maxSize[3000]"
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
                   }
                 ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
               }
             ],
             "dataType": "list",
-            "name": "farmSurveys",
-            "minSize": 1
+            "name": "participationInformationTableFls"
           },
           {
-            "name": "numberFarmManagementSurveysConducted",
-            "type": "number",
+            "dataType": "number",
+            "name": "totalSurveyBaseline",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(floraSurveys, \"baselineOrIndicatorSurvey == 'Baseline' ? 1 : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyBaselineInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyBaseline",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyIndicator",
+            "validate": "min[0]",
             "decimalPlaces": 0,
             "computed": {
-              "expression": "count(farmSurveys, \"baselineOrIndicatorSurvey\")"
+              "expression": "sum(floraSurveys, \"baselineOrIndicatorSurvey == 'Indicator' ? 1 : 0\")"
             }
           },
+          {
+            "dataType": "number",
+            "name": "totalSurveyIndicatorInvoiced",
+            "defaultValue": "",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyIndicator",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedFloraMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalSurveyIndicatorInvoiced < +totalSurveyIndicator or +totalSurveyBaselineInvoiced < +totalSurveyBaseline",
+                "type": "enable"
+              }
+            ]
+          },
           {
             "dataType": "text",
             "name": "comments",
@@ -7495,7 +13133,8 @@
           {
             "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "description": "",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -7504,27 +13143,40 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
+        "modelName": "NHT - Flora survey",
+        "title": "Flora Survey",
         "viewModel": [
           {
             "type": "section",
             "items": [
               {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Participation information</h3>"
+                  }
+                ]
+              },
+              {
+                "disableTableUpload": true,
                 "columns": [
                   {
                     "width": "10%",
                     "source": "participationIndividualsOrGroups",
-                    "title": "Individuals or groups?",
+                    "title": "Are individuals or groups delivering this service?",
                     "type": "selectOne"
                   },
                   {
                     "width": "20%",
                     "type": "col",
-                    "title": "Total Number of people delivering this service",
+                    "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                     "items": [
                       {
                         "source": "participationIndividualNumber",
@@ -7538,110 +13190,448 @@
                   },
                   {
                     "type": "col",
-                    "width": "20%",
-                    "title": "Total Number of First Nations people delivering this service ",
+                    "width": "20%",
+                    "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                    "items": [
+                      {
+                        "source": "firstNationIndividualNumber",
+                        "type": "number"
+                      },
+                      {
+                        "source": "firstNationGroupNumber",
+                        "type": "selectOne"
+                      }
+                    ]
+                  },
+                  {
+                    "width": "20%",
+                    "source": "participationDetails",
+                    "rows": 4,
+                    "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                    "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                    "type": "textarea"
+                  }
+                ],
+                "source": "participationInformationTableFls",
+                "type": "table"
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Survey information</h3><p><b>Before completing this section, please ensure you have created a Data Set Summary information for every data set produced by the surveys you intend to report</b></p><ul><li>Each survey reported must relate to a combination of outcomes as described in your MERI plan</li><li>Each Data Set Summary recorded for a survey must be addressing the same outcomes as selected for the survey</li><li>If a survey produced more than one data set, use the New Data Set button to add each Data Set Summary under your survey</li><li>A single survey can be made up of multiple dataset</li></ul>"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Totals Summary</h3>"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(i) Total Number of baseline flora surveys completed for this reporting period",
+                            "source": "totalSurveyBaseline",
+                            "type": "number"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(ii) Total Number of baseline flora surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyBaselineInvoiced",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
                     "items": [
                       {
-                        "source": "firstNationIndividualNumber",
-                        "type": "number"
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iii)  Total Number of indicator flora surveys completed for this reporting period",
+                            "source": "totalSurveyIndicator",
+                            "type": "number"
+                          }
+                        ]
                       },
                       {
-                        "source": "firstNationGroupNumber",
-                        "type": "selectOne"
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iv) Total Number of indicator flora surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyIndicatorInvoiced",
+                            "type": "number"
+                          }
+                        ]
                       }
                     ]
-                  },
-                  {
-                    "source": "participationDetails",
-                    "rows": 4,
-                    "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                    "type": "textarea"
                   }
-                ],
-                "userAddedRows": false,
-                "disableTableUpload": false,
-                "source": "",
-                "type": "table"
+                ]
               },
               {
-                "preLabel": "Number of Farm Management surveys conducted:",
-                "noEdit": true,
-                "type": "number",
-                "source": "numberFarmManagementSurveysConducted"
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                    "source": "totalInvoicedFloraMismatched",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": ""
+                  }
+                ]
               },
               {
-                "addRowText": "New survey site",
+                "addRowText": "Add survey",
+                "removeRowText": "Delete this survey",
                 "userAddedRows": true,
-                "source": "farmSurveys",
+                "source": "floraSurveys",
                 "type": "repeat",
                 "items": [
                   {
-                    "type": "table",
-                    "source": "surveyBaselineDetails",
-                    "userAddedRows": true,
-                    "disableTableUpload": true,
-                    "columns": [
-                      {
-                        "source": "baselineOrIndicatorSurvey",
-                        "type": "selectOne",
-                        "width": "8%",
-                        "title": "Baseline survey or indicator (follow-up) survey?"
-                      },
-                      {
-                        "source": "projectBaseline",
-                        "type": "selectOne",
-                        "width": "8%",
-                        "title": "Which project baseline relates to this survey?"
-                      },
-                      {
-                        "source": "datasetSupports",
-                        "type": "select2Many",
-                        "width": "10%",
-                        "title": "What dataset supports this?"
-                      },
-                      {
-                        "source": "relatedOutcomes",
-                        "type": "selectOne",
-                        "width": "10%",
-                        "title": "Which outcome statement/s relates to this survey?"
-                      },
+                    "type": "row",
+                    "items": [
                       {
-                        "title": "Activities start date",
-                        "source": "activitiesStartDate",
-                        "type": "date",
-                        "width": "10%"
+                        "type": "col",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s relates to this survey?"
+                          }
+                        ]
                       },
                       {
-                        "title": "Activities end date",
-                        "source": "activitiesEndDate",
-                        "type": "date",
-                        "width": "10%"
-                      },
+                        "type": "col",
+                        "items": [
+                          {
+                            "source": "baselineOrIndicatorSurvey",
+                            "type": "selectOne",
+                            "preLabel": "Baseline survey or indicator (follow-up) survey?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
                       {
-                        "width": "10%",
-                        "title": "Survey technique",
-                        "source": "ternSurveyTechnique",
-                        "type": "selectOne"
-                      },
+                        "source": "surveyObjective",
+                        "preLabel": "Survey objective",
+                        "type": "text"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "repeat",
+                    "source": "floraDataSets",
+                    "userAddedRows": true,
+                    "addRowText": "New data set",
+                    "removeRowText": "Delete this data set",
+                    "items": [
                       {
-                        "width": "10%",
-                        "title": "Survey technique (if Other)",
-                        "source": "otherTernSurveyTechnique",
-                        "type": "textarea"
+                        "type": "row",
+                        "css": "border-bottom",
+                        "items": [
+                          {
+                            "type": "col",
+                            "items": [
+                              {
+                                "source": "dataSetId",
+                                "type": "selectOne",
+                                "preLabel": "Please select the data set produced by this survey.  Note it must have already been entered on the Data Set Summary tab."
+                              }
+                            ]
+                          }
+                        ]
                       },
                       {
-                        "width": "12%",
-                        "rows": 4,
-                        "source": "surveyMethodology",
-                        "title": "Survey methodology",
-                        "type": "textarea"
+                        "type": "row",
+                        "items": [
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "projectBaselines",
+                                    "type": "selectMany",
+                                    "preLabel": "Which project baseline/s relate to this survey?",
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "investmentPriorities2",
+                                    "preLabel": "Which investment priority does this activity relate to?",
+                                    "type": "select2Many"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity start date",
+                                    "source": "activitiesStartDate",
+                                    "type": "date"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity end date",
+                                    "source": "activitiesEndDate",
+                                    "type": "date"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Sites covered by flora survey",
+                                    "source": "sitesCoveredForFloraSurvey",
+                                    "type": "feature"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedAreaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedLengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Please attach mapping details",
+                                    "source": "extraMappingDetails",
+                                    "type": "document"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Actual area (ha) / length (km) covered by flora survey",
+                                    "source": "areaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "lengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Reason for actual being different to mapped amount",
+                                    "source": "mappingNotAlignedReason",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                                    "source": "mappingNotAlignedComments",
+                                    "type": "textarea",
+                                    "rows": 5
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique",
+                                    "source": "emsaProtocol",
+                                    "type": "selectOne",
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique (if Other)",
+                                    "source": "otherEmsaProtocol",
+                                    "type": "select2Many"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "surveyMethodology",
+                                    "preLabel": "Survey methodology",
+                                    "type": "text"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "invoicingThisActivity",
+                                    "preLabel": "Are you invoicing for this activity in this reporting period?",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              }
+                            ]
+                          }
+                        ]
                       },
                       {
-                        "width": "12%",
-                        "rows": 4,
-                        "source": "surveyObjective",
-                        "title": "Survey objective",
-                        "type": "textarea"
+                        "columns": [
+                          {
+                            "width": "40%",
+                            "source": "species",
+                            "title": "Target species recorded",
+                            "type": "speciesSelect"
+                          },
+                          {
+                            "width": "35%",
+                            "source": "threatenedEcologicalCommunity",
+                            "title": "Threatened ecological communities (if applicable)",
+                            "type": "text"
+                          },
+                          {
+                            "width": "15%",
+                            "source": "individualsOrGroups",
+                            "title": "Individuals or groups?",
+                            "type": "selectOne"
+                          },
+                          {
+                            "width": "10%",
+                            "source": "numberOfIndividualsOrGroups",
+                            "title": "Number of groups / individuals in flora survey",
+                            "type": "number"
+                          }
+                        ],
+                        "userAddedRows": true,
+                        "disableTableUpload": true,
+                        "source": "floraSurveySpeciesTable",
+                        "type": "table"
                       }
                     ]
                   }
@@ -7675,7 +13665,7 @@
                 "items": [
                   {
                     "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
                   },
                   {
                     "preLabel": "Data have been uploaded",
@@ -7696,15 +13686,6 @@
                   }
                 ]
               },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-                  }
-                ]
-              },
               {
                 "type": "table",
                 "source": "assuranceDocuments",
@@ -7716,194 +13697,162 @@
                     "source": "attachments",
                     "type": "document"
                   }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      "modelName": null,
-      "templateName": "nhtFarmManagementSurvey",
-      "optional": true,
-      "optionalQuestionText": null,
-      "title": "Farm management survey",
-      "collapsibleHeading": null,
-      "name": "NHT - Farm Management Survey",
-      "description": null
-    },
-    {
-      "collapsedByDefault": false,
-      "template": {
-        "dataModel": [
-          {
-            "columns": [
-              {
-                "columns": [
-                  {
-                    "dataType": "species",
-                    "name": "species",
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "individualsOrGroups",
-                    "constraints": [
-                      "Individuals",
-                      "Groups"
-                    ],
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "number",
-                    "name": "numberOfIndividualsOrGroups",
-                    "validate": "required,min[0]"
-                  },
-                  {
-                    "dataType": "stringList",
-                    "name": "ternSurveyTechnique",
-                    "validate": "required",
-                    "constraints": [
-                      "Tern Survey technique 1",
-                      "Tern Survey technique 1",
-                      "Tern Survey technique 1",
-                      "Other"
-                    ]
-                  },
-                  {
-                    "dataType": "text",
-                    "description": "Please describe the Survey technique if other was selected.",
-                    "name": "otherTernSurveyTechnique",
-                    "behaviour": [
-                      {
-                        "condition": "ternSurveyTechnique == \"Other\"",
-                        "type": "enable_and_clear"
-                      }
-                    ],
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "surveyMethodology",
-                    "description": "Provide more details on what is being done",
-                    "validate": "required,maxSize[3000]"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "surveyObjective",
-                    "description": "How will the information obtained from the survey be used",
-                    "validate": "required,maxSize[3000]"
-                  }
-                ],
-                "dataType": "list",
-                "name": "faunaSurveyBaselineTable"
-              },
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "modelName": null,
+      "templateName": "nhtFloraSurvey",
+      "optional": true,
+      "optionalQuestionText": null,
+      "title": "Flora survey",
+      "collapsibleHeading": null,
+      "name": "NHT - Flora survey",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
+          {
+            "allowRowDelete": "false",
+            "columns": [
               {
                 "dataType": "text",
-                "name": "baselineOrIndicatorSurvey",
-                "description": "",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
                 "constraints": [
-                  "Baseline",
-                  "Indicator"
+                  "Individuals",
+                  "Groups"
                 ],
                 "validate": "required"
               },
               {
-                "name": "projectBaseline",
-                "dataType": "text",
-                "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "baseline",
-                  "valueProperty": "code",
-                  "type": "pre-populated",
-                  "excludePath": "projectBaseline",
-                  "config": {
-                    "source": {
-                      "context-path": "owner.custom.details.baseline.rows"
-                    }
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
-                }
+                ],
+                "validate": "required,min[0]"
               },
               {
-                "name": "datasetSupports",
                 "dataType": "text",
-                "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "name",
-                  "valueProperty": "dataSetId",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "context-path": "owner.custom.dataSets"
-                    }
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
-                }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
               },
               {
-                "name": "relatedOutcomes",
-                "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "label",
-                  "valueProperty": "label",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
-                      }
-                      ]
-                    }
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
-                }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
               },
               {
-                "dataType": "date",
-                "name": "activitiesStartDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
               },
               {
-                "dataType": "date",
-                "name": "activitiesEndDate",
-                "description": "Specific the dates these events were held on",
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableHaa"
+          },
+          {
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "initialOrMaintained",
+                "constraints": [
+                  "Initial",
+                  "Maintained"
+                ],
                 "validate": "required"
               },
               {
                 "dataType": "feature",
-                "name": "sitesTreated"
+                "name": "sitesOfHabitatAugmentation",
+                "description": "Mapping field to be done and Area (ha) field be auto-calculated from mapping."
               },
               {
                 "computed": {
-                  "expression": "$geom.areaHa(sitesTreated)"
+                  "expression": "$geom.areaHa(sitesOfHabitatAugmentation)"
                 },
                 "dataType": "number",
                 "name": "calculatedAreaTreatedHa",
                 "units": "ha",
-                "decimalPlaces": 3,
-                "behaviour": [
-                  {
-                    "condition": "areaInvoicedTreatedHa > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The managed area must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
-                  }
-                ]
+                "decimalPlaces": 3
               },
               {
                 "computed": {
-                  "expression": "$geom.lengthKm(sitesTreated)"
+                  "expression": "$geom.lengthKm(sitesOfHabitatAugmentation)"
                 },
                 "dataType": "number",
                 "name": "calculatedLengthTreatedKm",
@@ -7927,6 +13876,7 @@
                 },
                 "dataType": "number",
                 "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
                 "units": "ha",
                 "decimalPlaces": 3,
                 "validate": "required,min[0]"
@@ -7941,15 +13891,15 @@
                 "validate": "required",
                 "behaviour": [
                   {
-                    "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1))",
-                    "type": "visible"
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
+                    "type": "if"
                   }
                 ]
               },
               {
                 "dataType": "text",
                 "name": "mappingNotAlignedComments",
-                "validate": "required,maxSize[300]",
+                "validate": "required,maxSize[100]",
                 "behaviour": [
                   {
                     "type": "visible",
@@ -7964,170 +13914,275 @@
                 "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
                 "behaviour": [
                   {
-                    "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1)) or roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                    "type": "visible"
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
+                    "type": "if"
                   }
                 ]
               },
               {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKm"
+                },
                 "dataType": "number",
-                "name": "areaInvoicedTreatedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": [
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
+              },
+              {
+                "dataType": "number",
+                "name": "noStructuresInstalled",
+                "validate": "required"
+              },
+              {
+                "columns": [
                   {
-                    "rule": "min[0]"
+                    "dataType": "date",
+                    "name": "activitiesStartDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": "required"
                   },
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "areaTreatedHa"
-                    }
+                    "dataType": "date",
+                    "name": "activitiesEndDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": [
+                      {
+                        "rule": "required"
+                      },
+                      {
+                        "rule": "future",
+                        "param": {
+                          "expression": "formatDateForValidation(activitiesStartDate)",
+                          "type": "computed"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "habitatAugmentationType",
+                    "description": "",
+                    "constraints": [
+                      "Artificial fauna movement devices",
+                      "Artificial nesting or roosting habitat (incl. tiles, fence posts)",
+                      "Environmental thinning",
+                      "Improving fish passage",
+                      "Natural features (rocks, logs)",
+                      "Other"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "otherHabitatAugmentationType",
+                    "description": "Please specify the habitat augmentation type if Other (specify in notes) was selected in the Type of habitat augmentation column.",
+                    "behaviour": [
+                      {
+                        "condition": "habitatAugmentationType == \"Other\"",
+                        "type": "enable"
+                      }
+                    ],
+                    "validate": "required,maxSize[100]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "habitatAugmentationObjective",
+                    "description": "",
+                    "validate": "required,maxSize[300]"
                   }
-                ]
+                ],
+                "dataType": "list",
+                "name": "habitatAugmentationDetails"
               },
               {
+                "name": "relatedOutcomes",
                 "dataType": "text",
-                "name": "invoicedNotActualReason",
-                "constraints": [
-                  "Work was undertaken over a greater area than will be invoiced for",
-                  "Other"
-                ],
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
                 "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                    "type": "visible"
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
                   }
-                ]
+                }
               },
               {
+                "name": "investmentPriorities2",
                 "dataType": "text",
-                "name": "invoicedNotActualComments",
-                "behaviour": [
-                  {
-                    "type": "visible",
-                    "condition": "\"Other\" == invoicedNotActualReason"
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
                   }
-                ],
-                "validate": "required,maxSize[300]"
+                }
               },
               {
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "$geom.lengthKm(sitesTreated)"
-                },
-                "dataType": "number",
-                "name": "lengthTreatedKm",
-                "units": "km",
-                "decimalPlaces": 3,
-                "validate": [
-                  {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)*0.9"
-                    }
-                  },
+                "dataType": "text",
+                "name": "otherInvestmentPriority",
+                "behaviour": [
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)*1.1"
-                    }
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
                   }
                 ]
               },
               {
-                "dataType": "number",
-                "name": "numberOfSurveyInvoice",
-                "validate": "required,min[0]"
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
               }
             ],
             "dataType": "list",
-            "name": "faunaSurveys",
-            "minSize": 1
+            "name": "habitatAugmentationAreas"
           },
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
+            "dataType": "number",
+            "name": "totalAreaAugmentationInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(habitatAugmentationAreas, \"initialOrMaintained == 'Initial' ? areaTreatedHa : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "decimalPlaces": 3,
+            "name": "totalAreaAugmentationInitialInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaAugmentationInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
               }
             ],
-            "validate": "required,min[0]"
+            "defaultValue": ""
           },
           {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
+            "dataType": "number",
+            "name": "totalAreaAugmentationMaintained",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(habitatAugmentationAreas, \"initialOrMaintained == 'Maintained' ? areaTreatedHa : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalAreaAugmentationMaintainedInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaAugmentationMaintained",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
               }
             ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            "defaultValue": ""
           },
           {
             "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+            "name": "totalStructuresInstalledInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(habitatAugmentationAreas, \"initialOrMaintained == 'Initial' ? noStructuresInstalled : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalStructuresInstalledInitialInvoiced",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalStructuresInstalledInitial",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "validate": "required,min[0]"
+            "defaultValue": ""
           },
           {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
+            "dataType": "number",
+            "name": "totalStructuresInstalledMaintained",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(habitatAugmentationAreas, \"initialOrMaintained == 'Maintained' ? noStructuresInstalled : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalStructuresInstalledMaintainedInvoiced",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalStructuresInstalledMaintained",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            "defaultValue": ""
           },
           {
             "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "name": "numberFaunaSurveysConducted",
-            "type": "number",
-            "decimalPlaces": 0,
-            "computed": {
-              "expression": "count(faunaSurveys, \"baselineOrIndicatorSurvey\")"
-            }
+            "name": "totalInvoicedHabitatAugmentationMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalAreaAugmentationInitialInvoiced < +totalAreaAugmentationInitial or +totalAreaAugmentationMaintainedInvoiced < +totalAreaAugmentationMaintained or +totalStructuresInstalledInitialInvoiced < +totalStructuresInstalledInitial or +totalStructuresInstalledMaintainedInvoiced < +totalStructuresInstalledMaintained",
+                "type": "enable"
+              }
+            ]
           },
           {
             "dataType": "text",
@@ -8141,12 +14196,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -8155,840 +14210,1062 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Fauna survey",
-        "title": "Fauna survey",
+        "modelName": "NHT - Habitat augmentation",
+        "title": "Habitat Augmentation",
         "viewModel": [
           {
-            "type": "section",
+            "type": "row",
             "items": [
               {
-                "columns": [
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "width": "10%",
+                "source": "participationIndividualsOrGroups",
+                "title": "Are individuals or groups delivering this service?",
+                "type": "selectOne"
+              },
+              {
+                "width": "20%",
+                "type": "col",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
                   {
-                    "width": "10%",
-                    "source": "participationIndividualsOrGroups",
-                    "title": "Individuals or groups?",
+                    "source": "participationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "participationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "width": "20%",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "firstNationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "firstNationGroupNumber",
                     "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
+              }
+            ],
+            "source": "participationInformationTableHaa",
+            "type": "table"
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total area (ha) of augmentation (initial) during this reporting period",
+                        "source": "totalAreaAugmentationInitial",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total area (ha) of augmentation (initial) <u><i>invoiced</i></u> for during this reporting period",
+                        "source": "totalAreaAugmentationInitialInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii) Total area (ha) of augmentation (maintained) during this reporting period",
+                        "source": "totalAreaAugmentationMaintained",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total area (ha) of augmentation (maintained) <u><i>invoiced</i></u> for during this reporting period",
+                        "source": "totalAreaAugmentationMaintainedInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(v) Number of locations where structures installed (initial) during this reporting period",
+                        "source": "totalStructuresInstalledInitial",
+                        "type": "number"
+                      }
+                    ]
                   },
                   {
-                    "width": "20%",
-                    "type": "col",
-                    "title": "Total Number of people delivering this service",
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vi) Number of locations where structures installed (initial) <u><i>invoiced</i></u> for during this reporting period",
+                        "source": "totalStructuresInstalledInitialInvoiced",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
                     "items": [
                       {
-                        "source": "participationIndividualNumber",
+                        "preLabel": "(vii) Number of locations where structures installed (maintained) during this reporting period",
+                        "source": "totalStructuresInstalledMaintained",
                         "type": "number"
-                      },
-                      {
-                        "source": "participationGroupNumber",
-                        "type": "selectOne"
                       }
                     ]
                   },
                   {
-                    "type": "col",
-                    "width": "20%",
-                    "title": "Total Number of First Nations people delivering this service ",
+                    "type": "row",
                     "items": [
                       {
-                        "source": "firstNationIndividualNumber",
+                        "preLabel": "(viii) Number of locations where structures installed (maintained) <u><i>invoiced</i></u> for during this reporting period",
+                        "source": "totalStructuresInstalledMaintainedInvoiced",
                         "type": "number"
-                      },
-                      {
-                        "source": "firstNationGroupNumber",
-                        "type": "selectOne"
                       }
                     ]
-                  },
-                  {
-                    "source": "participationDetails",
-                    "rows": 4,
-                    "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                    "type": "textarea"
                   }
-                ],
-                "userAddedRows": false,
-                "disableTableUpload": false,
-                "source": "",
-                "type": "table"
-              },
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "preLabel": "Number of Fauna surveys conducted:",
-                "noEdit": true,
-                "type": "number",
-                "source": "numberFaunaSurveysConducted"
-              },
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedHabitatAugmentationMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "addRowText": "Add new area of habitat augmentation",
+            "userAddedRows": true,
+            "source": "habitatAugmentationAreas",
+            "type": "repeat",
+            "items": [
               {
-                "addRowText": "New survey site",
-                "userAddedRows": true,
-                "source": "faunaSurveys",
-                "type": "repeat",
+                "type": "row",
                 "items": [
                   {
-                    "type": "row",
-                    "css": "border-bottom",
+                    "css": "span3 col-border-right",
+                    "type": "col",
                     "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "baselineOrIndicatorSurvey",
-                                "type": "selectOne",
-                                "preLabel": "Baseline survey or indicator (follow-up) survey?"
-                              }
-                            ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "projectBaseline",
-                                "type": "selectOne",
-                                "preLabel": "Which project baseline relates to this survey?"
-                              }
-                            ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "datasetSupports",
-                                "type": "select2Many",
-                                "preLabel": "What dataset supports this?"
-                              }
-                            ]
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "relatedOutcomes",
-                                "type": "selectOne",
-                                "preLabel": "Which outcome statement/s relates to this survey?"
-                              }
-                            ]
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3 col-border-right",
+                    "type": "col",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Activities start date",
-                                "source": "activitiesStartDate",
-                                "type": "date"
-                              }
-                            ]
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "css": "border-bottom",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Activities end date",
-                                "source": "activitiesEndDate",
-                                "type": "date"
-                              }
-                            ]
+                            "source": "initialOrMaintained",
+                            "preLabel": "Initial or Maintenance Treatment?",
+                            "type": "selectOne"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Sites covered by fauna surveys",
-                                "source": "sitesTreated",
-                                "type": "feature"
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "calculatedAreaTreatedHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                },
-                                "readonly": "readonly"
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "calculatedLengthTreatedKm",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                },
-                                "readonly": "readonly"
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Please attach mapping details",
-                                "source": "extraMappingDetails",
-                                "type": "document"
-                              }
-                            ]
+                            "source": "noStructuresInstalled",
+                            "preLabel": "Number of locations where structures installed/maintained",
+                            "type": "number"
                           }
                         ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Actual area (ha) / length (km) treated by fauna surveys",
-                                "source": "areaTreatedHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "lengthTreatedKm",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Reason for actual being different to mapped amount",
-                                "source": "mappingNotAlignedReason",
-                                "type": "selectOne"
-                              }
-                            ]
-                          },
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "mappingNotAlignedComments",
-                                "type": "textarea",
-                                "rows": 5
-                              }
-                            ]
+                            "preLabel": "Site/s of habitat augmentation",
+                            "source": "sitesOfHabitatAugmentation",
+                            "type": "feature"
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "How may surveys will you be invoicing for?",
-                                "source": "numberOfSurveyInvoice",
-                                "type": "number"
-                              }
-                            ]
+                            "source": "calculatedAreaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Please attach mapping details",
+                            "source": "extraMappingDetails",
+                            "type": "document"
                           }
                         ]
                       }
                     ]
                   },
                   {
-                    "columns": [
-                      {
-                        "width": "20%",
-                        "source": "species",
-                        "title": "Target species recorded",
-                        "type": "speciesSelect"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "individualsOrGroups",
-                        "title": "Individuals or groups?",
-                        "type": "selectOne"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "numberOfIndividualsOrGroups",
-                        "title": "Number of groups / individuals in flora survey",
-                        "type": "number"
-                      },
-                      {
-                        "width": "10%",
-                        "title": "Survey technique",
-                        "source": "ternSurveyTechnique",
-                        "type": "selectOne"
-                      },
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "width": "10%",
-                        "title": "Survey technique (if Other)",
-                        "source": "otherTernSurveyTechnique",
-                        "type": "text"
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Actual area (ha) of habitat augmentation",
+                            "source": "areaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
                       },
                       {
-                        "width": "20%",
-                        "source": "surveyMethodology",
-                        "title": "Survey methodology",
-                        "type": "text"
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Reason for actual being different to mapped amount",
+                            "source": "mappingNotAlignedReason",
+                            "type": "selectOne"
+                          }
+                        ]
                       },
                       {
-                        "width": "20%",
-                        "source": "surveyObjective",
-                        "title": "Survey objective",
-                        "type": "text"
+                        "type": "row",
+                        "items": [
+                          {
+                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                            "source": "mappingNotAlignedComments",
+                            "type": "textarea",
+                            "rows": 5
+                          }
+                        ]
                       }
-                    ],
-                    "userAddedRows": true,
-                    "disableTableUpload": true,
-                    "source": "faunaSurveyBaselineTable",
-                    "type": "table"
+                    ]
                   }
                 ]
               },
               {
-                "type": "row",
-                "items": [
+                "columns": [
                   {
-                    "preLabel": "Optionally attach photos",
-                    "source": "photographicEvidence",
-                    "type": "image"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
+                    "title": "Activity start date",
+                    "source": "activitiesStartDate",
+                    "type": "date",
+                    "width": "20%"
+                  },
                   {
-                    "preLabel": "Clarification, if needed",
-                    "type": "textarea",
-                    "rows": 4,
-                    "css": "span8",
-                    "source": "comments",
-                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
+                    "title": "Activity end date",
+                    "source": "activitiesEndDate",
+                    "type": "date",
+                    "width": "20%"
+                  },
                   {
-                    "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                    "width": "25%",
+                    "title": "Type of habitat augmentation / installed",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "habitatAugmentationType",
+                            "type": "select2"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "otherHabitatAugmentationType",
+                            "type": "textarea"
+                          }
+                        ]
+                      }
+                    ]
                   },
                   {
-                    "preLabel": "Data have been uploaded",
-                    "source": "dataUploaded",
-                    "type": "boolean"
+                    "width": "35%",
+                    "source": "habitatAugmentationObjective",
+                    "title": "Purpose of habitat augmentation",
+                    "type": "textarea"
                   }
-                ]
-              },
+                ],
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "source": "habitatAugmentationDetails",
+                "type": "table"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "",
-                    "source": "projectAssuranceDetails",
-                    "type": "textarea",
-                    "rows": 4,
-                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
-                  }
-                ]
-              },
+                "preLabel": "Optionally attach photos",
+                "source": "photographicEvidence",
+                "type": "image"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-                  }
-                ]
+                "preLabel": "Clarification, if needed",
+                "type": "textarea",
+                "rows": 4,
+                "css": "span8",
+                "source": "comments",
+                "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
               },
               {
-                "type": "table",
-                "source": "assuranceDocuments",
-                "userAddedRows": true,
-                "disableTableUpload": true,
-                "columns": [
-                  {
-                    "title": "Attached documents",
-                    "source": "attachments",
-                    "type": "document"
-                  }
-                ]
+                "preLabel": "Data have been uploaded",
+                "source": "dataUploaded",
+                "type": "boolean"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "",
+                "source": "projectAssuranceDetails",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+              }
+            ]
+          },
+          {
+            "type": "table",
+            "source": "assuranceDocuments",
+            "userAddedRows": true,
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "title": "Attached documents",
+                "source": "attachments",
+                "type": "document"
               }
             ]
           }
         ]
       },
       "modelName": null,
-      "templateName": "nhtFaunaSurvey",
+      "templateName": "nhtHabitatAugmentation",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Fauna survey",
+      "title": "Habitat augmentation",
       "collapsibleHeading": null,
-      "name": "NHT - Fauna survey",
+      "name": "NHT - Habitat augmentation",
       "description": null
     },
-
     {
       "collapsedByDefault": false,
       "template": {
         "dataModel": [
           {
+            "name": "habitatConditionSurveys",
+            "dataType": "list",
+            "minSize": 1,
             "columns": [
               {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
+                  }
+                }
+              },
+              {
+                "dataType": "text",
+                "name": "baselineOrIndicatorSurvey",
+                "description": "",
+                "constraints": [
+                  "Baseline",
+                  "Indicator"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "text",
+                "name": "surveyObjective",
+                "description": "What the survey aim to capture? How will the information obtained from the survey be used?",
+                "validate": "required,maxSize[3000]"
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfSurveys",
+                "validate": "required,min[1],max[1]",
+                "defaultValue": 1,
+                "readonly": true
+              },
+              {
+                "dataType": "list",
+                "name": "habitatConditionDataSets",
                 "columns": [
                   {
-                    "dataType": "species",
-                    "name": "species",
-                    "validate": "required"
+                    "name": "dataSetId",
+                    "entityType": "au.org.ala.ecodata.DataSetSummary",
+                    "dataType": "text",
+                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
+                    "validate": "required",
+                    "constraints": {
+                      "textProperty": "name",
+                      "valueProperty": "dataSetId",
+                      "excludePath": "habitatConditionSurveys.habitatConditionDataSets.dataSetId",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.dataSets"
+                        },
+                        "filter": {
+                          "namespace": "dataSet",
+                          "expression": "dataSet.serviceId == 42 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
+                        }
+                      }
+                    },
+                    "behaviour": [
+                      {
+                        "type": "pre_populate",
+                        "config": {
+                          "waitForInitialisation": true,
+                          "source": {
+                            "url": "/site/geojson",
+                            "params": [
+                              {
+                                "expression": "x=find(owner.custom.dataSets, \"dataSetId\", dataSetId); x.siteId",
+                                "name": "id",
+                                "type": "computed",
+                                "required": true
+                              }
+                            ]
+                          },
+                          "target":  {
+                            "type": "singleValue",
+                            "name": "sitesCoveredForHabitatConditionSurvey"
+                          }
+                        }
+                      }
+                    ]
                   },
                   {
-                    "dataType": "text",
-                    "name": "threatenedEcologicalCommunity",
-                    "validate": "maxSize[300]"
+                    "name": "projectBaselines",
+                    "dataType": "stringList",
+                    "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.baselines"
+                    },
+                    "constraints": {
+                      "textProperty": "baseline",
+                      "valueProperty": "code",
+                      "type": "pre-populated",
+                      "excludePath": "projectBaselines",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.details.baseline.rows"
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "name": "investmentPriorities2",
+                    "dataType": "stringList",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.investmentPriorities"
+                    },
+                    "constraints": {
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "params": [
+                            {
+                              "expression": "owner.projectId",
+                              "name": "id",
+                              "type": "computed"
+                            }
+                          ],
+                          "url": "/project/listProjectInvestmentPriorities/"
+                        }
+                      }
+                    }
                   },
                   {
                     "dataType": "text",
-                    "name": "individualsOrGroups",
-                    "constraints": [
-                      "Individuals",
-                      "Groups"
-                    ],
-                    "validate": "required"
+                    "name": "otherInvestmentPriority",
+                    "behaviour": [
+                      {
+                        "type": "enable",
+                        "condition": "\"Other\" in investmentPriorities2"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "date",
+                    "name": "activitiesStartDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.startDate"
+                    }
+                  },
+                  {
+                    "dataType": "date",
+                    "name": "activitiesEndDate",
+                    "description": "Specific the dates these events were held on.",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.endDate"
+                    }
+                  },
+                  {
+                    "dataType": "feature",
+                    "name": "sitesCoveredForHabitatConditionSurvey",
+                    "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
                   },
                   {
+                    "computed": {
+                      "expression": "$geom.areaHa(sitesCoveredForHabitatConditionSurvey)"
+                    },
                     "dataType": "number",
-                    "name": "numberOfIndividualsOrGroups",
-                    "validate": "required,min[0]"
+                    "name": "calculatedAreaTreatedHa",
+                    "units": "ha",
+                    "decimalPlaces": 3,
+                    "behaviour": [
+                      {
+                        "condition": "areaInvoicedTreatedHa > 0",
+                        "type": "conditional_validation",
+                        "value": {
+                          "message": "The managed area must be mapped",
+                          "validate": "required,min[0.0001]"
+                        }
+                      }
+                    ]
                   },
                   {
-                    "dataType": "stringList",
-                    "name": "ternSurveyTechnique",
-                    "validate": "required",
-                    "constraints": [
-                      "Tern Survey technique 1",
-                      "Tern Survey technique 1",
-                      "Tern Survey technique 1",
-                      "Other"
+                    "computed": {
+                      "expression": "$geom.lengthKm(sitesCoveredForHabitatConditionSurvey)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedLengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3,
+                    "behaviour": [
+                      {
+                        "condition": "lengthTreatedKm > 0",
+                        "type": "conditional_validation",
+                        "value": {
+                          "message": "The managed length must be mapped",
+                          "validate": "required,min[0.0001]"
+                        }
+                      }
                     ]
                   },
+                  {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "calculatedAreaTreatedHa"
+                    },
+                    "dataType": "number",
+                    "name": "areaTreatedHa",
+                    "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                    "units": "ha",
+                    "decimalPlaces": 3,
+                    "validate": "required,min[0]"
+                  },
                   {
                     "dataType": "text",
-                    "description": "Please describe the Survey technique if other was selected.",
-                    "name": "otherTernSurveyTechnique",
+                    "name": "mappingNotAlignedReason",
+                    "constraints": [
+                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                      "Other"
+                    ],
+                    "validate": "required",
                     "behaviour": [
                       {
-                        "condition": "ternSurveyTechnique == \"Other\"",
-                        "type": "enable_and_clear"
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
                       }
-                    ],
-                    "validate": "required"
+                    ]
                   },
                   {
                     "dataType": "text",
-                    "name": "surveyMethodology",
-                    "description": "Provide more details on what is being done",
-                    "validate": "required,maxSize[3000]"
+                    "name": "mappingNotAlignedComments",
+                    "validate": "required,maxSize[100]",
+                    "behaviour": [
+                      {
+                        "type": "visible",
+                        "condition": "\"Other\" == mappingNotAlignedReason"
+                      }
+                    ]
                   },
                   {
-                    "dataType": "text",
-                    "name": "surveyObjective",
-                    "description": "How will the information obtained from the survey be used",
-                    "validate": "required,maxSize[3000]"
-                  }
-                ],
-                "dataType": "list",
-                "name": "floraSurveySpeciesTable"
-              },
-              {
-                "dataType": "text",
-                "name": "baselineOrIndicatorSurvey",
-                "description": "",
-                "constraints": [
-                  "Baseline",
-                  "Indicator"
-                ],
-                "validate": "required"
-              },
-              {
-                "name": "projectBaseline",
-                "dataType": "text",
-                "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "baseline",
-                  "valueProperty": "code",
-                  "type": "pre-populated",
-                  "excludePath": "projectBaseline",
-                  "config": {
-                    "source": {
-                      "context-path": "owner.custom.details.baseline.rows"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "datasetSupports",
-                "dataType": "text",
-                "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "name",
-                  "valueProperty": "dataSetId",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "context-path": "owner.custom.dataSets"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "relatedOutcomes",
-                "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "label",
-                  "valueProperty": "label",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
+                    "dataType": "document",
+                    "name": "extraMappingDetails",
+                    "validate": "required",
+                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                    "behaviour": [
+                      {
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
+                      }
+                    ]
+                  },
+                  {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "calculatedLengthTreatedKm"
+                    },
+                    "dataType": "number",
+                    "name": "lengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3
+                  },
+                  {
+                    "dataType": "text",
+                    "description": "Select the technique used to conduct the survey. If the EMSA Application tool was not used, you should select 'Other'.",
+                    "name": "emsaProtocol",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.protocol"
+                    },
+                    "constraints": {
+                      "textProperty": "label",
+                      "valueProperty": "value",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.protocols"
+                        }
                       }
-                      ]
                     }
-                  }
-                }
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesStartDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesEndDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "dataType": "feature",
-                "name": "sitesTreated"
-              },
-              {
-                "computed": {
-                  "expression": "$geom.areaHa(sitesTreated)"
-                },
-                "dataType": "number",
-                "name": "calculatedAreaTreatedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "behaviour": [
+                  },
                   {
-                    "condition": "areaInvoicedTreatedHa > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The managed area must be mapped",
-                      "validate": "required,min[0.0001]"
+                    "dataType": "stringList",
+                    "description": "Describe the technique (if Other) was selected.",
+                    "name": "otherEmsaProtocol",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methods"
                     }
-                  }
-                ]
-              },
-              {
-                "computed": {
-                  "expression": "$geom.lengthKm(sitesTreated)"
-                },
-                "dataType": "number",
-                "name": "calculatedLengthTreatedKm",
-                "units": "km",
-                "decimalPlaces": 3,
-                "behaviour": [
+                  },
                   {
-                    "condition": "lengthTreatedKm > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The managed length must be mapped",
-                      "validate": "required,min[0.0001]"
+                    "dataType": "text",
+                    "name": "surveyMethodology",
+                    "description": "Provide more details on what is being done.",
+                    "validate": "required,maxSize[3000]",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methodDescription"
                     }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "invoicingThisActivity",
+                    "constraints": [
+                      "Yes",
+                      "No"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "columns": [
+                      {
+                        "dataType": "species",
+                        "name": "species",
+                        "validate": "required"
+                      },
+                      {
+                        "dataType": "text",
+                        "name": "typesOfHabitat",
+                        "description": "",
+                        "constraints": [
+                          "Desert",
+                          "Grassland/Savanna",
+                          "Bush/Forest",
+                          "Subterranean",
+                          "Marsh/Swamps",
+                          "Rivers/Streams/Wetlands",
+                          "Coastal areas",
+                          "Marine areas",
+                          "Other"
+                        ],
+                        "validate": "required"
+                      },
+                      {
+                        "dataType": "text",
+                        "name": "habitatCondition",
+                        "validate": "maxSize[300]"
+                      }
+                    ],
+                    "dataType": "list",
+                    "name": "habitatConditionSurveySpeciesTable"
                   }
-                ]
-              },
-              {
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "calculatedAreaTreatedHa"
-                },
-                "dataType": "number",
-                "name": "areaTreatedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": "required,min[0]"
-              },
+                ],
+                "minSize": 1
+              }
+            ]
+          },
+          {
+            "dataType": "lookupTable",
+            "name": "baselineIndicatorMapping",
+            "config": {
+              "source": {
+                "literal": {
+                  "Baseline dataset associated with a project outcome": "Baseline",
+                  "Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
+                }
+              }
+            }
+          },
+          {
+            "allowRowDelete": "false",
+            "columns": [
               {
                 "dataType": "text",
-                "name": "mappingNotAlignedReason",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
                 "constraints": [
-                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                  "Other"
+                  "Individuals",
+                  "Groups"
                 ],
-                "validate": "required",
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
                 "behaviour": [
                   {
-                    "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1))",
-                    "type": "visible"
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
-                ]
+                ],
+                "validate": "required,min[0]"
               },
               {
                 "dataType": "text",
-                "name": "mappingNotAlignedComments",
-                "validate": "required,maxSize[300]",
+                "name": "participationGroupNumber",
                 "behaviour": [
                   {
-                    "type": "visible",
-                    "condition": "\"Other\" == mappingNotAlignedReason"
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
                 ]
               },
               {
-                "dataType": "document",
-                "name": "extraMappingDetails",
-                "validate": "required",
-                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
                 "behaviour": [
                   {
-                    "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1)) or roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                    "type": "visible"
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
-                ]
-              },
-              {
-                "dataType": "number",
-                "name": "areaInvoicedTreatedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
+                ],
                 "validate": [
+                  {
+                    "rule": "required"
+                  },
                   {
                     "rule": "min[0]"
                   },
                   {
-                    "rule": "max",
                     "param": {
-                      "type": "computed",
-                      "expression": "areaTreatedHa"
-                    }
-                  }
-                ]
-              },
-              {
-                "dataType": "text",
-                "name": "invoicedNotActualReason",
-                "constraints": [
-                  "Work was undertaken over a greater area than will be invoiced for",
-                  "Other"
-                ],
-                "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                    "type": "visible"
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
                   }
                 ]
               },
               {
                 "dataType": "text",
-                "name": "invoicedNotActualComments",
+                "name": "firstNationGroupNumber",
                 "behaviour": [
                   {
-                    "type": "visible",
-                    "condition": "\"Other\" == invoicedNotActualReason"
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
                 ],
-                "validate": "required,maxSize[300]"
-              },
-              {
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "$geom.lengthKm(sitesTreated)"
-                },
-                "dataType": "number",
-                "name": "lengthTreatedKm",
-                "units": "km",
-                "decimalPlaces": 3,
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
                 "validate": [
                   {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)*0.9"
-                    }
+                    "rule": "required"
                   },
                   {
-                    "rule": "max",
                     "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)*1.1"
-                    }
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
                   }
                 ]
               },
               {
-                "dataType": "number",
-                "name": "numberOfSurveyInvoice",
-                "validate": "required,min[0]"
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
               }
             ],
             "dataType": "list",
-            "name": "floraSurveys",
-            "minSize": 1
+            "name": "participationInformationTableHca"
           },
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
+            "dataType": "number",
+            "name": "totalSurveyBaseline",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(habitatConditionSurveys, \"baselineOrIndicatorSurvey == 'Baseline' ? 1 : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "name": "totalSurveyBaselineInvoiced",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
+                "rule": "required"
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyBaseline",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            "defaultValue": ""
           },
           {
             "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
+            "name": "totalSurveyIndicator",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(habitatConditionSurveys, \"baselineOrIndicatorSurvey == 'Indicator' ? 1 : 0\")"
+            }
           },
           {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
+            "dataType": "number",
+            "name": "totalSurveyIndicatorInvoiced",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyIndicator",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
+            "defaultValue": ""
           },
           {
-            "name": "numberFloraSurveysConducted",
-            "type": "number",
-            "decimalPlaces": 0,
-            "computed": {
-              "expression": "count(floraSurveys, \"baselineOrIndicatorSurvey\")"
-            }
+            "dataType": "text",
+            "name": "totalInvoicedHabitatConditionMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalSurveyIndicatorInvoiced < +totalSurveyIndicator or +totalSurveyBaselineInvoiced < +totalSurveyBaseline",
+                "type": "enable"
+              }
+            ]
           },
           {
             "dataType": "text",
@@ -9007,7 +15284,8 @@
           {
             "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "description": "",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -9016,29 +15294,40 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Flora survey",
-        "title": "Flora survey",
+        "modelName": "NHT - Habitat condition assessment survey",
+        "title": "Habitat Condition Assessment Survey",
         "viewModel": [
           {
             "type": "section",
             "items": [
               {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Participation information</h3>"
+                  }
+                ]
+              },
+              {
+                "disableTableUpload": true,
                 "columns": [
                   {
                     "width": "10%",
                     "source": "participationIndividualsOrGroups",
-                    "title": "Individuals or groups?",
+                    "title": "Are individuals or groups delivering this service?",
                     "type": "selectOne"
                   },
                   {
                     "width": "20%",
                     "type": "col",
-                    "title": "Total Number of people delivering this service",
+                    "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                     "items": [
                       {
                         "source": "participationIndividualNumber",
@@ -9053,7 +15342,8 @@
                   {
                     "type": "col",
                     "width": "20%",
-                    "title": "Total Number of First Nations people delivering this service ",
+                    "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                     "items": [
                       {
                         "source": "firstNationIndividualNumber",
@@ -9066,306 +15356,423 @@
                     ]
                   },
                   {
+                    "width": "20%",
                     "source": "participationDetails",
                     "rows": 4,
-                    "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
+                    "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                    "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
                     "type": "textarea"
                   }
                 ],
-                "userAddedRows": false,
-                "disableTableUpload": false,
-                "source": "",
+                "source": "participationInformationTableHca",
                 "type": "table"
               },
               {
-                "preLabel": "Number of Flora surveys conducted:",
-                "noEdit": true,
-                "type": "number",
-                "source": "numberFloraSurveysConducted"
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Survey information</h3><p><b>Before completing this section, please ensure you have created a Data Set Summary information for every data set produced by the surveys you intend to report</b></p><ul><li>Each survey reported must relate to a combination of outcomes as described in your MERI plan</li><li>Each Data Set Summary recorded for a survey must be addressing the same outcomes as selected for the survey</li><li>If a survey produced more than one data set, use the New Data Set button to add each Data Set Summary under your survey</li><li>A single survey can be made up of multiple dataset</li></ul>"
+                  }
+                ]
               },
               {
-                "addRowText": "New survey site",
-                "userAddedRows": true,
-                "source": "floraSurveys",
-                "type": "repeat",
+                "type": "row",
                 "items": [
                   {
-                    "type": "row",
-                    "css": "border-bottom",
+                    "type": "literal",
+                    "source": "<h3>Totals Summary</h3>"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
                     "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "baselineOrIndicatorSurvey",
-                                "type": "selectOne",
-                                "preLabel": "Baseline survey or indicator (follow-up) survey?"
-                              }
-                            ]
+                            "preLabel": "(i) Total Number of baseline habitat condition assessment surveys completed for this reporting period",
+                            "source": "totalSurveyBaseline",
+                            "type": "number"
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "projectBaseline",
-                                "type": "selectOne",
-                                "preLabel": "Which project baseline relates to this survey?"
-                              }
-                            ]
+                            "preLabel": "(ii) Total Number of baseline habitat condition assessment surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyBaselineInvoiced",
+                            "type": "number"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "datasetSupports",
-                                "type": "select2Many",
-                                "preLabel": "What dataset supports this?"
-                              }
-                            ]
+                            "preLabel": "(iii)  Total Number of  indicator habitat condition assessment surveys completed for this reporting period",
+                            "source": "totalSurveyIndicator",
+                            "type": "number"
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "relatedOutcomes",
-                                "type": "selectOne",
-                                "preLabel": "Which outcome statement/s relates to this survey?"
-                              }
-                            ]
+                            "preLabel": "(iv) Total Number of indicator habitat condition assessment surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyIndicatorInvoiced",
+                            "type": "number"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                    "source": "totalInvoicedHabitatConditionMismatched",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": ""
+                  }
+                ]
+              },
+              {
+                "addRowText": "Add survey",
+                "removeRowText": "Delete this survey",
+                "userAddedRows": true,
+                "source": "habitatConditionSurveys",
+                "type": "repeat",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
                       {
                         "type": "col",
-                        "css": "span3 col-border-right",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Activities start date",
-                                "source": "activitiesStartDate",
-                                "type": "date"
-                              }
-                            ]
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s relates to this survey?"
                           }
                         ]
                       },
                       {
                         "type": "col",
-                        "css": "span3 col-border-right",
                         "items": [
                           {
-                            "type": "row",
+                            "source": "baselineOrIndicatorSurvey",
+                            "type": "selectOne",
+                            "preLabel": "Baseline survey or indicator (follow-up) survey?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "source": "surveyObjective",
+                        "preLabel": "Survey objective",
+                        "type": "text"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "repeat",
+                    "source": "habitatConditionDataSets",
+                    "userAddedRows": true,
+                    "addRowText": "New data set",
+                    "removeRowText": "Delete this data set",
+                    "items": [
+                      {
+                        "type": "row",
+                        "css": "border-bottom",
+                        "items": [
+                          {
+                            "type": "col",
                             "items": [
                               {
-                                "preLabel": "Activities end date",
-                                "source": "activitiesEndDate",
-                                "type": "date"
+                                "source": "dataSetId",
+                                "type": "selectOne",
+                                "preLabel": "Please select the data set produced by this survey.  Note it must have already been entered on the Data Set Summary tab."
                               }
                             ]
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Sites surveyed by flora surveys",
-                                "source": "sitesTreated",
-                                "type": "feature"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "projectBaselines",
+                                    "type": "selectMany",
+                                    "preLabel": "Which project baseline/s relate to this survey?",
+                                    "readonly": "readonly"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "source": "calculatedAreaTreatedHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                },
-                                "readonly": "readonly"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "investmentPriorities2",
+                                    "preLabel": "Which investment priority does this activity relate to?",
+                                    "type": "select2Many"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "source": "calculatedLengthTreatedKm",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                },
-                                "readonly": "readonly"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity start date",
+                                    "source": "activitiesStartDate",
+                                    "type": "date"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Please attach mapping details",
-                                "source": "extraMappingDetails",
-                                "type": "document"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity end date",
+                                    "source": "activitiesEndDate",
+                                    "type": "date"
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
+                          },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Actual area (ha) / length (km) treated by flora surveys",
-                                "source": "areaTreatedHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Sites covered by habitat condition assessment survey",
+                                    "source": "sitesCoveredForHabitatConditionSurvey",
+                                    "type": "feature"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedAreaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedLengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Please attach mapping details",
+                                    "source": "extraMappingDetails",
+                                    "type": "document"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "source": "lengthTreatedKm",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Actual area (ha) / length (km) covered by habitat condition assessment survey",
+                                    "source": "areaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "lengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Reason for actual being different to mapped amount",
+                                    "source": "mappingNotAlignedReason",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                                    "source": "mappingNotAlignedComments",
+                                    "type": "textarea",
+                                    "rows": 5
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Reason for actual being different to mapped amount",
-                                "source": "mappingNotAlignedReason",
-                                "type": "selectOne"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique",
+                                    "source": "emsaProtocol",
+                                    "type": "selectOne",
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique (if Other)",
+                                    "source": "otherEmsaProtocol",
+                                    "type": "select2Many"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "mappingNotAlignedComments",
-                                "type": "textarea",
-                                "rows": 5
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "surveyMethodology",
+                                    "preLabel": "Survey methodology",
+                                    "type": "text"
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
+                          },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "How many surveys will you be invoicing for?",
-                                "source": "numberOfSurveyInvoice",
-                                "type": "number"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "invoicingThisActivity",
+                                    "preLabel": "Are you invoicing for this activity in this reporting period?",
+                                    "type": "selectOne"
+                                  }
+                                ]
                               }
                             ]
                           }
                         ]
-                      }
-                    ]
-                  },
-                  {
-                    "columns": [
-                      {
-                        "width": "20%",
-                        "source": "species",
-                        "title": "Target species recorded",
-                        "type": "speciesSelect"
-                      },
-                      {
-                        "width": "15%",
-                        "source": "threatenedEcologicalCommunity",
-                        "title": "Threatened ecological communities (if applicable)",
-                        "type": "text"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "individualsOrGroups",
-                        "title": "Individuals or groups?",
-                        "type": "selectOne"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "numberOfIndividualsOrGroups",
-                        "title": "Number of groups / individuals in flora survey",
-                        "type": "number"
-                      },
-                      {
-                        "width": "10%",
-                        "title": "Survey technique",
-                        "source": "ternSurveyTechnique",
-                        "type": "selectOne"
-                      },
-                      {
-                        "width": "10%",
-                        "title": "Survey technique (if Other)",
-                        "source": "otherTernSurveyTechnique",
-                        "type": "text"
-                      },
-                      {
-                        "width": "15%",
-                        "source": "surveyMethodology",
-                        "title": "Survey methodology",
-                        "type": "text"
                       },
                       {
-                        "width": "15%",
-                        "source": "surveyObjective",
-                        "title": "Survey objective",
-                        "type": "text"
+                        "columns": [
+                          {
+                            "width": "40%",
+                            "source": "typesOfHabitat",
+                            "title": "Types of habitat",
+                            "type": "selectOne"
+                          },
+                          {
+                            "width": "60%",
+                            "source": "habitatCondition",
+                            "title": "Condition of habitat",
+                            "type": "text"
+                          }
+                        ],
+                        "userAddedRows": true,
+                        "disableTableUpload": true,
+                        "source": "habitatConditionSurveySpeciesTable",
+                        "type": "table"
                       }
-                    ],
-                    "userAddedRows": true,
-                    "disableTableUpload": true,
-                    "source": "floraSurveySpeciesTable",
-                    "type": "table"
+                    ]
                   }
                 ]
               },
@@ -9397,7 +15804,7 @@
                 "items": [
                   {
                     "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
                   },
                   {
                     "preLabel": "Data have been uploaded",
@@ -9436,211 +15843,73 @@
         ]
       },
       "modelName": null,
-      "templateName": "nhtFloraSurvey",
+      "templateName": "nhtHabitatConditionAssessmentSurvey",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Flora survey",
+      "title": "Habitat condition assessment",
       "collapsibleHeading": null,
-      "name": "NHT - Flora survey",
+      "name": "NHT - Habitat condition assessment",
       "description": null
     },
     {
       "collapsedByDefault": false,
       "template": {
+        "title": "Identifying and Prioritising the Location of Potential Sites",
+        "modelName": "NHT - Identifying sites",
         "dataModel": [
-
-          {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-
           {
+            "allowRowDelete": "false",
             "columns": [
               {
                 "dataType": "text",
-                "name": "initialOrMaintained",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
                 "constraints": [
-                  "Initial",
-                  "Maintained"
+                  "Individuals",
+                  "Groups"
                 ],
                 "validate": "required"
               },
               {
-                "dataType": "feature",
-                "name": "implementationSite"
-              },
-              {
-                "computed": {
-                  "expression": "$geom.areaHa(implementationSite)"
-                },
-                "dataType": "number",
-                "name": "calculatedAreaImplementedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "behaviour": [
-                  {
-                    "condition": "areaImplementedInvoicedHa > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The area must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
-                  }
-                ]
-              },
-              {
-                "computed": {
-                  "expression": "$geom.lengthKm(implementationSite)"
-                },
                 "dataType": "number",
-                "name": "calculatedLengthImplementedKm",
-                "units": "ha",
-                "decimalPlaces": 3,
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
                 "behaviour": [
                   {
-                    "condition": "lengthImplementedKm > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The length must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
-                ]
-              },
-              {
-                "defaultValue": {
-                  "expression": "$geom.areaHa(implementationSite)",
-                  "type": "computed"
-                },
-                "dataType": "number",
-                "name": "areaImplementedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": "required,min[0]"
-              },
-              {
-                "defaultValue": {
-                  "expression": "$geom.lengthKm(implementationSite)",
-                  "type": "computed"
-                },
-                "dataType": "number",
-                "name": "lengthImplementedKm",
-                "units": "km",
-                "decimalPlaces": 3,
+                ],
                 "validate": "required,min[0]"
               },
               {
                 "dataType": "text",
-                "name": "mappingNotAlignedReason",
+                "name": "participationGroupNumber",
                 "behaviour": [
                   {
-                    "condition": "not (within(calculatedAreaImplementedHa, areaImplementedHa, 0.1))",
-                    "type": "visible"
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
                 ],
                 "constraints": [
-                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                  "Other"
-                ],
-                "validate": "required"
-              },
-              {
-                "dataType": "text",
-                "name": "mappingNotAlignedComments"
-              ,
-                "behaviour": [
-                  {
-                    "condition": "\"Other\" == mappingNotAlignedReason",
-                    "type": "visible"
-                  }
-                ],
-                "validate": "required,maxSize[300]"
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
               },
               {
-                "dataType": "document",
-                "name": "extraMappingDetails",
-                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
                 "behaviour": [
                   {
-                    "condition": "not (within(calculatedAreaImplementedHa, areaImplementedHa, 0.1)) or roundTo(areaImplementedHa, 2) != roundTo(areaImplementedInvoicedHa, 2)",
-                    "type": "visible"
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
                 ],
-                "validate": "required"
-              },
-              {
-                "dataType": "number",
-                "name": "areaInvoicedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
                 "validate": [
                   {
                     "rule": "required"
@@ -9649,221 +15918,408 @@
                     "rule": "min[0]"
                   },
                   {
-                    "rule": "max",
                     "param": {
-                      "type": "computed",
-                      "expression": "areaControlledHa"
-                    }
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
                   }
                 ]
               },
               {
-                "dataType": "number",
-                "name": "lengthInvoicedKm",
-                "units": "km",
-                "decimalPlaces": 3,
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
                 "validate": [
                   {
                     "rule": "required"
                   },
                   {
-                    "rule": "min[0]"
-                  },
-                  {
-                    "rule": "max",
                     "param": {
-                      "type": "computed",
-                      "expression": "lengthControlledKm"
-                    }
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
                   }
                 ]
               },
               {
                 "dataType": "text",
-                "name": "invoicedNotActualReason",
-                "constraints": [
-                  "Work was undertaken over a greater area than will be invoiced for",
-                  "Other"
-                ],
-                "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "roundTo(areaControlledHa, 2) != roundTo(areaInvoicedHa, 2)",
-                    "type": "if"
-                  }
-                ]
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableIpl"
+          },
+          {
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "sitesHaveBeenIdentified",
+                "description": "",
+                "validate": "required,maxSize[300]"
               },
               {
                 "dataType": "text",
-                "name": "invoicedNotActualComments",
-                "behaviour": [
-                  {
-                    "type": "if",
-                    "condition": "roundTo(areaControlledHa, 2) != roundTo(areaInvoicedHa, 2) and \"Other\" == invoicedNotActualReason"
-                  }
-                ],
+                "name": "methodsUsedToIdentify",
+                "description": "",
                 "validate": "required,maxSize[300]"
               },
               {
                 "dataType": "text",
-                "name": "invoicedLengthNotActualReason",
-                "constraints": [
-                  "Work was undertaken over a greater length than will be invoiced for",
-                  "Other"
-                ],
+                "name": "outcomesAchievement",
+                "description": "",
+                "validate": "required,maxSize[300]"
+              },
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
                 "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "roundTo(lengthControlledKm, 2) != roundTo(lengthInvoicedKm, 2)",
-                    "type": "if"
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "label",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "url": "/project/outcomesByScores",
+                      "params": [
+                        {
+                          "expression": "owner.projectId",
+                          "name": "id",
+                          "type": "computed"
+                        },
+                        {
+                          "expression": "scores",
+                          "name": "scoreIds",
+                          "type": "computed"
+                        }
+                      ]
+                    }
                   }
-                ]
+                }
               },
               {
+                "name": "investmentPriorities2",
                 "dataType": "text",
-                "name": "invoicedLengthNotActualComments",
-                "behaviour": [
-                  {
-                    "type": "if",
-                    "condition": "roundTo(lengthControlledKm, 2) != roundTo(lengthInvoicedKm, 2) and \"Other\" == invoicedLengthNotActualReason"
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
                   }
-                ],
-                "validate": "required,maxSize[300]"
+                }
               },
               {
-                "dataType": "document",
-                "name": "extraMappingDetails",
-                "validate": "required",
-                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "dataType": "text",
+                "name": "otherInvestmentPriority",
+                "description": "Describe the investment priority (if Other) was selected",
                 "behaviour": [
                   {
-                    "condition": "not (within(areaControlledHa, siteCalculatedAreaHa, 0.1) and within(lengthControlledKm, siteCalculatedLengthKm, 0.1)) or roundTo(areaControlledHa, 2) != roundTo(areaInvoicedHa, 2)",
-                    "type": "if"
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
                   }
                 ]
               },
               {
-                "dataType": "number",
-                "name": "noStructuresInstalled",
-                "validate": "required"
-              },
-              {
-                "dataType": "number",
-                "name": "invoiceLocationsStructures",
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
                 "validate": "required"
               },
               {
                 "columns": [
                   {
-                    "dataType": "date",
-                    "name": "activitiesStartDate",
-                    "description": "Specific the dates these events were held on",
+                    "dataType": "feature",
+                    "name": "sitesAssessed",
+                    "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping.",
                     "validate": "required"
                   },
                   {
-                    "dataType": "date",
-                    "name": "activitiesEndDate",
-                    "description": "Specific the dates these events were held on",
-                    "validate": "required"
+                    "computed": {
+                      "expression": "$geom.areaHa(sitesAssessed)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedAreaTreatedHaAssessed",
+                    "units": "ha",
+                    "decimalPlaces": 3
+                  },
+                  {
+                    "computed": {
+                      "expression": "$geom.lengthKm(sitesAssessed)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedLengthTreatedKmAssessed",
+                    "units": "km",
+                    "decimalPlaces": 3,
+                    "behaviour": [
+                      {
+                        "condition": "lengthTreatedKmAssessed > 0",
+                        "type": "conditional_validation",
+                        "value": {
+                          "message": "The managed length must be mapped",
+                          "validate": "required,min[0.0001]"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "calculatedAreaTreatedHaAssessed"
+                    },
+                    "dataType": "number",
+                    "name": "areaTreatedHaAssessed",
+                    "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                    "units": "ha",
+                    "decimalPlaces": 3,
+                    "validate": "required,min[0]"
                   },
                   {
                     "dataType": "text",
-                    "name": "habitatAugmentationType",
-                    "description": "",
+                    "name": "mappingNotAlignedReasonAssessed",
                     "constraints": [
-                      "Artificial fauna movement devices",
-                      "Artificial nesting or roosting habitat (incl. tiles, fence posts)",
-                      "Environmental thinning",
-                      "Improving fish passage",
-                      "Natural features (rocks, logs)",
+                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
                       "Other"
                     ],
-                    "validate": "required"
+                    "validate": "required",
+                    "behaviour": [
+                      {
+                        "condition": "not (within(areaTreatedHaAssessed, calculatedAreaTreatedHaAssessed, 0.1) and within(lengthTreatedKmAssessed, calculatedLengthTreatedKmAssessed, 0.1))",
+                        "type": "visible"
+                      }
+                    ]
                   },
                   {
                     "dataType": "text",
-                    "name": "otherHabitatAugmentationType",
-                    "description": "Please specify the habitat augmentation type if Other (specify in notes) was selected in the Type of habitat augmentation column.",
+                    "name": "mappingNotAlignedCommentsAssessed",
+                    "validate": "required,maxSize[100]",
                     "behaviour": [
                       {
-                        "condition": "habitatAugmentationType == \"Other\"",
+                        "type": "visible",
+                        "condition": "\"Other\" == mappingNotAlignedReasonAssessed"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "document",
+                    "name": "extraMappingDetailsAssessed",
+                    "validate": "required",
+                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                    "behaviour": [
+                      {
+                        "condition": "not (within(areaTreatedHaAssessed, calculatedAreaTreatedHaAssessed, 0.1) and within(lengthTreatedKmAssessed, calculatedLengthTreatedKmAssessed, 0.1))",
                         "type": "visible"
                       }
-                    ],
-                    "validate": "required,maxSize[100]"
+                    ]
+                  },
+                  {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "$geom.lengthKm(sitesAssessed)"
+                    },
+                    "dataType": "number",
+                    "name": "lengthTreatedKmAssessed",
+                    "units": "km",
+                    "decimalPlaces": 3
                   },
                   {
                     "dataType": "text",
-                    "name": "habitatAugmentationObjective",
+                    "name": "assessedSitesName",
                     "description": "",
                     "validate": "required,maxSize[300]"
                   },
+
                   {
                     "dataType": "feature",
-                    "name": "sitesBenefittedByHabitatAugmentation"
+                    "name": "sitesIdentified",
+                    "validate": [
+                      {
+                        "rule": "required"
+                      }
+                    ]
                   },
                   {
                     "computed": {
-                      "expression": "$geom.areaHa(sitesBenefittedByHabitatAugmentation)"
+                      "expression": "$geom.areaHa(sitesIdentified)"
                     },
                     "dataType": "number",
-                    "name": "areaBenefittedByHabitatAugmentationHa",
+                    "name": "calculatedAreaTreatedHaIdentified",
                     "units": "ha",
                     "decimalPlaces": 3
                   },
                   {
-                    "dataType": "text",
-                    "name": "evidenceOfBenefit",
-                    "validate": "maxSize[300]"
+                    "computed": {
+                      "expression": "$geom.lengthKm(sitesIdentified)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedLengthTreatedKmIdentified",
+                    "units": "km",
+                    "decimalPlaces": 3,
+                    "behaviour": [
+                      {
+                        "condition": "lengthTreatedKmIdentified > 0",
+                        "type": "conditional_validation",
+                        "value": {
+                          "message": "The managed length must be mapped",
+                          "validate": "required,min[0.0001]"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "calculatedAreaTreatedHaIdentified"
+                    },
+                    "dataType": "number",
+                    "name": "areaTreatedHaIdentified",
+                    "units": "ha",
+                    "decimalPlaces": 3,
+                    "validate": [
+                      {
+                        "rule": "required"
+                      },
+                      {
+                        "rule": "min[0]"
+                      }
+                    ]
                   },
                   {
                     "dataType": "text",
-                    "name": "investmentPrioritiesActivityRelates",
-                    "description": "",
-                    "validate": "required,maxSize[300]"
+                    "name": "mappingNotAlignedReasonIdentified",
+                    "constraints": [
+                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                      "Other"
+                    ],
+                    "validate": "required",
+                    "behaviour": [
+                      {
+                        "condition": "not (within(areaTreatedHaIdentified, calculatedAreaTreatedHaIdentified, 0.1) and within(lengthTreatedKmIdentified, calculatedLengthTreatedKmIdentified, 0.1))",
+                        "type": "visible"
+                      }
+                    ]
                   },
                   {
-                    "name": "relatedOutcomes",
                     "dataType": "text",
-                    "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
+                    "name": "mappingNotAlignedCommentsIdentified",
+                    "validate": "required,maxSize[100]",
+                    "behaviour": [
+                      {
+                        "type": "visible",
+                        "condition": "\"Other\" == mappingNotAlignedReasonIdentified"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "document",
+                    "name": "extraMappingDetailsIdentified",
                     "validate": "required",
-                    "constraints": {
-                      "textProperty": "label",
-                      "valueProperty": "label",
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "url": "/project/outcomesByScores",
-                          "params": [{
-                            "expression": "owner.projectId",
-                            "name": "id",
-                            "type": "computed"
-                          }, {
-                            "expression": "scores",
-                            "name": "scoreIds",
-                            "type": "computed"
-                          }
-                          ]
-                        }
+                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                    "behaviour": [
+                      {
+                        "condition": "not (within(areaTreatedHaIdentified, calculatedAreaTreatedHaIdentified, 0.1) and within(lengthTreatedKmIdentified, calculatedLengthTreatedKmIdentified, 0.1))",
+                        "type": "visible"
                       }
-                    }
+                    ]
+                  },
+                  {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "$geom.lengthKm(sitesIdentified)"
+                    },
+                    "dataType": "number",
+                    "name": "lengthTreatedKmIdentified",
+                    "units": "km",
+                    "decimalPlaces": 3
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "identifiedSitesName",
+                    "description": "",
+                    "validate": "maxSize[300]"
                   }
                 ],
                 "dataType": "list",
-                "name": "habitatAugmentationDetails"
+                "name": "potentialSitesSurveyBaselineTable"
+              },
+              {
+                "dataType": "number",
+                "name": "rowCount",
+                "decimalPlaces": 0,
+                "computed": {
+                  "expression": "sum(potentialSitesSurveyBaselineTable, \"assessedSitesName ? 1 : 0\")"
+                }
               }
             ],
             "dataType": "list",
-            "name": "habitatAugmentationAreas"
+            "name": "potentialSiteSurveys",
+            "minSize": 1
           },
           {
-            "name": "habitatSurveyCountHeader",
-            "type": "number",
+            "dataType": "number",
+            "name": "totalPotentialSites",
+            "validate": "min[0]",
             "decimalPlaces": 0,
             "computed": {
-              "expression": "count(habitatAugmentationAreas, \"relatedOutcomes\")"
+              "expression": "sum(potentialSiteSurveys, \"rowCount\")"
             }
           },
+          {
+            "dataType": "number",
+            "name": "totalPotentialSitesInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalPotentialSites",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedIdentifyingMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalPotentialSitesInvoiced < +totalPotentialSites",
+                "type": "enable"
+              }
+            ]
+          },
           {
             "dataType": "text",
             "name": "comments",
@@ -9876,12 +16332,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -9890,469 +16346,505 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Habitat augmentation",
-        "title": "Habitat augmentation",
         "viewModel": [
           {
-            "columns": [
+            "type": "section",
+            "items": [
               {
-                "width": "10%",
-                "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
-                "type": "selectOne"
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Participation information</h3>"
+                  }
+                ]
+              },
+              {
+                "disableTableUpload": true,
+                "columns": [
+                  {
+                    "width": "10%",
+                    "source": "participationIndividualsOrGroups",
+                    "title": "Are individuals or groups delivering this service?",
+                    "type": "selectOne"
+                  },
+                  {
+                    "width": "20%",
+                    "type": "col",
+                    "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                    "items": [
+                      {
+                        "source": "participationIndividualNumber",
+                        "type": "number"
+                      },
+                      {
+                        "source": "participationGroupNumber",
+                        "type": "selectOne"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "width": "20%",
+                    "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                    "items": [
+                      {
+                        "source": "firstNationIndividualNumber",
+                        "type": "number"
+                      },
+                      {
+                        "source": "firstNationGroupNumber",
+                        "type": "selectOne"
+                      }
+                    ]
+                  },
+                  {
+                    "width": "20%",
+                    "source": "participationDetails",
+                    "rows": 4,
+                    "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                    "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                    "type": "textarea"
+                  }
+                ],
+                "source": "participationInformationTableIpl",
+                "type": "table"
               },
               {
-                "width": "20%",
-                "type": "col",
-                "title": "Total Number of people delivering this service",
+                "type": "row",
                 "items": [
                   {
-                    "source": "participationIndividualNumber",
-                    "type": "number"
-                  },
-                  {
-                    "source": "participationGroupNumber",
-                    "type": "selectOne"
+                    "type": "literal",
+                    "source": "<h3>Totals Summary</h3>"
                   }
                 ]
               },
               {
-                "type": "col",
-                "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
+                "type": "row",
                 "items": [
                   {
-                    "source": "firstNationIndividualNumber",
-                    "type": "number"
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(i) Total number of potential sites assessed during this reporting period",
+                            "source": "totalPotentialSites",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
                   },
                   {
-                    "source": "firstNationGroupNumber",
-                    "type": "selectOne"
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(ii) Total number of potential sites assessed <u><i>invoiced</i></u> for during this reporting period",
+                            "source": "totalPotentialSitesInvoiced",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
                   }
                 ]
               },
-              {
-                "source": "participationDetails",
-                "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                "type": "textarea"
-              }
-            ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
-            "type": "table"
-          },
-          {
-            "preLabel": "Number of Habitat Augmentation surveys conducted:",
-            "noEdit": true,
-            "type": "number",
-            "source": "habitatSurveyCountHeader"
-          },
-          {
-            "addRowText": "Add a new controlled area",
-            "userAddedRows": true,
-            "source": "habitatAugmentationAreas",
-            "type": "repeat",
-            "items": [
               {
                 "type": "row",
-                "css": "border-bottom",
                 "items": [
                   {
-                    "preLabel": "Initial or Maintenance Treatment?",
-                    "css": "span3",
-                    "source": "initialOrMaintained",
-                    "type": "selectOne"
+                    "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                    "source": "totalInvoicedIdentifyingMismatched",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": ""
                   }
                 ]
               },
               {
-                "type": "row",
-                "css": "border-bottom",
+                "addRowText": "Add a new outcome statement and assessed sites",
+                "userAddedRows": true,
+                "source": "potentialSiteSurveys",
+                "type": "repeat",
                 "items": [
                   {
-                    "type": "col",
-                    "css": "span2 col-border-right",
+                    "type": "row",
                     "items": [
                       {
-                        "type": "row",
+                        "css": "span3",
+                        "type": "col",
                         "items": [
                           {
-                            "source": "implementationSite",
-                            "type": "feature",
-                            "preLabel": "Site/s of habitat augmentation"
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "relatedOutcomes",
+                                "type": "selectOne",
+                                "preLabel": "Which outcome statement/s does this activity relate to?"
+                              }
+                            ]
                           }
                         ]
                       },
                       {
-                        "type": "row",
+                        "type": "col",
+                        "css": "span3 col-border-right",
                         "items": [
                           {
-                            "source": "calculatedAreaImplementedHa",
-                            "type": "number",
-                            "readonly": true,
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "investmentPriorities2",
+                                "preLabel": "Which investment priority does this activity relate to?",
+                                "type": "select2Many"
+                              }
+                            ]
                           }
                         ]
                       },
                       {
-                        "type": "row",
+                        "css": "span3",
+                        "type": "col",
                         "items": [
                           {
-                            "source": "calculatedLengthImplementedKm",
-                            "type": "number",
-                            "readonly": true,
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "invoicingThisActivity",
+                                "preLabel": "Are you invoicing for this activity in this reporting period?",
+                                "type": "selectOne"
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "css": "span3",
+                        "type": "col",
+                        "items": [
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "sitesHaveBeenIdentified",
+                                "preLabel": "What have the sites identified for?",
+                                "type": "text"
+                              }
+                            ]
                           }
                         ]
                       },
                       {
-                        "type": "row",
+                        "type": "col",
+                        "css": "span3 col-border-right",
                         "items": [
                           {
-                            "preLabel": "Please attach mapping details",
-                            "source": "extraMappingDetails",
-                            "type": "document"
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "methodsUsedToIdentify",
+                                "preLabel": "What method/s were used to identify and prioritise?",
+                                "type": "text"
+                              }
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "col",
+                        "css": "span3 col-border-right",
+                        "items": [
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "source": "outcomesAchievement",
+                                "preLabel": "How do they contribute to the achievement of the outcome statement/s?",
+                                "type": "textarea"
+                              }
+                            ]
                           }
                         ]
                       }
                     ]
                   },
                   {
-                    "type": "col",
-                    "css": "span2 col-border-right",
-                    "items": [
+                    "columns": [
                       {
-                        "type": "row",
+                        "width": "15%",
+                        "title": "Site/s assessed<b style=\"color:red\">*</b>",
+                        "helpText": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping.",
+                        "type": "col",
                         "items": [
                           {
-                            "preLabel": "Actual area (ha) / length (km) of habitat augmentation",
-                            "helpText": "Manually enter correct figure for this reporting period if different to mapped value.",
-                            "source": "areaImplementedHa",
+                            "source": "sitesAssessed",
+                            "type": "feature"
+                          },
+                          {
+                            "source": "calculatedAreaTreatedHaAssessed",
                             "type": "number",
                             "displayOptions": {
                               "displayUnits": true
-                            }
+                            },
+                            "readonly": "readonly"
+                          },
+                          {
+                            "source": "calculatedLengthTreatedKmAssessed",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
+                          },
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Please attach mapping details",
+                                "source": "extraMappingDetailsAssessed",
+                                "type": "document"
+                              }
+                            ]
                           }
                         ]
                       },
                       {
-                        "type": "row",
+                        "width": "15%",
+                        "type": "col",
+                        "title": "Actual area (ha) / length (km) of assessed site<b style=\"color:red\">*</b>",
+                        "helpText": "Manually enter correct figure for this reporting period if different to mapped value.",
                         "items": [
                           {
-                            "preLabel": "",
-                            "source": "lengthImplementedKm",
+                            "source": "areaTreatedHaAssessed",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          },
+                          {
+                            "source": "lengthTreatedKmAssessed",
                             "type": "number",
-                            "validate": "required",
                             "displayOptions": {
                               "displayUnits": true
                             }
+                          },
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Reason for actual being different to mapped amount",
+                                "source": "mappingNotAlignedReasonAssessed",
+                                "type": "selectOne"
+                              }
+                            ]
+                          },
+                          {
+                            "type": "row",
+                            "items": [
+                              {
+                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                                "source": "mappingNotAlignedCommentsAssessed",
+                                "type": "textarea",
+                                "rows": 5
+                              }
+                            ]
                           }
                         ]
                       },
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Reason for actual being different to mapped amount",
-                            "source": "mappingNotAlignedReason",
-                            "type": "selectOne"
-                          }
-                        ]
+                        "width": "20%",
+                        "source": "assessedSitesName",
+                        "title": "Name of assessed site",
+                        "type": "text"
                       },
                       {
-                        "type": "row",
+                        "width": "15%",
+                        "title": "Site/s identified and prioritised",
+                        "helpText": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping.",
+                        "type": "col",
                         "items": [
                           {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "mappingNotAlignedComments",
-                            "type": "textarea",
-                            "rows": 5
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  {
-                    "type": "col",
-                    "css": "span2 col-border-right",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
+                            "source": "sitesIdentified",
+                            "type": "feature"
+                          },
+                          {
+                            "source": "calculatedAreaTreatedHaIdentified",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
+                          },
                           {
-                            "preLabel": "Invoiced area (ha) / length (km) treated of habitat augmentation",
-                            "helpText": "Enter the amount you will invoice for during this reporting period.",
-                            "source": "areaInvoicedHa",
+                            "source": "calculatedLengthTreatedKmIdentified",
                             "type": "number",
                             "displayOptions": {
                               "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Reason for invoiced amount being different to actual amount",
-                            "source": "invoicedNotActualReason",
-                            "type": "selectOne"
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
+                            },
+                            "readonly": "readonly"
+                          },
                           {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "invoicedNotActualComments",
-                            "type": "textarea",
-                            "rows": 5
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Please attach mapping details",
+                                "source": "extraMappingDetailsIdentified",
+                                "type": "document"
+                              }
+                            ]
                           }
                         ]
                       },
                       {
-                        "type": "row",
+                        "width": "15%",
+                        "type": "col",
+                        "title": "Actual area (ha) / length (km) of identified and prioritised site",
+                        "helpText": "Manually enter correct figure for this reporting period if different to mapped value.",
                         "items": [
                           {
-                            "preLabel": "",
-                            "helpText": "",
-                            "source": "lengthInvoicedKm",
+                            "source": "areaTreatedHaIdentified",
                             "type": "number",
                             "displayOptions": {
                               "displayUnits": true
                             }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
+                          },
                           {
-                            "preLabel": "Reason for invoiced amount being different to actual amount",
-                            "source": "invoicedLengthNotActualReason",
-                            "type": "selectOne"
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
+                            "source": "lengthTreatedKmIdentified",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          },
                           {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "invoicedLengthNotActualComments",
-                            "type": "textarea",
-                            "rows": 5
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  {
-                    "type": "col",
-                    "css": "span2 col-border-right",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
+                            "type": "row",
+                            "items": [
+                              {
+                                "preLabel": "Reason for actual being different to mapped amount",
+                                "source": "mappingNotAlignedReasonIdentified",
+                                "type": "selectOne"
+                              }
+                            ]
+                          },
                           {
-                            "source": "noStructuresInstalled",
-                            "preLabel": "Number of structures installed/maintained",
-                            "type": "number"
+                            "type": "row",
+                            "items": [
+                              {
+                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                                "source": "mappingNotAlignedCommentsIdentified",
+                                "type": "textarea",
+                                "rows": 5
+                              }
+                            ]
                           }
                         ]
-                      }
-                    ]
-                  },
-                  {
-                    "type": "col",
-                    "css": "span2 col-border-right",
-                    "items": [
+                      },
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "invoiceLocationsStructures",
-                            "preLabel": "Invoiced number of locations where structures were installed/maintained",
-                            "type": "number"
-                          }
-                        ]
+                        "width": "20%",
+                        "source": "identifiedSitesName",
+                        "title": "Name of identified and prioritised site",
+                        "type": "textarea"
                       }
-                    ]
+                    ],
+                    "addRowText": "Add a new assessed site to this outcome",
+                    "userAddedRows": true,
+                    "disableTableUpload": true,
+                    "source": "potentialSitesSurveyBaselineTable",
+                    "type": "table"
                   }
                 ]
               },
               {
-                "columns": [
-                  {
-                    "title": "Activities start date",
-                    "source": "activitiesStartDate",
-                    "type": "date",
-                    "width": "10%"
-                  },
-                  {
-                    "title": "Activities end date",
-                    "source": "activitiesEndDate",
-                    "type": "date",
-                    "width": "10%"
-                  },
-                  {
-                    "width": "10%",
-                    "title": "Type of habitat augmentation / installed",
-                    "type": "col",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "habitatAugmentationType",
-                            "type": "select2"
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "otherHabitatAugmentationType",
-                            "type": "textarea"
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  {
-                    "width": "15%",
-                    "source": "habitatAugmentationObjective",
-                    "title": "Purpose of habitat augmentation",
-                    "type": "textarea"
-                  },
-                  {
-                    "width": "15%",
-                    "title": "Please map any off-site area/s if they benefitted from this habitat augmentation",
-                    "type": "col",
-                    "items": [
-                      {
-                        "source": "sitesBenefittedByHabitatAugmentation",
-                        "type": "feature"
-                      },
-                      {
-                        "source": "areaBenefittedByHabitatAugmentationHa",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        },
-                        "readonly": "readonly"
-                      }
-                    ]
-                  },
-                  {
-                    "width": "15%",
-                    "source": "evidenceOfBenefit",
-                    "title": "If off-site area was mapped please provide a description on the evidence available to reflect this benefit",
-                    "type": "textarea"
-                  },
-                  {
-                    "width": "15%",
-                    "source": "investmentPrioritiesActivityRelates",
-                    "title": "Which investment priority does this activity relate to?",
-                    "type": "text"
-                  },
+                "type": "row",
+                "items": [
                   {
-                    "width": "15%",
-                    "source": "relatedOutcomes",
-                    "type": "selectOne",
-                    "title": "Which outcome statement/s relates to this survey?"
+                    "preLabel": "Optionally attach photos",
+                    "source": "photographicEvidence",
+                    "type": "image"
                   }
-                ],
-                "userAddedRows": false,
-                "source": "habitatAugmentationDetails",
-                "type": "table"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
-              {
-                "preLabel": "Optionally attach photos",
-                "source": "photographicEvidence",
-                "type": "image"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
-              {
-                "preLabel": "Clarification, if needed",
-                "type": "textarea",
-                "rows": 4,
-                "css": "span8",
-                "source": "comments",
-                "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
-              {
-                "type": "literal",
-                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                ]
               },
               {
-                "preLabel": "Data have been uploaded",
-                "source": "dataUploaded",
-                "type": "boolean"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Clarification, if needed",
+                    "type": "textarea",
+                    "rows": 4,
+                    "css": "span8",
+                    "source": "comments",
+                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+                  }
+                ]
+              },
               {
-                "preLabel": "",
-                "source": "projectAssuranceDetails",
-                "type": "textarea",
-                "rows": 4,
-                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
-              }
-            ]
-          },
-          {
-            "type": "table",
-            "source": "assuranceDocuments",
-            "userAddedRows": true,
-            "disableTableUpload": true,
-            "columns": [
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
+                  },
+                  {
+                    "preLabel": "Data have been uploaded",
+                    "source": "dataUploaded",
+                    "type": "boolean"
+                  }
+                ]
+              },
               {
-                "title": "Attached documents",
-                "source": "attachments",
-                "type": "document"
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "",
+                    "source": "projectAssuranceDetails",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                  }
+                ]
+              },
+              {
+                "type": "table",
+                "source": "assuranceDocuments",
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "columns": [
+                  {
+                    "title": "Attached documents",
+                    "source": "attachments",
+                    "type": "document"
+                  }
+                ]
               }
             ]
           }
         ]
       },
       "modelName": null,
-      "templateName": "nhtHabitatAugmentation",
+      "templateName": "nhtIdentifyingSites",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Habitat augmentation",
+      "title": "Identifying and Prioritising the Location of Potential Sites",
       "collapsibleHeading": null,
-      "name": "NHT - Habitat augmentation",
+      "name": "NHT - Identifying sites",
       "description": null
     },
     {
@@ -10360,197 +16852,164 @@
       "template": {
         "dataModel": [
           {
+            "allowRowDelete": "false",
             "columns": [
               {
-                "columns": [
-                  {
-                    "dataType": "species",
-                    "name": "species",
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "habitatCondition",
-                    "description": "",
-                    "validate": "required,maxSize[300]"
-                  },
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
                   {
-                    "name": "investmentPriorities2",
-                    "dataType": "stringList",
-                    "validate": "required",
-                    "constraints": {
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "params": [
-                            {
-                              "expression": "owner.projectId",
-                              "name": "id",
-                              "type": "computed"
-                            }
-                          ],
-                          "url": "/project/listProjectInvestmentPriorities/"
-                        }
-                      }
-                    }
-                  },
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "otherInvestmentPriority",
-                    "behaviour": [
-                      {
-                        "type": "enable",
-                        "condition": "\"Other\" in investmentPriorities2"
-                      }
-                    ]
-                  },
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
                   {
-                    "dataType": "stringList",
-                    "name": "ternSurveyTechnique",
-                    "validate": "required",
-                    "constraints": [
-                      "Tern Survey technique 1",
-                      "Tern Survey technique 1",
-                      "Tern Survey technique 1",
-                      "Other"
-                    ]
-                  },
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
                   {
-                    "dataType": "text",
-                    "description": "Please describe the Survey technique if other was selected.",
-                    "name": "otherTernSurveyTechnique",
-                    "behaviour": [
-                      {
-                        "condition": "ternSurveyTechnique == \"Other\"",
-                        "type": "enable_and_clear"
-                      }
-                    ],
-                    "validate": "required"
+                    "rule": "required"
                   },
                   {
-                    "dataType": "text",
-                    "name": "surveyMethodology",
-                    "description": "Provide more details on what is being done",
-                    "validate": "required,maxSize[3000]"
+                    "rule": "min[0]"
                   },
                   {
-                    "dataType": "text",
-                    "name": "surveyObjective",
-                    "description": "How will the information obtained from the survey be used",
-                    "validate": "required,maxSize[3000]"
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
                   }
-                ],
-                "dataType": "list",
-                "name": "habitatConditionBaselineTable"
+                ]
               },
               {
                 "dataType": "text",
-                "name": "baselineOrIndicatorSurvey",
-                "description": "",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
                 "constraints": [
-                  "Baseline",
-                  "Indicator"
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
                 ],
-                "validate": "required"
-              },
-              {
-                "name": "projectBaseline",
-                "dataType": "text",
-                "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "baseline",
-                  "valueProperty": "code",
-                  "type": "pre-populated",
-                  "excludePath": "projectBaseline",
-                  "config": {
-                    "source": {
-                      "context-path": "owner.custom.details.baseline.rows"
-                    }
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
                   }
-                }
+                ]
               },
               {
-                "name": "datasetSupports",
                 "dataType": "text",
-                "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "name",
-                  "valueProperty": "dataSetId",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "context-path": "owner.custom.dataSets"
-                    }
-                  }
-                }
-              },
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableIfm"
+          },
+          {
+            "columns": [
               {
-                "name": "relatedOutcomes",
-                "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "label",
-                  "valueProperty": "label",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
-                      }
-                      ]
-                    }
+                "columns": [
+                  {
+                    "dataType": "feature",
+                    "name": "sitesBenefittedByFireAction"
+                  },
+                  {
+                    "computed": {
+                      "expression": "$geom.areaHa(sitesBenefittedByFireAction)"
+                    },
+                    "dataType": "number",
+                    "name": "areaBenefittedByFireActionHa"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "evidenceOfBenefit",
+                    "validate": "maxSize[300]"
                   }
-                }
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesStartDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
+                ],
+                "dataType": "list",
+                "name": "fireManagementDetails"
               },
               {
-                "dataType": "date",
-                "name": "activitiesEndDate",
-                "description": "Specific the dates these events were held on",
+                "dataType": "text",
+                "name": "initialOrFollowup",
+                "constraints": [
+                  "Initial",
+                  "Follow-up"
+                ],
                 "validate": "required"
               },
               {
                 "dataType": "feature",
-                "name": "sitesTreated",
-                "description": "Manually enter correct figure for this reporting period if different to mapped value"
+                "name": "sitesTreatedByFireManagement",
+                "description": "Mapping field to be done and Area (ha) field be auto-calculated from mapping."
               },
               {
                 "computed": {
-                  "expression": "$geom.areaHa(sitesTreated)"
+                  "expression": "$geom.areaHa(sitesTreatedByFireManagement)"
                 },
                 "dataType": "number",
                 "name": "calculatedAreaTreatedHa",
                 "units": "ha",
-                "decimalPlaces": 3,
-                "behaviour": [
-                  {
-                    "condition": "areaInvoicedTreatedHa > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The managed area must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
-                  }
-                ]
+                "decimalPlaces": 3
               },
               {
                 "computed": {
-                  "expression": "$geom.lengthKm(sitesTreated)"
+                  "expression": "$geom.lengthKm(sitesTreatedByFireManagement)"
                 },
                 "dataType": "number",
                 "name": "calculatedLengthTreatedKm",
@@ -10574,6 +17033,7 @@
                 },
                 "dataType": "number",
                 "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
                 "units": "ha",
                 "decimalPlaces": 3,
                 "validate": "required,min[0]"
@@ -10588,15 +17048,15 @@
                 "validate": "required",
                 "behaviour": [
                   {
-                    "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1))",
-                    "type": "visible"
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
                   }
                 ]
               },
               {
                 "dataType": "text",
                 "name": "mappingNotAlignedComments",
-                "validate": "required,maxSize[300]",
+                "validate": "required,maxSize[100]",
                 "behaviour": [
                   {
                     "type": "visible",
@@ -10611,165 +17071,186 @@
                 "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
                 "behaviour": [
                   {
-                    "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1)) or roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                    "type": "visible"
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
                   }
                 ]
               },
               {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKm"
+                },
                 "dataType": "number",
-                "name": "areaInvoicedTreatedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": [
-                  {
-                    "rule": "min[0]"
-                  },
-                  {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "areaTreatedHa"
-                    }
-                  }
-                ]
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
               },
               {
                 "dataType": "text",
-                "name": "invoicedNotActualReason",
+                "name": "fireManagementType",
+                "description": "",
                 "constraints": [
-                  "Work was undertaken over a greater area than will be invoiced for",
+                  "Cultural burn",
+                  "Ecological burn",
+                  "Grading",
+                  "Hazard reduction burn",
+                  "Herbicide",
+                  "Slashing",
                   "Other"
                 ],
-                "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                    "type": "visible"
-                  }
-                ]
+                "validate": "required"
               },
               {
                 "dataType": "text",
-                "name": "invoicedNotActualComments",
+                "name": "otherFireManagementType",
                 "behaviour": [
                   {
-                    "type": "visible",
-                    "condition": "\"Other\" == invoicedNotActualReason"
+                    "condition": "fireManagementType == \"Other\"",
+                    "type": "enable"
                   }
                 ],
-                "validate": "required,maxSize[300]"
+                "validate": "required,maxSize[100]"
               },
               {
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "$geom.lengthKm(sitesTreated)"
+                "dataType": "feature",
+                "name": "sitesBenefittedByFireAction"
+              },
+              {
+                "computed": {
+                  "expression": "$geom.areaHa(sitesBenefittedByFireAction)"
                 },
                 "dataType": "number",
-                "name": "lengthTreatedKm",
-                "units": "km",
-                "decimalPlaces": 3,
-                "validate": [
-                  {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)*0.9"
+                "name": "areaBenefittedByFireActionHa2",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "dataType": "text",
+                "name": "evidenceOfBenefit",
+                "validate": "maxSize[300]"
+              },
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
                     }
-                  },
-                  {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)*1.1"
+                  }
+                }
+              },
+              {
+                "name": "investmentPriorities2",
+                "dataType": "text",
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
                     }
                   }
+                }
+              },
+              {
+                "dataType": "text",
+                "name": "otherInvestmentPriority",
+                "behaviour": [
+                  {
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
+                  }
                 ]
               }
             ],
             "dataType": "list",
-            "name": "conditionAssessmentSurveys",
-            "minSize": 1
+            "name": "fireManagementAreasControlled"
           },
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
+            "dataType": "number",
+            "name": "totalAreaTreatedFireMgmtInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(fireManagementAreasControlled, \"initialOrFollowup == 'Initial' ? areaTreatedHa : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "decimalPlaces": 3,
+            "name": "totalAreaTreatedFireMgmtInitialInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaTreatedFireMgmtInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
               }
             ],
-            "validate": "required,min[0]"
+            "defaultValue": ""
           },
           {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            "dataType": "number",
+            "name": "totalAreaTreatedFireMgmtFollowup",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(fireManagementAreasControlled, \"initialOrFollowup == 'Follow-up' ? areaTreatedHa : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+            "decimalPlaces": 3,
+            "name": "totalAreaTreatedFireMgmtFollowupInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaTreatedFireMgmtFollowup",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
               }
             ],
-            "validate": "required,min[0]"
+            "defaultValue": ""
           },
           {
             "dataType": "text",
-            "name": "firstNationGroupNumber",
+            "name": "totalInvoicedFireMgmtMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
             "behaviour": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
+                "condition": "+totalAreaTreatedFireMgmtInitialInvoiced < +totalAreaTreatedFireMgmtInitial or +totalAreaTreatedFireMgmtFollowupInvoiced < +totalAreaTreatedFireMgmtFollowup",
                 "type": "enable"
               }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "name": "numberHabitatConditionAssessmentSurveysConducted",
-            "type": "number",
-            "decimalPlaces": 0,
-            "computed": {
-              "expression": "count(conditionAssessmentSurveys, \"baselineOrIndicatorSurvey\")"
-            }
+            ]
           },
           {
             "dataType": "text",
@@ -10783,12 +17264,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -10797,497 +17278,608 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Habitat condition assessment",
-        "title": "Habitat condition assessment",
+        "modelName": "NHT - Fire management",
+        "title": "Implementing Fire Management Actions",
         "viewModel": [
           {
-            "type": "section",
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "width": "10%",
+                "source": "participationIndividualsOrGroups",
+                "title": "Are individuals or groups delivering this service?",
+                "type": "selectOne"
+              },
+              {
+                "width": "20%",
+                "type": "col",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "participationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "participationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "width": "20%",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "firstNationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "firstNationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
+              }
+            ],
+            "source": "participationInformationTableIfm",
+            "type": "table"
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total area (ha) treated by fire management action/s (initial) during this reporting period",
+                        "source": "totalAreaTreatedFireMgmtInitial",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total area (ha) treated by fire management action/s (initial) <u><i>invoiced</i></u> for during this reporting period",
+                        "source": "totalAreaTreatedFireMgmtInitialInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii) Total area (ha) treated by fire management action/s (follow up) during this reporting period",
+                        "source": "totalAreaTreatedFireMgmtFollowup",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total area (ha) treated by fire management action/s (follow up) <u><i>invoiced</i></u> for during this reporting period",
+                        "source": "totalAreaTreatedFireMgmtFollowupInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedFireMgmtMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "addRowText": "Add a new area of fire management actions",
+            "userAddedRows": true,
+            "source": "fireManagementAreasControlled",
+            "type": "repeat",
             "items": [
               {
-                "columns": [
-                  {
-                    "width": "10%",
-                    "source": "participationIndividualsOrGroups",
-                    "title": "Individuals or groups?",
-                    "type": "selectOne"
-                  },
+                "type": "row",
+                "items": [
                   {
-                    "width": "20%",
+                    "css": "span3",
                     "type": "col",
-                    "title": "Total Number of people delivering this service",
                     "items": [
                       {
-                        "source": "participationIndividualNumber",
-                        "type": "number"
-                      },
-                      {
-                        "source": "participationGroupNumber",
-                        "type": "selectOne"
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
+                          }
+                        ]
                       }
                     ]
                   },
                   {
                     "type": "col",
-                    "width": "20%",
-                    "title": "Total Number of First Nations people delivering this service ",
+                    "css": "span3 col-border-right",
                     "items": [
                       {
-                        "source": "firstNationIndividualNumber",
-                        "type": "number"
-                      },
-                      {
-                        "source": "firstNationGroupNumber",
-                        "type": "selectOne"
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
+                          }
+                        ]
                       }
                     ]
-                  },
-                  {
-                    "source": "participationDetails",
-                    "rows": 4,
-                    "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                    "type": "textarea"
                   }
-                ],
-                "userAddedRows": false,
-                "disableTableUpload": false,
-                "source": "",
-                "type": "table"
-              },
-              {
-                "preLabel": "Number of Habitat Condition Assessment surveys conducted:",
-                "noEdit": true,
-                "type": "number",
-                "source": "numberHabitatConditionAssessmentSurveysConducted"
+                ]
               },
               {
-                "addRowText": "New survey site",
-                "userAddedRows": true,
-                "source": "conditionAssessmentSurveys",
-                "type": "repeat",
+                "type": "row",
+                "css": "border-bottom",
                 "items": [
                   {
-                    "type": "row",
-                    "css": "border-bottom",
+                    "type": "col",
+                    "css": "span3 col-border-right",
                     "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "baselineOrIndicatorSurvey",
-                                "type": "selectOne",
-                                "preLabel": "Baseline survey or indicator (follow-up) survey?"
-                              }
-                            ]
+                            "source": "initialOrFollowup",
+                            "preLabel": "Initial or follow-up?",
+                            "type": "selectOne"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "projectBaseline",
-                                "type": "selectOne",
-                                "preLabel": "Which project baseline relates to this survey?"
-                              }
-                            ]
+                            "preLabel": "Site/s treated by fire management action",
+                            "source": "sitesTreatedByFireManagement",
+                            "type": "feature"
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "datasetSupports",
-                                "type": "select2Many",
-                                "preLabel": "What dataset supports this?"
-                              }
-                            ]
+                            "source": "calculatedAreaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "relatedOutcomes",
-                                "type": "selectOne",
-                                "preLabel": "Which outcome statement/s relates to this survey?"
-                              }
-                            ]
+                            "preLabel": "Please attach mapping details",
+                            "source": "extraMappingDetails",
+                            "type": "document"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Activities start date",
-                                "source": "activitiesStartDate",
-                                "type": "date"
-                              }
-                            ]
+                            "preLabel": "Actual area (ha) treated by fire management action",
+                            "source": "areaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Activities end date",
-                                "source": "activitiesEndDate",
-                                "type": "date"
-                              }
-                            ]
+                            "preLabel": "Reason for actual being different to mapped amount",
+                            "source": "mappingNotAlignedReason",
+                            "type": "selectOne"
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Sites surveyed for habitat condition assessment",
-                                "source": "sitesTreated",
-                                "type": "feature"
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "calculatedAreaTreatedHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                },
-                                "readonly": "readonly"
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "calculatedLengthTreatedKm",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                },
-                                "readonly": "readonly"
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Please attach mapping details",
-                                "source": "extraMappingDetails",
-                                "type": "document"
-                              }
-                            ]
+                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                            "source": "mappingNotAlignedComments",
+                            "type": "textarea",
+                            "rows": 5
                           }
                         ]
-                      },
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "css": "border-bottom",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Actual area (ha) / length (km) covered by habitatat condition assessment survey",
-                                "source": "areaTreatedHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "lengthTreatedKm",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Reason for actual being different to mapped amount",
-                                "source": "mappingNotAlignedReason",
-                                "type": "selectOne"
-                              }
-                            ]
-                          },
+                            "source": "fireManagementType",
+                            "preLabel": "Type of fire management action",
+                            "type": "select2"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "mappingNotAlignedComments",
-                                "type": "textarea",
-                                "rows": 5
-                              }
-                            ]
+                            "source": "otherFireManagementType",
+                            "preLabel": "",
+                            "type": "text"
                           }
                         ]
                       }
                     ]
                   },
                   {
-                    "columns": [
-                      {
-                        "width": "20%",
-                        "source": "species",
-                        "title": "Type of habitat",
-                        "type": "speciesSelect"
-                      },
-                      {
-                        "width": "15%",
-                        "source": "habitatCondition",
-                        "title": "Condition of habitat",
-                        "type": "text"
-                      },
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "width": "15%",
-                        "type": "col",
-                        "title": "Which investment priority does this activity relate to?",
+                        "type": "row",
                         "items": [
                           {
-                            "source": "investmentPriorities2",
-                            "type": "select2Many"
-                          },
-                          {
-                            "source": "otherInvestmentPriority",
-                            "type": "text"
+                            "source": "sitesBenefittedByFireAction",
+                            "type": "feature",
+                            "preLabel": "Please map any off-site area/s if they benefitted from this fire management action"
                           }
                         ]
                       },
                       {
-                        "width": "10%",
-                        "title": "Survey technique",
-                        "source": "ternSurveyTechnique",
-                        "type": "selectOne"
-                      },
-                      {
-                        "width": "10%",
-                        "title": "Survey technique (if Other)",
-                        "source": "otherTernSurveyTechnique",
-                        "type": "text"
-                      },
-                      {
-                        "width": "15%",
-                        "source": "surveyMethodology",
-                        "title": "Survey methodology",
-                        "type": "text"
-                      },
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "areaBenefittedByFireActionHa2",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "width": "15%",
-                        "source": "surveyObjective",
-                        "title": "Survey objective",
-                        "type": "text"
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "evidenceOfBenefit",
+                            "type": "textarea",
+                            "preLabel": "If off-site area was mapped please provide a description on the evidence available to reflect this benefit"
+                          }
+                        ]
                       }
-                    ],
-                    "userAddedRows": true,
-                    "disableTableUpload": true,
-                    "source": "habitatConditionBaselineTable",
-                    "type": "table"
+                    ]
                   }
                 ]
-              },
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Optionally attach photos",
-                    "source": "photographicEvidence",
-                    "type": "image"
-                  }
-                ]
-              },
+                "preLabel": "Optionally attach photos",
+                "source": "photographicEvidence",
+                "type": "image"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Clarification, if needed",
-                    "type": "textarea",
-                    "rows": 4,
-                    "css": "span8",
-                    "source": "comments",
-                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
-                  }
-                ]
-              },
+                "preLabel": "Clarification, if needed",
+                "type": "textarea",
+                "rows": 4,
+                "css": "span8",
+                "source": "comments",
+                "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
-                  },
-                  {
-                    "preLabel": "Data have been uploaded",
-                    "source": "dataUploaded",
-                    "type": "boolean"
-                  }
-                ]
+                "type": "literal",
+                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
               },
               {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "",
-                    "source": "projectAssuranceDetails",
-                    "type": "textarea",
-                    "rows": 4,
-                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
-                  }
-                ]
-              },
+                "preLabel": "Data have been uploaded",
+                "source": "dataUploaded",
+                "type": "boolean"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-                  }
-                ]
-              },
+                "preLabel": "",
+                "source": "projectAssuranceDetails",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+              }
+            ]
+          },
+          {
+            "type": "table",
+            "source": "assuranceDocuments",
+            "userAddedRows": true,
+            "disableTableUpload": true,
+            "columns": [
               {
-                "type": "table",
-                "source": "assuranceDocuments",
-                "userAddedRows": true,
-                "disableTableUpload": true,
-                "columns": [
-                  {
-                    "title": "Attached documents",
-                    "source": "attachments",
-                    "type": "document"
-                  }
-                ]
+                "title": "Attached documents",
+                "source": "attachments",
+                "type": "document"
               }
             ]
           }
         ]
       },
       "modelName": null,
-      "templateName": "nhtHabitatConditionAssessmentSurvey",
+      "templateName": "nhtFireManagement",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Habitat condition assessment",
+      "title": "Fire management actions",
       "collapsibleHeading": null,
-      "name": "NHT - Habitat condition assessment",
+      "name": "NHT - Fire management",
       "description": null
     },
     {
       "collapsedByDefault": false,
       "template": {
-        "title": "Identifying the location of potential sites",
-        "modelName": "NHT - Identifying sites",
         "dataModel": [
           {
+            "allowRowDelete": "false",
             "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
               {
                 "dataType": "number",
-                "name": "numberPotentialSitesAssessed",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
                 "validate": "required,min[0]"
               },
               {
                 "dataType": "text",
-                "name": "sitesHaveBeenIdentified",
-                "description": "",
-                "validate": "required,maxSize[300]"
-              },
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableHyd"
+          },
+          {
+            "columns": [
               {
                 "dataType": "text",
-                "name": "methodsUsedToIdentify",
-                "description": "",
-                "validate": "required,maxSize[300]"
+                "name": "initialOrFollowup",
+                "constraints": [
+                  "Initial",
+                  "Follow-up"
+                ],
+                "validate": "required"
               },
               {
                 "name": "relatedOutcomes",
                 "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
                 "validate": "required",
                 "constraints": {
                   "textProperty": "label",
-                  "valueProperty": "label",
+                  "valueProperty": "value",
                   "type": "pre-populated",
                   "config": {
                     "source": {
-                      "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
-                      }
-                      ]
+                      "context-path": "outcomes"
                     }
                   }
                 }
               },
               {
                 "name": "investmentPriorities2",
-                "dataType": "stringList",
+                "dataType": "text",
+                "description": "",
                 "validate": "required",
                 "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
                   "type": "pre-populated",
                   "config": {
                     "source": {
-                      "params": [
-                        {
-                          "expression": "owner.projectId",
-                          "name": "id",
-                          "type": "computed"
-                        }
-                      ],
-                      "url": "/project/listProjectInvestmentPriorities/"
+                      "context-path": "owner.investmentPriorities"
                     }
                   }
                 }
@@ -11303,283 +17895,227 @@
                 ]
               },
               {
-                "columns": [
-                  {
-                    "dataType": "feature",
-                    "name": "sitesTreated",
-                    "validate": [
-                      {
-                        "rule": "required"
-                      }
-                    ]
-                  },
-                  {
-                    "computed": {
-                      "expression": "$geom.areaHa(sitesTreated)"
-                    },
-                    "dataType": "number",
-                    "name": "calculatedAreaTreatedHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "behaviour": [
-                      {
-                        "condition": "areaInvoicedTreatedHa > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "The managed area must be mapped",
-                          "validate": "required,min[0.0001]"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "computed": {
-                      "expression": "$geom.lengthKm(sitesTreated)"
-                    },
-                    "dataType": "number",
-                    "name": "calculatedLengthTreatedKm",
-                    "units": "km",
-                    "decimalPlaces": 3,
-                    "behaviour": [
-                      {
-                        "condition": "lengthTreatedKm > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "The managed length must be mapped",
-                          "validate": "required,min[0.0001]"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "defaultValue": {
-                      "type": "computed",
-                      "expression": "calculatedAreaTreatedHa"
-                    },
-                    "dataType": "number",
-                    "name": "areaTreatedHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "validate": [
-                      {
-                        "rule": "required"
-                      },
-                      {
-                        "rule": "min[0]"
-                      }
-                    ]
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "mappingNotAlignedReason",
-                    "constraints": [
-                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                      "Other"
-                    ],
-                    "validate": "required",
-                    "behaviour": [
-                      {
-                        "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1))",
-                        "type": "visible"
-                      }
-                    ]
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "mappingNotAlignedComments",
-                    "validate": "required,maxSize[300]",
-                    "behaviour": [
-                      {
-                        "type": "visible",
-                        "condition": "\"Other\" == mappingNotAlignedReason"
-                      }
-                    ]
-                  },
-                  {
-                    "dataType": "document",
-                    "name": "extraMappingDetails",
-                    "validate": "required",
-                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
-                    "behaviour": [
-                      {
-                        "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1)) or roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                        "type": "visible"
-                      }
-                    ]
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "identifiedSitesName",
-                    "description": "",
-                    "validate": "required,maxSize[300]"
-                  },
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "feature",
+                "name": "sitesOfHydrological",
+                "description": "Mapping field to be done and Area (ha) field be auto-calculated from mapping."
+              },
+              {
+                "computed": {
+                  "expression": "$geom.areaHa(sitesOfHydrological)"
+                },
+                "dataType": "number",
+                "name": "calculatedAreaTreatedHa",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesOfHydrological)"
+                },
+                "dataType": "number",
+                "name": "calculatedLengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "dataType": "number",
-                    "name": "areaInvoicedTreatedHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "validate": [
-                      {
-                        "rule": "required"
-                      },
-                      {
-                        "rule": "min[0]"
-                      },
-                      {
-                        "rule": "max",
-                        "param": {
-                          "type": "computed",
-                          "expression": "areaTreatedHa"
-                        }
-                      }
-                    ]
-                  },
+                    "condition": "lengthTreatedKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
+                    }
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaTreatedHa"
+                },
+                "dataType": "number",
+                "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedReason",
+                "constraints": [
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                  "Other"
+                ],
+                "validate": "required",
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "invoicedNotActualReason",
-                    "constraints": [
-                      "Work was undertaken over a greater area than will be invoiced for",
-                      "Other"
-                    ],
-                    "validate": "required",
-                    "behaviour": [
-                      {
-                        "condition": "roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                        "type": "visible"
-                      }
-                    ]
-                  },
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedComments",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "invoicedNotActualComments",
-                    "behaviour": [
-                      {
-                        "type": "visible",
-                        "condition": "\"Other\" == invoicedNotActualReason"
-                      }
-                    ],
-                    "validate": "required,maxSize[300]"
-                  },
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReason"
+                  }
+                ]
+              },
+              {
+                "dataType": "document",
+                "name": "extraMappingDetails",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
                   {
-                    "defaultValue": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)"
-                    },
-                    "dataType": "number",
-                    "name": "lengthTreatedKm",
-                    "units": "km",
-                    "decimalPlaces": 3,
-                    "validate": [
-                      {
-                        "rule": "min",
-                        "param": {
-                          "type": "computed",
-                          "expression": "$geom.lengthKm(sitesTreated)*0.9"
-                        }
-                      },
-                      {
-                        "rule": "max",
-                        "param": {
-                          "type": "computed",
-                          "expression": "$geom.lengthKm(sitesTreated)*1.1"
-                        }
-                      }
-                    ]
-                  },
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKm"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
+              },
+              {
+                "dataType": "number",
+                "name": "noTreatments",
+                "defaultValue": "",
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "number",
+                "name": "waterVolume",
+                "defaultValue": "",
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "number",
+                "name": "stormWaterVolume",
+                "defaultValue": "",
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "treatmentType",
+                "description": "",
+                "constraints": [
+                  "Removing barriers (e.g fish barriers)",
+                  "Structure instalment or modification (e.g. weirs, flow gauging stations, fords, culverts)",
+                  "Resnagging",
+                  "Other"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "text",
+                "name": "otherTreatmentType",
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "assessedSitesName",
-                    "description": "",
-                    "validate": "required,maxSize[300]"
+                    "condition": "treatmentType == \"Other\"",
+                    "type": "enable"
                   }
                 ],
-                "dataType": "list",
-                "name": "potentialSitesSurveyBaselineTable"
+                "validate": "required,maxSize[300]"
+              },
+              {
+                "dataType": "text",
+                "name": "treatmentObjective",
+                "description": "Aim of the action - e.g. hydrological regime change from X to Y.",
+                "validate": "required,maxSize[300]"
               }
             ],
             "dataType": "list",
-            "name": "potentialSiteSurveys",
-            "minSize": 1
+            "name": "hydroAreasControlled"
           },
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
+            "dataType": "number",
+            "name": "totalHydroTreatmentsInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(hydroAreasControlled, \"initialOrFollowup == 'Initial' ? noTreatments : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "name": "totalHydroTreatmentsInitialInvoiced",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalHydroTreatmentsInitial",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "validate": "required,min[0]"
+            "defaultValue": ""
           },
           {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            "dataType": "number",
+            "name": "totalHydroTreatmentsFollowup",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(hydroAreasControlled, \"initialOrFollowup == 'Follow-up' ? noTreatments : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+            "name": "totalHydroTreatmentsFollowupInvoiced",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalHydroTreatmentsFollowup",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "validate": "required,min[0]"
+            "defaultValue": ""
           },
           {
             "dataType": "text",
-            "name": "firstNationGroupNumber",
+            "name": "totalInvoicedIdentifyingMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
             "behaviour": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
+                "condition": "+totalHydroTreatmentsInitialInvoiced < +totalHydroTreatmentsInitial or +totalHydroTreatmentsFollowupInvoiced < +totalHydroTreatmentsFollowup",
                 "type": "enable"
               }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "name": "numberPotentialSitesConducted",
-            "type": "number",
-            "decimalPlaces": 0,
-            "computed": {
-              "expression": "count(potentialSiteSurveys, \"baselineOrIndicatorSurvey\")"
-            }
+            ]
           },
           {
             "dataType": "text",
@@ -11593,12 +18129,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -11607,346 +18143,488 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
+        "modelName": "NHT - Improving hydrological regimes",
+        "title": "Improving Hydrological Regimes for Site Eco-hydrology",
         "viewModel": [
           {
-            "type": "section",
+            "type": "row",
             "items": [
               {
-                "columns": [
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "width": "10%",
+                "source": "participationIndividualsOrGroups",
+                "title": "Are individuals or groups delivering this service?",
+                "type": "selectOne"
+              },
+              {
+                "width": "20%",
+                "type": "col",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
                   {
-                    "width": "10%",
-                    "source": "participationIndividualsOrGroups",
-                    "title": "Individuals or groups?",
+                    "source": "participationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "participationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "width": "20%",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "firstNationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "firstNationGroupNumber",
                     "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
+              }
+            ],
+            "source": "participationInformationTableHyd",
+            "type": "table"
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total number of treatments implemented to improve site eco-hydrology (initial) for this reporting period",
+                        "source": "totalHydroTreatmentsInitial",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total number of treatments implemented to improve site eco-hydrology (initial) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalHydroTreatmentsInitialInvoiced",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii) Total number of treatments implemented to improve site eco-hydrology (follow up) for this reporting period",
+                        "source": "totalHydroTreatmentsFollowup",
+                        "type": "number"
+                      }
+                    ]
                   },
                   {
-                    "width": "20%",
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total number of treatments implemented to improve site eco-hydrology (follow up) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalHydroTreatmentsFollowupInvoiced",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedIdentifyingMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "addRowText": "Add a new area treated to improve hydrological regimes",
+            "userAddedRows": true,
+            "source": "hydroAreasControlled",
+            "type": "repeat",
+            "items": [
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "css": "span3 col-border-right",
                     "type": "col",
-                    "title": "Total Number of people delivering this service",
                     "items": [
                       {
-                        "source": "participationIndividualNumber",
-                        "type": "number"
-                      },
-                      {
-                        "source": "participationGroupNumber",
-                        "type": "selectOne"
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
+                          }
+                        ]
                       }
                     ]
                   },
                   {
                     "type": "col",
-                    "width": "20%",
-                    "title": "Total Number of First Nations people delivering this service ",
+                    "css": "span3 col-border-right",
                     "items": [
                       {
-                        "source": "firstNationIndividualNumber",
-                        "type": "number"
-                      },
-                      {
-                        "source": "firstNationGroupNumber",
-                        "type": "selectOne"
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
+                          }
+                        ]
                       }
                     ]
                   },
                   {
-                    "source": "participationDetails",
-                    "rows": 4,
-                    "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                    "type": "textarea"
-                  }
-                ],
-                "userAddedRows": false,
-                "disableTableUpload": false,
-                "source": "",
-                "type": "table"
-              },
-              {
-                "preLabel": "Number of Potential sites conducted:",
-                "noEdit": true,
-                "type": "number",
-                "source": "numberPotentialSitesConducted"
-              },
-              {
-                "addRowText": "New survey site",
-                "userAddedRows": true,
-                "source": "potentialSiteSurveys",
-                "type": "repeat",
-                "items": [
-                  {
-                    "type": "row",
-                    "css": "border-bottom",
+                    "css": "span3 col-border-right",
+                    "type": "col",
                     "items": [
                       {
-                        "type": "col",
-                        "css": "span2 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "numberPotentialSitesAssessed",
-                                "type": "number",
-                                "preLabel": "Number of potential sites identified and prioritised"
-                              }
-                            ]
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "sitesHaveBeenIdentified",
-                                "preLabel": "What sites have been identified?",
-                                "type": "text"
-                              }
-                            ]
+                            "source": "initialOrFollowup",
+                            "preLabel": "Initial or Follow-up?",
+                            "type": "selectOne"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span2 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "methodsUsedToIdentify",
-                                "preLabel": "What method/s were used to identify and prioritise?",
-                                "type": "text"
-                              }
-                            ]
+                            "preLabel": "Site/s where hydrological regimes have been improved",
+                            "source": "sitesOfHydrological",
+                            "type": "feature"
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span2 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "relatedOutcomes",
-                                "type": "selectOne",
-                                "preLabel": "Which outcome statement/s relates to this survey?"
-                              }
-                            ]
+                            "source": "calculatedAreaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "investmentPriorities2",
-                                "preLabel": "Which investment priority does this activity relate to?",
-                                "type": "select2Many"
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "otherInvestmentPriority",
-                                "type": "text"
-                              }
-                            ]
+                            "preLabel": "Please attach mapping details",
+                            "source": "extraMappingDetails",
+                            "type": "document"
                           }
                         ]
                       }
                     ]
                   },
                   {
-                    "columns": [
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "width": "25%",
-                        "title": "Identified and prioritised sites",
-                        "type": "col",
+                        "type": "row",
                         "items": [
                           {
-                            "source": "sitesTreated",
-                            "type": "feature"
-                          },
-                          {
-                            "source": "calculatedAreaTreatedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            },
-                            "readonly": "readonly"
-                          },
-                          {
-                            "source": "calculatedLengthTreatedKm",
+                            "preLabel": "Actual area (ha) where the hydrological regimes have been improved",
+                            "source": "areaTreatedHa",
                             "type": "number",
                             "displayOptions": {
                               "displayUnits": true
-                            },
-                            "readonly": "readonly"
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Please attach mapping details",
-                                "source": "extraMappingDetails",
-                                "type": "document"
-                              }
-                            ]
+                            }
                           }
                         ]
                       },
                       {
-                        "width": "25%",
-                        "source": "identifiedSitesName",
-                        "title": "Name of identified and prioritised site/s",
-                        "type": "text"
-                      },
-                      {
-                        "width": "25%",
-                        "type": "col",
-                        "title": "Assessed sites",
-                        "helpText": "",
+                        "type": "row",
                         "items": [
                           {
-                            "source": "areaTreatedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          },
-                          {
-                            "source": "lengthTreatedKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Reason for actual being different to mapped amount",
-                                "source": "mappingNotAlignedReason",
-                                "type": "selectOne"
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "mappingNotAlignedComments",
-                                "type": "textarea",
-                                "rows": 5
-                              }
-                            ]
+                            "preLabel": "Reason for actual being different to mapped amount",
+                            "source": "mappingNotAlignedReason",
+                            "type": "selectOne"
                           }
                         ]
                       },
                       {
-                        "width": "25%",
-                        "source": "assessedSitesName",
-                        "title": "Name of assessed site/s",
-                        "type": "text"
-                      }
-                    ],
-                    "userAddedRows": true,
-                    "source": "potentialSitesSurveyBaselineTable",
-                    "type": "table"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Optionally attach photos",
-                    "source": "photographicEvidence",
-                    "type": "image"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Clarification, if needed",
-                    "type": "textarea",
-                    "rows": 4,
-                    "css": "span8",
-                    "source": "comments",
-                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+                        "type": "row",
+                        "items": [
+                          {
+                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                            "source": "mappingNotAlignedComments",
+                            "type": "textarea",
+                            "rows": 5
+                          }
+                        ]
+                      }
+                    ]
                   }
                 ]
               },
               {
                 "type": "row",
+                "css": "border-bottom",
                 "items": [
                   {
-                    "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "noTreatments",
+                            "preLabel": "Number of treatments implemented to improve site eco-hydrology",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
                   },
                   {
-                    "preLabel": "Data have been uploaded",
-                    "source": "dataUploaded",
-                    "type": "boolean"
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "waterVolume",
+                            "type": "number",
+                            "preLabel": "Volume of water (in megalitres) introduced as a result of the intervention"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "stormWaterVolume",
+                            "type": "number",
+                            "preLabel": "Volume of stormwater (in megalitres) redirected or removed"
+                          }
+                        ]
+                      }
+                    ]
                   }
                 ]
               },
               {
                 "type": "row",
+                "css": "border-bottom",
                 "items": [
                   {
-                    "preLabel": "",
-                    "source": "projectAssuranceDetails",
-                    "type": "textarea",
-                    "rows": 4,
-                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "treatmentType",
+                            "preLabel": "Type of treatment implemented to improve eco-hydrological treatment",
+                            "type": "select2"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "otherTreatmentType",
+                            "placeholder": "Type of treatment implemented (if Other)",
+                            "type": "text"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "treatmentObjective",
+                            "type": "textarea",
+                            "preLabel": "Treatment objective"
+                          }
+                        ]
+                      }
+                    ]
                   }
                 ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "Optionally attach photos",
+                "source": "photographicEvidence",
+                "type": "image"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "Clarification, if needed",
+                "type": "textarea",
+                "rows": 4,
+                "css": "span8",
+                "source": "comments",
+                "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
               },
               {
-                "type": "table",
-                "source": "assuranceDocuments",
-                "userAddedRows": true,
-                "disableTableUpload": true,
-                "columns": [
-                  {
-                    "title": "Attached documents",
-                    "source": "attachments",
-                    "type": "document"
-                  }
-                ]
+                "preLabel": "Data have been uploaded",
+                "source": "dataUploaded",
+                "type": "boolean"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "",
+                "source": "projectAssuranceDetails",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+              }
+            ]
+          },
+          {
+            "type": "table",
+            "source": "assuranceDocuments",
+            "userAddedRows": true,
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "title": "Attached documents",
+                "source": "attachments",
+                "type": "document"
               }
             ]
           }
         ]
       },
       "modelName": null,
-      "templateName": "nhtIdentifyingSites",
+      "templateName": "nhtImprovingHydrologicalRegimes",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Identifying the location of potential sites",
+      "title": "Improving hydrological regimes",
       "collapsibleHeading": null,
-      "name": "NHT - Identifying sites",
+      "name": "NHT - Improving hydrological regimes",
       "description": null
     },
     {
@@ -11954,79 +18632,197 @@
       "template": {
         "dataModel": [
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "allowRowDelete": "false",
+            "columns": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
               }
             ],
-            "validate": "required,min[0]"
+            "dataType": "list",
+            "name": "participationInformationTableIlm"
           },
           {
             "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            "name": "comments",
+            "validate": "maxSize[1500]"
+          },
+          {
+            "dataType": "image",
+            "name": "photographicEvidence"
           },
           {
+            "dataType": "boolean",
+            "name": "dataUploaded",
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
+          },
+          {
+            "name": "projectAssuranceDetails",
             "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
+            "validate": "required,maxSize[5000]"
+          },
+          {
+            "dataType": "list",
+            "name": "assuranceDocuments",
+            "columns": [
+              {
+                "dataType": "document",
+                "name": "attachments",
+                "description": "Please attach any Evidence of Service Delivery here."
+              }
+            ]
           },
           {
             "columns": [
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "investmentPriorities2",
+                "dataType": "text",
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
+                  }
+                }
+              },
+              {
+                "dataType": "text",
+                "name": "otherInvestmentPriority",
+                "behaviour": [
+                  {
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
+              },
               {
                 "dataType": "text",
                 "name": "initialOrFollowup",
@@ -12036,345 +18832,278 @@
                 ],
                 "validate": "required"
               },
-
               {
-                "columns": [
-                  {
-                    "dataType": "feature",
-                    "name": "sitesTreated",
-                    "validate": "required"
-                  },
-                  {
-                    "computed": {
-                      "expression": "$geom.areaHa(sitesTreated)"
-                    },
-                    "dataType": "number",
-                    "name": "calculatedAreaTreatedHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "behaviour": [
-                      {
-                        "condition": "areaInvoicedTreatedHa > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "The managed area must be mapped",
-                          "validate": "required,min[0.0001]"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "computed": {
-                      "expression": "$geom.lengthKm(sitesTreated)"
-                    },
-                    "dataType": "number",
-                    "name": "calculatedLengthTreatedKm",
-                    "units": "km",
-                    "decimalPlaces": 3,
-                    "behaviour": [
-                      {
-                        "condition": "lengthTreatedKm > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "The managed length must be mapped",
-                          "validate": "required,min[0.0001]"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "defaultValue": {
-                      "type": "computed",
-                      "expression": "calculatedAreaTreatedHa"
-                    },
-                    "dataType": "number",
-                    "name": "areaTreatedHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "validate": "required,min[0]"
-                  },
-                  {
-                    "defaultValue": {
-                      "type": "computed",
-                      "expression": "calculatedLengthTreatedKm"
-                    },
-                    "dataType": "number",
-                    "name": "lengthTreatedKm",
-                    "units": "km",
-                    "decimalPlaces": 3,
-                    "validate": "required,min[0]"
-                  },
+                "dataType": "feature",
+                "name": "sitesCoveredByPracticeChange",
+                "description": "Mapping field to be done and Area (ha) field be auto-calculated from mapping."
+              },
+              {
+                "computed": {
+                  "expression": "$geom.areaHa(sitesCoveredByPracticeChange)"
+                },
+                "dataType": "number",
+                "name": "calculatedAreaTreatedHa",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesCoveredByPracticeChange)"
+                },
+                "dataType": "number",
+                "name": "calculatedLengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "mappingNotAlignedReason",
-                    "constraints": [
-                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                      "Other"
-                    ],
-                    "validate": "required",
-                    "behaviour": [
-                      {
-                        "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1))",
-                        "type": "visible"
-                      }
-                    ]
-                  },
+                    "condition": "lengthTreatedKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
+                    }
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaTreatedHa"
+                },
+                "dataType": "number",
+                "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedReason",
+                "constraints": [
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                  "Other"
+                ],
+                "validate": "required",
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "mappingNotAlignedComments",
-                    "validate": "required,maxSize[300]",
-                    "behaviour": [
-                      {
-                        "type": "visible",
-                        "condition": "\"Other\" == mappingNotAlignedReason"
-                      }
-                    ]
-                  },
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedComments",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
                   {
-                    "dataType": "document",
-                    "name": "extraMappingDetails",
-                    "validate": "required",
-                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
-                    "behaviour": [
-                      {
-                        "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1)) or roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                        "type": "visible"
-                      }
-                    ]
-                  },
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReason"
+                  }
+                ]
+              },
+              {
+                "dataType": "document",
+                "name": "extraMappingDetails",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
                   {
-                    "dataType": "number",
-                    "name": "areaInvoicedTreatedHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "validate": [
-                      {
-                        "rule": "required"
-                      },
-                      {
-                        "rule": "min[0]"
-                      },
-                      {
-                        "rule": "max",
-                        "param": {
-                          "type": "computed",
-                          "expression": "areaTreatedHa"
-                        }
-                      }
-                    ]
-                  },
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKm"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
+              },
+              {
+                "columns": [
                   {
                     "dataType": "text",
-                    "name": "invoicedNotActualReason",
+                    "name": "practiceChangeType",
+                    "description": "",
                     "constraints": [
-                      "Work was undertaken over a greater area than will be invoiced for",
+                      "Fencing",
+                      "Erosion management",
+                      "Stocking rates",
+                      "Watering arrangements",
+                      "Paddock design",
+                      "Rotation grazing",
+                      "Permaculture",
                       "Other"
                     ],
-                    "validate": "required",
-                    "behaviour": [
-                      {
-                        "condition": "roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                        "type": "visible"
-                      }
-                    ]
+                    "validate": "required"
                   },
                   {
                     "dataType": "text",
-                    "name": "invoicedNotActualComments",
+                    "name": "otherPracticeChangeType",
+                    "description": "Please specify the type of land management practice change if Other (specify in notes) was selected in the Type of land management practice change.",
                     "behaviour": [
                       {
-                        "type": "visible",
-                        "condition": "\"Other\" == invoicedNotActualReason"
+                        "condition": "practiceChangeType == \"Other\"",
+                        "type": "enable"
                       }
                     ],
-                    "validate": "required,maxSize[300]"
-                  },
-                  {
-                    "defaultValue": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)"
-                    },
-                    "dataType": "number",
-                    "name": "lengthTreatedKm",
-                    "units": "km",
-                    "decimalPlaces": 3,
-                    "validate": [
-                      {
-                        "rule": "min",
-                        "param": {
-                          "type": "computed",
-                          "expression": "$geom.lengthKm(sitesTreated)*0.9"
-                        }
-                      },
-                      {
-                        "rule": "max",
-                        "param": {
-                          "type": "computed",
-                          "expression": "$geom.lengthKm(sitesTreated)*1.1"
-                        }
-                      }
-                    ]
+                    "validate": "required,maxSize[100]"
                   },
                   {
                     "dataType": "text",
-                    "name": "fireManagementType",
-                    "description": "",
+                    "name": "industryType",
                     "constraints": [
-                      "Cultural burn",
-                      "Ecological burn",
-                      "Grading",
-                      "Hazard reduction burn",
-                      "Herbicide",
-                      "Slashing",
-                      "Other"
+                      "Broad acre cropping",
+                      "Dairy",
+                      "Horticulture",
+                      "Grazing",
+                      "Fisheries",
+                      "Aquaculture",
+                      "Environment"
                     ],
                     "validate": "required"
                   },
                   {
                     "dataType": "text",
-                    "name": "otherFireManagementType",
-                    "behaviour": [
-                      {
-                        "condition": "fireManagementType == \"Other\"",
-                        "type": "enable"
-                      }
-                    ],
-                    "validate": "required,maxSize[100]"
+                    "name": "practiceChangeObjective",
+                    "description": "How will the practice change/s contribute to the area?",
+                    "validate": "required,maxSize[300]"
                   },
                   {
                     "dataType": "feature",
-                    "name": "sitesBenefittedByFireAction"
+                    "name": "offSiteBenefitSites"
                   },
                   {
                     "computed": {
-                      "expression": "$geom.areaHa(sitesBenefittedByFireAction)"
+                      "expression": "$geom.areaHa(offSiteBenefitSites)"
                     },
                     "dataType": "number",
-                    "name": "areaBenefittedByFireActionHa"
+                    "name": "offSiteBenefitAreaHa2",
+                    "units": "ha",
+                    "decimalPlaces": 3
                   },
                   {
                     "dataType": "text",
                     "name": "evidenceOfBenefit",
                     "validate": "maxSize[300]"
-                  },
-                  {
-                    "name": "investmentPriorities2",
-                    "dataType": "stringList",
-                    "validate": "required",
-                    "constraints": {
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "params": [
-                            {
-                              "expression": "owner.projectId",
-                              "name": "id",
-                              "type": "computed"
-                            }
-                          ],
-                          "url": "/project/listProjectInvestmentPriorities/"
-                        }
-                      }
-                    }
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "otherInvestmentPriority",
-                    "behaviour": [
-                      {
-                        "type": "enable",
-                        "condition": "\"Other\" in investmentPriorities2"
-                      }
-                    ]
-                  },
-                  {
-                    "name": "relatedOutcomes",
-                    "dataType": "text",
-                    "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                    "validate": "required",
-                    "constraints": {
-                      "textProperty": "label",
-                      "valueProperty": "label",
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "url": "/project/outcomesByScores",
-                          "params": [{
-                            "expression": "owner.projectId",
-                            "name": "id",
-                            "type": "computed"
-                          }, {
-                            "expression": "scores",
-                            "name": "scoreIds",
-                            "type": "computed"
-                          }
-                          ]
-                        }
-                      }
-                    }
                   }
                 ],
                 "dataType": "list",
-                "name": "fireManagementDetails"
+                "name": "landManagementDetails"
               }
             ],
             "dataType": "list",
-            "name": "areasControlled"
+            "name": "landManagementAreasControlled"
           },
           {
-            "name": "fireMgmtCountHeader",
-            "type": "number",
-            "decimalPlaces": 0,
+            "dataType": "number",
+            "name": "totalAreaPracticeChangeInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
             "computed": {
-              "expression": "count(areasControlled, \"relatedOutcomes\")"
+              "expression": "sum(landManagementAreasControlled, \"initialOrFollowup == 'Initial' ? areaTreatedHa : 0\")"
             }
           },
           {
-            "dataType": "text",
-            "name": "comments",
-            "validate": "maxSize[1500]"
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalAreaPracticeChangeInitialInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaPracticeChangeInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
           },
           {
-            "dataType": "image",
-            "name": "photographicEvidence"
+            "dataType": "number",
+            "name": "totalAreaPracticeChangeFollowup",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(landManagementAreasControlled, \"initialOrFollowup == 'Follow-up' ? areaTreatedHa : 0\")"
+            }
           },
           {
-            "dataType": "boolean",
-            "name": "dataUploaded",
-            "description": ""
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalAreaPracticeChangeInvoicedFollowup",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaPracticeChangeFollowup",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
           },
           {
             "dataType": "text",
-            "name": "projectAssuranceDetails",
-            "description": ""
-          },
-          {
-            "dataType": "list",
-            "name": "assuranceDocuments",
-            "columns": [
+            "name": "totalInvoicedPracticeChangeMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
               {
-                "dataType": "document",
-                "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "condition": "+totalAreaPracticeChangeInitialInvoiced < +totalAreaPracticeChangeInitial or +totalAreaPracticeChangeInvoicedFollowup < +totalAreaPracticeChangeFollowup",
+                "type": "enable"
               }
             ]
           }
         ],
-        "modelName": "NHT - Fire management",
-        "title": "Implementing fire management actions",
+        "modelName": "NHT - Improving land management practices",
+        "title": "Improving Land Management Practices",
         "viewModel": [
           {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
             "columns": [
               {
                 "width": "10%",
                 "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
+                "title": "Are individuals or groups delivering this service?",
                 "type": "selectOne"
               },
               {
                 "width": "20%",
                 "type": "col",
-                "title": "Total Number of people delivering this service",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "participationIndividualNumber",
@@ -12389,7 +19118,8 @@
               {
                 "type": "col",
                 "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "firstNationIndividualNumber",
@@ -12402,108 +19132,210 @@
                 ]
               },
               {
+                "width": "20%",
                 "source": "participationDetails",
                 "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
                 "type": "textarea"
               }
             ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
+            "source": "participationInformationTableIlm",
             "type": "table"
           },
           {
-            "preLabel": "Number of Fire Management Actions surveys conducted:",
-            "noEdit": true,
-            "type": "number",
-            "source": "fireMgmtCountHeader"
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total area (ha) covered by practice change (initial) during this reporting period",
+                        "source": "totalAreaPracticeChangeInitial",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total area (ha) covered by practice change (initial) <u><i>invoiced</i></u> for during this reporting period",
+                        "source": "totalAreaPracticeChangeInitialInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii) Total area (ha) covered by practice change (follow up) during this reporting period",
+                        "source": "totalAreaPracticeChangeFollowup",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total area (ha) covered by practice change (follow up) <u><i>invoiced</i></u> for during this reporting period",
+                        "source": "totalAreaPracticeChangeInvoicedFollowup",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedPracticeChangeMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
           },
           {
-            "addRowText": "Add a new controlled area",
+            "addRowText": "Add a new area of improved land management",
             "userAddedRows": true,
-            "source": "areasControlled",
+            "source": "landManagementAreasControlled",
             "type": "repeat",
             "items": [
               {
                 "type": "row",
-                "css": "border-bottom",
                 "items": [
                   {
-                    "preLabel": "Initial or follow-up?",
                     "css": "span3",
-                    "source": "initialOrFollowup",
-                    "type": "selectOne"
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
                   }
                 ]
               },
-
               {
-                "columns": [
+                "type": "row",
+                "css": "border-bottom",
+                "items": [
                   {
-                    "width": "10%",
-                    "title": "Site/s treated by fire management action",
                     "type": "col",
+                    "css": "span3 col-border-right",
                     "items": [
-                      {
-                        "source": "sitesTreated",
-                        "type": "feature"
-                      },
-                      {
-                        "source": "calculatedAreaTreatedHa",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        },
-                        "readonly": "readonly"
-                      },
-                      {
-                        "source": "calculatedLengthTreatedKm",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        },
-                        "readonly": "readonly"
-                      },
                       {
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Please attach mapping details",
-                            "source": "extraMappingDetails",
-                            "type": "document"
+                            "source": "initialOrFollowup",
+                            "preLabel": "Initial or follow-up?",
+                            "type": "selectOne"
                           }
                         ]
                       }
                     ]
-                  },
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "css": "border-bottom",
+                "items": [
                   {
-                    "width": "10%",
                     "type": "col",
-                    "title": "Actual area (ha) / length (km) treated by managment action",
-                    "helpText": "Enter the amount you will invoice for during this reporting period.",
+                    "css": "span3 col-border-right",
                     "items": [
                       {
-                        "source": "areaTreatedHa",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
-                      },
-                      {
-                        "source": "lengthTreatedKm",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Sites covered by practice change",
+                            "source": "sitesCoveredByPracticeChange",
+                            "type": "feature"
+                          }
+                        ]
                       },
                       {
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Reason for actual being different to mapped amount",
-                            "source": "mappingNotAlignedReason",
-                            "type": "selectOne"
+                            "source": "calculatedAreaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
                           }
                         ]
                       },
@@ -12511,34 +19343,37 @@
                         "type": "row",
                         "items": [
                           {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "mappingNotAlignedComments",
-                            "type": "textarea",
-                            "rows": 5
+                            "preLabel": "Please attach mapping details",
+                            "source": "extraMappingDetails",
+                            "type": "document"
                           }
                         ]
                       }
                     ]
                   },
                   {
-                    "width": "10%",
                     "type": "col",
-                    "title": "Invoiced area (ha) treated by management action",
-                    "helpText": "Enter the amount you will invoice for during this reporting period.",
+                    "css": "span3 col-border-right",
                     "items": [
                       {
-                        "source": "areaInvoicedTreatedHa",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Actual area (ha) covered by practice change",
+                            "source": "areaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
                       },
                       {
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Reason for invoiced amount being different to actual amount",
-                            "source": "invoicedNotActualReason",
+                            "preLabel": "Reason for actual being different to mapped amount",
+                            "source": "mappingNotAlignedReason",
                             "type": "selectOne"
                           }
                         ]
@@ -12548,158 +19383,164 @@
                         "items": [
                           {
                             "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "invoicedNotActualComments",
+                            "source": "mappingNotAlignedComments",
                             "type": "textarea",
                             "rows": 5
                           }
                         ]
                       }
                     ]
-                  },
+                  }
+                ]
+              },
+              {
+                "columns": [
                   {
-                    "width": "10%",
-                    "title": "Type of fire management action",
+                    "width": "20%",
+                    "title": "Type of action",
                     "type": "col",
                     "items": [
                       {
                         "type": "row",
                         "items": [
                           {
-                            "source": "fireManagementType",
-                            "type": "select2"
+                            "source": "practiceChangeType",
+                            "type": "selectOne"
                           }
                         ]
                       },
                       {
-                        "source": "otherFireManagementType",
+                        "source": "otherPracticeChangeType",
+                        "title": "Type of action (if Other)",
                         "type": "text"
                       }
                     ]
                   },
                   {
-                    "width": "15%",
-                    "type": "col",
-                    "title": "Please map any off-site area/s if they benefitted from this fire management action",
-                    "items": [
-                      {
-                        "source": "sitesBenefittedByFireAction",
-                        "type": "feature",
-                        "title": "Please map any off-site area/s if they benefitted from this fire management action"
-                      },
-                      {
-                        "source": "areaBenefittedByFireActionHa",
-                        "type": "number",
-                        "readonly": "readonly",
-                        "title": "Area (ha) protected by fire management action"
-                      }
-                    ]
+                    "width": "20%",
+                    "source": "industryType",
+                    "title": "Industry type",
+                    "type": "selectOne"
                   },
                   {
-                    "width": "15%",
-                    "source": "evidenceOfBenefit",
-                    "type": "textarea",
-                    "rows": 3,
-                    "title": "If off-site area was mapped please provide a description on the evidence available to reflect this benefit"
+                    "width": "35%",
+                    "source": "practiceChangeObjective",
+                    "title": "Purpose of improving land management practice",
+                    "type": "textarea"
                   },
                   {
-                    "width": "15%",
+                    "width": "25%",
+                    "title": "Please map any off-site area/s if they benefitted from this practice change",
                     "type": "col",
-                    "title": "Which investment priority does this activity relate to?",
                     "items": [
                       {
-                        "source": "investmentPriorities2",
-                        "type": "select2Many"
+                        "source": "offSiteBenefitSites",
+                        "type": "feature"
                       },
                       {
-                        "source": "otherInvestmentPriority",
-                        "type": "text"
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "offSiteBenefitAreaHa2",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
+                          }
+                        ]
+                      },
+                      {
+                        "source": "evidenceOfBenefit",
+                        "placeholder": "If off-site area was mapped please provide a description on the evidence available to reflect this benefit",
+                        "type": "textarea"
                       }
                     ]
-                  },
-                  {
-                    "width": "15%",
-                    "source": "relatedOutcomes",
-                    "type": "selectOne",
-                    "title": "Which outcome statement/s relates to this survey?"
                   }
                 ],
                 "userAddedRows": true,
-                "source": "fireManagementDetails",
+                "disableTableUpload": true,
+                "source": "landManagementDetails",
                 "type": "table"
               }
             ]
           },
           {
-            "type": "row",
+            "type": "section",
             "items": [
               {
-                "preLabel": "Optionally attach photos",
-                "source": "photographicEvidence",
-                "type": "image"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Optionally attach photos",
+                    "source": "photographicEvidence",
+                    "type": "image"
+                  }
+                ]
+              },
               {
-                "preLabel": "Clarification, if needed",
-                "type": "textarea",
-                "rows": 4,
-                "css": "span8",
-                "source": "comments",
-                "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Clarification, if needed",
+                    "type": "textarea",
+                    "rows": 4,
+                    "css": "span8",
+                    "source": "comments",
+                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+                  }
+                ]
+              },
               {
-                "type": "literal",
-                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
+                  },
+                  {
+                    "preLabel": "Data have been uploaded",
+                    "source": "dataUploaded",
+                    "type": "boolean"
+                  }
+                ]
               },
               {
-                "preLabel": "Data have been uploaded",
-                "source": "dataUploaded",
-                "type": "boolean"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
-              {
-                "preLabel": "",
-                "source": "projectAssuranceDetails",
-                "type": "textarea",
-                "rows": 4,
-                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
-              }
-            ]
-          },
-          {
-            "type": "table",
-            "source": "assuranceDocuments",
-            "userAddedRows": true,
-            "disableTableUpload": true,
-            "columns": [
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "",
+                    "source": "projectAssuranceDetails",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                  }
+                ]
+              },
               {
-                "title": "Attached documents",
-                "source": "attachments",
-                "type": "document"
+                "type": "table",
+                "source": "assuranceDocuments",
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "columns": [
+                  {
+                    "title": "Attached documents",
+                    "source": "attachments",
+                    "type": "document"
+                  }
+                ]
               }
             ]
           }
         ]
       },
       "modelName": null,
-      "templateName": "nhtFireManagement",
+      "templateName": "nhtLandManagementPractices",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Fire management actions",
+      "title": "Improving land management practices",
       "collapsibleHeading": null,
-      "name": "NHT - Fire management",
+      "name": "NHT - Improving land management practices",
       "description": null
     },
     {
@@ -12707,362 +19548,459 @@
       "template": {
         "dataModel": [
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
+            "allowRowDelete": "false",
             "columns": [
               {
                 "dataType": "text",
-                "name": "initialOrFollowup",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
                 "constraints": [
-                  "Initial",
-                  "Follow-up"
+                  "Individuals",
+                  "Groups"
                 ],
                 "validate": "required"
               },
               {
-                "columns": [
-                  {
-                    "dataType": "feature",
-                    "name": "improvedSites",
-                    "validate": "required"
-                  },
-                  {
-                    "computed": {
-                      "expression": "$geom.areaHa(improvedSites)"
-                    },
-                    "dataType": "number",
-                    "name": "calculatedAreaCoveringRegimeChangeHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "behaviour": [
-                      {
-                        "condition": "invoicedAreaHa > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "The area must be mapped",
-                          "validate": "required,min[0.0001]"
-                        }
-                      }
-                    ]
-                  },
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
                   {
-                    "computed": {
-                      "expression": "$geom.lengthKm(improvedSites)"
-                    },
-                    "dataType": "number",
-                    "name": "calculatedLengthOfRegimeChangeKm",
-                    "units": "km",
-                    "decimalPlaces": 3,
-                    "behaviour": [
-                      {
-                        "condition": "lengthOfRegimeChangeKm > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "The length must be mapped",
-                          "validate": "required,min[0.0001]"
-                        }
-                      }
-                    ]
-                  },
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
                   {
-                    "dataType": "document",
-                    "name": "extraMappingDetails",
-                    "validate": "required",
-                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
-                    "behaviour": [
-                      {
-                        "condition": "not (within(calculatedAreaCoveringRegimeChangeHa, areaCoveringRegimeChangeHa, 0.1) and within(calculatedLengthOfRegimeChangeKm, lengthOfRegimeChangeKm, 0.1))",
-                        "type": "visible"
-                      }
-                    ]
-                  },
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "mappingNotAlignedReason",
-                    "constraints": [
-                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                      "Other"
-                    ],
-                    "validate": "required",
-                    "behaviour": [
-                      {
-                        "condition": "not (within(calculatedAreaCoveringRegimeChangeHa, areaCoveringRegimeChangeHa, 0.1) and within(calculatedLengthOfRegimeChangeKm, lengthOfRegimeChangeKm, 0.1))",
-                        "type": "visible"
-                      }
-                    ]
-                  },
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
                   {
-                    "dataType": "text",
-                    "name": "mappingNotAlignedComments",
-                    "validate": "required,maxSize[300]",
-                    "behaviour": [
-                      {
-                        "type": "visible",
-                        "condition": "\"Other\" == mappingNotAlignedReason"
-                      }
-                    ]
+                    "rule": "required"
                   },
                   {
-                    "defaultValue": {
-                      "type": "computed",
-                      "expression": "calculatedAreaCoveringRegimeChangeHa"
-                    },
-                    "dataType": "number",
-                    "name": "areaCoveringRegimeChangeHa",
-                    "validate": "min[0]",
-                    "decimalPlaces": 3,
-                    "units": "ha"
+                    "rule": "min[0]"
                   },
                   {
-                    "defaultValue": {
-                      "type": "computed",
-                      "expression": "calculatedLengthOfRegimeChangeKm"
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
                     },
-                    "dataType": "number",
-                    "name": "lengthOfRegimeChangeKm",
-                    "validate": "min[0]",
-                    "decimalPlaces": 3,
-                    "units": "km"
-                  },
-                  {
-                    "dataType": "number",
-                    "name": "areaInvoicedHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "validate": [
-                      {
-                        "rule": "required"
-                      },
-                      {
-                        "rule": "min[0]"
-                      },
-                      {
-                        "param": {
-                          "expression": "areaCoveringRegimeChangeHa",
-                          "type": "computed"
-                        },
-                        "rule": "max"
-                      }
-                    ]
-                  },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
                   {
-                    "dataType": "number",
-                    "name": "areaInvoicedKm",
-                    "units": "km",
-                    "decimalPlaces": 3,
-                    "validate": [
-                      {
-                        "rule": "required"
-                      },
-                      {
-                        "rule": "min[0]"
-                      },
-                      {
-                        "param": {
-                          "expression": "lengthOfRegimeChangeKm",
-                          "type": "computed"
-                        },
-                        "rule": "max"
-                      }
-                    ]
-                  },
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
                   {
-                    "dataType": "text",
-                    "name": "invoicedNotActualReason",
-                    "behaviour": [
-                      {
-                        "condition": "roundTo(areaCoveringRegimeChangeHa, 2) != roundTo(areaInvoicedHa, 2) or roundTo(lengthOfRegimeChangeKm, 2) != roundTo(areaInvoicedKm, 2)",
-                        "type": "visible"
-                      }
-                    ],
-                    "constraints": [
-                      "Work was undertaken over a greater area than will be invoiced for",
-                      "Other"
-                    ],
-                    "validate": "required"
+                    "rule": "required"
                   },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableMad"
+          },
+          {
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "initialOrFollowup",
+                "constraints": [
+                  "Initial",
+                  "Follow-up"
+                ],
+                "validate": "required"
+              },
+              {
+                "columns": [
                   {
                     "dataType": "text",
-                    "name": "invoicedNotActualComments",
-                    "behaviour": [
-                      {
-                        "condition": "\"Other\" == invoicedNotActualReason",
-                        "type": "if"
-                      }
-                    ],
-                    "validate": "required,maxSize[300]"
+                    "name": "targetDisease",
+                    "description": "",
+                    "validate": "required,maxSize[100]"
                   },
                   {
                     "dataType": "text",
-                    "name": "treatmentType",
-                    "description": "",
+                    "name": "managementMethod",
+                    "dwcAttribute": "treatmentMethod",
                     "constraints": [
-                      "Removing barriers (e.g fish barriers)",
-                      "Structure instalment or modification (e.g. weirs, flow gauging stations, fords, culverts)",
-                      "Resnagging",
+                      "Biological control agents",
+                      "Fumigation",
+                      "Host destruction",
+                      "Plant disease management - quarantine",
+                      "Plant disease management - treatment",
+                      "Plant disease management - hygiene",
+                      "Positive competition",
                       "Other"
                     ],
                     "validate": "required"
                   },
                   {
                     "dataType": "text",
-                    "name": "otherTreatmentType",
+                    "name": "otherManagementMethod",
+                    "description": "Please specify the management method used if Other (specify in notes) was selected in the Management Method column.",
                     "behaviour": [
                       {
-                        "condition": "treatmentType == \"Other\"",
+                        "condition": "managementMethod == \"Other\"",
                         "type": "enable"
                       }
                     ],
-                    "validate": "required,maxSize[300]"
+                    "validate": "required,maxSize[100]"
                   },
                   {
                     "dataType": "text",
                     "name": "treatmentObjective",
-                    "description": "Aim of the action - e.g. hydrological regime change from X to Y",
+                    "description": "Please start with either part of the field heading [dash]. If reporting on both separate the information with a ';'. (eg. 'Management method -' and a brief description of method being used to fix the area; 'Treatment objective -' and a brief description of how the work will contribute to the area.",
                     "validate": "required,maxSize[300]"
-                  },
-                  {
-                    "name": "investmentPriorities2",
-                    "dataType": "stringList",
-                    "validate": "required",
-                    "constraints": {
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "params": [
-                            {
-                              "expression": "owner.projectId",
-                              "name": "id",
-                              "type": "computed"
-                            }
-                          ],
-                          "url": "/project/listProjectInvestmentPriorities/"
-                        }
-                      }
+                  }
+                ],
+                "dataType": "list",
+                "name": "diseaseManagementDetails"
+              },
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
                     }
-                  },
+                  }
+                }
+              },
+              {
+                "name": "investmentPriorities2",
+                "dataType": "text",
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
+                  }
+                }
+              },
+              {
+                "dataType": "text",
+                "name": "otherInvestmentPriority",
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "otherInvestmentPriority",
-                    "behaviour": [
-                      {
-                        "type": "enable",
-                        "condition": "\"Other\" in investmentPriorities2"
-                      }
-                    ]
-                  },
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "feature",
+                "name": "sitesDiseaseManaged",
+                "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
+              },
+              {
+                "computed": {
+                  "expression": "$geom.areaHa(sitesDiseaseManaged)"
+                },
+                "dataType": "number",
+                "name": "calculatedAreaTreatedHa",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesDiseaseManaged)"
+                },
+                "dataType": "number",
+                "name": "calculatedLengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "name": "relatedOutcomes",
-                    "dataType": "text",
-                    "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                    "validate": "required",
-                    "constraints": {
-                      "textProperty": "label",
-                      "valueProperty": "label",
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "url": "/project/outcomesByScores",
-                          "params": [{
-                            "expression": "owner.projectId",
-                            "name": "id",
-                            "type": "computed"
-                          }, {
-                            "expression": "scores",
-                            "name": "scoreIds",
-                            "type": "computed"
-                          }
-                          ]
-                        }
-                      }
+                    "condition": "lengthTreatedKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
                     }
                   }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaTreatedHa"
+                },
+                "dataType": "number",
+                "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedReason",
+                "constraints": [
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                  "Other"
                 ],
-                "dataType": "list",
-                "name": "hydrologicalRegimeDetails"
+                "validate": "required",
+                "behaviour": [
+                  {
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedComments",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
+                  {
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReason"
+                  }
+                ]
+              },
+              {
+                "dataType": "document",
+                "name": "extraMappingDetails",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
+                  {
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKm"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
+              }
+            ],
+            "dataType": "list",
+            "name": "diseaseManagementAreasControlled"
+          },
+          {
+            "dataType": "number",
+            "name": "totalAreaDiseaseManagementInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(diseaseManagementAreasControlled, \"initialOrFollowup == 'Initial' ? areaTreatedHa : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalAreaDiseaseManagementInitialInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaDiseaseManagementInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
               }
             ],
-            "dataType": "list",
-            "name": "hydroAreasControlled"
+            "defaultValue": ""
           },
           {
-            "name": "numberEcoHydroTreatments",
-            "type": "number",
-            "decimalPlaces": 0,
+            "dataType": "number",
+            "name": "totalAreaDiseaseManagementFollowup",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(diseaseManagementAreasControlled, \"initialOrFollowup == 'Follow-up' ? areaTreatedHa : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalAreaDiseaseManagementInvoicedFollowup",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaDiseaseManagementFollowup",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalLengthDiseaseManagementInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(diseaseManagementAreasControlled, \"initialOrFollowup == 'Initial' ? lengthTreatedKm : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalLengthDiseaseManagementInvoicedInitial",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalLengthDiseaseManagementInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalLengthDiseaseManagementFollowup",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
             "computed": {
-              "expression": "count(hydroAreasControlled, \"relatedOutcomes\")"
+              "expression": "sum(diseaseManagementAreasControlled, \"initialOrFollowup == 'Follow-up' ? lengthTreatedKm : 0\")"
             }
           },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalLengthDiseaseManagementInvoicedFollowup",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalLengthDiseaseManagementFollowup",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedDiseaseMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalAreaDiseaseManagementInitialInvoiced < +totalAreaDiseaseManagementInitial or +totalAreaDiseaseManagementInvoicedFollowup < +totalAreaDiseaseManagementFollowup or +totalLengthDiseaseManagementInvoicedInitial < +totalLengthDiseaseManagementInitial or +totalLengthDiseaseManagementInvoicedFollowup < +totalLengthDiseaseManagementFollowup",
+                "type": "enable"
+              }
+            ]
+          },
           {
             "dataType": "text",
             "name": "comments",
@@ -13075,12 +20013,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -13089,26 +20027,37 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Improving hydrological regimes",
-        "title": "Improving hydrological regimes",
+        "modelName": "NHT - Disease management",
+        "title": "Managing Disease",
         "viewModel": [
           {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
             "columns": [
               {
                 "width": "10%",
                 "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
+                "title": "Are individuals or groups delivering this service?",
                 "type": "selectOne"
               },
               {
                 "width": "20%",
                 "type": "col",
-                "title": "Total Number of people delivering this service",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "participationIndividualNumber",
@@ -13123,7 +20072,8 @@
               {
                 "type": "col",
                 "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "firstNationIndividualNumber",
@@ -13136,29 +20086,218 @@
                 ]
               },
               {
+                "width": "20%",
                 "source": "participationDetails",
                 "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
                 "type": "textarea"
               }
             ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
+            "source": "participationInformationTableMad",
             "type": "table"
           },
           {
-            "preLabel": "Number of Hydrological Regimes surveys conducted:",
-            "noEdit": true,
-            "type": "number",
-            "source": "numberEcoHydroTreatments"
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
           },
           {
-            "addRowText": "Add a new controlled area",
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total area (ha) for disease treatment/prevention (initial) for this reporting period",
+                        "source": "totalAreaDiseaseManagementInitial",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total area (ha) for disease treatment/prevention (initial) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalAreaDiseaseManagementInitialInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii) Total area (ha) for disease treatment/prevention (follow up) for this reporting period",
+                        "source": "totalAreaDiseaseManagementFollowup",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total Area (ha) for disease treatment/prevention (follow up) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalAreaDiseaseManagementInvoicedFollowup",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(v) Total length (km) for disease treatment/prevention (initial) for this reporting period",
+                        "source": "totalLengthDiseaseManagementInitial",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vi) Total length (km) for disease treatment/prevention (initial) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalLengthDiseaseManagementInvoicedInitial",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vii) Total length (km) for disease treatment/prevention (follow up) for this reporting period",
+                        "source": "totalLengthDiseaseManagementFollowup",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(viii) Total length (km) for disease treatment/prevention (follow up) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalLengthDiseaseManagementInvoicedFollowup",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedDiseaseMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "addRowText": "Add a new area where disease is being managed",
             "userAddedRows": true,
-            "source": "hydroAreasControlled",
+            "source": "diseaseManagementAreasControlled",
             "type": "repeat",
             "items": [
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
               {
                 "type": "row",
                 "css": "border-bottom",
@@ -13171,27 +20310,34 @@
                   }
                 ]
               },
-
               {
-                "columns": [
+                "type": "row",
+                "css": "border-bottom",
+                "items": [
                   {
-                    "width": "10%",
                     "type": "col",
+                    "css": "span3 col-border-right",
                     "items": [
                       {
-                        "type": "feature",
-                        "source": "improvedSites"
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Site/s where disease managed",
+                            "source": "sitesDiseaseManaged",
+                            "type": "feature"
+                          }
+                        ]
                       },
                       {
                         "type": "row",
                         "items": [
                           {
+                            "source": "calculatedAreaTreatedHa",
                             "type": "number",
-                            "source": "calculatedAreaCoveringRegimeChangeHa",
                             "displayOptions": {
                               "displayUnits": true
                             },
-                            "readonly": true
+                            "readonly": "readonly"
                           }
                         ]
                       },
@@ -13199,12 +20345,12 @@
                         "type": "row",
                         "items": [
                           {
+                            "source": "calculatedLengthTreatedKm",
                             "type": "number",
-                            "source": "calculatedLengthOfRegimeChangeKm",
                             "displayOptions": {
                               "displayUnits": true
                             },
-                            "readonly": true
+                            "readonly": "readonly"
                           }
                         ]
                       },
@@ -13218,19 +20364,18 @@
                           }
                         ]
                       }
-                    ],
-                    "title": "Site/s where hydrological regimes have been improved"
+                    ]
                   },
                   {
-                    "width": "10%",
-                    "title": "Actual area (ha) / length (km) where the hydrological regimes have benn improved",
                     "type": "col",
+                    "css": "span3 col-border-right",
                     "items": [
                       {
                         "type": "row",
                         "items": [
                           {
-                            "source": "areaCoveringRegimeChangeHa",
+                            "preLabel": "Actual area (ha) / length (km) where disease has been managed",
+                            "source": "areaTreatedHa",
                             "type": "number",
                             "displayOptions": {
                               "displayUnits": true
@@ -13242,7 +20387,7 @@
                         "type": "row",
                         "items": [
                           {
-                            "source": "lengthOfRegimeChangeKm",
+                            "source": "lengthTreatedKm",
                             "type": "number",
                             "displayOptions": {
                               "displayUnits": true
@@ -13272,110 +20417,49 @@
                         ]
                       }
                     ]
-                  },
+                  }
+                ]
+              },
+              {
+                "columns": [
                   {
-                    "width": "10%",
-                    "title": "Invoiced area (ha) where the hydrological regimes have been improved",
-                    "type": "col",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "areaInvoicedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "areaInvoicedKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Reason for invoiced amount being different to actual amount",
-                            "source": "invoicedNotActualReason",
-                            "type": "selectOne"
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "invoicedNotActualComments",
-                            "type": "textarea",
-                            "rows": 5
-                          }
-                        ]
-                      }
-                    ]
+                    "width": "30%",
+                    "source": "targetDisease",
+                    "title": "Disease treated",
+                    "type": "textarea"
                   },
                   {
                     "width": "20%",
-                    "title": "Type of treatment implemented to improve eco-hydrological treatment",
                     "type": "col",
+                    "title": "Type of management method / treatment",
                     "items": [
                       {
                         "type": "row",
                         "items": [
                           {
-                            "source": "treatmentType",
-                            "type": "select2"
+                            "source": "managementMethod",
+                            "type": "selectOne"
                           }
                         ]
                       },
                       {
-                        "source": "otherTreatmentType",
-                        "placeholder": "Type of treatment implemented (if Other)",
+                        "source": "otherManagementMethod",
+                        "placeholder": "Type of management method / treatment (if other)",
                         "type": "text"
                       }
                     ]
                   },
                   {
-                    "width": "20%",
+                    "width": "50%",
                     "source": "treatmentObjective",
-                    "title": "Treatment objective",
+                    "title": "Management method / treatment objective",
                     "type": "textarea"
-                  },
-                  {
-                    "width": "15%",
-                    "type": "col",
-                    "title": "Which investment priority does this activity relate to?",
-                    "items": [
-                      {
-                        "source": "investmentPriorities2",
-                        "type": "select2Many"
-                      },
-                      {
-                        "source": "otherInvestmentPriority",
-                        "type": "text"
-                      }
-                    ]
-                  },
-                  {
-                    "width": "15%",
-                    "source": "relatedOutcomes",
-                    "type": "selectOne",
-                    "title": "Which outcome statement/s relates to this survey?"
                   }
                 ],
                 "userAddedRows": true,
-                "source": "hydrologicalRegimeDetails",
+                "addRowText": "Add a new disease being managed in this area",
+                "disableTableUpload": true,
+                "source": "diseaseManagementDetails",
                 "type": "table"
               }
             ]
@@ -13408,7 +20492,7 @@
             "items": [
               {
                 "type": "literal",
-                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
               },
               {
                 "preLabel": "Data have been uploaded",
@@ -13445,12 +20529,12 @@
         ]
       },
       "modelName": null,
-      "templateName": "nhtImprovingHydrologicalRegimes",
+      "templateName": "nhtDiseaseManagement",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Improving hydrological regimes",
+      "title": "Managing disease",
       "collapsibleHeading": null,
-      "name": "NHT - Improving hydrological regimes",
+      "name": "NHT - Disease management",
       "description": null
     },
     {
@@ -13458,585 +20542,692 @@
       "template": {
         "dataModel": [
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "dataType": "text",
-            "name": "comments",
-            "validate": "maxSize[1500]"
-          },
-          {
-            "dataType": "image",
-            "name": "photographicEvidence"
-          },
-          {
-            "dataType": "boolean",
-            "name": "dataUploaded",
-            "description": ""
-          },
-          {
-            "dataType": "text",
-            "name": "projectAssuranceDetails",
-            "description": ""
-          },
-          {
+            "name": "pestAnimalSurveys",
             "dataType": "list",
-            "name": "assuranceDocuments",
+            "minSize": 1,
             "columns": [
               {
-                "dataType": "document",
-                "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
-              }
-            ]
-          },
-          {
-            "columns": [
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
+                  }
+                }
+              },
               {
                 "dataType": "text",
-                "name": "initialOrFollowup",
+                "name": "baselineOrIndicatorSurvey",
+                "description": "",
                 "constraints": [
-                  "Initial",
-                  "Follow-up"
+                  "Baseline",
+                  "Indicator"
                 ],
                 "validate": "required"
               },
-
               {
+                "dataType": "text",
+                "name": "surveyObjective",
+                "description": "What the survey aim to capture? How will the information obtained from the survey be used?",
+                "validate": "required,maxSize[3000]"
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfSurveys",
+                "validate": "required,min[1],max[1]",
+                "defaultValue": 1,
+                "readonly": true
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfSurveysInvoiced",
+                "validate": "required,min[0]",
+                "defaultValue": 1
+              },
+              {
+                "dataType": "list",
+                "name": "pestAnimalDataSets",
                 "columns": [
                   {
-                    "dataType": "feature",
-                    "name": "implementationSite"
-                  },
-                  {
-                    "computed": {
-                      "expression": "$geom.areaHa(implementationSite)"
+                    "name": "dataSetId",
+                    "entityType": "au.org.ala.ecodata.DataSetSummary",
+                    "dataType": "text",
+                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
+                    "validate": "required",
+                    "constraints": {
+                      "textProperty": "name",
+                      "valueProperty": "dataSetId",
+                      "excludePath": "pestAnimalSurveys.pestAnimalDataSets.dataSetId",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.dataSets"
+                        },
+                        "filter": {
+                          "namespace": "dataSet",
+                          "expression": "dataSet.serviceId == 23 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
+                        }
+                      }
                     },
-                    "dataType": "number",
-                    "name": "calculatedAreaImplementedHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
                     "behaviour": [
                       {
-                        "condition": "areaImplementedInvoicedHa > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "The area must be mapped",
-                          "validate": "required,min[0.0001]"
+                        "type": "pre_populate",
+                        "config": {
+                          "waitForInitialisation": true,
+                          "source": {
+                            "url": "/site/geojson",
+                            "params": [
+                              {
+                                "expression": "x=find(owner.custom.dataSets, \"dataSetId\", dataSetId); x.siteId",
+                                "name": "id",
+                                "type": "computed",
+                                "required": true
+                              }
+                            ]
+                          },
+                          "target":  {
+                            "type": "singleValue",
+                            "name": "sitesCoveredForPestAnimal"
+                          }
                         }
                       }
                     ]
                   },
                   {
-                    "computed": {
-                      "expression": "$geom.lengthKm(implementationSite)"
-                    },
-                    "dataType": "number",
-                    "name": "calculatedLengthImplementedKm",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "behaviour": [
+                    "columns": [
                       {
-                        "condition": "lengthImplementedKm > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "The length must be mapped",
-                          "validate": "required,min[0.0001]"
-                        }
+                        "dataType": "species",
+                        "name": "species",
+                        "validate": "required"
+                      },
+                      {
+                        "dataType": "text",
+                        "name": "individualsOrGroups",
+                        "constraints": [
+                          "Individuals",
+                          "Groups"
+                        ],
+                        "validate": "required"
+                      },
+                      {
+                        "dataType": "number",
+                        "name": "numberOfIndividualsOrGroups",
+                        "validate": "required,min[0]"
                       }
-                    ]
+                    ],
+                    "dataType": "list",
+                    "name": "pestAnimalSurveySpeciesTable"
                   },
                   {
-                    "defaultValue": {
-                      "expression": "$geom.areaHa(implementationSite)",
-                      "type": "computed"
+                    "name": "projectBaselines",
+                    "dataType": "stringList",
+                    "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.baselines"
                     },
-                    "dataType": "number",
-                    "name": "areaImplementedHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "validate": "required,min[0]"
+                    "constraints": {
+                      "textProperty": "baseline",
+                      "valueProperty": "code",
+                      "type": "pre-populated",
+                      "excludePath": "projectBaselines",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.details.baseline.rows"
+                        }
+                      }
+                    }
                   },
                   {
-                    "defaultValue": {
-                      "expression": "$geom.lengthKm(implementationSite)",
-                      "type": "computed"
+                    "name": "investmentPriorities2",
+                    "dataType": "stringList",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.investmentPriorities"
                     },
-                    "dataType": "number",
-                    "name": "lengthImplementedKm",
-                    "units": "km",
-                    "decimalPlaces": 3,
-                    "validate": "required,min[0]"
+                    "constraints": {
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "params": [
+                            {
+                              "expression": "owner.projectId",
+                              "name": "id",
+                              "type": "computed"
+                            }
+                          ],
+                          "url": "/project/listProjectInvestmentPriorities/"
+                        }
+                      }
+                    }
                   },
                   {
                     "dataType": "text",
-                    "name": "mappingNotAlignedReason",
+                    "name": "otherInvestmentPriority",
                     "behaviour": [
                       {
-                        "condition": "not (within(calculatedAreaImplementedHa, areaImplementedHa, 0.1))",
-                        "type": "visible"
+                        "type": "enable",
+                        "condition": "\"Other\" in investmentPriorities2"
                       }
-                    ],
-                    "constraints": [
-                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                      "Other"
-                    ],
-                    "validate": "required"
+                    ]
                   },
                   {
-                    "dataType": "text",
-                    "name": "mappingNotAlignedComments"
-                  ,
-                    "behaviour": [
-                      {
-                        "condition": "\"Other\" == mappingNotAlignedReason",
-                        "type": "visible"
-                      }
-                    ],
-                    "validate": "required,maxSize[300]"
+                    "dataType": "date",
+                    "name": "activitiesStartDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.startDate"
+                    }
                   },
                   {
-                    "dataType": "document",
-                    "name": "extraMappingDetails",
-                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
-                    "behaviour": [
-                      {
-                        "condition": "not (within(calculatedAreaImplementedHa, areaImplementedHa, 0.1)) or roundTo(areaImplementedHa, 2) != roundTo(areaImplementedInvoicedHa, 2)",
-                        "type": "visible"
-                      }
-                    ],
-                    "validate": "required"
+                    "dataType": "date",
+                    "name": "activitiesEndDate",
+                    "description": "Specific the dates these events were held on.",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.endDate"
+                    }
                   },
+                  {
+                    "dataType": "feature",
+                    "name": "sitesCoveredForPestAnimal",
+                    "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
 
+                  },
                   {
+                    "computed": {
+                      "expression": "$geom.areaHa(sitesCoveredForPestAnimal)"
+                    },
                     "dataType": "number",
-                    "name": "areaImplementedInvoicedHa",
+                    "name": "calculatedAreaTreatedHa",
                     "units": "ha",
+                    "decimalPlaces": 3
+                  },
+                  {
+                    "computed": {
+                      "expression": "$geom.lengthKm(sitesCoveredForPestAnimal)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedLengthTreatedKm",
+                    "units": "km",
                     "decimalPlaces": 3,
-                    "validate": [
-                      {
-                        "rule": "min[0]"
-                      },
+                    "behaviour": [
                       {
-                        "param": {
-                          "expression": "lengthOfErosionControlKm",
-                          "type": "computed"
-                        },
-                        "rule": "max"
+                        "condition": "lengthTreatedKm > 0",
+                        "type": "conditional_validation",
+                        "value": {
+                          "message": "The managed length must be mapped",
+                          "validate": "required,min[0.0001]"
+                        }
                       }
                     ]
                   },
                   {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "calculatedAreaTreatedHa"
+                    },
                     "dataType": "number",
-                    "name": "areaImplementedInvoicedKm",
+                    "name": "areaTreatedHa",
+                    "description": "Manually enter correct figure for this reporting period if different to mapped value.",
                     "units": "ha",
                     "decimalPlaces": 3,
-                    "validate": [
-                      {
-                        "rule": "min[0]"
-                      },
-                      {
-                        "param": {
-                          "expression": "lengthImplementedKm",
-                          "type": "computed"
-                        },
-                        "rule": "max"
-                      }
-                    ]
+                    "validate": "required,min[0]"
                   },
                   {
                     "dataType": "text",
-                    "name": "invoicedNotActualReason",
-                    "behaviour": [
-                      {
-                        "condition": "roundTo(areaImplementedHa, 2) != roundTo(areaImplementedInvoicedHa, 2) or roundTo(lengthImplementedKm, 2) != roundTo(areaImplementedInvoicedKm, 2)",
-                        "type": "visible"
-                      }
-                    ],
+                    "name": "mappingNotAlignedReason",
                     "constraints": [
-                      "Work was undertaken over a greater area than will be invoiced for",
+                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
                       "Other"
                     ],
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "invoicedNotActualComments",
+                    "validate": "required",
                     "behaviour": [
                       {
-                        "condition": "\"Other\" == invoicedNotActualReason",
-                        "type": "visible"
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
                       }
-                    ],
-                    "validate": "required,maxSize[300]"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "practiceChangeType",
-                    "description": "",
-                    "constraints": [
-                      "Fencing",
-                      "Erosion management",
-                      "Stocking rates",
-                      "Watering arrangements",
-                      "Paddock design",
-                      "Rotation grazing",
-                      "Permaculture",
-                      "Other"
-                    ],
-                    "validate": "required"
+                    ]
                   },
                   {
                     "dataType": "text",
-                    "name": "otherPracticeChangeType",
-                    "description": "Please specify the type of land management practice change if Other (specify in notes) was selected in the Type of land management practice change.",
+                    "name": "mappingNotAlignedComments",
+                    "validate": "required,maxSize[100]",
                     "behaviour": [
                       {
-                        "condition": "practiceChangeType == \"Other\"",
-                        "type": "enable"
-                      }
-                    ],
-                    "validate": "required,maxSize[100]"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "industryType",
-                    "constraints": [
-                      "Broad acre cropping",
-                      "Dairy",
-                      "Horticulture",
-                      "Grazing",
-                      "Fisheries",
-                      "Aquaculture",
-                      "Environment"
-                    ],
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "practiceChangeObjective",
-                    "description": "How will the practice change/s contribute to the area",
-                    "validate": "required,maxSize[300]"
-                  },
-                  {
-                    "dataType": "feature",
-                    "name": "offSiteBenefitSites"
-                  },
-                  {
-                    "defaultValue": {
-                      "expression": "$geom.areaHa(offSiteBenefitSites)",
-                      "type": "computed"
-                    },
-                    "dataType": "number",
-                    "name": "offSiteBenefitAreaHa",
-                    "validate": [
-                      {
-                        "param": {
-                          "expression": "$geom.areaHa(offSiteBenefitSites)*0.9",
-                          "type": "computed"
-                        },
-                        "rule": "min"
-                      },
-                      {
-                        "param": {
-                          "expression": "$geom.areaHa(offSiteBenefitSites)*1.1",
-                          "type": "computed"
-                        },
-                        "rule": "max"
+                        "type": "visible",
+                        "condition": "\"Other\" == mappingNotAlignedReason"
                       }
                     ]
                   },
                   {
-                    "dataType": "text",
-                    "name": "evidenceOfBenefit",
-                    "validate": "maxSize[300]"
-                  },
-                  {
-                    "name": "investmentPriorities2",
-                    "dataType": "stringList",
+                    "dataType": "document",
+                    "name": "extraMappingDetails",
                     "validate": "required",
-                    "constraints": {
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "params": [
-                            {
-                              "expression": "owner.projectId",
-                              "name": "id",
-                              "type": "computed"
-                            }
-                          ],
-                          "url": "/project/listProjectInvestmentPriorities/"
-                        }
-                      }
-                    }
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "otherInvestmentPriority",
+                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
                     "behaviour": [
                       {
-                        "type": "enable",
-                        "condition": "\"Other\" in investmentPriorities2"
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
                       }
                     ]
                   },
                   {
-                    "name": "relatedOutcomes",
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "$geom.lengthKm(sitesCoveredForPestAnimal)"
+                    },
+                    "dataType": "number",
+                    "name": "lengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3
+                  },
+                  {
                     "dataType": "text",
-                    "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
+                    "description": "Select the technique used to conduct the survey. If the EMSA Application tool was not used, you should select 'Other'.",
+                    "name": "emsaProtocol",
                     "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.protocol"
+                    },
                     "constraints": {
                       "textProperty": "label",
-                      "valueProperty": "label",
+                      "valueProperty": "value",
                       "type": "pre-populated",
                       "config": {
                         "source": {
-                          "url": "/project/outcomesByScores",
-                          "params": [{
-                            "expression": "owner.projectId",
-                            "name": "id",
-                            "type": "computed"
-                          }, {
-                            "expression": "scores",
-                            "name": "scoreIds",
-                            "type": "computed"
-                          }
-                          ]
+                          "context-path": "owner.protocols"
                         }
                       }
                     }
+                  },
+                  {
+                    "dataType": "stringList",
+                    "description": "Describe the technique (if Other) was selected.",
+                    "name": "otherEmsaProtocol",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methods"
+                    }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "surveyMethodology",
+                    "description": "Provide more details on what is being done.",
+                    "validate": "required,maxSize[3000]",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methodDescription"
+                    }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "invoicingThisActivity",
+                    "constraints": [
+                      "Yes",
+                      "No"
+                    ],
+                    "validate": "required"
                   }
                 ],
-                "dataType": "list",
-                "name": "landManagementDetails"
+                "minSize": 1
+              }
+            ]
+          },
+          {
+            "dataType": "lookupTable",
+            "name": "baselineIndicatorMapping",
+            "config": {
+              "source": {
+                "literal": {
+                  "Baseline dataset associated with a project outcome": "Baseline",
+                  "Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
+                }
+              }
+            }
+          },
+          {
+            "allowRowDelete": "false",
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
               }
             ],
             "dataType": "list",
-            "name": "landManagementControlledArea"
+            "name": "participationInformationTablePas"
           },
           {
-            "name": "landMgmtSurveyCountHeader",
-            "type": "number",
+            "dataType": "number",
+            "name": "totalSurveyBaseline",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(pestAnimalSurveys, \"baselineOrIndicatorSurvey == 'Baseline' ? 1 : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyBaselineInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyBaseline",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyIndicator",
+            "validate": "min[0]",
             "decimalPlaces": 0,
             "computed": {
-              "expression": "count(landManagementControlledArea, \"relatedOutcomes\")"
+              "expression": "sum(pestAnimalSurveys, \"baselineOrIndicatorSurvey == 'Indicator' ? 1 : 0\")"
             }
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyIndicatorInvoiced",
+            "defaultValue": "",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyIndicator",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedPestAnimalMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalSurveyIndicatorInvoiced < +totalSurveyIndicator or +totalSurveyBaselineInvoiced < +totalSurveyBaseline",
+                "type": "enable"
+              }
+            ]
+          },
+          {
+            "dataType": "text",
+            "name": "comments",
+            "validate": "maxSize[1500]"
+          },
+          {
+            "dataType": "image",
+            "name": "photographicEvidence"
+          },
+          {
+            "dataType": "boolean",
+            "name": "dataUploaded",
+            "description": ""
+          },
+          {
+            "dataType": "text",
+            "name": "projectAssuranceDetails",
+            "description": "",
+            "validate": "required,maxSize[5000]"
+          },
+          {
+            "dataType": "list",
+            "name": "assuranceDocuments",
+            "columns": [
+              {
+                "dataType": "document",
+                "name": "attachments",
+                "description": "Please attach any Evidence of Service Delivery here."
+              }
+            ]
           }
         ],
-        "modelName": "NHT - Improving land management practices",
-        "title": "Improving land management practices",
+        "modelName": "NHT - Pest animal survey",
+        "title": "Pest Animal Survey",
         "viewModel": [
           {
-            "columns": [
+            "type": "section",
+            "items": [
               {
-                "width": "10%",
-                "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
-                "type": "selectOne"
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Participation information</h3>"
+                  }
+                ]
               },
               {
-                "width": "20%",
-                "type": "col",
-                "title": "Total Number of people delivering this service",
-                "items": [
+                "disableTableUpload": true,
+                "columns": [
                   {
-                    "source": "participationIndividualNumber",
-                    "type": "number"
+                    "width": "10%",
+                    "source": "participationIndividualsOrGroups",
+                    "title": "Are individuals or groups delivering this service?",
+                    "type": "selectOne"
                   },
                   {
-                    "source": "participationGroupNumber",
-                    "type": "selectOne"
+                    "width": "20%",
+                    "type": "col",
+                    "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                    "items": [
+                      {
+                        "source": "participationIndividualNumber",
+                        "type": "number"
+                      },
+                      {
+                        "source": "participationGroupNumber",
+                        "type": "selectOne"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "width": "20%",
+                    "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                    "items": [
+                      {
+                        "source": "firstNationIndividualNumber",
+                        "type": "number"
+                      },
+                      {
+                        "source": "firstNationGroupNumber",
+                        "type": "selectOne"
+                      }
+                    ]
+                  },
+                  {
+                    "width": "20%",
+                    "source": "participationDetails",
+                    "rows": 4,
+                    "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                    "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                    "type": "textarea"
                   }
-                ]
+                ],
+                "source": "participationInformationTablePas",
+                "type": "table"
               },
               {
-                "type": "col",
-                "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
+                "type": "row",
                 "items": [
                   {
-                    "source": "firstNationIndividualNumber",
-                    "type": "number"
-                  },
-                  {
-                    "source": "firstNationGroupNumber",
-                    "type": "selectOne"
+                    "type": "literal",
+                    "source": "<h3>Survey information</h3><p><b>Before completing this section, please ensure you have created a Data Set Summary information for every data set produced by the surveys you intend to report</b></p><ul><li>Each survey reported must relate to a combination of outcomes as described in your MERI plan</li><li>Each Data Set Summary recorded for a survey must be addressing the same outcomes as selected for the survey</li><li>If a survey produced more than one data set, use the New Data Set button to add each Data Set Summary under your survey</li><li>A single survey can be made up of multiple dataset</li></ul>"
                   }
                 ]
               },
-              {
-                "source": "participationDetails",
-                "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                "type": "textarea"
-              }
-            ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
-            "type": "table"
-          },
-          {
-            "preLabel": "Number of Land Management Practices surveys conducted:",
-            "noEdit": true,
-            "type": "number",
-            "source": "landMgmtSurveyCountHeader"
-          },
-          {
-            "addRowText": "Add a new controlled area",
-            "userAddedRows": true,
-            "source": "landManagementControlledArea",
-            "type": "repeat",
-            "items": [
               {
                 "type": "row",
-                "css": "border-bottom",
                 "items": [
                   {
-                    "preLabel": "Initial or Follow-up?",
-                    "css": "span3",
-                    "source": "initialOrFollowup",
-                    "type": "selectOne"
+                    "type": "literal",
+                    "source": "<h3>Totals Summary</h3>"
                   }
                 ]
               },
-
               {
-                "columns": [
+                "type": "row",
+                "items": [
                   {
-                    "width": "10%",
                     "type": "col",
-                    "title": "Site/s covered by practice change",
+                    "css": "span4 col-border-right",
                     "items": [
                       {
-                        "source": "implementationSite",
-                        "type": "feature"
-                      },
-                      {
-                        "readonly": "readonly",
-                        "source": "calculatedAreaImplementedHa",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
-                      },
-                      {
-                        "readonly": "readonly",
-                        "source": "calculatedLengthImplementedKm",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(i) Total Number of baseline pest animal surveys completed for this reporting period",
+                            "source": "totalSurveyBaseline",
+                            "type": "number"
+                          }
+                        ]
                       },
                       {
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Please attach mapping details",
-                            "source": "extraMappingDetails",
-                            "type": "document"
+                            "preLabel": "(ii) Total Number of baseline pest animal surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyBaselineInvoiced",
+                            "type": "number"
                           }
                         ]
                       }
                     ]
                   },
                   {
-                    "helpText": "Enter the amount you will invoice for during this reporting period.",
-                    "width": "10%",
                     "type": "col",
-                    "title": "Actual area (ha) / length (km) covered by practice change",
+                    "css": "span4 col-border-right",
                     "items": [
-                      {
-                        "source": "areaImplementedHa",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
-                      },
-                      {
-                        "source": "lengthImplementedKm",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
-                      },
                       {
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Reason for actual being different to mapped amount",
-                            "source": "mappingNotAlignedReason",
-                            "type": "selectOne"
+                            "preLabel": "(iii)  Total Number of  indicator pest animal surveys completed for this reporting period",
+                            "source": "totalSurveyIndicator",
+                            "type": "number"
                           }
                         ]
                       },
@@ -14044,213 +21235,429 @@
                         "type": "row",
                         "items": [
                           {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "mappingNotAlignedComments",
-                            "type": "textarea",
-                            "rows": 5
+                            "preLabel": "(iv) Total Number of indicator pest animal surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyIndicatorInvoiced",
+                            "type": "number"
                           }
                         ]
                       }
                     ]
-                  },
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
                   {
-                    "helpText": "Enter the amount you will invoice for during this reporting period.",
-                    "width": "10%",
-                    "type": "col",
-                    "title": "Invoiced area (ha) covered by practice change",
+                    "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                    "source": "totalInvoicedPestAnimalMismatched",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": ""
+                  }
+                ]
+              },
+              {
+                "addRowText": "Add survey",
+                "removeRowText": "Delete this survey",
+                "userAddedRows": true,
+                "source": "pestAnimalSurveys",
+                "type": "repeat",
+                "items": [
+                  {
+                    "type": "row",
                     "items": [
                       {
-                        "source": "areaImplementedInvoicedHa",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
-                      },
-                      {
-                        "source": "areaImplementedInvoicedKm",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
-                      },
-                      {
-                        "type": "row",
+                        "type": "col",
                         "items": [
                           {
-                            "preLabel": "Reason for invoiced amount being different to actual amount",
-                            "source": "invoicedNotActualReason",
-                            "type": "selectOne"
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s relates to this survey?"
                           }
                         ]
                       },
                       {
-                        "type": "row",
+                        "type": "col",
                         "items": [
                           {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "invoicedNotActualComments",
-                            "type": "textarea",
-                            "rows": 5
+                            "source": "baselineOrIndicatorSurvey",
+                            "type": "selectOne",
+                            "preLabel": "Baseline survey or indicator (follow-up) survey?"
                           }
                         ]
                       }
                     ]
                   },
                   {
-                    "width": "10%",
-                    "title": "Type of action",
-                    "type": "col",
+                    "type": "row",
                     "items": [
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "practiceChangeType",
-                            "type": "select2"
-                          }
-                        ]
-                      },
-                      {
-                        "source": "otherPracticeChangeType",
-                        "title": "Type of action (if Other)",
+                        "source": "surveyObjective",
+                        "preLabel": "Survey objective",
                         "type": "text"
                       }
                     ]
                   },
                   {
-                    "width": "10%",
-                    "source": "industryType",
-                    "title": "Industry type",
-                    "type": "selectOne"
-                  },
-                  {
-                    "width": "10%",
-                    "source": "practiceChangeObjective",
-                    "title": "Purpose of improving land management practice",
-                    "type": "textarea"
-                  },
-                  {
-                    "width": "10%",
-                    "title": "Please map any off-site area/s if they benefitted from this practice change",
-                    "type": "col",
+                    "type": "repeat",
+                    "source": "pestAnimalDataSets",
+                    "userAddedRows": true,
+                    "addRowText": "New data set",
+                    "removeRowText": "Delete this data set",
                     "items": [
                       {
-                        "source": "offSiteBenefitSites",
-                        "type": "feature"
-                      },
-                      {
-                        "source": "offSiteBenefitAreaHa",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
+                        "type": "row",
+                        "css": "border-bottom",
+                        "items": [
+                          {
+                            "type": "col",
+                            "items": [
+                              {
+                                "source": "dataSetId",
+                                "type": "selectOne",
+                                "preLabel": "Please select the data set produced by this survey.  Note it must have already been entered on the Data Set Summary tab."
+                              }
+                            ]
+                          }
+                        ]
                       },
                       {
-                        "source": "evidenceOfBenefit",
-                        "placeholder": "Please provide a description on the evidence available to reflect this benefit",
-                        "type": "textarea"
-                      }
-                    ]
-                  },
-                  {
-                    "width": "15%",
-                    "type": "col",
-                    "title": "Which investment priority does this activity relate to?",
-                    "items": [
-                      {
-                        "source": "investmentPriorities2",
-                        "type": "select2Many"
+                        "type": "row",
+                        "items": [
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "projectBaselines",
+                                    "type": "selectMany",
+                                    "preLabel": "Which project baseline/s relate to this survey?",
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "investmentPriorities2",
+                                    "preLabel": "Which investment priority does this activity relate to?",
+                                    "type": "select2Many"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity start date",
+                                    "source": "activitiesStartDate",
+                                    "type": "date"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity end date",
+                                    "source": "activitiesEndDate",
+                                    "type": "date"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Sites covered by pest animal survey",
+                                    "source": "sitesCoveredForPestAnimal",
+                                    "type": "feature"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedAreaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedLengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Please attach mapping details",
+                                    "source": "extraMappingDetails",
+                                    "type": "document"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Actual area (ha) / length (km) covered by pest animal survey",
+                                    "source": "areaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "lengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Reason for actual being different to mapped amount",
+                                    "source": "mappingNotAlignedReason",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                                    "source": "mappingNotAlignedComments",
+                                    "type": "textarea",
+                                    "rows": 5
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique",
+                                    "source": "emsaProtocol",
+                                    "type": "selectOne",
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique (if Other)",
+                                    "source": "otherEmsaProtocol",
+                                    "type": "select2Many"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "surveyMethodology",
+                                    "preLabel": "Survey methodology",
+                                    "type": "text"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "invoicingThisActivity",
+                                    "preLabel": "Are you invoicing for this activity in this reporting period?",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              }
+                            ]
+                          }
+                        ]
                       },
                       {
-                        "source": "otherInvestmentPriority",
-                        "type": "text"
+                        "columns": [
+                          {
+                            "width": "55%",
+                            "source": "species",
+                            "title": "Target species recorded",
+                            "type": "speciesSelect"
+                          },
+                          {
+                            "width": "25%",
+                            "source": "individualsOrGroups",
+                            "title": "Individuals or groups?",
+                            "type": "selectOne"
+                          },
+                          {
+                            "width": "20%",
+                            "source": "numberOfIndividualsOrGroups",
+                            "title": "Number of individuals / groups in pest animal survey",
+                            "type": "number"
+                          }
+                        ],
+                        "userAddedRows": true,
+                        "disableTableUpload": true,
+                        "source": "pestAnimalSurveySpeciesTable",
+                        "type": "table"
                       }
                     ]
-                  },
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
                   {
-                    "width": "15%",
-                    "source": "relatedOutcomes",
-                    "type": "selectOne",
-                    "title": "Which outcome statement/s relates to this survey?"
+                    "preLabel": "Optionally attach photos",
+                    "source": "photographicEvidence",
+                    "type": "image"
                   }
-                ],
-                "userAddedRows": true,
-                "source": "landManagementDetails",
-                "type": "table"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
-              {
-                "preLabel": "Optionally attach photos",
-                "source": "photographicEvidence",
-                "type": "image"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
-              {
-                "preLabel": "Clarification, if needed",
-                "type": "textarea",
-                "rows": 4,
-                "css": "span8",
-                "source": "comments",
-                "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
+                ]
+              },
               {
-                "type": "literal",
-                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Clarification, if needed",
+                    "type": "textarea",
+                    "rows": 4,
+                    "css": "span8",
+                    "source": "comments",
+                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+                  }
+                ]
               },
               {
-                "preLabel": "Data have been uploaded",
-                "source": "dataUploaded",
-                "type": "boolean"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
+                  },
+                  {
+                    "preLabel": "Data have been uploaded",
+                    "source": "dataUploaded",
+                    "type": "boolean"
+                  }
+                ]
+              },
               {
-                "preLabel": "",
-                "source": "projectAssuranceDetails",
-                "type": "textarea",
-                "rows": 4,
-                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
-              }
-            ]
-          },
-          {
-            "type": "table",
-            "source": "assuranceDocuments",
-            "userAddedRows": true,
-            "disableTableUpload": true,
-            "columns": [
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "",
+                    "source": "projectAssuranceDetails",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                  }
+                ]
+              },
               {
-                "title": "Attached documents",
-                "source": "attachments",
-                "type": "document"
+                "type": "table",
+                "source": "assuranceDocuments",
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "columns": [
+                  {
+                    "title": "Attached documents",
+                    "source": "attachments",
+                    "type": "document"
+                  }
+                ]
               }
             ]
           }
         ]
       },
       "modelName": null,
-      "templateName": "nhtLandManagementPractices",
+      "templateName": "nhtPestAnimalSurvey",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Improving land management practices",
+      "title": "Pest animal survey",
       "collapsibleHeading": null,
-      "name": "NHT - Improving land management practices",
+      "name": "NHT - Pest animal survey",
       "description": null
     },
     {
@@ -14258,80 +21665,167 @@
       "template": {
         "dataModel": [
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "allowRowDelete": "false",
+            "columns": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
               }
             ],
-            "validate": "required,min[0]"
+            "dataType": "list",
+            "name": "participationInformationTableRem"
           },
           {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
+            "columns": [
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
+                  }
+                }
+              },
+              {
+                "name": "investmentPriorities2",
+                "dataType": "text",
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
+                  }
+                }
+              },
+              {
+                "dataType": "text",
+                "name": "otherInvestmentPriority",
+                "behaviour": [
+                  {
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
+                  }
+                ]
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-
-          {
-            "columns": [
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
+              },
               {
                 "dataType": "text",
                 "name": "initialOrFollowup",
@@ -14342,318 +21836,482 @@
                 "validate": "required"
               },
               {
-                "columns": [
-                  {
-                    "dataType": "feature",
-                    "name": "siteTreated"
-                  },
-                  {
-                    "defaultValue": {
-                      "expression": "$geom.areaHa(siteTreated)",
-                      "type": "computed"
-                    },
-                    "dataType": "number",
-                    "name": "calculatedAreaTreatedHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "behaviour": [
-                      {
-                        "condition": "areaTreatedInvoicedHa > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "The managed area must be mapped",
-                          "validate": "required,min[0.0001]"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "computed": {
-                      "expression": "$geom.lengthKm(siteTreated)"
-                    },
-                    "dataType": "number",
-                    "name": "calculatedLengthTreatedKm",
-                    "units": "km",
-                    "decimalPlaces": 3,
-                    "behaviour": [
-                      {
-                        "condition": "lengthTreatedKm > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "The managed length must be mapped",
-                          "validate": "required,min[0.0001]"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "defaultValue": {
-                      "expression": "calculatedAreaTreatedHa",
-                      "type": "computed"
-                    },
-                    "dataType": "number",
-                    "name": "areaTreatedHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "validate": "required,min[0]"
-                  },
-                  {
-                    "defaultValue": {
-                      "expression": "calculatedLengthTreatedKm",
-                      "type": "computed"
-                    },
-                    "dataType": "number",
-                    "name": "lengthTreatedKm",
-                    "units": "km",
-                    "decimalPlaces": 3,
-                    "validate": "required,min[0]"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "mappingNotAlignedReason",
-                    "behaviour": [
-                      {
-                        "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1))",
-                        "type": "visible"
-                      }
-                    ],
-                    "constraints": [
-                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                      "Other"
-                    ],
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "mappingNotAlignedComments",
-                    "behaviour": [
-                      {
-                        "condition": "\"Other\" == mappingNotAlignedReason",
-                        "type": "visible"
-                      }
-                    ],
-                    "validate": "required,maxSize[300]"
-                  },
-                  {
-                    "dataType": "document",
-                    "name": "extraMappingDetails",
-                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
-                    "behaviour": [
-                      {
-                        "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1)) or roundTo(areaTreatedHa, 2) != roundTo(areaTreatedInvoicedHa, 2)",
-                        "type": "visible"
-                      }
-                    ],
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "number",
-                    "name": "areaTreatedInvoicedHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "validate": [
-                      {
-                        "rule": "min[0]"
-                      },
-                      {
-                        "param": {
-                          "expression": "areaTreatedHa",
-                          "type": "computed"
-                        },
-                        "rule": "max"
-                      }
-                    ]
-                  },
-                  {
-                    "dataType": "number",
-                    "name": "areaTreatedInvoicedKm",
-                    "units": "km",
-                    "decimalPlaces": 3,
-                    "validate": [
-                      {
-                        "rule": "required"
-                      },
-                      {
-                        "rule": "min[0]"
-                      },
-                      {
-                        "param": {
-                          "expression": "lengthTreatedKm",
-                          "type": "computed"
-                        },
-                        "rule": "max"
-                      }
-                    ]
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "invoicedNotActualReason",
-                    "behaviour": [
-                      {
-                        "condition": "roundTo(areaTreatedHa, 2) != roundTo(areaTreatedInvoicedHa, 2) or roundTo(lengthTreatedKm, 2) != roundTo(areaTreatedInvoicedKm, 2)",
-                        "type": "visible"
-                      }
-                    ],
-                    "constraints": [
-                      "Work was undertaken over a greater area than will be invoiced for",
-                      "Other"
-                    ],
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "invoicedNotActualComments",
-                    "behaviour": [
-                      {
-                        "condition": "\"Other\" == invoicedNotActualReason",
-                        "type": "visible"
-                      }
-                    ],
-                    "validate": "required,maxSize[300]"
-                  },
+                "dataType": "number",
+                "name": "noRemediationInterventions",
+                "validate": "required"
+              },
+              {
+                "dataType": "feature",
+                "name": "sitesRemediated",
+                "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
+              },
+              {
+                "computed": {
+                  "expression": "$geom.areaHa(sitesRemediated)"
+                },
+                "dataType": "number",
+                "name": "calculatedAreaTreatedHaRemediated",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesRemediated)"
+                },
+                "dataType": "number",
+                "name": "calculatedLengthTreatedKmRemediated",
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "targetDisease",
-                    "description": "",
-                    "validate": "required,maxSize[100]"
-                  },
+                    "condition": "lengthTreatedKmRemediated > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
+                    }
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaTreatedHaRemediated"
+                },
+                "dataType": "number",
+                "name": "areaTreatedHaRemediated",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedReasonRemediated",
+                "constraints": [
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                  "Other"
+                ],
+                "validate": "required",
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "managementMethod",
-                    "dwcAttribute": "treatmentMethod",
-                    "constraints": [
-                      "Biological control agents",
-                      "Fumigation",
-                      "Host destruction",
-                      "Plant disease management - quarantine",
-                      "Plant disease management - treatment",
-                      "Plant disease management - hygiene",
-                      "Positive competition",
-                      "Other"
-                    ],
-                    "validate": "required"
-                  },
+                    "condition": "not (within(areaTreatedHaRemediated, calculatedAreaTreatedHaRemediated, 0.1) and within(lengthTreatedKmRemediated, calculatedLengthTreatedKmRemediated, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedCommentsRemediated",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "otherManagementMethod",
-                    "description": "Please specify the management method used if Other (specify in notes) was selected in the Management Method column.",
-                    "behaviour": [
-                      {
-                        "condition": "managementMethod == \"Other\"",
-                        "type": "enable"
-                      }
-                    ],
-                    "validate": "required,maxSize[100]"
-                  },
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReasonRemediated"
+                  }
+                ]
+              },
+              {
+                "dataType": "document",
+                "name": "extraMappingDetailsRemediated",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "treatmentObjective",
-                    "description": "Please start with either part of the field heading [dash]. If reporting on both separate the information with a ';'. (eg. 'Management method -' and a brief description of method being used to fix the area; 'Treatment objective -' and a brief description of how the work will contribute to the area.",
-                    "validate": "required,maxSize[300]"
-                  },
+                    "condition": "not (within(areaTreatedHaRemediated, calculatedAreaTreatedHaRemediated, 0.1) and within(lengthTreatedKmRemediated, calculatedLengthTreatedKmRemediated, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKmRemediated"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKmRemediated",
+                "units": "km",
+                "decimalPlaces": 3
+              },
+              {
+                "dataType": "date",
+                "name": "activitiesStartDate",
+                "description": "Specific the dates these events were held on.",
+                "validate": "required"
+              },
+              {
+                "dataType": "date",
+                "name": "activitiesEndDate",
+                "description": "Specific the dates these events were held on.",
+                "validate": [
                   {
-                    "dataType": "feature",
-                    "name": "offSiteBenefitSites"
+                    "rule": "required"
                   },
                   {
-                    "defaultValue": {
-                      "expression": "$geom.areaHa(offSiteBenefitSites)",
+                    "rule": "future",
+                    "param": {
+                      "expression": "formatDateForValidation(activitiesStartDate)",
                       "type": "computed"
-                    },
-                    "dataType": "number",
-                    "name": "offSiteBenefitAreaHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "validate": "min[0]"
-                  },
+                    }
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "typesOfRemediationInstalled",
+                "description": "",
+                "constraints": [
+                  "Access control",
+                  "Bank grooming",
+                  "Flow gauging stations",
+                  "Fords",
+                  "Culverts",
+                  "Revegetation",
+                  "Weirs",
+                  "Other"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "text",
+                "name": "otherRemediationType",
+                "behaviour": [
                   {
-                    "defaultValue": {
-                      "expression": "$geom.lengthKm(offSiteBenefitSites)",
-                      "type": "computed"
-                    },
-                    "dataType": "number",
-                    "name": "offSiteBenefitLengthKm",
-                    "units": "km",
-                    "decimalPlaces": 3,
-                    "validate": "min[0]"
-                  },
+                    "condition": "typesOfRemediationInstalled == \"Other\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,maxSize[100]"
+              },
+              {
+                "dataType": "text",
+                "name": "remediationType",
+                "description": "",
+                "constraints": [
+                  "Access control",
+                  "Bank grooming",
+                  "Flow gauging stations",
+                  "Fords",
+                  "Culverts",
+                  "Revegetation",
+                  "Weirs",
+                  "Other"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "text",
+                "name": "otherAquaticOrRemediationType",
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "evidenceOfBenefit",
-                    "validate": "maxSize[300]"
-                  },
+                    "condition": "remediationType == \"Other\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,maxSize[100]"
+              },
+              {
+                "dataType": "feature",
+                "name": "sitesBenefitted",
+                "description": "Mapping field to be done and Area (ha) field be auto-calculated from mapping."
+              },
+              {
+                "computed": {
+                  "expression": "$geom.areaHa(sitesBenefitted)"
+                },
+                "dataType": "number",
+                "name": "calculatedAreaTreatedHaBenefitted",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesBenefitted)"
+                },
+                "dataType": "number",
+                "name": "calculatedLengthTreatedKmBenefitted",
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "name": "investmentPriorities2",
-                    "dataType": "stringList",
-                    "validate": "required",
-                    "constraints": {
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "params": [
-                            {
-                              "expression": "owner.projectId",
-                              "name": "id",
-                              "type": "computed"
-                            }
-                          ],
-                          "url": "/project/listProjectInvestmentPriorities/"
-                        }
-                      }
+                    "condition": "lengthTreatedKmBenefitted > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
                     }
-                  },
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaTreatedHaBenefitted"
+                },
+                "dataType": "number",
+                "name": "areaTreatedHaBenefitted",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedReasonBenefitted",
+                "constraints": [
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                  "Other"
+                ],
+                "validate": "required",
+                "behaviour": [
                   {
-                    "dataType": "text",
-                    "name": "otherInvestmentPriority",
-                    "behaviour": [
-                      {
-                        "type": "enable",
-                        "condition": "\"Other\" in investmentPriorities2"
-                      }
-                    ]
-                  },
+                    "condition": "not (within(areaTreatedHaBenefitted, calculatedAreaTreatedHaBenefitted, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedCommentsBenefitted",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
                   {
-                    "name": "relatedOutcomes",
-                    "dataType": "text",
-                    "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                    "validate": "required",
-                    "constraints": {
-                      "textProperty": "label",
-                      "valueProperty": "label",
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "url": "/project/outcomesByScores",
-                          "params": [{
-                            "expression": "owner.projectId",
-                            "name": "id",
-                            "type": "computed"
-                          }, {
-                            "expression": "scores",
-                            "name": "scoreIds",
-                            "type": "computed"
-                          }
-                          ]
-                        }
-                      }
-                    }
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReasonBenefitted"
                   }
-                ],
-                "dataType": "list",
-                "name": "diseaseManagementDetails"
+                ]
+              },
+              {
+                "dataType": "document",
+                "name": "extraMappingDetailsBenefitted",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
+                  {
+                    "condition": "not (within(areaTreatedHaBenefitted, calculatedAreaTreatedHaBenefitted, 0.1) and within(lengthTreatedKmBenefitted, calculatedLengthTreatedKmBenefitted, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKmBenefitted"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKmBenefitted",
+                "units": "km",
+                "decimalPlaces": 3
+              },
+              {
+                "dataType": "text",
+                "name": "evidenceOfBenefit",
+                "validate": "maxSize[100]"
+              }
+            ],
+            "dataType": "list",
+            "name": "remediatingAreas"
+          },
+          {
+            "dataType": "number",
+            "name": "totalAreaRemediationInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(remediatingAreas, \"initialOrFollowup == 'Initial' ? areaTreatedHaRemediated : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalAreaRemediationInitialInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaRemediationInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalAreaRemediationFollowup",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(remediatingAreas, \"initialOrFollowup == 'Follow-up' ? areaTreatedHaRemediated : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalAreaRemediationFollowupInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaRemediationFollowup",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
               }
             ],
-            "dataType": "list",
-            "name": "diseaseManagementAreasControlled"
+            "defaultValue": ""
           },
+
           {
-            "name": "diseaseSurveyCountHeader",
-            "type": "number",
+            "dataType": "number",
+            "name": "totalLengthRemediationInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(remediatingAreas, \"initialOrFollowup == 'Initial' ? lengthTreatedKmRemediated : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalLengthRemediationInitialInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalLengthRemediationInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalLengthRemediationFollowup",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(remediatingAreas, \"initialOrFollowup == 'Follow-up' ? lengthTreatedKmRemediated : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalLengthRemediationFollowupInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalLengthRemediationFollowup",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+
+          {
+            "dataType": "number",
+            "name": "totalStructuresInstalled",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(remediatingAreas, \"noRemediationInterventions\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalStructuresInstalledInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalStructuresInstalled",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalStructuresInstalledFollowup",
+            "validate": "min[0]",
             "decimalPlaces": 0,
             "computed": {
-              "expression": "count(diseaseManagementAreasControlled, \"relatedOutcomes\")"
+              "expression": "sum(remediatingAreas, \"initialOrFollowup == 'Follow-up' ? noRemediationInterventions : 0\")"
             }
           },
+          {
+            "dataType": "number",
+            "name": "totalStructuresInstalledFollowupInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalStructuresInstalledFollowup",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedRemediationMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalAreaRemediationInitialInvoiced < +totalAreaRemediationInitial or +totalAreaRemediationFollowupInvoiced < +totalAreaRemediationFollowup or +totalLengthRemediationInitialInvoiced < +totalLengthRemediationInitial or +totalLengthRemediationFollowupInvoiced < +totalLengthRemediationFollowup or +totalStructuresInstalledInvoiced < +totalStructuresInstalled",
+                "type": "enable"
+              }
+            ]
+          },
           {
             "dataType": "text",
             "name": "comments",
@@ -14666,12 +22324,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -14680,26 +22338,37 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Disease management",
-        "title": "Managing disease",
+        "modelName": "NHT - Remediating riparian and aquatic areas",
+        "title": "Remediating Riparian and Aquatic Areas",
         "viewModel": [
           {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
             "columns": [
               {
                 "width": "10%",
                 "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
+                "title": "Are individuals or groups delivering this service?",
                 "type": "selectOne"
               },
               {
                 "width": "20%",
                 "type": "col",
-                "title": "Total Number of people delivering this service",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "participationIndividualNumber",
@@ -14714,87 +22383,339 @@
               {
                 "type": "col",
                 "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "firstNationIndividualNumber",
                     "type": "number"
                   },
                   {
-                    "source": "firstNationGroupNumber",
-                    "type": "selectOne"
+                    "source": "firstNationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
+              }
+            ],
+            "source": "participationInformationTableRem",
+            "type": "table"
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total area (ha) of remediation of riparian/aquatic areas (initial) during this reporting period",
+                        "source": "totalAreaRemediationInitial",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total area (ha) of remediation of riparian/aquatic areas (initial) <u><i>invoiced</i></u> for during this reporting period",
+                        "source": "totalAreaRemediationInitialInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii) Total area (ha) of remediation of riparian/aquatic areas (follow - up) during this reporting period",
+                        "source": "totalAreaRemediationFollowup",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total area (ha) of remediation of riparian/aquatic areas (follow - up) <u><i>invoiced</i></u> for during this reporting period",
+                        "source": "totalAreaRemediationFollowupInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(v) Total length (km) of remediation of riparian/aquatic areas (initial) during this reporting period",
+                        "source": "totalLengthRemediationInitial",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vi) Total length (km) of remediation of riparian/aquatic areas (initial) <u><i>invoiced</i></u> for during this reporting period",
+                        "source": "totalLengthRemediationInitialInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vii) Total length (km) of remediation of riparian/aquatic areas (follow-up) during this reporting period",
+                        "source": "totalLengthRemediationFollowup",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(viii) Total length (km) of remediation of riparian/aquatic areas (follow-up) <u><i>invoiced</i></u> for during this reporting period",
+                        "source": "totalLengthRemediationFollowupInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ix) Number of remediation interventions applied to promote aquatic health during this reporting period",
+                        "source": "totalStructuresInstalled",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(x) Number of remediation interventions applied to promote aquatic health <u><i>invoiced</i></u> for during this reporting period",
+                        "source": "totalStructuresInstalledInvoiced",
+                        "type": "number"
+                      }
+                    ]
                   }
                 ]
-              },
-              {
-                "source": "participationDetails",
-                "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                "type": "textarea"
               }
-            ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
-            "type": "table"
+            ]
           },
           {
-            "preLabel": "Number of Managing Disease surveys conducted:",
-            "noEdit": true,
-            "type": "number",
-            "source": "diseaseSurveyCountHeader"
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedRemediationMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
           },
           {
-            "addRowText": "Add a new controlled area",
+            "addRowText": "Add a new remediated area",
             "userAddedRows": true,
-            "source": "diseaseManagementAreasControlled",
+            "source": "remediatingAreas",
             "type": "repeat",
             "items": [
               {
                 "type": "row",
-                "css": "border-bottom",
                 "items": [
                   {
-                    "preLabel": "Initial or Follow-up?",
+                    "css": "span3 col-border-right",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
                     "css": "span3",
-                    "source": "initialOrFollowup",
-                    "type": "selectOne"
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
                   }
                 ]
               },
               {
-                "columns": [
+                "type": "row",
+                "items": [
                   {
-                    "width": "15%",
                     "type": "col",
-                    "title": "Site/s where disease managed",
+                    "css": "span3 col-border-right",
                     "items": [
                       {
-                        "source": "siteTreated",
-                        "type": "feature"
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "noRemediationInterventions",
+                            "preLabel": "Number of remediation interventions installed",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "initialOrFollowup",
+                            "preLabel": "Initial or follow-up treatment?",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Site/s covered by remediation",
+                            "source": "sitesRemediated",
+                            "type": "feature"
+                          }
+                        ]
                       },
                       {
-                        "readonly": "readonly",
-                        "source": "calculatedAreaTreatedHa",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "calculatedAreaTreatedHaRemediated",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
+                          }
+                        ]
                       },
                       {
-                        "readonly": "readonly",
-                        "source": "calculatedLengthTreatedKm",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "calculatedLengthTreatedKmRemediated",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
+                          }
+                        ]
                       },
                       {
                         "type": "row",
                         "items": [
                           {
                             "preLabel": "Please attach mapping details",
-                            "source": "extraMappingDetails",
+                            "source": "extraMappingDetailsRemediated",
                             "type": "document"
                           }
                         ]
@@ -14802,31 +22723,40 @@
                     ]
                   },
                   {
-                    "helpText": "Enter the amount you will invoice for during this reporting period.",
-                    "width": "10%",
                     "type": "col",
-                    "title": "Actual area (ha) / length (km) where disease has been managed",
+                    "css": "span3 col-border-right",
                     "items": [
                       {
-                        "source": "areaTreatedHa",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Actual area (ha) / length (km) being remediated",
+                            "source": "areaTreatedHaRemediated",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
                       },
                       {
-                        "source": "lengthTreatedKm",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "lengthTreatedKmRemediated",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
                       },
                       {
                         "type": "row",
                         "items": [
                           {
                             "preLabel": "Reason for actual being different to mapped amount",
-                            "source": "mappingNotAlignedReason",
+                            "source": "mappingNotAlignedReasonRemediated",
                             "type": "selectOne"
                           }
                         ]
@@ -14836,36 +22766,119 @@
                         "items": [
                           {
                             "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "mappingNotAlignedComments",
+                            "source": "mappingNotAlignedCommentsRemediated",
                             "type": "textarea",
                             "rows": 5
                           }
                         ]
                       }
                     ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "activitiesStartDate",
+                            "type": "date",
+                            "preLabel": "Activity start date"
+                          }
+                        ]
+                      }
+                    ]
                   },
                   {
-                    "helpText": "Enter the amount you will invoice for during this reporting period.",
-                    "width": "10%",
                     "type": "col",
-                    "title": "Invoiced area (ha) where disease has been managed",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "activitiesEndDate",
+                            "preLabel": "Activity end date",
+                            "type": "date"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Type of remediation intervention",
+                            "source": "typesOfRemediationInstalled",
+                            "type": "select2"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "otherRemediationType",
+                            "placeholder": "Type of remediation intervention (if Other)",
+                            "type": "text"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Type of aquatic or riparian remediation",
+                            "source": "remediationType",
+                            "type": "select2"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "otherAquaticOrRemediationType",
+                            "placeholder": "Type of aquatic or riparian remediation (if Other)",
+                            "type": "text"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
                     "items": [
-                      {
-                        "source": "areaTreatedInvoicedHa",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
-                      },
                       {
                         "type": "row",
                         "items": [
                           {
-                            "source": "areaTreatedInvoicedKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
+                            "preLabel": "Please identify any off-site area/s that may benefit from this service",
+                            "source": "sitesBenefitted",
+                            "type": "feature"
                           }
                         ]
                       },
@@ -14873,9 +22886,12 @@
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Reason for invoiced amount being different to actual amount",
-                            "source": "invoicedNotActualReason",
-                            "type": "selectOne"
+                            "source": "calculatedAreaTreatedHaBenefitted",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
                           }
                         ]
                       },
@@ -14883,352 +22899,144 @@
                         "type": "row",
                         "items": [
                           {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "invoicedNotActualComments",
-                            "type": "textarea",
-                            "rows": 5
+                            "preLabel": "Please attach mapping details",
+                            "source": "extraMappingDetailsBenefitted",
+                            "type": "document"
                           }
                         ]
                       }
                     ]
                   },
                   {
-                    "width": "10%",
-                    "source": "targetDisease",
-                    "title": "Disease treated",
-                    "type": "text"
-                  },
-                  {
-                    "width": "10%",
                     "type": "col",
-                    "title": "Type of management method / treatment",
+                    "css": "span3 col-border-right",
                     "items": [
                       {
                         "type": "row",
                         "items": [
                           {
-                            "source": "managementMethod",
-                            "type": "select2"
+                            "source": "evidenceOfBenefit",
+                            "preLabel": "Please provide a description on the evidence available to reflect this benefit",
+                            "type": "textarea"
                           }
                         ]
-                      },
-                      {
-                        "source": "otherManagementMethod",
-                        "placeholder": "Type of management method / treatment (if other)",
-                        "type": "text"
-                      }
-                    ]
-                  },
-                  {
-                    "width": "10%",
-                    "source": "treatmentObjective",
-                    "title": "Management method / treatment objective",
-                    "type": "textarea"
-                  },
-                  {
-                    "width": "15%",
-                    "type": "col",
-                    "title": "Please map any off-site area/s if they have also benefitted from this disease management",
-                    "items": [
-                      {
-                        "source": "offSiteBenefitSites",
-                        "type": "feature"
-                      },
-                      {
-                        "source": "offSiteBenefitAreaHa",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
-                      },
-                      {
-                        "source": "offSiteBenefitLengthKm",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
-                      },
-                      {
-                        "source": "evidenceOfBenefit",
-                        "placeholder": "Please provide a description on the evidence available to reflect this benefit",
-                        "type": "textarea"
-                      }
-                    ]
-                  },
-                  {
-                    "width": "10%",
-                    "type": "col",
-                    "title": "Which investment priority does this activity relate to?",
-                    "items": [
-                      {
-                        "source": "investmentPriorities2",
-                        "type": "select2Many"
-                      },
-                      {
-                        "source": "otherInvestmentPriority",
-                        "type": "text"
                       }
                     ]
-                  },
-                  {
-                    "width": "10%",
-                    "source": "relatedOutcomes",
-                    "type": "selectOne",
-                    "title": "Which outcome statement/s relates to this survey?"
                   }
-                ],
-                "userAddedRows": true,
-                "source": "diseaseManagementDetails",
-                "type": "table"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
-              {
-                "preLabel": "Optionally attach photos",
-                "source": "photographicEvidence",
-                "type": "image"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
-              {
-                "preLabel": "Clarification, if needed",
-                "type": "textarea",
-                "rows": 4,
-                "css": "span8",
-                "source": "comments",
-                "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
-              }
-            ]
-          },
-          {
-            "type": "row",
-            "items": [
-              {
-                "type": "literal",
-                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
-              },
-              {
-                "preLabel": "Data have been uploaded",
-                "source": "dataUploaded",
-                "type": "boolean"
+                ]
               }
             ]
           },
           {
-            "type": "row",
+            "type": "section",
             "items": [
               {
-                "preLabel": "",
-                "source": "projectAssuranceDetails",
-                "type": "textarea",
-                "rows": 4,
-                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
-              }
-            ]
-          },
-          {
-            "type": "table",
-            "source": "assuranceDocuments",
-            "userAddedRows": true,
-            "disableTableUpload": true,
-            "columns": [
-              {
-                "title": "Attached documents",
-                "source": "attachments",
-                "type": "document"
-              }
-            ]
-          }
-        ]
-      },
-      "modelName": null,
-      "templateName": "nhtDiseaseManagement",
-      "optional": true,
-      "optionalQuestionText": null,
-      "title": "Managing disease",
-      "collapsibleHeading": null,
-      "name": "NHT - Disease management",
-      "description": null
-    },
-    {
-      "collapsedByDefault": false,
-      "template": {
-        "dataModel": [
-          {
-            "columns": [
-              {
-                "columns": [
-                  {
-                    "dataType": "species",
-                    "name": "species",
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "individualsOrGroups",
-                    "constraints": [
-                      "Individuals",
-                      "Groups"
-                    ],
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "number",
-                    "name": "numberOfIndividualsOrGroups",
-                    "validate": "required,min[0]"
-                  },
-                  {
-                    "dataType": "stringList",
-                    "name": "ternSurveyTechnique",
-                    "validate": "required",
-                    "constraints": [
-                      "Tern Survey technique 1",
-                      "Tern Survey technique 1",
-                      "Tern Survey technique 1",
-                      "Other"
-                    ]
-                  },
-                  {
-                    "dataType": "text",
-                    "description": "Please describe the Survey technique if other was selected.",
-                    "name": "otherTernSurveyTechnique",
-                    "behaviour": [
-                      {
-                        "condition": "ternSurveyTechnique == \"Other\"",
-                        "type": "enable_and_clear"
-                      }
-                    ],
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "surveyMethodology",
-                    "description": "Provide more details on what is being done",
-                    "validate": "required,maxSize[3000]"
-                  },
+                "type": "row",
+                "items": [
                   {
-                    "dataType": "text",
-                    "name": "surveyObjective",
-                    "description": "How will the information obtained from the survey be used",
-                    "validate": "required,maxSize[3000]"
-                  }
-                ],
-                "dataType": "list",
-                "name": "pestAnimalSurveySpeciesTable"
-              },
-              {
-                "dataType": "text",
-                "name": "baselineOrIndicatorSurvey",
-                "description": "",
-                "constraints": [
-                  "Baseline",
-                  "Indicator"
-                ],
-                "validate": "required"
-              },
-              {
-                "name": "projectBaseline",
-                "dataType": "text",
-                "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "baseline",
-                  "valueProperty": "code",
-                  "type": "pre-populated",
-                  "excludePath": "projectBaseline",
-                  "config": {
-                    "source": {
-                      "context-path": "owner.custom.details.baseline.rows"
-                    }
+                    "preLabel": "Optionally attach photos",
+                    "source": "photographicEvidence",
+                    "type": "image"
                   }
-                }
+                ]
               },
               {
-                "name": "datasetSupports",
-                "dataType": "text",
-                "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "name",
-                  "valueProperty": "dataSetId",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "context-path": "owner.custom.dataSets"
-                    }
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Clarification, if needed",
+                    "type": "textarea",
+                    "rows": 4,
+                    "css": "span8",
+                    "source": "comments",
+                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
                   }
-                }
+                ]
               },
               {
-                "name": "relatedOutcomes",
-                "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "label",
-                  "valueProperty": "label",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
-                      }
-                      ]
-                    }
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
+                  },
+                  {
+                    "preLabel": "Data have been uploaded",
+                    "source": "dataUploaded",
+                    "type": "boolean"
                   }
-                }
+                ]
               },
               {
-                "dataType": "date",
-                "name": "activitiesStartDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "",
+                    "source": "projectAssuranceDetails",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                  }
+                ]
               },
               {
-                "dataType": "date",
-                "name": "activitiesEndDate",
-                "description": "Specific the dates these events were held on",
+                "type": "table",
+                "source": "assuranceDocuments",
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "columns": [
+                  {
+                    "title": "Attached documents",
+                    "source": "attachments",
+                    "type": "document"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "modelName": null,
+      "templateName": "nhtRemediatingRiparianAndAquaticAreas",
+      "optional": true,
+      "optionalQuestionText": null,
+      "title": "Remediating riparian and aquatic areas",
+      "collapsibleHeading": null,
+      "name": "NHT - Remediating riparian and aquatic areas",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
+          {
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "initialOrFollowup",
+                "constraints": [
+                  "Initial",
+                  "Follow-up"
+                ],
                 "validate": "required"
               },
               {
                 "dataType": "feature",
-                "name": "sitesTreated"
+                "name": "sitesUndertakenForWeedTreatment",
+                "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
               },
               {
                 "computed": {
-                  "expression": "$geom.areaHa(sitesTreated)"
+                  "expression": "$geom.areaHa(sitesUndertakenForWeedTreatment)"
                 },
                 "dataType": "number",
                 "name": "calculatedAreaTreatedHa",
                 "units": "ha",
-                "decimalPlaces": 3,
-                "behaviour": [
-                  {
-                    "condition": "areaInvoicedTreatedHa > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The managed area must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
-                  }
-                ]
+                "decimalPlaces": 3
               },
               {
                 "computed": {
-                  "expression": "$geom.lengthKm(sitesTreated)"
+                  "expression": "$geom.lengthKm(sitesUndertakenForWeedTreatment)"
                 },
                 "dataType": "number",
                 "name": "calculatedLengthTreatedKm",
@@ -15252,6 +23060,7 @@
                 },
                 "dataType": "number",
                 "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
                 "units": "ha",
                 "decimalPlaces": 3,
                 "validate": "required,min[0]"
@@ -15260,199 +23069,430 @@
                 "dataType": "text",
                 "name": "mappingNotAlignedReason",
                 "constraints": [
-                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                  "Other"
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                  "Other"
+                ],
+                "validate": "required",
+                "behaviour": [
+                  {
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedComments",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
+                  {
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReason"
+                  }
+                ]
+              },
+              {
+                "dataType": "document",
+                "name": "extraMappingDetails",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
+                  {
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKm"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
+              },
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "label",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "url": "/project/outcomesByScores",
+                      "params": [
+                        {
+                          "expression": "owner.projectId",
+                          "name": "id",
+                          "type": "computed"
+                        },
+                        {
+                          "expression": "scores",
+                          "name": "scoreIds",
+                          "type": "computed"
+                        }
+                      ]
+                    }
+                  }
+                }
+              },
+              {
+                "name": "investmentPriorities2",
+                "dataType": "text",
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
+                  }
+                }
+              },
+              {
+                "dataType": "text",
+                "name": "otherInvestmentPriority",
+                "behaviour": [
+                  {
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
+              },
+              {
+                "columns": [
+                  {
+                    "dataType": "species",
+                    "name": "weedTargetSpecies",
+                    "dwcAttribute": "scientificName",
+                    "description": "Weed species targeted for treatment (start typing a  scientific or common name for a species).",
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "threatenedEcologicalCommunity",
+                    "validate": "maxSize[100]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "treatmentMethod",
+                    "description": "The primary method used to treat the patch of the target species.",
+                    "constraints": [
+                      "Basal bark spraying",
+                      "Biological agents",
+                      "Cut stump",
+                      "Cut and swab",
+                      "Dozing",
+                      "Felling",
+                      "Fire",
+                      "Foliar spraying",
+                      "Grubbing / chipping",
+                      "Hand pulling",
+                      "Moisture and nutrient control",
+                      "Mowing",
+                      "Overplanting",
+                      "Pushing",
+                      "Slashing",
+                      "Spot spraying",
+                      "Splatter gun",
+                      "Stem injection",
+                      "Stem scraper",
+                      "Wick applicators",
+                      "Other"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "otherTreatmentMethod",
+                    "description": "Please specify the method of treatment used if Other was selected in the Type of treatment column.",
+                    "behaviour": [
+                      {
+                        "condition": "treatmentMethod == \"Other\"",
+                        "type": "enable"
+                      }
+                    ],
+                    "validate": "required,maxSize[100]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "treatmentObjective",
+                    "description": "How will the work contribute to protecting the area?",
+                    "validate": "required,maxSize[300]"
+                  }
+                ],
+                "dataType": "list",
+                "name": "weedSpeciesTreated"
+              }
+            ],
+            "dataType": "list",
+            "name": "weedTreatmentAreasControlled"
+          },
+          {
+            "allowRowDelete": "false",
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
                 ],
-                "validate": "required",
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
                 "behaviour": [
                   {
-                    "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1))",
-                    "type": "visible"
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
-                ]
+                ],
+                "validate": "required,min[0]"
               },
               {
                 "dataType": "text",
-                "name": "mappingNotAlignedComments",
-                "validate": "required,maxSize[300]",
+                "name": "participationGroupNumber",
                 "behaviour": [
                   {
-                    "type": "visible",
-                    "condition": "\"Other\" == mappingNotAlignedReason"
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
                 ]
               },
               {
-                "dataType": "document",
-                "name": "extraMappingDetails",
-                "validate": "required",
-                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
                 "behaviour": [
                   {
-                    "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1)) or roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                    "type": "visible"
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
-                ]
-              },
-              {
-                "dataType": "number",
-                "name": "areaInvoicedTreatedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
+                ],
                 "validate": [
+                  {
+                    "rule": "required"
+                  },
                   {
                     "rule": "min[0]"
                   },
                   {
-                    "rule": "max",
                     "param": {
-                      "type": "computed",
-                      "expression": "areaTreatedHa"
-                    }
-                  }
-                ]
-              },
-              {
-                "dataType": "text",
-                "name": "invoicedNotActualReason",
-                "constraints": [
-                  "Work was undertaken over a greater area than will be invoiced for",
-                  "Other"
-                ],
-                "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                    "type": "visible"
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
                   }
                 ]
               },
               {
                 "dataType": "text",
-                "name": "invoicedNotActualComments",
+                "name": "firstNationGroupNumber",
                 "behaviour": [
                   {
-                    "type": "visible",
-                    "condition": "\"Other\" == invoicedNotActualReason"
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
                 ],
-                "validate": "required,maxSize[300]"
-              },
-              {
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "$geom.lengthKm(sitesTreated)"
-                },
-                "dataType": "number",
-                "name": "lengthTreatedKm",
-                "units": "km",
-                "decimalPlaces": 3,
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
                 "validate": [
                   {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)*0.9"
-                    }
+                    "rule": "required"
                   },
                   {
-                    "rule": "max",
                     "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)*1.1"
-                    }
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
                   }
                 ]
               },
               {
-                "dataType": "number",
-                "name": "numberOfSurveyInvoice",
-                "validate": "required,min[0]"
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
               }
             ],
             "dataType": "list",
-            "name": "pestAnimalSurveys",
-            "minSize": 1
+            "name": "participationInformationTableRew"
           },
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
+            "dataType": "number",
+            "name": "totalAreaWeedsTreatedInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(weedTreatmentAreasControlled, \"initialOrFollowup == 'Initial' ? areaTreatedHa : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "decimalPlaces": 3,
+            "name": "totalAreaWeedsTreatedInitialInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaWeedsTreatedInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
               }
             ],
-            "validate": "required,min[0]"
+            "defaultValue": ""
           },
           {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
+            "dataType": "number",
+            "name": "totalAreaWeedsTreatedFollowup",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(weedTreatmentAreasControlled, \"initialOrFollowup == 'Follow-up' ? areaTreatedHa : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalAreaWeedsTreatedInvoicedFollowup",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaWeedsTreatedFollowup",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
               }
             ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            "defaultValue": ""
           },
           {
             "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+            "name": "totalLengthWeedsTreatedInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(weedTreatmentAreasControlled, \"initialOrFollowup == 'Initial' ? lengthTreatedKm : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalLengthWeedsTreatedInvoicedInitial",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalLengthWeedsTreatedInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
               }
             ],
-            "validate": "required,min[0]"
+            "defaultValue": ""
           },
           {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
+            "dataType": "number",
+            "name": "totalLengthWeedsTreatedFollowup",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(weedTreatmentAreasControlled, \"initialOrFollowup == 'Follow-up' ? lengthTreatedKm : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalLengthWeedsTreatedInvoicedFollowup",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalLengthWeedsTreatedFollowup",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
               }
             ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            "defaultValue": ""
           },
           {
             "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "name": "numberPestAnimalSurveysConducted",
-            "type": "number",
-            "decimalPlaces": 0,
-            "computed": {
-              "expression": "count(pestAnimalSurveys, \"baselineOrIndicatorSurvey\")"
-            }
+            "name": "totalInvoicedRemovingWeedsMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalAreaWeedsTreatedInitialInvoiced < +totalAreaWeedsTreatedInitial or +totalAreaWeedsTreatedInvoicedFollowup < +totalAreaWeedsTreatedFollowup or +totalLengthWeedsTreatedInvoicedInitial < +totalLengthWeedsTreatedInitial or +totalLengthWeedsTreatedInvoicedFollowup < +totalLengthWeedsTreatedFollowup",
+                "type": "enable"
+              }
+            ]
           },
           {
             "dataType": "text",
@@ -15466,12 +23506,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -15480,29 +23520,40 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Pest animal survey",
-        "title": "Pest animal survey",
+        "modelName": "NHT - Weed treatment",
+        "title": "Removing Weeds",
         "viewModel": [
           {
             "type": "section",
             "items": [
               {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Participation information</h3>"
+                  }
+                ]
+              },
+              {
+                "disableTableUpload": true,
                 "columns": [
                   {
                     "width": "10%",
                     "source": "participationIndividualsOrGroups",
-                    "title": "Individuals or groups?",
+                    "title": "Are individuals or groups delivering this service?",
                     "type": "selectOne"
                   },
                   {
                     "width": "20%",
                     "type": "col",
-                    "title": "Total Number of people delivering this service",
+                    "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                     "items": [
                       {
                         "source": "participationIndividualNumber",
@@ -15516,98 +23567,186 @@
                   },
                   {
                     "type": "col",
-                    "width": "20%",
-                    "title": "Total Number of First Nations people delivering this service ",
+                    "width": "20%",
+                    "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                    "items": [
+                      {
+                        "source": "firstNationIndividualNumber",
+                        "type": "number"
+                      },
+                      {
+                        "source": "firstNationGroupNumber",
+                        "type": "selectOne"
+                      }
+                    ]
+                  },
+                  {
+                    "width": "20%",
+                    "source": "participationDetails",
+                    "rows": 4,
+                    "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                    "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                    "type": "textarea"
+                  }
+                ],
+                "source": "participationInformationTableRew",
+                "type": "table"
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Totals Summary</h3>"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(i) Total area (ha) treated for weeds (initial) for this reporting period",
+                            "source": "totalAreaWeedsTreatedInitial",
+                            "type": "number"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(ii) Total area (ha) treated for weeds (initial) <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalAreaWeedsTreatedInitialInvoiced",
+                            "type": "number",
+                            "displayOptions": {
+                              "removeTrailingZeros": false
+                            }
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
                     "items": [
                       {
-                        "source": "firstNationIndividualNumber",
-                        "type": "number"
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iii) Total area (ha) treated for weeds (follow-up) for this reporting period",
+                            "source": "totalAreaWeedsTreatedFollowup",
+                            "type": "number"
+                          }
+                        ]
                       },
                       {
-                        "source": "firstNationGroupNumber",
-                        "type": "selectOne"
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iv) Total area (ha) treated for weeds (follow-up) <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalAreaWeedsTreatedInvoicedFollowup",
+                            "type": "number",
+                            "displayOptions": {
+                              "removeTrailingZeros": false
+                            }
+                          }
+                        ]
                       }
                     ]
                   },
                   {
-                    "source": "participationDetails",
-                    "rows": 4,
-                    "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                    "type": "textarea"
-                  }
-                ],
-                "userAddedRows": false,
-                "disableTableUpload": false,
-                "source": "",
-                "type": "table"
-              },
-              {
-                "preLabel": "Number of Pest Animal surveys conducted:",
-                "noEdit": true,
-                "type": "number",
-                "source": "numberPestAnimalSurveysConducted"
-              },
-              {
-                "addRowText": "New survey site",
-                "userAddedRows": true,
-                "source": "pestAnimalSurveys",
-                "type": "repeat",
-                "items": [
-                  {
-                    "type": "row",
-                    "css": "border-bottom",
+                    "type": "col",
+                    "css": "span4 col-border-right",
                     "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "baselineOrIndicatorSurvey",
-                                "type": "selectOne",
-                                "preLabel": "Baseline survey or indicator (follow-up) survey?"
-                              }
-                            ]
+                            "preLabel": "(v) Total length (km) treated for weeds (initial) for this reporting period",
+                            "source": "totalLengthWeedsTreatedInitial",
+                            "type": "number"
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "projectBaseline",
-                                "type": "selectOne",
-                                "preLabel": "Which project baseline relates to this survey?"
-                              }
-                            ]
+                            "preLabel": "(vi) Total length (km) treated for weeds (initial) <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalLengthWeedsTreatedInvoicedInitial",
+                            "type": "number",
+                            "displayOptions": {
+                              "removeTrailingZeros": false
+                            }
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "datasetSupports",
-                                "type": "select2Many",
-                                "preLabel": "What dataset supports this?"
-                              }
-                            ]
+                            "preLabel": "(vii) Total length (km) treated for weeds (follow-up) for this reporting period",
+                            "source": "totalLengthWeedsTreatedFollowup",
+                            "type": "number"
                           }
                         ]
                       },
                       {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(viii) Total length (km) treated for weeds (follow-up) <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalLengthWeedsTreatedInvoicedFollowup",
+                            "type": "number",
+                            "displayOptions": {
+                              "removeTrailingZeros": false
+                            }
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                    "source": "totalInvoicedRemovingWeedsMismatched",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": ""
+                  }
+                ]
+              },
+              {
+                "addRowText": "New weed removal site",
+                "userAddedRows": true,
+                "source": "weedTreatmentAreasControlled",
+                "type": "repeat",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "css": "span3",
                         "type": "col",
-                        "css": "span3 col-border-right",
                         "items": [
                           {
                             "type": "row",
@@ -15615,7 +23754,7 @@
                               {
                                 "source": "relatedOutcomes",
                                 "type": "selectOne",
-                                "preLabel": "Which outcome statement/s relates to this survey?"
+                                "preLabel": "Which outcome statement/s does this activity relate to?"
                               }
                             ]
                           }
@@ -15629,30 +23768,47 @@
                             "type": "row",
                             "items": [
                               {
-                                "preLabel": "Activities start date",
-                                "source": "activitiesStartDate",
-                                "type": "date"
+                                "source": "investmentPriorities2",
+                                "preLabel": "Which investment priority does this activity relate to?",
+                                "type": "select2Many"
                               }
                             ]
                           }
                         ]
                       },
                       {
+                        "css": "span3",
                         "type": "col",
-                        "css": "span3 col-border-right",
                         "items": [
                           {
                             "type": "row",
                             "items": [
                               {
-                                "preLabel": "Activities end date",
-                                "source": "activitiesEndDate",
-                                "type": "date"
+                                "source": "invoicingThisActivity",
+                                "preLabel": "Are you invoicing for this activity in this reporting period?",
+                                "type": "selectOne"
                               }
                             ]
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "css": "border-bottom",
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "Initial or follow-up treatment",
+                        "css": "span3",
+                        "source": "initialOrFollowup",
+                        "type": "selectOne"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
                       {
                         "type": "col",
                         "css": "span3 col-border-right",
@@ -15661,8 +23817,8 @@
                             "type": "row",
                             "items": [
                               {
-                                "preLabel": "Sites covered by pest animal surveys",
-                                "source": "sitesTreated",
+                                "preLabel": "Site/s treated for weed removal",
+                                "source": "sitesUndertakenForWeedTreatment",
                                 "type": "feature"
                               }
                             ]
@@ -15713,7 +23869,7 @@
                             "type": "row",
                             "items": [
                               {
-                                "preLabel": "Actual area (ha) / length (km) covered by pest animal surveys",
+                                "preLabel": "Actual area (ha) / length (km) treated for weed removal",
                                 "source": "areaTreatedHa",
                                 "type": "number",
                                 "displayOptions": {
@@ -15756,73 +23912,46 @@
                             ]
                           }
                         ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "How many surveys will you be invoicing for?",
-                                "source": "numberOfSurveyInvoice",
-                                "type": "number"
-                              }
-                            ]
-                          }
-                        ]
                       }
                     ]
                   },
                   {
                     "columns": [
                       {
-                        "width": "25%",
-                        "source": "species",
-                        "title": "Target species recorded",
+                        "width": "20%",
+                        "source": "weedTargetSpecies",
+                        "title": "Target weed species",
                         "type": "speciesSelect"
                       },
                       {
-                        "width": "10%",
-                        "source": "individualsOrGroups",
-                        "title": "Individuals or groups?",
-                        "type": "selectOne"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "numberOfIndividualsOrGroups",
-                        "title": "Number of groups / individuals in Pest Animal survey",
-                        "type": "number"
-                      },
-                      {
-                        "width": "10%",
-                        "title": "Survey technique",
-                        "source": "ternSurveyTechnique",
-                        "type": "selectOne"
+                        "width": "22%",
+                        "source": "threatenedEcologicalCommunity",
+                        "title": "Threatened Ecological Communities (if applicable) benefitting from this activity",
+                        "type": "text"
                       },
                       {
                         "width": "15%",
-                        "title": "Survey technique (if Other)",
-                        "source": "otherTernSurveyTechnique",
-                        "type": "text"
+                        "source": "treatmentMethod",
+                        "title": "Type of treatment being used",
+                        "type": "selectOne"
                       },
                       {
-                        "width": "15%",
-                        "source": "surveyMethodology",
-                        "title": "Survey methodology",
+                        "width": "20%",
+                        "source": "otherTreatmentMethod",
+                        "title": "Type of treatment (if other)",
                         "type": "text"
                       },
                       {
-                        "width": "15%",
-                        "source": "surveyObjective",
-                        "title": "Survey objective",
-                        "type": "text"
+                        "width": "23%",
+                        "source": "treatmentObjective",
+                        "title": "Treatment objective",
+                        "type": "textarea"
                       }
                     ],
                     "userAddedRows": true,
+                    "addRowText": "Add a new weed species",
                     "disableTableUpload": true,
-                    "source": "pestAnimalSurveySpeciesTable",
+                    "source": "weedSpeciesTreated",
                     "type": "table"
                   }
                 ]
@@ -15855,7 +23984,7 @@
                 "items": [
                   {
                     "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
                   },
                   {
                     "preLabel": "Data have been uploaded",
@@ -15894,203 +24023,155 @@
         ]
       },
       "modelName": null,
-      "templateName": "nhtPestAnimalSurvey",
+      "templateName": "nhtWeedTreatment",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Pest animal survey",
+      "title": "Removing weeds",
       "collapsibleHeading": null,
-      "name": "NHT - Pest animal survey",
-      "description": null
-    },
-    {
-      "collapsedByDefault": false,
-      "template": {
-        "dataModel": [
-          {
-            "columns": [
-              {
-                "dataType": "stringList",
-                "name": "ternSurveyTechnique",
-                "validate": "required",
-                "constraints": [
-                  "Tern Survey technique 1",
-                  "Tern Survey technique 1",
-                  "Tern Survey technique 1",
-                  "Other"
-                ]
-              },
-              {
-                "dataType": "text",
-                "description": "Please describe the Survey technique if other was selected.",
-                "name": "otherTernSurveyTechnique",
-                "behaviour": [
-                  {
-                    "condition": "ternSurveyTechnique == \"Other\"",
-                    "type": "enable_and_clear"
-                  }
-                ],
-                "validate": "required"
-              },
-              {
-                "dataType": "text",
-                "name": "surveyMethodology",
-                "description": "Provide more details on what is being done",
-                "validate": "required,maxSize[3000]"
-              },
-              {
-                "dataType": "text",
-                "name": "surveyObjective",
-                "description": "How will the information obtained from the survey be used",
-                "validate": "required,maxSize[3000]"
-              },
-
-              {
-                "columns": [
-                  {
-                    "dataType": "species",
-                    "name": "species",
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "plantingMethod",
-                    "constraints": [
-                      "Direct seeding",
-                      "Tubestock/Seedling planting"
-                    ],
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "number",
-                    "name": "hectaresPlanted",
-                    "validate": "required,min[0]"
-                  },
-                  {
-                    "dataType": "number",
-                    "name": "kilosOfDirectSeeding",
-                    "validate": "required,min[0]"
-                  },
-                  {
-                    "dataType": "number",
-                    "name": "numberPlanted",
-                    "validate": "required,min[0]"
-                  },
-                  {
-                    "dataType": "number",
-                    "name": "numberSurvived",
-                    "validate": "required,min[0]"
-                  },
-                  {
-                    "dataType": "number",
-                    "name": "survivalRate",
-                    "validate": "required,min[0]"
-                  }
+      "name": "NHT - Weed treatment",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
+          {
+            "allowRowDelete": "false",
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
                 ],
-                "dataType": "list",
-                "name": "surveySpeciesTable"
+                "validate": "required"
               },
-
               {
                 "dataType": "number",
-                "name": "numberSurveysConducted"
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
               },
               {
-                "name": "projectBaseline",
                 "dataType": "text",
-                "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "baseline",
-                  "valueProperty": "code",
-                  "type": "pre-populated",
-                  "excludePath": "projectBaseline",
-                  "config": {
-                    "source": {
-                      "context-path": "owner.custom.details.baseline.rows"
-                    }
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
-                }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
               },
               {
-                "name": "datasetSupports",
-                "dataType": "text",
-                "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "name",
-                  "valueProperty": "dataSetId",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "context-path": "owner.custom.dataSets"
-                    }
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
-                }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
               },
               {
-                "name": "relatedOutcomes",
                 "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "label",
-                  "valueProperty": "label",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
-                      }
-                      ]
-                    }
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
-                }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
               },
               {
-                "dataType": "date",
-                "name": "activitiesStartDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableReh"
+          },
+          {
+            "columns": [
               {
-                "dataType": "date",
-                "name": "activitiesEndDate",
-                "description": "Specific the dates these events were held on",
+                "dataType": "text",
+                "name": "initialOrMaintenance",
+                "constraints": [
+                  "Initial",
+                  "Maintenance"
+                ],
                 "validate": "required"
               },
               {
                 "dataType": "feature",
-                "name": "sitesTreated"
+                "name": "sitesBeingRevegetated",
+                "description": "Mapping field to be done and Area (ha) field be auto-calculated from mapping."
               },
               {
                 "computed": {
-                  "expression": "$geom.areaHa(sitesTreated)"
+                  "expression": "$geom.areaHa(sitesBeingRevegetated)"
                 },
                 "dataType": "number",
                 "name": "calculatedAreaTreatedHa",
                 "units": "ha",
-                "decimalPlaces": 3,
-                "behaviour": [
-                  {
-                    "condition": "areaInvoicedTreatedHa > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The managed area must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
-                  }
-                ]
+                "decimalPlaces": 3
               },
               {
                 "computed": {
-                  "expression": "$geom.lengthKm(sitesTreated)"
+                  "expression": "$geom.lengthKm(sitesBeingRevegetated)"
                 },
                 "dataType": "number",
                 "name": "calculatedLengthTreatedKm",
@@ -16114,6 +24195,7 @@
                 },
                 "dataType": "number",
                 "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
                 "units": "ha",
                 "decimalPlaces": 3,
                 "validate": "required,min[0]"
@@ -16128,15 +24210,15 @@
                 "validate": "required",
                 "behaviour": [
                   {
-                    "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1))",
-                    "type": "visible"
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
                   }
                 ]
               },
               {
                 "dataType": "text",
                 "name": "mappingNotAlignedComments",
-                "validate": "required,maxSize[300]",
+                "validate": "required,maxSize[100]",
                 "behaviour": [
                   {
                     "type": "visible",
@@ -16151,165 +24233,276 @@
                 "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
                 "behaviour": [
                   {
-                    "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1)) or roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                    "type": "visible"
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                    "type": "if"
                   }
                 ]
               },
               {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKm"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
+              },
+              {
+                "dataType": "feature",
+                "name": "offSiteBenefitSites"
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "$geom.areaHa(offSiteBenefitSites)"
+                },
                 "dataType": "number",
-                "name": "areaInvoicedTreatedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
+                "name": "offSiteBenefitAreaHa",
                 "validate": [
                   {
-                    "rule": "min[0]"
+                    "rule": "min",
+                    "param": {
+                      "type": "computed",
+                      "expression": "$geom.areaHa(offSiteBenefitSites)*0.9"
+                    }
                   },
                   {
                     "rule": "max",
                     "param": {
                       "type": "computed",
-                      "expression": "areaTreatedHa"
+                      "expression": "$geom.areaHa(offSiteBenefitSites)*1.1"
                     }
                   }
                 ]
               },
               {
                 "dataType": "text",
-                "name": "invoicedNotActualReason",
-                "constraints": [
-                  "Work was undertaken over a greater area than will be invoiced for",
-                  "Other"
-                ],
+                "name": "evidenceOfBenefit",
+                "validate": "maxSize[300]"
+              },
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
                 "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                    "type": "visible"
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "label",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "url": "/project/outcomesByScores",
+                      "params": [
+                        {
+                          "expression": "owner.projectId",
+                          "name": "id",
+                          "type": "computed"
+                        },
+                        {
+                          "expression": "scores",
+                          "name": "scoreIds",
+                          "type": "computed"
+                        }
+                      ]
+                    }
                   }
-                ]
+                }
+              },
+              {
+                "name": "investmentPriorities2",
+                "dataType": "text",
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
+                  }
+                }
               },
               {
                 "dataType": "text",
-                "name": "invoicedNotActualComments",
+                "name": "otherInvestmentPriority",
                 "behaviour": [
                   {
-                    "type": "visible",
-                    "condition": "\"Other\" == invoicedNotActualReason"
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
                   }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
                 ],
-                "validate": "required,maxSize[300]"
+                "validate": "required"
               },
               {
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "$geom.lengthKm(sitesTreated)"
-                },
-                "dataType": "number",
-                "name": "lengthTreatedKm",
-                "units": "km",
-                "decimalPlaces": 3,
+                "dataType": "date",
+                "name": "activitiesStartDate",
+                "description": "Specific the dates these events were held on.",
+                "validate": "required"
+              },
+              {
+                "dataType": "date",
+                "name": "activitiesEndDate",
+                "description": "Specific the dates these events were held on.",
                 "validate": [
                   {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)*0.9"
-                    }
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "future",
+                    "param": {
+                      "expression": "formatDateForValidation(activitiesStartDate)",
+                      "type": "computed"
+                    }
+                  }
+                ]
+              },
+              {
+                "columns": [
+                  {
+                    "dataType": "species",
+                    "name": "species",
+                    "dwcAttribute": "scientificName",
+                    "description": "",
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "objectiveRevegetationActivity",
+                    "validate": "required,maxSize[100]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "revegetationMethod",
+                    "dwcAttribute": "establishmentMeans",
+                    "constraints": [
+                      "Direct seeding",
+                      "Tubestock planting",
+                      "Both",
+                      "Other"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "otherRevegetationMethod",
+                    "behaviour": [
+                      {
+                        "condition": "revegetationMethod == \"Other\"",
+                        "type": "enable"
+                      }
+                    ],
+                    "validate": "required,maxSize[100]"
                   },
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)*1.1"
-                    }
+                    "dataType": "text",
+                    "name": "threatenedEcologicalCommunity",
+                    "description": "This free text field allows multiple TECs to be entered. They should be written as listed in EPBC, and separated by ';'",
+                    "validate": "required,maxSize[100]"
+                  },
+                  {
+                    "dataType": "number",
+                    "name": "numberPlanted",
+                    "validate": "required,min[0]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "revegetationActivityDescription",
+                    "validate": "required,maxSize[300]"
                   }
-                ]
+                ],
+                "dataType": "list",
+                "name": "revegetationDetails"
               }
             ],
             "dataType": "list",
-            "name": "plantSurveys",
-            "minSize": 1
+            "name": "revegetationAreasControlled"
           },
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
+            "dataType": "number",
+            "name": "totalAreaWeedsTreatedInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(revegetationAreasControlled, \"initialOrMaintenance == 'Initial' ? areaTreatedHa : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "decimalPlaces": 3,
+            "name": "totalAreaWeedsTreatedInitialInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaWeedsTreatedInitial",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
               }
             ],
-            "validate": "required,min[0]"
+            "defaultValue": ""
           },
           {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            "dataType": "number",
+            "name": "totalAreaWeedsTreatedFollowup",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(revegetationAreasControlled, \"initialOrMaintenance == 'Maintenance' ? areaTreatedHa : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+            "decimalPlaces": 3,
+            "name": "totalAreaWeedsTreatedInvoicedFollowup",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAreaWeedsTreatedFollowup",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
               }
             ],
-            "validate": "required,min[0]"
+            "defaultValue": ""
           },
           {
             "dataType": "text",
-            "name": "firstNationGroupNumber",
+            "name": "totalInvoicedRevegetatingMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
             "behaviour": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
+                "condition": "+totalAreaWeedsTreatedInitialInvoiced < +totalAreaWeedsTreatedInitial or +totalAreaWeedsTreatedInvoicedFollowup < +totalAreaWeedsTreatedFollowup",
                 "type": "enable"
               }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "name": "numberPlantSurvivalSurveys",
-            "type": "number",
-            "decimalPlaces": 0,
-            "computed": {
-              "expression": "count(plantSurveys, \"projectBaseline\")"
-            }
+            ]
           },
           {
             "dataType": "text",
@@ -16323,12 +24516,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -16337,1436 +24530,2057 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Plant survival survey",
-        "title": "Plant survival survey",
+        "modelName": "NHT - Revegetating habitat",
+        "title": "Revegetating Habitat",
         "viewModel": [
           {
-            "type": "section",
+            "type": "row",
             "items": [
               {
-                "columns": [
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "width": "10%",
+                "source": "participationIndividualsOrGroups",
+                "title": "Are individuals or groups delivering this service?",
+                "type": "selectOne"
+              },
+              {
+                "width": "20%",
+                "type": "col",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
                   {
-                    "width": "10%",
-                    "source": "participationIndividualsOrGroups",
-                    "title": "Individuals or groups?",
+                    "source": "participationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "participationGroupNumber",
                     "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "width": "20%",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "firstNationIndividualNumber",
+                    "type": "number"
                   },
                   {
-                    "width": "20%",
-                    "type": "col",
-                    "title": "Total Number of people delivering this service",
+                    "source": "firstNationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
+              }
+            ],
+            "source": "participationInformationTableReh",
+            "type": "table"
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
                     "items": [
                       {
-                        "source": "participationIndividualNumber",
+                        "preLabel": "(i) Total area (ha) of habitat revegetated (initial) for this reporting period",
+                        "source": "totalAreaWeedsTreatedInitial",
                         "type": "number"
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
                       {
-                        "source": "participationGroupNumber",
-                        "type": "selectOne"
+                        "preLabel": "(ii) Total area (ha) of habitat revegetated (initial) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalAreaWeedsTreatedInitialInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii) Total area (ha) of habitat revegetated (maintenance) for this reporting period",
+                        "source": "totalAreaWeedsTreatedFollowup",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total area (ha) of habitat revegetated (maintenance) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalAreaWeedsTreatedInvoicedFollowup",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedRevegetatingMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "addRowText": "New area of revegetation",
+            "userAddedRows": true,
+            "source": "revegetationAreasControlled",
+            "type": "repeat",
+            "items": [
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
+                          }
+                        ]
                       }
                     ]
                   },
                   {
+                    "css": "span3",
                     "type": "col",
-                    "width": "20%",
-                    "title": "Total Number of First Nations people delivering this service ",
                     "items": [
                       {
-                        "source": "firstNationIndividualNumber",
-                        "type": "number"
-                      },
-                      {
-                        "source": "firstNationGroupNumber",
-                        "type": "selectOne"
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
+                          }
+                        ]
                       }
                     ]
-                  },
-                  {
-                    "source": "participationDetails",
-                    "rows": 4,
-                    "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                    "type": "textarea"
                   }
-                ],
-                "userAddedRows": false,
-                "disableTableUpload": false,
-                "source": "",
-                "type": "table"
+                ]
               },
               {
-                "preLabel": "Number of Plant Survival surveys completed:",
-                "noEdit": true,
-                "type": "number",
-                "source": "numberPlantSurvivalSurveys"
+                "type": "row",
+                "css": "border-bottom",
+                "items": [
+                  {
+                    "preLabel": "Initial or maintenance activity?",
+                    "css": "span3",
+                    "source": "initialOrMaintenance",
+                    "type": "selectOne"
+                  }
+                ]
               },
               {
-                "addRowText": "New survey site",
-                "userAddedRows": true,
-                "source": "plantSurveys",
-                "type": "repeat",
+                "type": "row",
                 "items": [
                   {
-                    "type": "row",
-                    "css": "border-bottom",
+                    "type": "col",
+                    "css": "span3 col-border-right",
                     "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "numberSurveysConducted",
-                                "preLabel": "Number of surveys conducted",
-                                "type": "number"
-                              }
-                            ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "projectBaseline",
-                                "type": "selectOne",
-                                "preLabel": "Which project baseline relates to this survey?"
-                              }
-                            ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "datasetSupports",
-                                "type": "select2Many",
-                                "preLabel": "What dataset supports this?"
-                              }
-                            ]
+                            "preLabel": "Site/s being revegetated",
+                            "source": "sitesBeingRevegetated",
+                            "type": "feature"
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "relatedOutcomes",
-                                "type": "selectOne",
-                                "preLabel": "Which outcome statement/s relates to this survey?"
-                              }
-                            ]
+                            "source": "calculatedAreaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Activities start date",
-                                "source": "activitiesStartDate",
-                                "type": "date"
-                              }
-                            ]
+                            "preLabel": "Please attach mapping details",
+                            "source": "extraMappingDetails",
+                            "type": "document"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Activities end date",
-                                "source": "activitiesEndDate",
-                                "type": "date"
-                              }
-                            ]
+                            "preLabel": "Actual area (ha) of habitat revegetated",
+                            "source": "areaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Sites surveyed for plant survival",
-                                "source": "sitesTreated",
-                                "type": "feature"
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "calculatedAreaTreatedHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                },
-                                "readonly": "readonly"
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "calculatedLengthTreatedKm",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                },
-                                "readonly": "readonly"
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Please attach mapping details",
-                                "source": "extraMappingDetails",
-                                "type": "document"
-                              }
-                            ]
+                            "preLabel": "Reason for actual being different to mapped amount",
+                            "source": "mappingNotAlignedReason",
+                            "type": "selectOne"
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Actual area (ha) / length (km) surveyed for plant survival",
-                                "source": "areaTreatedHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "lengthTreatedKm",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Reason for actual being different to mapped amount",
-                                "source": "mappingNotAlignedReason",
-                                "type": "selectOne"
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "mappingNotAlignedComments",
-                                "type": "textarea",
-                                "rows": 5
-                              }
-                            ]
+                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                            "source": "mappingNotAlignedComments",
+                            "type": "textarea",
+                            "rows": 5
                           }
                         ]
-                      },
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Survey technique",
-                                "source": "ternSurveyTechnique",
-                                "type": "selectOne"
-                              }
-                            ]
+                            "source": "activitiesStartDate",
+                            "type": "date",
+                            "preLabel": "Activity start date"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Survey technique (if Other)",
-                                "source": "otherTernSurveyTechnique",
-                                "type": "text"
-                              }
-                            ]
+                            "source": "activitiesEndDate",
+                            "preLabel": "Activity end date",
+                            "type": "date"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "columns": [
+                  {
+                    "width": "20%",
+                    "source": "species",
+                    "title": "Target Plant Species",
+                    "type": "speciesSelect"
+                  },
+                  {
+                    "width": "10%",
+                    "source": "numberPlanted",
+                    "title": "Numbers planted",
+                    "type": "number"
+                  },
+                  {
+                    "width": "10%",
+                    "title": "Planting method",
+                    "type": "col",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "surveyMethodology",
-                                "preLabel": "Survey methodology",
-                                "type": "text"
-                              }
-                            ]
+                            "source": "revegetationMethod",
+                            "type": "selectOne"
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "surveyObjective",
-                                "preLabel": "Survey objective",
-                                "type": "text"
-                              }
-                            ]
+                            "placeholder": "Planting method (if other)",
+                            "source": "otherRevegetationMethod",
+                            "type": "textarea"
                           }
                         ]
                       }
                     ]
                   },
                   {
-                    "columns": [
-                      {
-                        "width": "30%",
-                        "source": "species",
-                        "title": "Target species recorded",
-                        "type": "speciesSelect"
-                      },
-                      {
-                        "width": "20%",
-                        "title": "Planting Method",
-                        "source": "plantingMethod",
-                        "type": "selectOne"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "hectaresPlanted",
-                        "title": "How many hectares planted?",
-                        "type": "number"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "kilosOfDirectSeeding",
-                        "title": "Number of kilos for direct seeding",
-                        "type": "number"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "numberPlanted",
-                        "title": "Number planted (Tubestock/Seedling planting)",
-                        "type": "number"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "numberSurvived",
-                        "title": "Number Survived",
-                        "type": "number"
-                      },
-                      {
-                        "width": "10%",
-                        "source": "survivalRate",
-                        "title": "Survival Rate %",
-                        "type": "number"
-                      }
-                    ],
-                    "userAddedRows": true,
-                    "disableTableUpload": true,
-                    "source": "surveySpeciesTable",
-                    "type": "table"
+                    "width": "20%",
+                    "source": "objectiveRevegetationActivity",
+                    "title": "Objective of revegetation activity",
+                    "type": "text"
+                  },
+                  {
+                    "width": "20%",
+                    "source": "revegetationActivityDescription",
+                    "title": "Description of revegetation activity",
+                    "type": "textarea"
+                  },
+                  {
+                    "width": "20%",
+                    "source": "threatenedEcologicalCommunity",
+                    "title": "Threatened Ecological Communities (if applicable) benefitting from this activity",
+                    "type": "text"
+                  }
+                ],
+                "userAddedRows": true,
+                "addRowText": "Add a new plant species to this area",
+                "disableTableUpload": true,
+                "source": "revegetationDetails",
+                "type": "table"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "Optionally attach photos",
+                "source": "photographicEvidence",
+                "type": "image"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "Clarification, if needed",
+                "type": "textarea",
+                "rows": 4,
+                "css": "span8",
+                "source": "comments",
+                "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
+              },
+              {
+                "preLabel": "Data have been uploaded",
+                "source": "dataUploaded",
+                "type": "boolean"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "",
+                "source": "projectAssuranceDetails",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+              }
+            ]
+          },
+          {
+            "type": "table",
+            "source": "assuranceDocuments",
+            "userAddedRows": true,
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "title": "Attached documents",
+                "source": "attachments",
+                "type": "document"
+              }
+            ]
+          }
+        ]
+      },
+      "modelName": null,
+      "templateName": "nhtRevegetatingHabitat",
+      "optional": true,
+      "optionalQuestionText": null,
+      "title": "Revegetating habitat",
+      "collapsibleHeading": null,
+      "name": "NHT - Revegetating habitat",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
+          {
+            "allowRowDelete": "false",
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
                   }
                 ]
               },
               {
-                "type": "row",
-                "items": [
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableScp"
+          },
+          {
+            "columns": [
+              {
+                "dataType": "feature",
+                "name": "sitesCollectionAndPropagation",
+                "description": "Mapping field to be done and Area (ha) field be auto-calculated from mapping."
+              },
+              {
+                "computed": {
+                  "expression": "$geom.areaHa(sitesCollectionAndPropagation)"
+                },
+                "dataType": "number",
+                "name": "calculatedAreaTreatedHa",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesCollectionAndPropagation)"
+                },
+                "dataType": "number",
+                "name": "calculatedLengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "preLabel": "Optionally attach photos",
-                    "source": "photographicEvidence",
-                    "type": "image"
+                    "condition": "lengthTreatedKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
+                    }
                   }
                 ]
               },
               {
-                "type": "row",
-                "items": [
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaTreatedHa"
+                },
+                "dataType": "number",
+                "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedReason",
+                "constraints": [
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                  "Other"
+                ],
+                "validate": "required",
+                "behaviour": [
                   {
-                    "preLabel": "Clarification, if needed",
-                    "type": "textarea",
-                    "rows": 4,
-                    "css": "span8",
-                    "source": "comments",
-                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
+                    "type": "if"
                   }
                 ]
               },
               {
-                "type": "row",
-                "items": [
+                "dataType": "text",
+                "name": "mappingNotAlignedComments",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
                   {
-                    "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
-                  },
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReason"
+                  }
+                ]
+              },
+              {
+                "dataType": "document",
+                "name": "extraMappingDetails",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
                   {
-                    "preLabel": "Data have been uploaded",
-                    "source": "dataUploaded",
-                    "type": "boolean"
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
+                    "type": "if"
                   }
                 ]
               },
               {
-                "type": "row",
-                "items": [
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKm"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
+              },
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "label",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "url": "/project/outcomesByScores",
+                      "params": [
+                        {
+                          "expression": "owner.projectId",
+                          "name": "id",
+                          "type": "computed"
+                        },
+                        {
+                          "expression": "scores",
+                          "name": "scoreIds",
+                          "type": "computed"
+                        }
+                      ]
+                    }
+                  }
+                }
+              },
+              {
+                "name": "investmentPriorities2",
+                "dataType": "text",
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
+                  }
+                }
+              },
+              {
+                "dataType": "text",
+                "name": "otherInvestmentPriority",
+                "behaviour": [
                   {
-                    "preLabel": "",
-                    "source": "projectAssuranceDetails",
-                    "type": "textarea",
-                    "rows": 4,
-                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
                   }
                 ]
               },
               {
-                "type": "table",
-                "source": "assuranceDocuments",
-                "userAddedRows": true,
-                "disableTableUpload": true,
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
+              },
+              {
                 "columns": [
                   {
-                    "title": "Attached documents",
-                    "source": "attachments",
-                    "type": "document"
+                    "dataType": "date",
+                    "name": "activitiesStartDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "date",
+                    "name": "activitiesEndDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": [
+                      {
+                        "rule": "required"
+                      },
+                      {
+                        "rule": "future",
+                        "param": {
+                          "expression": "formatDateForValidation(activitiesStartDate)",
+                          "type": "computed"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "activityType",
+                    "constraints": [
+                      "Collecting",
+                      "Storing",
+                      "Propagating"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "activityPurpose",
+                    "validate": "required,maxSize[300]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "materialType",
+                    "constraints": [
+                      "Seeds",
+                      "Plant cuttings"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "otherSeedSources",
+                    "validate": "maxSize[300]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "storingFacility",
+                    "validate": "required,maxSize[300]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "threatEcoCommunity",
+                    "validate": "maxSize[100]",
+                    "description": "This free text field allows multiple TECs to be entered. They should be written as listed in EPBC, and separated by ';'"
                   }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      "modelName": null,
-      "templateName": "nhtPlantSurvivalSurvey",
-      "optional": true,
-      "optionalQuestionText": null,
-      "title": "Plant survival survey",
-      "collapsibleHeading": null,
-      "name": "NHT - Plant survival survey",
-      "description": null
-    },
-    {
-      "collapsedByDefault": false,
-      "template": {
-        "dataModel": [
-          {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
+                ],
+                "dataType": "list",
+                "name": "seedCollectionDetails"
+              },
+              {
+                "dataType": "species",
+                "name": "species",
+                "validate": "required"
+              },
+              {
+                "dataType": "text",
+                "name": "inKgSeedCollected",
+                "constraints": [
+                  "Individuals",
+                  "Grams"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "amountSeedCollected",
+                "decimalPlaces": 5,
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfDaysCollectingSeeds",
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfSourcePlants"
+              },
+              {
+                "dataType": "number",
+                "name": "noOfPlantsPropogated"
+              },
+              {
+                "name": "noOfDaysPropagating",
+                "dataType": "number"
+              }
             ],
-            "validate": "required"
+            "dataType": "list",
+            "name": "areasOfSeedCollection"
           },
           {
             "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
+            "name": "totalAmountSeedsCuttingsCollected",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(areasOfSeedCollection, \"amountSeedCollected\")"
+            }
           },
           {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
+            "dataType": "number",
+            "name": "totalAmountSeedsCuttingsCollectedInvoiced",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAmountSeedsCuttingsCollected",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            "defaultValue": ""
           },
           {
             "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
+            "name": "totalDaysSeedsCuttingsCollected",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(areasOfSeedCollection, \"numberOfDaysCollectingSeeds\")"
+            }
           },
           {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
+            "dataType": "number",
+            "name": "totalDaysSeedsCuttingsCollectedInvoiced",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalDaysSeedsCuttingsCollected",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            "defaultValue": ""
           },
           {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
+            "dataType": "number",
+            "name": "totalDaysPropagating",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(areasOfSeedCollection, \"noOfDaysPropagating\")"
+            }
           },
           {
-            "dataType": "text",
-            "name": "initialOrFollowup",
-            "constraints": [
-              "Initial",
-              "Follow-up"
+            "dataType": "number",
+            "name": "totalDaysPropagatingInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalDaysPropagating",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
             ],
-            "validate": "required"
+            "defaultValue": ""
           },
           {
-            "dataType": "feature",
-            "name": "sitesRemediated"
+            "dataType": "number",
+            "name": "totalPlantsPropagated",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(areasOfSeedCollection, \"noOfPlantsPropogated\")"
+            }
           },
           {
-            "computed": {
-              "expression": "$geom.areaHa(sitesRemediated)"
-            },
             "dataType": "number",
-            "name": "calculatedAreaRemediatedHa",
-            "units": "ha",
-            "decimalPlaces": 3,
-            "behaviour": [
+            "name": "totalPlantsPropagatedInvoiced",
+            "validate": [
               {
-                "condition": "areaRemediatedInvoicedHa > 0",
-                "type": "conditional_validation",
-                "value": {
-                  "message": "The remediated area must be mapped",
-                  "validate": "required,min[0.0001]"
-                }
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalPlantsPropagated",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
-            ]
+            ],
+            "defaultValue": ""
           },
           {
-            "computed": {
-              "expression": "$geom.lengthKm(sitesRemediated)"
-            },
-            "dataType": "number",
-            "name": "calculatedLengthRemediatedKm",
-            "units": "km",
-            "decimalPlaces": 3,
+            "dataType": "text",
+            "name": "totalInvoicedSeedCollectionMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
             "behaviour": [
               {
-                "condition": "lengthRemediatedInvoicedKm > 0",
-                "type": "conditional_validation",
-                "value": {
-                  "message": "The remediated length must be mapped",
-                  "validate": "required,min[0.0001]"
-                }
+                "condition": "+totalAmountSeedsCuttingsCollectedInvoiced < +totalAmountSeedsCuttingsCollected or +totalDaysSeedsCuttingsCollectedInvoiced < +totalDaysSeedsCuttingsCollected or +totalDaysPropagatingInvoiced < +totalDaysPropagating or +totalPlantsPropagatedInvoiced < +totalPlantsPropagated",
+                "type": "enable"
               }
             ]
           },
           {
-            "defaultValue": {
-              "expression": "calculatedAreaRemediatedHa",
-              "type": "computed"
-            },
-            "dataType": "number",
-            "name": "areaRemediatedHa",
-            "units": "ha",
-            "decimalPlaces": 3,
-            "validate": "required,min[0]"
+            "dataType": "text",
+            "name": "comments",
+            "validate": "maxSize[1500]"
           },
           {
-            "defaultValue": {
-              "expression": "calculatedLengthRemediatedKm",
-              "type": "computed"
-            },
-            "dataType": "number",
-            "name": "lengthRemediatedKm",
-            "units": "km",
-            "decimalPlaces": 3,
-            "validate": "required,min[0]"
+            "dataType": "image",
+            "name": "photographicEvidence"
           },
           {
+            "dataType": "boolean",
+            "name": "dataUploaded",
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
+          },
+          {
+            "name": "projectAssuranceDetails",
             "dataType": "text",
-            "name": "mappingNotAlignedReason",
-            "behaviour": [
+            "validate": "required,maxSize[5000]"
+          },
+          {
+            "dataType": "list",
+            "name": "assuranceDocuments",
+            "columns": [
               {
-                "condition": "not (within(calculatedAreaRemediatedHa, areaRemediatedHa, 0.1) and within(calculatedLengthRemediatedKm, lengthRemediatedKm, 0.1))",
-                "type": "visible"
+                "dataType": "document",
+                "name": "attachments",
+                "description": "Please attach any Evidence of Service Delivery here."
               }
-            ],
-            "constraints": [
-              "Mapped area simplifies more complex area/s where work was undertaken during this period",
-              "Other"
-            ],
-            "validate": "required"
+            ]
+          }
+        ],
+        "modelName": "NHT - Seed Collection",
+        "title": "Seed Collection and Propagation",
+        "viewModel": [
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
           },
           {
-            "dataType": "text",
-            "name": "mappingNotAlignedComments",
-            "behaviour": [
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "width": "10%",
+                "source": "participationIndividualsOrGroups",
+                "title": "Are individuals or groups delivering this service?",
+                "type": "selectOne"
+              },
+              {
+                "width": "20%",
+                "type": "col",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "participationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "participationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "width": "20%",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "firstNationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "firstNationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
               {
-                "condition": "\"Other\" == mappingNotAlignedReason",
-                "type": "visible"
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
               }
             ],
-            "validate": "required,maxSize[300]"
+            "source": "participationInformationTableScp",
+            "type": "table"
           },
           {
-            "dataType": "document",
-            "name": "extraMappingDetails",
-            "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
-            "behaviour": [
+            "type": "row",
+            "items": [
               {
-                "condition": "not (within(calculatedAreaRemediatedHa, areaRemediatedHa, 0.1) and within(calculatedLengthRemediatedKm, lengthRemediatedKm, 0.1)) or roundTo(areaRemediatedHa, 2) != roundTo(areaRemediatedInvoicedHa, 2) or roundTo(lengthRemediatedKm, 2) != roundTo(lengthRemediatedInvoicedKm, 2)",
-                "type": "visible"
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
               }
-            ],
-            "validate": "required"
+            ]
           },
           {
-            "dataType": "number",
-            "name": "areaRemediatedInvoicedHa",
-            "units": "ha",
-            "decimalPlaces": 3,
-            "validate": [
+            "type": "row",
+            "items": [
               {
-                "rule": "min[0]"
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total amount (grams)/number of seeds/cuttings collected for this reporting period",
+                        "source": "totalAmountSeedsCuttingsCollected",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total amount (grams)/number of seeds/cuttings collected and <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalAmountSeedsCuttingsCollectedInvoiced",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii) Total number of days collecting seeds/cuttings for this reporting period",
+                        "source": "totalDaysSeedsCuttingsCollected",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total number of days collecting seeds/cuttings <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalDaysSeedsCuttingsCollectedInvoiced",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(v) Total number of plants propagated for this reporting period",
+                        "source": "totalPlantsPropagated",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vi) Total number of plants propagated <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalPlantsPropagatedInvoiced",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
               },
               {
-                "param": {
-                  "expression": "areaRemediatedHa",
-                  "type": "computed"
-                },
-                "rule": "max"
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(vii) Total number of days propagating for this reporting period",
+                        "source": "totalDaysPropagating",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(viii) Total number of days propagating <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalDaysPropagatingInvoiced",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
               }
             ]
           },
           {
-            "dataType": "number",
-            "name": "lengthRemediatedInvoicedKm",
-            "units": "km",
-            "decimalPlaces": 3,
-            "validate": [
-              {
-                "rule": "min[0]"
-              },
+            "type": "row",
+            "items": [
               {
-                "param": {
-                  "expression": "lengthRemediatedKm",
-                  "type": "computed"
-                },
-                "rule": "max"
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedSeedCollectionMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
               }
             ]
           },
           {
-            "dataType": "text",
-            "name": "invoicedNotActualReason",
-            "behaviour": [
+            "addRowText": "Add a new collection/propagation site",
+            "userAddedRows": true,
+            "source": "areasOfSeedCollection",
+            "type": "repeat",
+            "items": [
               {
-                "condition": "roundTo(areaRemediatedHa, 2) != roundTo(areaRemediatedInvoicedHa, 2) or roundTo(lengthRemediatedKm, 2) != roundTo(lengthRemediatedInvoicedKm, 2)",
-                "type": "visible"
-              }
-            ],
-            "constraints": [
-              "Work was undertaken over a greater area than will be invoiced for",
-              "Other"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "invoicedNotActualComments",
-            "behaviour": [
+                "type": "row",
+                "items": [
+                  {
+                    "css": "span3 col-border-right",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3 col-border-right",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
               {
-                "condition": "\"Other\" == invoicedNotActualReason",
-                "type": "visible"
-              }
-            ],
-            "validate": "required,maxSize[300]"
-          },
-
-          {
-            "columns": [
+                "type": "row",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Site/s where collection/propagation was undertaken",
+                            "source": "sitesCollectionAndPropagation",
+                            "type": "feature"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "calculatedAreaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Please attach mapping details",
+                            "source": "extraMappingDetails",
+                            "type": "document"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Actual Area (ha) where collection/propagation was undertaken",
+                            "source": "areaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Reason for actual being different to mapped amount",
+                            "source": "mappingNotAlignedReason",
+                            "type": "selectOne"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                            "source": "mappingNotAlignedComments",
+                            "type": "textarea",
+                            "rows": 5
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
               {
-                "name": "relatedOutcomes",
-                "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "label",
-                  "valueProperty": "label",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
+                "type": "row",
+                "items": [
+                  {
+                    "css": "span3 col-border-right",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "species",
+                            "type": "speciesSelect",
+                            "preLabel": "Target species recorded"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "inKgSeedCollected",
+                            "preLabel": "Individuals (cuttings) / grams of seed collected",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3 col-border-right",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "amountSeedCollected",
+                            "preLabel": "Amount of seeds (grams)/Number of individuals (cuttings) collected",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3 col-border-right",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "numberOfDaysCollectingSeeds",
+                            "preLabel": "Number of days collecting seeds/cuttings",
+                            "type": "number"
+                          }
+                        ]
                       }
-                      ]
-                    }
-                  }
-                }
-              },
-              {
-                "name": "investmentPriorities2",
-                "dataType": "stringList",
-                "validate": "required",
-                "constraints": {
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "params": [
-                        {
-                          "expression": "owner.projectId",
-                          "name": "id",
-                          "type": "computed"
-                        }
-                      ],
-                      "url": "/project/listProjectInvestmentPriorities/"
-                    }
-                  }
-                }
-              },
-              {
-                "dataType": "text",
-                "name": "otherInvestmentPriority",
-                "behaviour": [
+                    ]
+                  },
                   {
-                    "type": "enable",
-                    "condition": "\"Other\" in investmentPriorities2"
+                    "css": "span3 col-border-right",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "noOfPlantsPropogated",
+                            "preLabel": "Number of plants propagated",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3 col-border-right",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "noOfDaysPropagating",
+                            "preLabel": "Number of days propagating",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3 col-border-right",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "numberOfSourcePlants",
+                            "preLabel": "Number of source plants",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
                   }
                 ]
               },
               {
-                "dataType": "date",
-                "name": "activitiesStartDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesEndDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "dataType": "number",
-                "name": "numberOfStructuresInstalled",
-                "validate": "required,min[0]"
-              },
-              {
-                "dataType": "text",
-                "name": "typesOfStructuresInstalled",
-                "description": "",
-                "constraints": [
-                  "Access control",
-                  "Bank grooming",
-                  "Flow gauging stations",
-                  "Fords",
-                  "Culverts",
-                  "Revegetation",
-                  "Weirs",
-                  "Other"
-                ],
-                "validate": "required"
-              },
-              {
-                "dataType": "text",
-                "name": "otherStructuresType",
-                "behaviour": [
+                "columns": [
                   {
-                    "condition": "typesOfStructuresInstalled == \"Other\"",
-                    "type": "enable"
-                  }
-                ],
-                "validate": "required,maxSize[100]"
-              },
-              {
-                "dataType": "text",
-                "name": "remediationType",
-                "description": "",
-                "constraints": [
-                  "Access control",
-                  "Bank grooming",
-                  "Flow gauging stations",
-                  "Fords",
-                  "Culverts",
-                  "Revegetation",
-                  "Weirs",
-                  "Other"
-                ],
-                "validate": "required"
-              },
-              {
-                "dataType": "text",
-                "name": "otherRemediationType",
-                "behaviour": [
+                    "width": "10%",
+                    "title": "Activity start date",
+                    "source": "activitiesStartDate",
+                    "type": "date"
+                  },
                   {
-                    "condition": "remediationType == \"Other\"",
-                    "type": "enable"
+                    "width": "10%",
+                    "title": "Activity end date",
+                    "source": "activitiesEndDate",
+                    "type": "date"
+                  },
+                  {
+                    "width": "10%",
+                    "title": "Type of activity",
+                    "source": "activityType",
+                    "type": "selectOne"
+                  },
+                  {
+                    "width": "15%",
+                    "title": "Purpose of activity",
+                    "source": "activityPurpose",
+                    "type": "textarea"
+                  },
+                  {
+                    "width": "10%",
+                    "title": "Type of material collected/stored or propagated",
+                    "source": "materialType",
+                    "type": "selectOne"
+                  },
+                  {
+                    "width": "15%",
+                    "source": "otherSeedSources",
+                    "title": "Other seed sources (if applicable)",
+                    "type": "textarea"
+                  },
+                  {
+                    "width": "15%",
+                    "source": "storingFacility",
+                    "title": "Name of storing facility",
+                    "type": "textarea"
+                  },
+                  {
+                    "width": "15%",
+                    "source": "threatEcoCommunity",
+                    "title": "Threatened Ecological Community (if applicable) where the seeds were sourced from",
+                    "type": "textarea"
                   }
                 ],
-                "validate": "required,maxSize[100]"
-              },
-              {
-                "dataType": "feature",
-                "name": "offSiteBenefitSites"
-              },
-              {
-                "defaultValue": {
-                  "expression": "$geom.areaHa(offSiteBenefitSites)",
-                  "type": "computed"
-                },
-                "dataType": "number",
-                "name": "offSiteBenefitAreaHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": "min[0]"
-              },
-              {
-                "dataType": "text",
-                "name": "evidenceOfBenefit",
-                "validate": "maxSize[300]"
+                "userAddedRows": true,
+                "addRowText": "Add a new propagation/storage/collecting activity",
+                "disableTableUpload": true,
+                "source": "seedCollectionDetails",
+                "type": "table"
               }
-            ],
-            "dataType": "list",
-            "name": "remediationDetails"
-          },
-          {
-            "dataType": "text",
-            "name": "comments",
-            "validate": "maxSize[1500]"
-          },
-          {
-            "dataType": "image",
-            "name": "photographicEvidence"
-          },
-          {
-            "dataType": "boolean",
-            "name": "dataUploaded",
-            "description": ""
-          },
-          {
-            "dataType": "text",
-            "name": "projectAssuranceDetails",
-            "description": ""
+            ]
           },
           {
-            "dataType": "list",
-            "name": "assuranceDocuments",
-            "columns": [
+            "type": "section",
+            "items": [
               {
-                "dataType": "document",
-                "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
-              }
-            ]
-          }
-        ],
-        "modelName": "NHT - Remediating riparian and aquatic areas",
-        "title": "Remediating riparian and aquatic areas",
-        "viewModel": [
-          {
-            "columns": [
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Optionally attach photos",
+                    "source": "photographicEvidence",
+                    "type": "image"
+                  }
+                ]
+              },
               {
-                "width": "10%",
-                "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
-                "type": "selectOne"
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Clarification, if needed",
+                    "type": "textarea",
+                    "rows": 4,
+                    "css": "span8",
+                    "source": "comments",
+                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+                  }
+                ]
               },
               {
-                "width": "20%",
-                "type": "col",
-                "title": "Total Number of people delivering this service",
+                "type": "row",
                 "items": [
                   {
-                    "source": "participationIndividualNumber",
-                    "type": "number"
+                    "type": "literal",
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
                   },
                   {
-                    "source": "participationGroupNumber",
-                    "type": "selectOne"
+                    "preLabel": "Data have been uploaded",
+                    "source": "dataUploaded",
+                    "type": "boolean"
                   }
                 ]
               },
               {
-                "type": "col",
-                "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
+                "type": "row",
                 "items": [
                   {
-                    "source": "firstNationIndividualNumber",
-                    "type": "number"
-                  },
-                  {
-                    "source": "firstNationGroupNumber",
-                    "type": "selectOne"
+                    "preLabel": "",
+                    "source": "projectAssuranceDetails",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
                   }
                 ]
               },
               {
-                "source": "participationDetails",
-                "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                "type": "textarea"
+                "type": "table",
+                "source": "assuranceDocuments",
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "columns": [
+                  {
+                    "title": "Attached documents",
+                    "source": "attachments",
+                    "type": "document"
+                  }
+                ]
               }
-            ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
-            "type": "table"
-          },
+            ]
+          }
+        ]
+      },
+      "modelName": null,
+      "templateName": "statesSeedCollecting",
+      "optional": true,
+      "optionalQuestionText": null,
+      "title": null,
+      "collapsibleHeading": null,
+      "name": "NHT - Seed Collection",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
           {
-            "type": "section",
-            "items": [
+            "name": "plantSurvivalSurveys",
+            "dataType": "list",
+            "minSize": 1,
+            "columns": [
               {
-                "type": "row",
-                "css": "border-bottom",
-                "items": [
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
+                  }
+                }
+              },
+              {
+                "dataType": "text",
+                "name": "surveyObjective",
+                "description": "What the survey aim to capture? How will the information obtained from the survey be used?",
+                "validate": "required,maxSize[3000]"
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfSurveys",
+                "validate": "required,min[1],max[1]",
+                "defaultValue": 1,
+                "readonly": true
+              },
+              {
+                "dataType": "list",
+                "name": "plantSurvivalDataSets",
+                "columns": [
                   {
-                    "type": "col",
-                    "css": "span3 col-border-right",
-                    "items": [
+                    "name": "dataSetId",
+                    "entityType": "au.org.ala.ecodata.DataSetSummary",
+                    "dataType": "text",
+                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
+                    "validate": "required",
+                    "constraints": {
+                      "textProperty": "name",
+                      "valueProperty": "dataSetId",
+                      "excludePath": "plantSurvivalSurveys.plantSurvivalDataSets.dataSetId",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.dataSets"
+                        },
+                        "filter": {
+                          "namespace": "dataSet",
+                          "expression": "dataSet.serviceId == 24 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and deepEquals(relatedOutcomes,dataSet.outcomesLabel) and 'Indicator' == baselineIndicatorMapping.lookupValue(dataSet.type)"
+                        }
+                      }
+                    },
+                    "behaviour": [
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "initialOrFollowup",
-                            "type": "selectOne",
-                            "preLabel": "Initial or follow-up?"
+                        "type": "pre_populate",
+                        "config": {
+                          "waitForInitialisation": true,
+                          "source": {
+                            "url": "/site/geojson",
+                            "params": [
+                              {
+                                "expression": "x=find(owner.custom.dataSets, \"dataSetId\", dataSetId); x.siteId",
+                                "name": "id",
+                                "type": "computed",
+                                "required": true
+                              }
+                            ]
+                          },
+                          "target":  {
+                            "type": "singleValue",
+                            "name": "sitesCoveredForPlantSurvival"
                           }
-                        ]
+                        }
                       }
                     ]
                   },
                   {
-                    "type": "col",
-                    "css": "span3 col-border-right",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "sitesRemediated",
-                            "type": "feature",
-                            "preLabel": "Site/s covered by remediation"
-                          }
-                        ]
-                      },
+                    "columns": [
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "calculatedAreaRemediatedHa",
-                            "type": "number",
-                            "readonly": true,
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
+                        "dataType": "species",
+                        "name": "species",
+                        "validate": "required"
                       },
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "calculatedLengthRemediatedKm",
-                            "type": "number",
-                            "readonly": true,
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
+                        "dataType": "text",
+                        "name": "plantingMethod",
+                        "constraints": [
+                          "Direct seeding",
+                          "Tubestock/Seedling planting"
+                        ],
+                        "validate": "required"
                       },
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Please attach mapping details",
-                            "source": "extraMappingDetails",
-                            "type": "document"
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  {
-                    "type": "col",
-                    "css": "span3 col-border-right",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "helpText": "Enter the amount you will invoice for during this reporting period.",
-                            "preLabel": "Actual area (ha) / length (km) being remediated",
-                            "source": "areaRemediatedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
+                        "dataType": "number",
+                        "name": "hectaresPlanted",
+                        "validate": "required,min[0]"
                       },
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "lengthRemediatedKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
+                        "dataType": "number",
+                        "name": "kilosOfDirectSeeding",
+                        "validate": "required,min[0]"
                       },
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Reason for actual being different to mapped amount",
-                            "source": "mappingNotAlignedReason",
-                            "type": "selectOne"
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  {
-                    "type": "col",
-                    "css": "span3 col-border-right",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "helpText": "Enter the amount you will invoice for during this reporting period.",
-                            "preLabel": "Invoiced area (ha) / length (km) being remediated",
-                            "source": "areaRemediatedInvoicedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
+                        "dataType": "number",
+                        "name": "numberPlanted",
+                        "validate": "required,min[0]"
                       },
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "lengthRemediatedInvoicedKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
+                        "dataType": "text",
+                        "name": "individualsOrGroups",
+                        "constraints": [
+                          "Individuals",
+                          "Groups"
+                        ],
+                        "validate": "required"
                       },
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Reason for invoiced amount being different to actual amount",
-                            "source": "invoicedNotActualReason",
-                            "type": "selectOne"
-                          }
-                        ]
+                        "dataType": "number",
+                        "name": "numberOfIndividualsGroupsSurvived",
+                        "validate": "required,min[0]"
                       },
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "invoicedNotActualComments",
-                            "type": "textarea"
-                          }
-                        ]
+                        "dataType": "number",
+                        "name": "survivalRate",
+                        "validate": "required,min[0]"
+                      }
+                    ],
+                    "dataType": "list",
+                    "name": "plantSurvivalSurveySpeciesTable"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "baselineOrIndicatorSurvey",
+                    "description": "",
+                    "constraints": [
+                      "Baseline",
+                      "Indicator"
+                    ],
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); baselineIndicatorMapping.lookupValue(x.type)"
+                    }
+                  },
+                  {
+                    "name": "projectBaselines",
+                    "dataType": "stringList",
+                    "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.baselines"
+                    },
+                    "constraints": {
+                      "textProperty": "baseline",
+                      "valueProperty": "code",
+                      "type": "pre-populated",
+                      "excludePath": "projectBaselines",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.details.baseline.rows"
+                        }
                       }
-                    ]
-                  }
-                ]
-              },
-
-              {
-                "columns": [
+                    }
+                  },
                   {
-                    "source": "relatedOutcomes",
-                    "type": "selectOne",
-                    "width": "10%",
-                    "title": "Which outcome statement/s relates to this survey?"
+                    "name": "investmentPriorities2",
+                    "dataType": "stringList",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.investmentPriorities"
+                    },
+                    "constraints": {
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "params": [
+                            {
+                              "expression": "owner.projectId",
+                              "name": "id",
+                              "type": "computed"
+                            }
+                          ],
+                          "url": "/project/listProjectInvestmentPriorities/"
+                        }
+                      }
+                    }
                   },
                   {
-                    "width": "15%",
-                    "type": "col",
-                    "title": "Which investment priority does this activity relate to?",
-                    "items": [
-                      {
-                        "source": "investmentPriorities2",
-                        "type": "select2Many"
-                      },
+                    "dataType": "text",
+                    "name": "otherInvestmentPriority",
+                    "behaviour": [
                       {
-                        "source": "otherInvestmentPriority",
-                        "type": "text"
+                        "type": "enable",
+                        "condition": "\"Other\" in investmentPriorities2"
                       }
                     ]
                   },
                   {
-                    "title": "Activities start date",
-                    "source": "activitiesStartDate",
-                    "type": "date",
-                    "width": "10%"
+                    "dataType": "date",
+                    "name": "activitiesStartDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.startDate"
+                    }
                   },
                   {
-                    "title": "Activities end date",
-                    "source": "activitiesEndDate",
-                    "type": "date",
-                    "width": "10%"
+                    "dataType": "date",
+                    "name": "activitiesEndDate",
+                    "description": "Specific the dates these events were held on.",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.endDate"
+                    }
                   },
                   {
-                    "width": "10%",
-                    "source": "numberOfStructuresInstalled",
-                    "type": "number",
-                    "title": "Number of structures installed"
+                    "dataType": "feature",
+                    "name": "sitesCoveredForPlantSurvival",
+                    "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
+
                   },
                   {
-                    "width": "15%",
-                    "type": "col",
-                    "title": "Type of structures installed",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "typesOfStructuresInstalled",
-                            "type": "select2"
-                          }
-                        ]
-                      },
+                    "computed": {
+                      "expression": "$geom.areaHa(sitesCoveredForPlantSurvival)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedAreaTreatedHa",
+                    "units": "ha",
+                    "decimalPlaces": 3
+                  },
+                  {
+                    "computed": {
+                      "expression": "$geom.lengthKm(sitesCoveredForPlantSurvival)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedLengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3,
+                    "behaviour": [
                       {
-                        "source": "otherStructuresType",
-                        "placeholder": "Type of structures (if Other)",
-                        "type": "text"
+                        "condition": "lengthTreatedKm > 0",
+                        "type": "conditional_validation",
+                        "value": {
+                          "message": "The managed length must be mapped",
+                          "validate": "required,min[0.0001]"
+                        }
                       }
                     ]
                   },
                   {
-                    "width": "15%",
-                    "type": "col",
-                    "title": "Type of remediation",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "remediationType",
-                            "type": "select2"
-                          }
-                        ]
-                      },
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "calculatedAreaTreatedHa"
+                    },
+                    "dataType": "number",
+                    "name": "areaTreatedHa",
+                    "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                    "units": "ha",
+                    "decimalPlaces": 3,
+                    "validate": "required,min[0]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "mappingNotAlignedReason",
+                    "constraints": [
+                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                      "Other"
+                    ],
+                    "validate": "required",
+                    "behaviour": [
                       {
-                        "source": "otherRemediationType",
-                        "placeholder": "Type of remediation (if Other)",
-                        "type": "text"
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
                       }
                     ]
                   },
                   {
-                    "width": "15%",
-                    "type": "col",
-                    "title": "Please identify any area/s that have shown evidence of off-site benefits",
-                    "items": [
-                      {
-                        "source": "offSiteBenefitSites",
-                        "type": "feature"
-                      },
-                      {
-                        "source": "offSiteBenefitAreaHa",
-                        "title": "Area (ha) evident of improved remediation",
-                        "type": "number",
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
-                      },
+                    "dataType": "text",
+                    "name": "mappingNotAlignedComments",
+                    "validate": "required,maxSize[100]",
+                    "behaviour": [
                       {
-                        "source": "evidenceOfBenefit",
-                        "placeholder": "Please provide a description on the evidence available to reflect this benefit",
-                        "type": "textarea"
+                        "type": "visible",
+                        "condition": "\"Other\" == mappingNotAlignedReason"
                       }
                     ]
-                  }
-                ],
-                "userAddedRows": true,
-                "source": "remediationDetails",
-                "type": "table"
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Optionally attach photos",
-                    "source": "photographicEvidence",
-                    "type": "image"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
+                  },
                   {
-                    "preLabel": "Clarification, if needed",
-                    "type": "textarea",
-                    "rows": 4,
-                    "css": "span8",
-                    "source": "comments",
-                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
+                    "dataType": "document",
+                    "name": "extraMappingDetails",
+                    "validate": "required",
+                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                    "behaviour": [
+                      {
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
+                      }
+                    ]
+                  },
                   {
-                    "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "$geom.lengthKm(sitesCoveredForPlantSurvival)"
+                    },
+                    "dataType": "number",
+                    "name": "lengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3
                   },
                   {
-                    "preLabel": "Data have been uploaded",
-                    "source": "dataUploaded",
-                    "type": "boolean"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
+                    "dataType": "text",
+                    "description": "Select the technique used to conduct the survey. If the EMSA Application tool was not used, you should select 'Other'.",
+                    "name": "emsaProtocol",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.protocol"
+                    },
+                    "constraints": {
+                      "textProperty": "label",
+                      "valueProperty": "value",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.protocols"
+                        }
+                      }
+                    }
+                  },
                   {
-                    "preLabel": "",
-                    "source": "projectAssuranceDetails",
-                    "type": "textarea",
-                    "rows": 4,
-                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
+                    "dataType": "stringList",
+                    "description": "Describe the technique (if Other) was selected.",
+                    "name": "otherEmsaProtocol",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methods"
+                    }
+                  },
                   {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-                  }
-                ]
-              },
-              {
-                "type": "table",
-                "source": "assuranceDocuments",
-                "userAddedRows": true,
-                "disableTableUpload": true,
-                "columns": [
+                    "dataType": "text",
+                    "name": "surveyMethodology",
+                    "description": "Provide more details on what is being done.",
+                    "validate": "required,maxSize[3000]",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methodDescription"
+                    }
+                  },
                   {
-                    "title": "Attached documents",
-                    "source": "attachments",
-                    "type": "document"
+                    "dataType": "text",
+                    "name": "invoicingThisActivity",
+                    "constraints": [
+                      "Yes",
+                      "No"
+                    ],
+                    "validate": "required"
                   }
-                ]
+                ],
+                "minSize": 1
               }
             ]
-          }
-        ]
-      },
-      "modelName": null,
-      "templateName": "nhtRemediatingRiparianAndAquaticAreas",
-      "optional": true,
-      "optionalQuestionText": null,
-      "title": "Remediating riparian and aquatic areas",
-      "collapsibleHeading": null,
-      "name": "NHT - Remediating riparian and aquatic areas",
-      "description": null
-    },
-    {
-      "collapsedByDefault": false,
-      "template": {
-        "dataModel": [
+          },
+          {
+            "dataType": "lookupTable",
+            "name": "baselineIndicatorMapping",
+            "config": {
+              "source": {
+                "literal": {
+                  "Baseline dataset associated with a project outcome": "Baseline",
+                  "Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
+                }
+              }
+            }
+          },
           {
+            "allowRowDelete": "false",
             "columns": [
               {
                 "dataType": "text",
-                "name": "initialOrFollowup",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
                 "constraints": [
-                  "Initial",
-                  "Follow-up"
+                  "Individuals",
+                  "Groups"
                 ],
                 "validate": "required"
               },
               {
-                "dataType": "feature",
-                "name": "sitesTreated"
-              },
-              {
-                "computed": {
-                  "expression": "$geom.areaHa(sitesTreated)"
-                },
                 "dataType": "number",
-                "name": "siteCalculatedAreaHa",
-                "units": "ha",
-                "decimalPlaces": 3,
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
                 "behaviour": [
                   {
-                    "condition": "areaInvoicedHa > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The treated area must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
-                ]
+                ],
+                "validate": "required,min[0]"
               },
               {
-                "computed": {
-                  "expression": "$geom.lengthKm(sitesTreated)"
-                },
-                "dataType": "number",
-                "name": "siteCalculatedLengthKm",
-                "units": "km",
-                "decimalPlaces": 3,
+                "dataType": "text",
+                "name": "participationGroupNumber",
                 "behaviour": [
                   {
-                    "condition": "lengthInvoicedKm > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The treated length must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
                 ]
               },
-              {
-                "defaultValue": {
-                  "expression": "$geom.areaHa(sitesTreated)",
-                  "type": "computed"
-                },
-                "dataType": "number",
-                "name": "areaTreatedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": "required,min[0]"
-              },
-              {
-                "defaultValue": {
-                  "expression": "$geom.lengthKm(sitesTreated)",
-                  "type": "computed"
-                },
-                "dataType": "number",
-                "name": "lengthTreatedKm",
-                "units": "km",
-                "decimalPlaces": 3,
-                "validate": "required,min[0]"
-              },
               {
                 "dataType": "number",
-                "name": "areaInvoicedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": [
-                  {
-                    "rule": "required"
-                  },
-                  {
-                    "rule": "min[0]"
-                  },
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
                   {
-                    "param": {
-                      "expression": "areaTreatedHa",
-                      "type": "computed"
-                    },
-                    "rule": "max"
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
-                ]
-              },
-              {
-                "dataType": "number",
-                "name": "lengthInvoicedKm",
-                "units": "km",
-                "decimalPlaces": 3,
+                ],
                 "validate": [
                   {
                     "rule": "required"
@@ -17776,7 +26590,7 @@
                   },
                   {
                     "param": {
-                      "expression": "lengthTreatedKm",
+                      "expression": "participationIndividualNumber",
                       "type": "computed"
                     },
                     "rule": "max"
@@ -17785,272 +26599,84 @@
               },
               {
                 "dataType": "text",
-                "name": "mappingNotAlignedReason",
-                "behaviour": [
-                  {
-                    "condition": "not (within(areaTreatedHa, siteCalculatedAreaHa, 0.1) and within(lengthTreatedKm, siteCalculatedLengthKm, 0.1))",
-                    "type": "if"
-                  }
-                ],
-                "constraints": [
-                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                  "Other"
-                ],
-                "validate": "required"
-              },
-              {
-                "dataType": "text",
-                "name": "mappingNotAlignedComments",
-                "behaviour": [
-                  {
-                    "condition": "\"Other\" == mappingNotAlignedReason",
-                    "type": "if"
-                  }
-                ],
-                "validate": "required,maxSize[300]"
-              },
-              {
-                "dataType": "text",
-                "name": "invoicedNotActualReason",
+                "name": "firstNationGroupNumber",
                 "behaviour": [
                   {
-                    "condition": "roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedHa, 2) or roundTo(lengthTreatedKm, 2) != roundTo(lengthInvoicedKm, 2)",
-                    "type": "visible"
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
                 ],
                 "constraints": [
-                  "Work was undertaken over a greater area than will be invoiced for",
-                  "Other"
-                ],
-                "validate": "required"
-              },
-              {
-                "dataType": "text",
-                "name": "invoicedNotActualComments",
-                "behaviour": [
-                  {
-                    "condition": "\"Other\" == invoicedNotActualReason",
-                    "type": "if"
-                  }
-                ],
-                "validate": "required,maxSize[300]"
-              },
-              {
-                "dataType": "document",
-                "name": "extraMappingDetails",
-                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
-                "behaviour": [
-                  {
-                    "condition": "not (within(areaTreatedHa, siteCalculatedAreaHa, 0.1) and within(lengthTreatedKm, siteCalculatedLengthKm, 0.1)) or roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedHa, 2) or roundTo(lengthTreatedKm, 2) != roundTo(lengthInvoicedKm, 2)",
-                    "type": "if"
-                  }
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
                 ],
-                "validate": "required"
-              },
-              {
-                "name": "relatedOutcomes",
-                "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "label",
-                  "valueProperty": "label",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
-                      }
-                      ]
-                    }
-                  }
-                }
-              },
-              {
-                "name": "investmentPriorities2",
-                "dataType": "stringList",
-                "validate": "required",
-                "constraints": {
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "params": [
-                        {
-                          "expression": "owner.projectId",
-                          "name": "id",
-                          "type": "computed"
-                        }
-                      ],
-                      "url": "/project/listProjectInvestmentPriorities/"
-                    }
-                  }
-                }
-              },
-              {
-                "dataType": "text",
-                "name": "otherInvestmentPriority",
-                "behaviour": [
-                  {
-                    "type": "enable",
-                    "condition": "\"Other\" in investmentPriorities2"
-                  }
-                ]
-              },
-              {
-                "columns": [
-                  {
-                    "dataType": "species",
-                    "name": "weedTargetSpecies",
-                    "dwcAttribute": "scientificName",
-                    "description": "Weed species targeted for treatment (start typing a  scientific or common name for a species)",
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "threatenedEcologicalCommunity",
-                    "validate": "maxSize[100]"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "treatmentMethod",
-                    "description": "The primary method used to treat the patch of the target species",
-                    "constraints": [
-                      "Basal bark spraying",
-                      "Biological agents",
-                      "Cut stump",
-                      "Cut and swab",
-                      "Dozing",
-                      "Felling",
-                      "Fire",
-                      "Foliar spraying",
-                      "Grubbing / chipping",
-                      "Hand pulling",
-                      "Moisture and nutrient control",
-                      "Mowing",
-                      "Overplanting",
-                      "Pushing",
-                      "Slashing",
-                      "Spot spraying",
-                      "Splatter gun",
-                      "Stem injection",
-                      "Stem scraper",
-                      "Wick applicators",
-                      "Other"
-                    ],
-                    "validate": "required"
-                  },
+                "validate": [
                   {
-                    "dataType": "text",
-                    "name": "otherTreatmentMethod",
-                    "description": "Please specify the method of treatment used if Other was selected in the Type of treatment column.",
-                    "behaviour": [
-                      {
-                        "condition": "treatmentMethod == \"Other\"",
-                        "type": "enable"
-                      }
-                    ],
-                    "validate": "required,maxSize[100]"
+                    "rule": "required"
                   },
                   {
-                    "dataType": "text",
-                    "name": "treatmentObjective",
-                    "description": "How will the work contribute to protecting the area",
-                    "validate": "required,maxSize[300]"
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
                   }
-                ],
-                "dataType": "list",
-                "name": "weedSpeciesTreated"
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
               }
             ],
             "dataType": "list",
-            "name": "weedTreatmentSites"
+            "name": "participationInformationTableSgs"
           },
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
+            "dataType": "number",
+            "name": "totalSurveyIndicator",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(plantSurvivalSurveys, \"surveyObjective ? 1 : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "name": "totalSurveyIndicatorInvoiced",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
+                "rule": "required"
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+                "rule": "min[0]"
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "param": {
+                  "expression": "totalSurveyIndicator",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "validate": "required,min[0]"
+            "defaultValue": ""
           },
           {
             "dataType": "text",
-            "name": "firstNationGroupNumber",
+            "name": "totalInvoicedSeedMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
             "behaviour": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
+                "condition": "+totalSurveyIndicatorInvoiced < +totalSurveyIndicator",
                 "type": "enable"
               }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "name": "surveyCountHeader",
-            "type": "number",
-            "decimalPlaces": 0,
-            "computed": {
-              "expression": "count(weedTreatmentSites, \"treatmentObjective\")"
-            }
+            ]
           },
           {
             "dataType": "text",
@@ -18069,7 +26695,8 @@
           {
             "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "description": "",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -18078,29 +26705,40 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Weed treatment",
-        "title": "Removing weeds",
+        "modelName": "NHT - Plant survival survey",
+        "title": "Seed Germination/Plant Survival Survey",
         "viewModel": [
           {
             "type": "section",
             "items": [
               {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Participation information</h3>"
+                  }
+                ]
+              },
+              {
+                "disableTableUpload": true,
                 "columns": [
                   {
                     "width": "10%",
                     "source": "participationIndividualsOrGroups",
-                    "title": "Individuals or groups?",
+                    "title": "Are individuals or groups delivering this service?",
                     "type": "selectOne"
                   },
                   {
                     "width": "20%",
                     "type": "col",
-                    "title": "Total Number of people delivering this service",
+                    "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                     "items": [
                       {
                         "source": "participationIndividualNumber",
@@ -18115,7 +26753,8 @@
                   {
                     "type": "col",
                     "width": "20%",
-                    "title": "Total Number of First Nations people delivering this service ",
+                    "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                     "items": [
                       {
                         "source": "firstNationIndividualNumber",
@@ -18128,38 +26767,103 @@
                     ]
                   },
                   {
+                    "width": "20%",
                     "source": "participationDetails",
                     "rows": 4,
-                    "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
+                    "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                    "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
                     "type": "textarea"
                   }
                 ],
-                "userAddedRows": false,
-                "disableTableUpload": false,
-                "source": "",
+                "source": "participationInformationTableSgs",
                 "type": "table"
               },
               {
-                "preLabel": "Number of Removing Weeds surveys conducted:",
-                "noEdit": true,
-                "type": "number",
-                "source": "surveyCountHeader"
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Survey information</h3><p><b>Before completing this section, please ensure you have created a Data Set Summary information for every data set produced by the surveys you intend to report</b></p><ul><li>Each survey reported must relate to a combination of outcomes as described in your MERI plan</li><li>Each Data Set Summary recorded for a survey must be addressing the same outcomes as selected for the survey</li><li>If a survey produced more than one data set, use the New Data Set button to add each Data Set Summary under your survey</li><li>A single survey can be made up of multiple dataset</li></ul>"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Totals Summary</h3>"
+                  }
+                ]
               },
               {
-                "addRowText": "New weed removal site",
+                "type": "row",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(i)  Total Number of  indicator seed germination/plant survival surveys completed for this reporting period",
+                            "source": "totalSurveyIndicator",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(ii) Total Number of indicator seed germination/plant survival surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyIndicatorInvoiced",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                    "source": "totalInvoicedSeedMismatched",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": ""
+                  }
+                ]
+              },
+              {
+                "addRowText": "Add survey",
+                "removeRowText": "Delete this survey",
                 "userAddedRows": true,
-                "source": "weedTreatmentSites",
+                "source": "plantSurvivalSurveys",
                 "type": "repeat",
                 "items": [
                   {
-                    "css": "border-bottom",
                     "type": "row",
                     "items": [
                       {
-                        "preLabel": "Initial or follow-up treatment",
-                        "css": "span3",
-                        "source": "initialOrFollowup",
-                        "type": "selectOne"
+                        "type": "col",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s relates to this survey?"
+                          }
+                        ]
                       }
                     ]
                   },
@@ -18167,240 +26871,325 @@
                     "type": "row",
                     "items": [
                       {
-                        "css": "span3 col-border-right",
-                        "type": "col",
+                        "source": "surveyObjective",
+                        "preLabel": "Survey objective",
+                        "type": "text"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "repeat",
+                    "source": "plantSurvivalDataSets",
+                    "userAddedRows": true,
+                    "addRowText": "New data set",
+                    "removeRowText": "Delete this data set",
+                    "items": [
+                      {
+                        "type": "row",
+                        "css": "border-bottom",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Site/s where weed treatment was undertaken",
-                                "source": "sitesTreated",
-                                "type": "feature"
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "readonly": true,
-                                "source": "siteCalculatedAreaHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "readonly": true,
-                                "source": "siteCalculatedLengthKm",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
+                            "type": "col",
                             "items": [
                               {
-                                "preLabel": "Please attach mapping details",
-                                "source": "extraMappingDetails",
-                                "type": "document"
+                                "source": "dataSetId",
+                                "type": "selectOne",
+                                "preLabel": "Please select the data set produced by this survey.  Note it must have already been entered on the Data Set Summary tab."
                               }
                             ]
                           }
                         ]
                       },
                       {
-                        "css": "span4 col-border-right",
-                        "type": "col",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Actual area (ha) / length (km) treated for weed removal",
-                                "helpText": "Manually enter correct figure for this reporting period if different to mapped value.",
-                                "source": "areaTreatedHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "projectBaselines",
+                                    "type": "selectMany",
+                                    "preLabel": "Which project baseline/s relate to this survey?",
+                                    "readonly": "readonly"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "source": "lengthTreatedKm",
-                                "type": "number",
-                                "validate": "required",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "investmentPriorities2",
+                                    "preLabel": "Which investment priority does this activity relate to?",
+                                    "type": "select2Many"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Reason for actual being different to mapped amount",
-                                "source": "mappingNotAlignedReason",
-                                "type": "selectOne"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity start date",
+                                    "source": "activitiesStartDate",
+                                    "type": "date"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "mappingNotAlignedComments",
-                                "type": "textarea",
-                                "rows": 5
-                              }
-                            ]
-                          }
-                        ]
-                      },
-                      {
-                        "css": "span4",
-                        "type": "col",
-                        "items": [
-                          {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Invoiced area (ha) / length (km) treated for weed removal",
-                                "helpText": "Enter the amount you will invoice for during this reporting period.",
-                                "source": "areaInvoicedHa",
-                                "type": "number",
-                                "validate": "required",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity end date",
+                                    "source": "activitiesEndDate",
+                                    "type": "date"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "source": "lengthInvoicedKm",
-                            "type": "number",
-                            "validate": "required",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          },
-                          {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Reason for invoiced amount being different to actual amount",
-                                "source": "invoicedNotActualReason",
-                                "type": "selectOne"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Sites covered for plant survival survey",
+                                    "source": "sitesCoveredForPlantSurvival",
+                                    "type": "feature"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedAreaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedLengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Please attach mapping details",
+                                    "source": "extraMappingDetails",
+                                    "type": "document"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "invoicedNotActualComments",
-                                "type": "textarea",
-                                "rows": 5
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Actual area (ha) covered by plant survival survey",
+                                    "source": "areaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "lengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Reason for actual being different to mapped amount",
+                                    "source": "mappingNotAlignedReason",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                                    "source": "mappingNotAlignedComments",
+                                    "type": "textarea",
+                                    "rows": 5
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
+                          },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "source": "relatedOutcomes",
-                                "type": "selectOne",
-                                "preLabel": "Which outcome statement/s relates to this survey?"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique",
+                                    "source": "emsaProtocol",
+                                    "type": "selectOne",
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique (if Other)",
+                                    "source": "otherEmsaProtocol",
+                                    "type": "select2Many"
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
+                          },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "source": "investmentPriorities2",
-                                "preLabel": "Which investment priority does this activity relate to?",
-                                "type": "select2Many"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "surveyMethodology",
+                                    "preLabel": "Survey methodology",
+                                    "type": "text"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "source": "otherInvestmentPriority",
-                                "type": "text"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "invoicingThisActivity",
+                                    "preLabel": "Are you invoicing for this activity in this reporting period?",
+                                    "type": "selectOne"
+                                  }
+                                ]
                               }
                             ]
                           }
                         ]
-                      }
-                    ]
-                  },
-                  {
-                    "columns": [
-                      {
-                        "width": "20%",
-                        "source": "weedTargetSpecies",
-                        "title": "Target weed species",
-                        "type": "speciesSelect"
-                      },
-                      {
-                        "width": "22%",
-                        "source": "threatenedEcologicalCommunity",
-                        "title": "Threatened Ecological Community (if applicable)",
-                        "type": "text"
-                      },
-                      {
-                        "width": "15%",
-                        "source": "treatmentMethod",
-                        "title": "Type of treatment",
-                        "type": "select2"
-                      },
-                      {
-                        "width": "20%",
-                        "source": "otherTreatmentMethod",
-                        "title": "Type of treatment (if other)",
-                        "type": "text"
                       },
                       {
-                        "width": "23%",
-                        "source": "treatmentObjective",
-                        "title": "Treatment objective",
-                        "type": "textarea"
+                        "columns": [
+                          {
+                            "width": "30%",
+                            "source": "species",
+                            "title": "Target species recorded",
+                            "type": "speciesSelect"
+                          },
+                          {
+                            "width": "20%",
+                            "title": "Planting method",
+                            "source": "plantingMethod",
+                            "type": "selectOne"
+                          },
+                          {
+                            "width": "10%",
+                            "source": "hectaresPlanted",
+                            "title": "How many hectares planted?",
+                            "type": "number"
+                          },
+                          {
+                            "width": "10%",
+                            "source": "kilosOfDirectSeeding",
+                            "title": "Number of kilos for direct seeding",
+                            "type": "number"
+                          },
+                          {
+                            "width": "10%",
+                            "source": "numberPlanted",
+                            "title": "Number planted (Tubestock/Seedling planting)",
+                            "type": "number"
+                          },
+                          {
+                            "width": "10%",
+                            "source": "individualsOrGroups",
+                            "title": "Individuals / groups",
+                            "type": "selectOne"
+                          },
+                          {
+                            "width": "10%",
+                            "source": "numberOfIndividualsGroupsSurvived",
+                            "title": "Number of individuals / groups survived",
+                            "type": "number"
+                          },
+                          {
+                            "width": "10%",
+                            "source": "survivalRate",
+                            "title": "Survival Rate %",
+                            "type": "number"
+                          }
+                        ],
+                        "userAddedRows": true,
+                        "disableTableUpload": true,
+                        "source": "plantSurvivalSurveySpeciesTable",
+                        "type": "table"
                       }
-                    ],
-                    "userAddedRows": true,
-                    "source": "weedSpeciesTreated",
-                    "type": "table"
+                    ]
                   }
                 ]
               },
@@ -18432,7 +27221,7 @@
                 "items": [
                   {
                     "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
                   },
                   {
                     "preLabel": "Data have been uploaded",
@@ -18453,15 +27242,6 @@
                   }
                 ]
               },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-                  }
-                ]
-              },
               {
                 "type": "table",
                 "source": "assuranceDocuments",
@@ -18480,12 +27260,12 @@
         ]
       },
       "modelName": null,
-      "templateName": "nhtWeedTreatment",
+      "templateName": "nhtPlantSurvivalSurvey",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Removing weeds",
+      "title": "Plant survival survey",
       "collapsibleHeading": null,
-      "name": "NHT - Weed treatment",
+      "name": "NHT - Plant survival survey",
       "description": null
     },
     {
@@ -18493,157 +27273,58 @@
       "template": {
         "dataModel": [
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
+            "allowRowDelete": "false",
             "columns": [
               {
                 "dataType": "text",
-                "name": "initialOrMaintenance",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
                 "constraints": [
-                  "Initial",
-                  "Maintenance"
+                  "Individuals",
+                  "Groups"
                 ],
                 "validate": "required"
               },
-              {
-                "dataType": "feature",
-                "name": "sitesRevegetated"
-              },
               {
                 "dataType": "number",
-                "name": "siteCalculatedAreaHa",
-                "computed": {
-                  "expression": "$geom.areaHa(sitesRevegetated)"
-                },
-                "units": "ha",
-                "decimalPlaces": 3,
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
                 "behaviour": [
                   {
-                    "condition": "areaInvoicedHa > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The revegetated area must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
-                ]
+                ],
+                "validate": "required,min[0]"
               },
               {
-                "dataType": "number",
-                "name": "siteCalculatedLengthKm",
-                "computed": {
-                  "expression": "$geom.lengthKm(sitesRevegetated)"
-                },
-                "units": "km",
-                "decimalPlaces": 3,
+                "dataType": "text",
+                "name": "participationGroupNumber",
                 "behaviour": [
                   {
-                    "condition": "lengthRevegetatedKm > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The revegetated length must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
                 ]
               },
-              {
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "siteCalculatedAreaHa"
-                },
-                "dataType": "number",
-                "name": "areaRevegetatedHa",
-                "validate": "required,min[0]",
-                "decimalPlaces": 3,
-                "units": "ha"
-              },
-              {
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "siteCalculatedLengthKm"
-                },
-                "dataType": "number",
-                "name": "lengthRevegetatedKm",
-                "validate": "required,min[0]",
-                "decimalPlaces": 3,
-                "units": "km"
-              },
               {
                 "dataType": "number",
-                "name": "areaInvoicedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
                 "validate": [
                   {
                     "rule": "required"
@@ -18652,36 +27333,101 @@
                     "rule": "min[0]"
                   },
                   {
-                    "rule": "max",
                     "param": {
-                      "type": "computed",
-                      "expression": "areaRevegetatedHa"
-                    }
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
                   }
                 ]
               },
-
               {
-                "dataType": "number",
-                "name": "areaInvoicedKm",
-                "units": "km",
-                "decimalPlaces": 3,
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
                 "validate": [
                   {
                     "rule": "required"
                   },
-                  {
-                    "rule": "min[0]"
-                  },
                   {
                     "param": {
-                      "expression": "lengthRevegetatedKm",
+                      "expression": "participationGroupNumber",
                       "type": "computed"
                     },
-                    "rule": "max"
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableSip"
+          },
+          {
+            "columns": [
+              {
+                "dataType": "feature",
+                "name": "sitesPreparation",
+                "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
+              },
+              {
+                "computed": {
+                  "expression": "$geom.areaHa(sitesPreparation)"
+                },
+                "dataType": "number",
+                "name": "calculatedAreaTreatedHa",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesPreparation)"
+                },
+                "dataType": "number",
+                "name": "calculatedLengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
+                  {
+                    "condition": "lengthTreatedKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
+                    }
                   }
                 ]
               },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaTreatedHa"
+                },
+                "dataType": "number",
+                "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
               {
                 "dataType": "text",
                 "name": "mappingNotAlignedReason",
@@ -18692,7 +27438,7 @@
                 "validate": "required",
                 "behaviour": [
                   {
-                    "condition": "not within(areaRevegetatedHa, siteCalculatedAreaHa, 0.1)",
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
                     "type": "if"
                   }
                 ]
@@ -18700,40 +27446,14 @@
               {
                 "dataType": "text",
                 "name": "mappingNotAlignedComments",
-                "validate": "required,maxSize[300]",
+                "validate": "required,maxSize[100]",
                 "behaviour": [
                   {
-                    "type": "if",
+                    "type": "visible",
                     "condition": "\"Other\" == mappingNotAlignedReason"
                   }
                 ]
               },
-              {
-                "dataType": "text",
-                "name": "invoicedNotActualReason",
-                "constraints": [
-                  "Work was undertaken over a greater area than will be invoiced for",
-                  "Other"
-                ],
-                "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "roundTo(areaRevegetatedHa, 2) != roundTo(areaInvoicedHa, 2) or roundTo(lengthRevegetatedKm, 2) != roundTo(areaInvoicedKm, 2)",
-                    "type": "visible"
-                  }
-                ]
-              },
-              {
-                "dataType": "text",
-                "name": "invoicedNotActualComments",
-                "behaviour": [
-                  {
-                    "type": "if",
-                    "condition": "\"Other\" == invoicedNotActualReason"
-                  }
-                ],
-                "validate": "required,maxSize[300]"
-              },
               {
                 "dataType": "document",
                 "name": "extraMappingDetails",
@@ -18741,86 +27461,158 @@
                 "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
                 "behaviour": [
                   {
-                    "condition": "not within(areaRevegetatedHa, siteCalculatedAreaHa, 0.1) or roundTo(areaRevegetatedHa, 2) != roundTo(areaInvoicedHa, 2)",
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
                     "type": "if"
                   }
                 ]
               },
-              {
-                "dataType": "feature",
-                "name": "offSiteBenefitSites"
-              },
               {
                 "defaultValue": {
                   "type": "computed",
-                  "expression": "$geom.areaHa(offSiteBenefitSites)"
+                  "expression": "calculatedLengthTreatedKm"
                 },
                 "dataType": "number",
-                "name": "offSiteBenefitAreaHa",
-                "validate": [
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
+              },
+              {
+                "columns": [
                   {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.areaHa(offSiteBenefitSites)*0.9"
-                    }
+                    "dataType": "date",
+                    "name": "activitiesStartDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": "required"
                   },
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.areaHa(offSiteBenefitSites)*1.1"
-                    }
+                    "dataType": "date",
+                    "name": "activitiesEndDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": [
+                      {
+                        "rule": "required"
+                      },
+                      {
+                        "rule": "future",
+                        "param": {
+                          "expression": "formatDateForValidation(activitiesStartDate)",
+                          "type": "computed"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "number",
+                    "name": "numberOfDaysPreparingSite",
+                    "description": "Number of days should be calculated as number of days by number of people (eg. 4.5 days by 3 people is 13.5 days).",
+                    "validate": "required,min[0]"
+                  },
+                  {
+                    "dataType": "stringList",
+                    "name": "industryType",
+                    "constraints": [
+                      "Broad acre cropping",
+                      "Dairy",
+                      "Environmental",
+                      "Horticulture",
+                      "Grazing",
+                      "Fisheries",
+                      "Aquaculture",
+                      "Other"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "otherIndustryType",
+                    "behaviour": [
+                      {
+                        "condition": "industryType == \"Other\"",
+                        "type": "enable"
+                      }
+                    ],
+                    "validate": "required,maxSize[100]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "actionType",
+                    "description": "",
+                    "constraints": [
+                      "Basal bark spraying",
+                      "Biological agents",
+                      "Cut stump",
+                      "Cut and swab",
+                      "Dozing",
+                      "Felling",
+                      "Fire",
+                      "Foliar spraying",
+                      "Grubbing/chipping",
+                      "Hand pulling",
+                      "Moisture and nutrient control",
+                      "Mowing",
+                      "Other earthworks",
+                      "Overplanting",
+                      "Pushing",
+                      "Slashing",
+                      "Spot spraying",
+                      "Splatter gun",
+                      "Stem injection",
+                      "Stem scraper",
+                      "Wick applicators",
+                      "Other"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "otherActionType",
+                    "description": "This field may be used to list multiple preparation activities. This list of activities need to be separated with a ';'",
+                    "behaviour": [
+                      {
+                        "condition": "actionType == \"Other\"",
+                        "type": "enable"
+                      }
+                    ],
+                    "validate": "required,maxSize[100]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "purposeOfSitePreparation",
+                    "description": "Please provide a brief description of how the work will benefit the area.",
+                    "validate": "required,maxSize[300]"
                   }
-                ]
-              },
-              {
-                "dataType": "text",
-                "name": "evidenceOfBenefit",
-                "validate": "maxSize[300]"
+                ],
+                "dataType": "list",
+                "name": "sitePreparationDetails"
               },
               {
                 "name": "relatedOutcomes",
                 "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
                 "validate": "required",
                 "constraints": {
                   "textProperty": "label",
-                  "valueProperty": "label",
+                  "valueProperty": "value",
                   "type": "pre-populated",
                   "config": {
                     "source": {
-                      "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
-                      }
-                      ]
+                      "context-path": "outcomes"
                     }
                   }
                 }
               },
               {
                 "name": "investmentPriorities2",
-                "dataType": "stringList",
+                "dataType": "text",
+                "description": "",
                 "validate": "required",
                 "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
                   "type": "pre-populated",
                   "config": {
                     "source": {
-                      "params": [
-                        {
-                          "expression": "owner.projectId",
-                          "name": "id",
-                          "type": "computed"
-                        }
-                      ],
-                      "url": "/project/listProjectInvestmentPriorities/"
+                      "context-path": "owner.investmentPriorities"
                     }
                   }
                 }
@@ -18836,75 +27628,93 @@
                 ]
               },
               {
-                "dataType": "date",
-                "name": "activitiesStartDate",
-                "description": "Specific the dates these events were held on",
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
                 "validate": "required"
+              }
+            ],
+            "dataType": "list",
+            "name": "sitePreparationDetailsControlled"
+          },
+          {
+            "dataType": "number",
+            "name": "totalAreaSitePreparation",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(sitePreparationDetailsControlled, \"areaTreatedHa\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalAreaSitePreparationInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
               },
               {
-                "dataType": "date",
-                "name": "activitiesEndDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
+                "rule": "min[0]"
               },
               {
-                "columns": [
-                  {
-                    "dataType": "species",
-                    "name": "species",
-                    "dwcAttribute": "scientificName",
-                    "description": "",
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "typeOfRevegetationActivity",
-                    "validate": "required,maxSize[100]"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "revegetationMethod",
-                    "dwcAttribute": "establishmentMeans",
-                    "description": "If 'Other', please identify in 'Type of revegetation activity' field",
-                    "constraints": [
-                      "Direct seeding",
-                      "Tubestock planting",
-                      "Both",
-                      "Other"
-                    ],
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "threatenedEcologicalCommunity",
-                    "description": "This free text field allows multiple TECs to be entered. They should be written as listed in EPBC, and separated by ';'",
-                    "validate": "maxSize[100]"
-                  },
-                  {
-                    "dataType": "number",
-                    "name": "numberPlanted",
-                    "validate": "required,min[0]"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "revegetationObjective",
-                    "validate": "required,maxSize[300]"
-                  }
-                ],
-                "dataType": "list",
-                "name": "revegetationDetails"
+                "param": {
+                  "expression": "totalAreaSitePreparation",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalLengthSitePreparation",
+            "validate": "min[0]",
+            "computed": {
+              "expression": "sum(sitePreparationDetailsControlled, \"lengthTreatedKm\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "decimalPlaces": 3,
+            "name": "totalLengthSitePreparationInvoiced",
+            "description": "Manually enter if values have decimal points e.g. 0.350 or 2.545",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalLengthSitePreparation",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
               }
             ],
-            "dataType": "list",
-            "name": "revegetationArea"
+            "defaultValue": ""
           },
           {
-            "name": "revegetatingSurveyCountHeader",
-            "type": "number",
-            "decimalPlaces": 0,
-            "computed": {
-              "expression": "count(revegetationArea, \"revegetationObjective\")"
-            }
+            "dataType": "text",
+            "name": "totalInvoicedSiteCollectionMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalAreaSitePreparationInvoiced < +totalAreaSitePreparation or +totalLengthSitePreparationInvoiced < +totalLengthSitePreparation",
+                "type": "enable"
+              }
+            ]
           },
           {
             "dataType": "text",
@@ -18918,12 +27728,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -18932,26 +27742,37 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Revegetating habitat",
-        "title": "Revegetating habitat",
+        "modelName": "NHT - Site preparation",
+        "title": "Site Preparation",
         "viewModel": [
           {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
             "columns": [
               {
                 "width": "10%",
                 "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
+                "title": "Are individuals or groups delivering this service?",
                 "type": "selectOne"
               },
               {
                 "width": "20%",
                 "type": "col",
-                "title": "Total Number of people delivering this service",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "participationIndividualNumber",
@@ -18966,7 +27787,8 @@
               {
                 "type": "col",
                 "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "firstNationIndividualNumber",
@@ -18979,82 +27801,121 @@
                 ]
               },
               {
+                "width": "20%",
                 "source": "participationDetails",
                 "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
                 "type": "textarea"
               }
             ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
+            "source": "participationInformationTableSip",
             "type": "table"
           },
           {
-            "preLabel": "Number of Revegetating Habitat surveys conducted:",
-            "noEdit": true,
-            "type": "number",
-            "source": "revegetatingSurveyCountHeader"
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
           },
           {
-            "addRowText": "New area of revegetation",
-            "userAddedRows": true,
-            "source": "revegetationArea",
-            "type": "repeat",
+            "type": "row",
             "items": [
               {
-                "type": "row",
-                "css": "border-bottom",
+                "type": "col",
+                "css": "span4 col-border-right",
                 "items": [
                   {
-                    "preLabel": "Initial or maintenance activity?",
-                    "css": "span3",
-                    "source": "initialOrMaintenance",
-                    "type": "selectOne"
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total area (ha) of site preparation for this reporting period",
+                        "source": "totalAreaSitePreparation",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total area (ha) of site preparation <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalAreaSitePreparationInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
                   }
                 ]
               },
               {
-                "type": "row",
-                "css": "border-bottom",
+                "type": "col",
+                "css": "span4 col-border-right",
                 "items": [
                   {
-                    "type": "col",
-                    "css": "span3 col-border-right",
+                    "type": "row",
                     "items": [
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Site/s being revegetated",
-                            "source": "sitesRevegetated",
-                            "type": "feature"
-                          }
-                        ]
-                      },
-                      {
-                        "source": "siteCalculatedAreaHa",
-                        "type": "number",
-                        "readonly": true,
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
-                      },
+                        "preLabel": "(iii) Total length (km) of site preparation for this reporting period",
+                        "source": "totalLengthSitePreparation",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
                       {
-                        "source": "siteCalculatedLengthKm",
+                        "preLabel": "(iv) Total length (km) of site preparation <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalLengthSitePreparationInvoiced",
                         "type": "number",
-                        "readonly": true,
                         "displayOptions": {
-                          "displayUnits": true
+                          "removeTrailingZeros": false
                         }
-                      },
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedSiteCollectionMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "addRowText": "Add a new preparation site",
+            "userAddedRows": true,
+            "source": "sitePreparationDetailsControlled",
+            "type": "repeat",
+            "items": [
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "css": "span3 col-border-right",
+                    "type": "col",
+                    "items": [
                       {
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Please attach mapping details",
-                            "source": "extraMappingDetails",
-                            "type": "document"
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
                           }
                         ]
                       }
@@ -19068,67 +27929,46 @@
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Actual area (ha) / length (km) of habitat revegetated",
-                            "helpText": "Manually enter correct figure for this reporting period if different to mapped value.",
-                            "source": "areaRevegetatedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "lengthRevegetatedKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3 col-border-right",
+                    "type": "col",
+                    "items": [
                       {
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Reason for actual being different to mapped amount",
-                            "source": "mappingNotAlignedReason",
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
                             "type": "selectOne"
                           }
                         ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "mappingNotAlignedComments",
-                            "type": "textarea",
-                            "rows": 5
-                          }
-                        ]
                       }
                     ]
-                  },
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
                   {
                     "type": "col",
-                    "css": "span3",
+                    "css": "span3 col-border-right",
                     "items": [
                       {
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Invoiced area (ha) of habitat revegetated",
-                            "helpText": "Enter the amount you will invoice for during this reporting period.",
-                            "source": "areaInvoicedHa",
-                            "type": "number",
-                            "validate": "required",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
+                            "preLabel": "Site/s where preparation was undertaken",
+                            "source": "sitesPreparation",
+                            "type": "feature"
                           }
                         ]
                       },
@@ -19136,11 +27976,12 @@
                         "type": "row",
                         "items": [
                           {
-                            "source": "areaInvoicedKm",
+                            "source": "calculatedAreaTreatedHa",
                             "type": "number",
                             "displayOptions": {
                               "displayUnits": true
-                            }
+                            },
+                            "readonly": "readonly"
                           }
                         ]
                       },
@@ -19148,9 +27989,12 @@
                         "type": "row",
                         "items": [
                           {
-                            "preLabel": "Reason for invoiced amount being different to actual amount",
-                            "source": "invoicedNotActualReason",
-                            "type": "selectOne"
+                            "source": "calculatedLengthTreatedKm",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
                           }
                         ]
                       },
@@ -19158,10 +28002,9 @@
                         "type": "row",
                         "items": [
                           {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "invoicedNotActualComments",
-                            "type": "textarea",
-                            "rows": 5
+                            "preLabel": "Please attach mapping details",
+                            "source": "extraMappingDetails",
+                            "type": "document"
                           }
                         ]
                       }
@@ -19175,9 +28018,12 @@
                         "type": "row",
                         "items": [
                           {
-                            "source": "investmentPriorities2",
-                            "preLabel": "Which investment priority does this activity relate to?",
-                            "type": "select2Many"
+                            "preLabel": "Actual area (ha) / length (km) of site preparation",
+                            "source": "areaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
                           }
                         ]
                       },
@@ -19185,103 +28031,112 @@
                         "type": "row",
                         "items": [
                           {
-                            "source": "otherInvestmentPriority",
-                            "type": "text"
+                            "source": "lengthTreatedKm",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
                           }
                         ]
-                      }
-                    ]
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Which outcome statement/s relates to this survey?",
-                    "css": "span3",
-                    "source": "relatedOutcomes",
-                    "type": "selectOne"
-                  },
-                  {
-                    "preLabel": "Activities start date",
-                    "css": "span3",
-                    "source": "activitiesStartDate",
-                    "type": "date"
-                  },
-                  {
-                    "preLabel": "Activities end date",
-                    "css": "span3",
-                    "source": "activitiesEndDate",
-                    "type": "date"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Please map any off-site area/s if they benefitted from this  revegetation activity",
-                    "css": "span3",
-                    "source": "offSiteBenefitSites",
-                    "type": "feature"
-                  },
-                  {
-                    "preLabel": "Area (ha) benefitting from revegetation activity",
-                    "css": "span2",
-                    "source": "offSiteBenefitAreaHa",
-                    "type": "number"
-                  },
-                  {
-                    "preLabel": "If off-site area was mapped please provide a description on the evidence available to reflect this benefit.",
-                    "css": "span6",
-                    "source": "evidenceOfBenefit",
-                    "type": "textarea"
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Reason for actual being different to mapped amount",
+                            "source": "mappingNotAlignedReason",
+                            "type": "selectOne"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                            "source": "mappingNotAlignedComments",
+                            "type": "textarea",
+                            "rows": 5
+                          }
+                        ]
+                      }
+                    ]
                   }
                 ]
               },
               {
-                "addRowText": "Add a species",
                 "columns": [
                   {
-                    "width": "20%",
-                    "source": "species",
-                    "title": "Target Plant Species",
-                    "type": "speciesSelect"
+                    "title": "Activity start date",
+                    "source": "activitiesStartDate",
+                    "type": "date",
+                    "width": "10%"
                   },
                   {
-                    "width": "10%",
-                    "source": "revegetationMethod",
-                    "title": "Planting method",
-                    "type": "selectOne"
+                    "title": "Activity end date",
+                    "source": "activitiesEndDate",
+                    "type": "date",
+                    "width": "10%"
                   },
                   {
-                    "width": "20%",
-                    "source": "typeOfRevegetationActivity",
-                    "title": "Type of revegetation activity",
-                    "type": "text"
+                    "width": "10%",
+                    "source": "numberOfDaysPreparingSite",
+                    "title": "Number of days in preparing site",
+                    "type": "number"
                   },
                   {
                     "width": "20%",
-                    "source": "threatenedEcologicalCommunity",
-                    "title": "Threatened ecological community (if applicable)",
-                    "type": "text"
+                    "type": "col",
+                    "title": "Industry type",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "industryType",
+                            "type": "selectOne"
+                          }
+                        ]
+                      },
+                      {
+                        "source": "otherIndustryType",
+                        "placeholder": "Type of industry type (if Other)",
+                        "type": "text"
+                      }
+                    ]
                   },
                   {
-                    "width": "10%",
-                    "source": "numberPlanted",
-                    "title": "Numbers planted",
-                    "type": "number"
+                    "width": "25%",
+                    "type": "col",
+                    "title": "Type of action",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "actionType",
+                            "type": "selectOne"
+                          }
+                        ]
+                      },
+                      {
+                        "source": "otherActionType",
+                        "placeholder": "Type of action (if Other)",
+                        "type": "text"
+                      }
+                    ]
                   },
                   {
-                    "width": "20%",
-                    "source": "revegetationObjective",
-                    "title": "Objective of revegetation activity",
+                    "width": "25%",
+                    "source": "purposeOfSitePreparation",
+                    "title": "Purpose of site preparation",
                     "type": "textarea"
                   }
                 ],
                 "userAddedRows": true,
-                "source": "revegetationDetails",
+                "disableTableUpload": true,
+                "addRowText": "Add a new activity at this site",
+                "source": "sitePreparationDetails",
                 "type": "table"
               }
             ]
@@ -19314,7 +28169,7 @@
             "items": [
               {
                 "type": "literal",
-                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please attach any evidence you have available for this service and/or provide information (e.g. links) to where the evidence is stored. This field will help the Department and Service Providers during assurance activities or audits. Refer to the Evidence Guide for details of the types of acceptable evidence."
+                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
               },
               {
                 "preLabel": "Data have been uploaded",
@@ -19335,15 +28190,6 @@
               }
             ]
           },
-          {
-            "type": "row",
-            "items": [
-              {
-                "type": "literal",
-                "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-              }
-            ]
-          },
           {
             "type": "table",
             "source": "assuranceDocuments",
@@ -19360,12 +28206,12 @@
         ]
       },
       "modelName": null,
-      "templateName": "nhtRevegetatingHabitat",
+      "templateName": "nhtSitePreparation",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Revegetating habitat",
+      "title": "Site preparation",
       "collapsibleHeading": null,
-      "name": "NHT - Revegetating habitat",
+      "name": "NHT - Site preparation",
       "description": null
     },
     {
@@ -19373,339 +28219,525 @@
       "template": {
         "dataModel": [
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
+            "name": "skillsAndKnowledgeSurveys",
+            "dataType": "list",
+            "minSize": 1,
             "columns": [
-              {
-                "dataType": "text",
-                "name": "initialOrMaintenance",
-                "constraints": [
-                  "Initial",
-                  "Maintenance"
-                ],
-                "validate": "required"
-              },
               {
                 "name": "relatedOutcomes",
                 "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
                 "validate": "required",
                 "constraints": {
                   "textProperty": "label",
-                  "valueProperty": "label",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
-                      }
-                      ]
-                    }
-                  }
-                }
-              },
-              {
-                "dataType": "feature",
-                "name": "siteSeedCollected",
-                "validate": "required"
-              },
-              {
-                "defaultValue": {
-                  "expression": "$geom.areaHa(siteSeedCollected)",
-                  "type": "computed"
-                },
-                "dataType": "number",
-                "name": "calculatedAreaHabitatRevegetedHa",
-                "units": "ha",
-                "decimalPlaces": 3
-              },
-              {
-                "computed": {
-                  "expression": "$geom.lengthKm(siteSeedCollected)"
-                },
-                "dataType": "number",
-                "name": "calculatedLengthHabitatRevegetedKm",
-                "units": "km",
-                "decimalPlaces": 3
-              },
-              {
-                "defaultValue": {
-                  "expression": "calculatedAreaHabitatRevegetedHa",
-                  "type": "computed"
-                },
-                "dataType": "number",
-                "name": "areaHabitatRevegetedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": "required,min[0]"
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesStartDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesEndDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "name": "investmentPriorities2",
-                "dataType": "stringList",
-                "validate": "required",
-                "constraints": {
+                  "valueProperty": "value",
                   "type": "pre-populated",
                   "config": {
                     "source": {
-                      "params": [
-                        {
-                          "expression": "owner.projectId",
-                          "name": "id",
-                          "type": "computed"
-                        }
-                      ],
-                      "url": "/project/listProjectInvestmentPriorities/"
+                      "context-path": "outcomes"
                     }
                   }
                 }
               },
               {
                 "dataType": "text",
-                "name": "otherInvestmentPriority",
-                "behaviour": [
-                  {
-                    "type": "enable",
-                    "condition": "\"Other\" in investmentPriorities2"
-                  }
-                ]
-              },
-              {
-                "dataType": "text",
-                "name": "activityType",
+                "name": "baselineOrIndicatorSurvey",
+                "description": "",
                 "constraints": [
-                  "Collecting",
-                  "Storing",
-                  "Propagating"
+                  "Baseline",
+                  "Indicator"
                 ],
                 "validate": "required"
               },
               {
                 "dataType": "text",
-                "name": "activityPurpose",
-                "validate": "required"
+                "name": "surveyObjective",
+                "description": "What the survey aim to capture? How will the information obtained from the survey be used?",
+                "validate": "required,maxSize[3000]"
               },
               {
-                "dataType": "text",
-                "name": "materialType",
-                "constraints": [
-                  "Seeds",
-                  "Plant cuttings"
-                ],
-                "validate": "required"
+                "dataType": "number",
+                "name": "numberOfSurveys",
+                "validate": "required,min[1],max[1]",
+                "defaultValue": 1,
+                "readonly": true
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfSurveysInvoiced",
+                "validate": "required,min[0]",
+                "defaultValue": 1
               },
               {
+                "dataType": "list",
+                "name": "skillsAndKnowledgeDataSets",
                 "columns": [
                   {
-                    "dataType": "text",
-                    "name": "inKgSeedCollected",
-                    "constraints": [
-                      "Individuals",
-                      "Kilograms"
-                    ],
-                    "validate": "required"
+                    "name": "dataSetId",
+                    "entityType": "au.org.ala.ecodata.DataSetSummary",
+                    "dataType": "text",
+                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
+                    "validate": "required",
+                    "constraints": {
+                      "textProperty": "name",
+                      "valueProperty": "dataSetId",
+                      "excludePath": "skillsAndKnowledgeSurveys.skillsAndKnowledgeDataSets.dataSetId",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.dataSets"
+                        },
+                        "filter": {
+                          "namespace": "dataSet",
+                          "expression": "dataSet.serviceId == 29 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
+                        }
+                      }
+                    },
+                    "behaviour": [
+                      {
+                        "type": "pre_populate",
+                        "config": {
+                          "waitForInitialisation": true,
+                          "source": {
+                            "url": "/site/geojson",
+                            "params": [
+                              {
+                                "expression": "x=find(owner.custom.dataSets, \"dataSetId\", dataSetId); x.siteId",
+                                "name": "id",
+                                "type": "computed",
+                                "required": true
+                              }
+                            ]
+                          },
+                          "target":  {
+                            "type": "singleValue",
+                            "name": "sitesCoveredForSkillsAndKnowledge"
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "name": "projectBaselines",
+                    "dataType": "stringList",
+                    "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.baselines"
+                    },
+                    "constraints": {
+                      "textProperty": "baseline",
+                      "valueProperty": "code",
+                      "type": "pre-populated",
+                      "excludePath": "projectBaselines",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.details.baseline.rows"
+                        }
+                      }
+                    }
                   },
                   {
-                    "dataType": "number",
-                    "name": "amountSeedCollected",
-                    "decimalPlaces": 5
+                    "name": "investmentPriorities2",
+                    "dataType": "stringList",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.investmentPriorities"
+                    },
+                    "constraints": {
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "params": [
+                            {
+                              "expression": "owner.projectId",
+                              "name": "id",
+                              "type": "computed"
+                            }
+                          ],
+                          "url": "/project/listProjectInvestmentPriorities/"
+                        }
+                      }
+                    }
                   },
                   {
                     "dataType": "text",
-                    "name": "otherSeedSources"
+                    "name": "otherInvestmentPriority",
+                    "behaviour": [
+                      {
+                        "type": "enable",
+                        "condition": "\"Other\" in investmentPriorities2"
+                      }
+                    ]
                   },
                   {
-                    "name": "noOfDaysPropagating",
-                    "dataType": "number"
+                    "dataType": "date",
+                    "name": "activitiesStartDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.startDate"
+                    }
                   },
                   {
-                    "dataType": "number",
-                    "name": "numberOfSourcePlants"
+                    "dataType": "date",
+                    "name": "activitiesEndDate",
+                    "description": "Specific the dates these events were held on.",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.endDate"
+                    }
                   },
                   {
-                    "dataType": "text",
-                    "name": "storingFacility"
+                    "dataType": "feature",
+                    "name": "sitesCoveredForSkillsAndKnowledge",
+                    "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
                   },
                   {
+                    "computed": {
+                      "expression": "$geom.areaHa(sitesCoveredForSkillsAndKnowledge)"
+                    },
                     "dataType": "number",
-                    "name": "noOfPlantsPropogated"
-                  },
-                  {
-                    "dataType": "feature",
-                    "name": "siteSeedSourced"
+                    "name": "calculatedAreaTreatedHa",
+                    "units": "ha",
+                    "decimalPlaces": 3
                   },
                   {
                     "computed": {
-                      "expression": "$geom.areaHa(siteSeedSourced)"
+                      "expression": "$geom.lengthKm(sitesCoveredForSkillsAndKnowledge)"
                     },
                     "dataType": "number",
+                    "name": "calculatedLengthTreatedKm",
+                    "units": "km",
                     "decimalPlaces": 3,
-                    "name": "siteSeedSourcedCalculatedAreaHa",
-                    "units": "ha",
                     "behaviour": [
                       {
-                        "condition": "areaInvoicedHa > 0",
+                        "condition": "lengthTreatedKm > 0",
                         "type": "conditional_validation",
                         "value": {
-                          "message": "The controlled area must be mapped",
+                          "message": "The managed length must be mapped",
                           "validate": "required,min[0.0001]"
                         }
                       }
                     ]
                   },
                   {
-                    "computed": {
-                      "expression": "$geom.lengthKm(siteSeedSourced)"
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "calculatedAreaTreatedHa"
                     },
                     "dataType": "number",
+                    "name": "areaTreatedHa",
+                    "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                    "units": "ha",
                     "decimalPlaces": 3,
-                    "name": "siteSeedSourcedCalculatedLengthKm",
-                    "units": "km",
+                    "validate": "required,min[0]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "mappingNotAlignedReason",
+                    "constraints": [
+                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                      "Other"
+                    ],
+                    "validate": "required",
                     "behaviour": [
                       {
-                        "condition": "lengthInvoicedKm > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "The length controlled must be mapped",
-                          "validate": "required,min[0.001]"
-                        }
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "mappingNotAlignedComments",
+                    "validate": "required,maxSize[100]",
+                    "behaviour": [
+                      {
+                        "type": "visible",
+                        "condition": "\"Other\" == mappingNotAlignedReason"
                       }
                     ]
                   },
                   {
                     "dataType": "document",
                     "name": "extraMappingDetails",
+                    "validate": "required",
                     "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
                     "behaviour": [
                       {
-                        "condition": "not (within(areaInstalledHa, siteSeedSourcedCalculatedAreaHa, 0.1) and within(lengthInstalledKm, siteSeedSourcedCalculatedLengthKm, 0.1)) or roundTo(areaInstalledHa, 2) != roundTo(areaInvoicedHa, 2) or roundTo(lengthInstalledKm, 2) != roundTo(lengthInvoicedKm, 2)",
-                        "type": "visible"
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
+                      }
+                    ]
+                  },
+                  {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "$geom.lengthKm(sitesCoveredForSkillsAndKnowledge)"
+                    },
+                    "dataType": "number",
+                    "name": "lengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3
+                  },
+                  {
+                    "dataType": "text",
+                    "description": "Select the technique used to conduct the survey. If the EMSA Application tool was not used, you should select 'Other'.",
+                    "name": "emsaProtocol",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.protocol"
+                    },
+                    "constraints": {
+                      "textProperty": "label",
+                      "valueProperty": "value",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.protocols"
+                        }
                       }
+                    }
+                  },
+                  {
+                    "dataType": "stringList",
+                    "description": "Describe the technique (if Other) was selected.",
+                    "name": "otherEmsaProtocol",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methods"
+                    }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "surveyMethodology",
+                    "description": "Provide more details on what is being done.",
+                    "validate": "required,maxSize[3000]",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methodDescription"
+                    }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "invoicingThisActivity",
+                    "constraints": [
+                      "Yes",
+                      "No"
                     ],
                     "validate": "required"
                   },
+                  {
+                    "dataType": "number",
+                    "name": "numberOfPeopleSurveying",
+                    "validate": "required,min[0]",
+                    "defaultValue": ""
+                  },
                   {
                     "dataType": "text",
-                    "name": "threatEcoCommunity",
-                    "validate": "maxSize[100]"
+                    "name": "skillsSurveyObjective",
+                    "validate": "maxSize[300],required",
+                    "description": "How will the information from the surveys be used?"
                   }
                 ],
-                "dataType": "list",
-                "name": "seedCollectionDetails"
+                "minSize": 1
+              }
+            ]
+          },
+          {
+            "dataType": "lookupTable",
+            "name": "baselineIndicatorMapping",
+            "config": {
+              "source": {
+                "literal": {
+                  "Baseline dataset associated with a project outcome": "Baseline",
+                  "Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
+                }
+              }
+            }
+          },
+          {
+            "allowRowDelete": "false",
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableSss"
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyBaseline",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(skillsAndKnowledgeSurveys, \"baselineOrIndicatorSurvey == 'Baseline' ? 1 : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyBaselineInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyBaseline",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "dataType": "list",
-            "name": "areasOfSeedCollection"
+            "defaultValue": ""
           },
           {
-            "name": "siteSeedCountHeader",
-            "type": "number",
+            "dataType": "number",
+            "name": "totalSurveyIndicator",
+            "validate": "min[0]",
             "decimalPlaces": 0,
             "computed": {
-              "expression": "count(areasOfSeedCollection, \"threatEcoCommunity\")"
+              "expression": "sum(skillsAndKnowledgeSurveys, \"baselineOrIndicatorSurvey == 'Indicator' ? 1 : 0\")"
             }
           },
           {
-            "computed": {
-              "expression": "amountSeedCollected"
-            },
             "dataType": "number",
-            "name": "totalSeedCollected"
+            "name": "totalSurveyIndicatorInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyIndicator",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
           },
           {
-            "computed": {
-              "expression": "numberOfSourcePlants"
-            },
             "dataType": "number",
-            "name": "totalPlantsPropogated"
+            "name": "numberOfSurveysInvoiced",
+            "validate": "required,min[0]",
+            "defaultValue": 1
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedSkillsMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalSurveyIndicatorInvoiced < +totalSurveyIndicator or +totalSurveyBaselineInvoiced < +totalSurveyBaseline",
+                "type": "enable"
+              }
+            ]
           },
           {
             "dataType": "text",
@@ -19724,7 +28756,8 @@
           {
             "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "description": "",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -19733,320 +28766,85 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Seed Collection",
-        "title": "Seed Collecting",
+        "modelName": "NHT - Skills and knowledge survey",
+        "title": "Skills and Knowledge Survey",
         "viewModel": [
           {
-            "columns": [
-              {
-                "width": "10%",
-                "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
-                "type": "selectOne"
-              },
+            "type": "section",
+            "items": [
               {
-                "width": "20%",
-                "type": "col",
-                "title": "Total Number of people delivering this service",
+                "type": "row",
                 "items": [
                   {
-                    "source": "participationIndividualNumber",
-                    "type": "number"
-                  },
-                  {
-                    "source": "participationGroupNumber",
-                    "type": "selectOne"
+                    "type": "literal",
+                    "source": "<h3>Participation information</h3>"
                   }
                 ]
               },
               {
-                "type": "col",
-                "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
-                "items": [
-                  {
-                    "source": "firstNationIndividualNumber",
-                    "type": "number"
-                  },
+                "disableTableUpload": true,
+                "columns": [
                   {
-                    "source": "firstNationGroupNumber",
+                    "width": "10%",
+                    "source": "participationIndividualsOrGroups",
+                    "title": "Are individuals or groups delivering this service?",
                     "type": "selectOne"
-                  }
-                ]
-              },
-              {
-                "source": "participationDetails",
-                "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                "type": "textarea"
-              }
-            ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
-            "type": "table"
-          },
-          {
-            "preLabel": "Number of Seed Collection surveys conducted:",
-            "noEdit": true,
-            "type": "number",
-            "source": "siteSeedCountHeader"
-          },
-          {
-            "addRowText": "New area of seed collection",
-            "userAddedRows": true,
-            "source": "areasOfSeedCollection",
-            "type": "repeat",
-            "items": [
-              {
-                "type": "row",
-                "css": "border-bottom",
-                "items": [
-                  {
-                    "type": "col",
-                    "css": "span3 col-border-right",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Initial or maintenance activity?",
-                            "source": "initialOrMaintenance",
-                            "type": "selectOne"
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  {
-                    "type": "col",
-                    "css": "span3 col-border-right",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Which outcome statement/s relates to this survey?",
-                            "source": "relatedOutcomes",
-                            "type": "selectOne"
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  {
-                    "type": "col",
-                    "css": "span3 col-border-right",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Site/s where collection/propagation was undertaken",
-                            "source": "siteSeedCollected",
-                            "type": "feature"
-                          }
-                        ]
-                      },
-                      {
-                        "source": "calculatedAreaHabitatRevegetedHa",
-                        "type": "number",
-                        "readonly": true,
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
-                      },
-                      {
-                        "source": "calculatedLengthHabitatRevegetedKm",
-                        "type": "number",
-                        "readonly": true,
-                        "displayOptions": {
-                          "displayUnits": true
-                        }
-                      }
-                    ]
                   },
                   {
+                    "width": "20%",
                     "type": "col",
-                    "css": "span3 col-border-right",
+                    "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                     "items": [
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Which investment priority does this activity relate to?",
-                            "source": "investmentPriorities2",
-                            "type": "select2Many"
-                          }
-                        ]
+                        "source": "participationIndividualNumber",
+                        "type": "number"
                       },
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "otherInvestmentPriority",
-                            "type": "text"
-                          }
-                        ]
+                        "source": "participationGroupNumber",
+                        "type": "selectOne"
                       }
                     ]
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "Activities start date",
-                    "css": "span2",
-                    "source": "activitiesStartDate",
-                    "type": "date"
-                  },
-                  {
-                    "preLabel": "Activities end date",
-                    "css": "span2",
-                    "source": "activitiesEndDate",
-                    "type": "date"
-                  },
-                  {
-                    "preLabel": "Type of activity",
-                    "css": "span2",
-                    "source": "activityType",
-                    "type": "selectOne"
-                  },
-                  {
-                    "preLabel": "Purpose of activity",
-                    "css": "span2",
-                    "source": "activityPurpose",
-                    "type": "text"
                   },
                   {
-                    "preLabel": "Type of material collected/stored or propagated",
-                    "css": "span2",
-                    "source": "materialType",
-                    "type": "selectOne"
-                  }
-                ]
-              },
-              {
-                "columns": [
-                  {
-                    "width": "10%",
-                    "source": "inKgSeedCollected",
-                    "title": "Individuals / Kilograms collected",
-                    "type": "selectOne"
-                  },
-                  {
-                    "width": "7%",
-                    "source": "amountSeedCollected",
-                    "title": "Amount collected",
-                    "type": "number"
-                  },
-                  {
-                    "width": "15%",
-                    "source": "otherSeedSources",
-                    "title": "Other seed sources (if applicable)",
-                    "type": "textarea"
-                  },
-                  {
-                    "width": "7%",
-                    "source": "numberOfSourcePlants",
-                    "title": "Number of source plants",
-                    "type": "number"
-                  },
-                  {
-                    "width": "15%",
-                    "source": "storingFacility",
-                    "title": "Name of storing facility",
-                    "type": "textarea"
-                  },
-                  {
-                    "width": "9%",
-                    "source": "noOfPlantsPropogated",
-                    "title": "Number of plants propogated",
-                    "type": "number"
-                  },
-                  {
-                    "width": "7%",
-                    "source": "noOfDaysPropagating",
-                    "title": "Number of days propagating",
-                    "type": "number"
-                  },
-                  {
-                    "width": "15%",
                     "type": "col",
-                    "title": "Site/s where the seeds/plant cuttings were sourced from",
-                    "items": [
-                      {
-                        "source": "siteSeedSourced",
-                        "type": "feature"
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "readonly": true,
-                            "source": "siteSeedSourcedCalculatedAreaHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "readonly": true,
-                            "source": "siteSeedSourcedCalculatedLengthKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
+                    "width": "20%",
+                    "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                    "items": [
+                      {
+                        "source": "firstNationIndividualNumber",
+                        "type": "number"
                       },
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Please attach mapping details",
-                            "source": "extraMappingDetails",
-                            "type": "document"
-                          }
-                        ]
+                        "source": "firstNationGroupNumber",
+                        "type": "selectOne"
                       }
                     ]
                   },
                   {
-                    "width": "15%",
-                    "source": "threatEcoCommunity",
-                    "title": "Threatened ecological communities (if applicable)",
+                    "width": "20%",
+                    "source": "participationDetails",
+                    "rows": 4,
+                    "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                    "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
                     "type": "textarea"
                   }
                 ],
-                "userAddedRows": true,
-                "source": "seedCollectionDetails",
+                "source": "participationInformationTableSss",
                 "type": "table"
-              }
-            ]
-          },
-          {
-            "type": "section",
-            "items": [
+              },
               {
                 "type": "row",
                 "items": [
                   {
-                    "preLabel": "Optionally attach photos",
-                    "source": "photographicEvidence",
-                    "type": "image"
+                    "type": "literal",
+                    "source": "<h3>Survey information</h3><p><b>Before completing this section, please ensure you have created a Data Set Summary information for every data set produced by the surveys you intend to report</b></p><ul><li>Each survey reported must relate to a combination of outcomes as described in your MERI plan</li><li>Each Data Set Summary recorded for a survey must be addressing the same outcomes as selected for the survey</li><li>If a survey produced more than one data set, use the New Data Set button to add each Data Set Summary under your survey</li><li>A single survey can be made up of multiple dataset</li></ul>"
                   }
                 ]
               },
@@ -20054,12 +28852,8 @@
                 "type": "row",
                 "items": [
                   {
-                    "preLabel": "Clarification, if needed",
-                    "type": "textarea",
-                    "rows": 4,
-                    "css": "span8",
-                    "source": "comments",
-                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+                    "type": "literal",
+                    "source": "<h3>Totals Summary</h3>"
                   }
                 ]
               },
@@ -20067,13 +28861,56 @@
                 "type": "row",
                 "items": [
                   {
-                    "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(i) Total Number of baseline skills and knowledge surveys completed for this reporting period",
+                            "source": "totalSurveyBaseline",
+                            "type": "number"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(ii) Total Number of baseline skills and knowledge surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyBaselineInvoiced",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
                   },
                   {
-                    "preLabel": "Data have been uploaded",
-                    "source": "dataUploaded",
-                    "type": "boolean"
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iii)  Total Number of  indicator skills and knowledge surveys completed for this reporting period",
+                            "source": "totalSurveyIndicator",
+                            "type": "number"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iv) Total Number of indicator skills and knowledge surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyIndicatorInvoiced",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
                   }
                 ]
               },
@@ -20081,410 +28918,432 @@
                 "type": "row",
                 "items": [
                   {
-                    "preLabel": "",
-                    "source": "projectAssuranceDetails",
+                    "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                    "source": "totalInvoicedSkillsMismatched",
                     "type": "textarea",
                     "rows": 4,
-                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                    "placeholder": ""
                   }
                 ]
               },
               {
-                "type": "row",
+                "addRowText": "Add survey",
+                "removeRowText": "Delete this survey",
+                "userAddedRows": true,
+                "source": "skillsAndKnowledgeSurveys",
+                "type": "repeat",
                 "items": [
                   {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-                  }
-                ]
-              },
-              {
-                "type": "table",
-                "source": "assuranceDocuments",
-                "userAddedRows": true,
-                "disableTableUpload": true,
-                "columns": [
+                    "type": "row",
+                    "items": [
+                      {
+                        "type": "col",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s relates to this survey?"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "col",
+                        "items": [
+                          {
+                            "source": "baselineOrIndicatorSurvey",
+                            "type": "selectOne",
+                            "preLabel": "Baseline survey or indicator (follow-up) survey?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
                   {
-                    "title": "Attached documents",
-                    "source": "attachments",
-                    "type": "document"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      "modelName": null,
-      "templateName": "statesSeedCollecting",
-      "optional": true,
-      "optionalQuestionText": null,
-      "title": null,
-      "collapsibleHeading": null,
-      "name": "NHT - Seed Collection",
-      "description": null
-    },
-    {
-      "collapsedByDefault": false,
-      "template": {
-        "dataModel": [
-          {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "columns": [
-              {
-                "dataType": "feature",
-                "name": "sitesPrepared"
-              },
-              {
-                "computed": {
-                  "expression": "$geom.areaHa(sitesPrepared)"
-                },
-                "dataType": "number",
-                "name": "calculatedAreaPreparedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "behaviour": [
+                    "type": "row",
+                    "items": [
+                      {
+                        "source": "surveyObjective",
+                        "preLabel": "Survey objective",
+                        "type": "text"
+                      }
+                    ]
+                  },
                   {
-                    "condition": "areaPreparedInvoicedHa > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The prepared area must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
+                    "type": "repeat",
+                    "source": "skillsAndKnowledgeDataSets",
+                    "userAddedRows": true,
+                    "addRowText": "New data set",
+                    "removeRowText": "Delete this data set",
+                    "items": [
+                      {
+                        "type": "row",
+                        "css": "border-bottom",
+                        "items": [
+                          {
+                            "type": "col",
+                            "items": [
+                              {
+                                "source": "dataSetId",
+                                "type": "selectOne",
+                                "preLabel": "Please select the data set produced by this survey.  Note it must have already been entered on the Data Set Summary tab."
+                              }
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "projectBaselines",
+                                    "type": "selectMany",
+                                    "preLabel": "Which project baseline/s relate to this survey?",
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "investmentPriorities2",
+                                    "preLabel": "Which investment priority does this activity relate to?",
+                                    "type": "select2Many"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity start date",
+                                    "source": "activitiesStartDate",
+                                    "type": "date"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity end date",
+                                    "source": "activitiesEndDate",
+                                    "type": "date"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique",
+                                    "source": "emsaProtocol",
+                                    "type": "selectOne",
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique (if Other)",
+                                    "source": "otherEmsaProtocol",
+                                    "type": "select2Many"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "surveyMethodology",
+                                    "preLabel": "Survey methodology",
+                                    "type": "text"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "invoicingThisActivity",
+                                    "preLabel": "Are you invoicing for this activity in this reporting period?",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "numberOfPeopleSurveying",
+                                    "preLabel": "Number of people completing survey",
+                                    "type": "number"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "skillsSurveyObjective",
+                                    "preLabel": "Survey objective",
+                                    "type": "text"
+                                  }
+                                ]
+                              }
+                            ]
+                          }
+                        ]
+                      }
+                    ]
                   }
                 ]
               },
               {
-                "computed": {
-                  "expression": "$geom.lengthKm(sitesPrepared)"
-                },
-                "dataType": "number",
-                "name": "calculatedLengthPreparedKm",
-                "units": "km",
-                "decimalPlaces": 3,
-                "behaviour": [
+                "type": "row",
+                "items": [
                   {
-                    "condition": "lengthPreparedKm > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The prepared length must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
+                    "preLabel": "Optionally attach photos",
+                    "source": "photographicEvidence",
+                    "type": "image"
                   }
                 ]
               },
               {
-                "defaultValue": {
-                  "expression": "calculatedAreaPreparedHa",
-                  "type": "computed"
-                },
-                "dataType": "number",
-                "name": "areaPreparedHa",
-                "decimalPlaces": 3,
-                "units": "ha",
-                "validate": "required,min[0]"
-              },
-              {
-                "defaultValue": {
-                  "expression": "calculatedLengthPreparedKm",
-                  "type": "computed"
-                },
-                "dataType": "number",
-                "name": "lengthPreparedKm",
-                "units": "km",
-                "decimalPlaces": 3,
-                "validate": "required,min[0]"
-              },
-              {
-                "dataType": "text",
-                "name": "mappingNotAlignedReason",
-                "behaviour": [
-                  {
-                    "condition": "not (within(calculatedAreaPreparedHa, areaPreparedHa, 0.1))",
-                    "type": "visible"
-                  }
-                ],
-                "constraints": [
-                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                  "Other"
-                ],
-                "validate": "required"
-              },
-              {
-                "dataType": "text",
-                "name": "mappingNotAlignedComments",
-                "behaviour": [
-                  {
-                    "condition": "\"Other\" == mappingNotAlignedReason",
-                    "type": "visible"
-                  }
-                ],
-                "validate": "required,maxSize[300]"
-              },
-              {
-                "dataType": "document",
-                "name": "extraMappingDetails",
-                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
-                "behaviour": [
+                "type": "row",
+                "items": [
                   {
-                    "condition": "not (within(calculatedAreaPreparedHa, areaPreparedHa, 0.1)) or roundTo(areaPreparedHa, 2) != roundTo(areaPreparedInvoicedHa, 2)",
-                    "type": "visible"
+                    "preLabel": "Clarification, if needed",
+                    "type": "textarea",
+                    "rows": 4,
+                    "css": "span8",
+                    "source": "comments",
+                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
                   }
-                ],
-                "validate": "required"
+                ]
               },
               {
-                "dataType": "number",
-                "name": "areaPreparedInvoicedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": [
+                "type": "row",
+                "items": [
                   {
-                    "rule": "min[0]"
+                    "type": "literal",
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
                   },
                   {
-                    "param": {
-                      "expression": "areaPreparedHa",
-                      "type": "computed"
-                    },
-                    "rule": "max"
+                    "preLabel": "Data have been uploaded",
+                    "source": "dataUploaded",
+                    "type": "boolean"
                   }
                 ]
               },
               {
-                "dataType": "number",
-                "name": "areaPreparedInvoicedKm",
-                "units": "km",
-                "decimalPlaces": 3,
-                "validate": [
-                  {
-                    "rule": "required"
-                  },
-                  {
-                    "rule": "min[0]"
-                  },
+                "type": "row",
+                "items": [
                   {
-                    "param": {
-                      "expression": "lengthPreparedKm",
-                      "type": "computed"
-                    },
-                    "rule": "max"
+                    "preLabel": "",
+                    "source": "projectAssuranceDetails",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
                   }
                 ]
               },
               {
-                "dataType": "text",
-                "name": "invoicedNotActualReason",
-                "behaviour": [
+                "type": "table",
+                "source": "assuranceDocuments",
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "columns": [
                   {
-                    "condition": "roundTo(areaPreparedHa, 2) != roundTo(areaPreparedInvoicedHa, 2) or roundTo(lengthPreparedKm, 2) != roundTo(areaPreparedInvoicedKm, 2)",
-                    "type": "visible"
+                    "title": "Attached documents",
+                    "source": "attachments",
+                    "type": "document"
                   }
-                ],
-                "constraints": [
-                  "Work was undertaken over a greater area than will be invoiced for",
-                  "Other"
-                ],
-                "validate": "required"
-              },
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "modelName": null,
+      "templateName": "nhtSkillsAndKnowledgeSurvey",
+      "optional": true,
+      "optionalQuestionText": null,
+      "title": "Skills and knowledge survey",
+      "collapsibleHeading": null,
+      "name": "NHT - Skills and knowledge survey",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
+          {
+            "name": "soilSurveys",
+            "dataType": "list",
+            "minSize": 1,
+            "columns": [
               {
+                "name": "relatedOutcomes",
                 "dataType": "text",
-                "name": "invoicedNotActualComments",
-                "behaviour": [
-                  {
-                    "condition": "\"Other\" == invoicedNotActualReason",
-                    "type": "visible"
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
                   }
-                ],
-                "validate": "required,maxSize[300]"
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesStartDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesEndDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesEndDate",
-                "description": "",
-                "validate": "required"
+                }
               },
-              {
-                "columns": [
-                  {
-                    "dataType": "number",
-                    "name": "numberOfDaysPreparingSite",
-                    "description": "Number of days should be calculated as number of days by number of people (eg. 4.5 days by 3 people is 13.5 days)",
-                    "validate": "required,min[0]"
-                  },
-                  {
-                    "dataType": "stringList",
-                    "name": "industryType",
-                    "constraints": [
-                      "Broad acre cropping",
-                      "Dairy",
-                      "Environmental",
-                      "Horticulture",
-                      "Grazing",
-                      "Fisheries",
-                      "Aquaculture",
-                      "Other"
-                    ]
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "actionType",
-                    "description": "",
-                    "constraints": [
-                      "Basal bark spraying",
-                      "Biological agents",
-                      "Cut stump",
-                      "Cut and swab",
-                      "Dozing",
-                      "Felling",
-                      "Fire",
-                      "Foliar spraying",
-                      "Grubbing/chipping",
-                      "Hand pulling",
-                      "Moisture and nutrient control",
-                      "Mowing",
-                      "Other earthworks",
-                      "Overplanting",
-                      "Pushing",
-                      "Slashing",
-                      "Spot spraying",
-                      "Splatter gun",
-                      "Stem injection",
-                      "Stem scraper",
-                      "Wick applicators",
-                      "Other"
-                    ],
-                    "validate": "required"
-                  },
+              {
+                "dataType": "text",
+                "name": "baselineOrIndicatorSurvey",
+                "description": "",
+                "constraints": [
+                  "Baseline",
+                  "Indicator"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "text",
+                "name": "surveyObjective",
+                "description": "What the survey aim to capture? How will the information obtained from the survey be used?",
+                "validate": "required,maxSize[3000]"
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfSurveys",
+                "validate": "required,min[1],max[1]",
+                "defaultValue": 1,
+                "readonly": true
+              },
+              {
+                "dataType": "list",
+                "name": "soilDataSets",
+                "columns": [
                   {
+                    "name": "dataSetId",
+                    "entityType": "au.org.ala.ecodata.DataSetSummary",
                     "dataType": "text",
-                    "name": "otherActionType",
-                    "description": "This field may be used to list multiple preparation activities. This list of activities need to be separated with a ';'",
+                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
+                    "validate": "required",
+                    "constraints": {
+                      "textProperty": "name",
+                      "valueProperty": "dataSetId",
+                      "excludePath": "soilSurveys.soilDataSets.dataSetId",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.dataSets"
+                        },
+                        "filter": {
+                          "namespace": "dataSet",
+                          "expression": "dataSet.serviceId == 30 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
+                        }
+                      }
+                    },
                     "behaviour": [
                       {
-                        "condition": "actionType == \"Other\"",
-                        "type": "enable"
+                        "type": "pre_populate",
+                        "config": {
+                          "waitForInitialisation": true,
+                          "source": {
+                            "url": "/site/geojson",
+                            "params": [
+                              {
+                                "expression": "x=find(owner.custom.dataSets, \"dataSetId\", dataSetId); x.siteId",
+                                "name": "id",
+                                "type": "computed",
+                                "required": true
+                              }
+                            ]
+                          },
+                          "target":  {
+                            "type": "singleValue",
+                            "name": "sitesCoveredForSoilSurvey"
+                          }
+                        }
                       }
-                    ],
-                    "validate": "required,maxSize[100]"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "purposeOfSitePreparation",
-                    "description": "Please provide a brief description of how the work will benefit the area",
-                    "validate": "required"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "threatenedEcologicalCommunity",
-                    "description": "This free text field allows multiple TECs to be entered. They should be written as listed in EPBC, and separated by commas",
-                    "validate": "maxSize[100]"
+                    ]
                   },
                   {
-                    "name": "relatedOutcomes",
-                    "dataType": "text",
-                    "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
+                    "name": "projectBaselines",
+                    "dataType": "stringList",
+                    "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
                     "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.baselines"
+                    },
                     "constraints": {
-                      "textProperty": "label",
-                      "valueProperty": "label",
+                      "textProperty": "baseline",
+                      "valueProperty": "code",
                       "type": "pre-populated",
+                      "excludePath": "projectBaselines",
                       "config": {
                         "source": {
-                          "url": "/project/outcomesByScores",
-                          "params": [{
-                            "expression": "owner.projectId",
-                            "name": "id",
-                            "type": "computed"
-                          }, {
-                            "expression": "scores",
-                            "name": "scoreIds",
-                            "type": "computed"
-                          }
-                          ]
+                          "context-path": "owner.custom.details.baseline.rows"
                         }
                       }
                     }
@@ -20493,6 +29352,9 @@
                     "name": "investmentPriorities2",
                     "dataType": "stringList",
                     "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.investmentPriorities"
+                    },
                     "constraints": {
                       "type": "pre-populated",
                       "config": {
@@ -20518,622 +29380,990 @@
                         "condition": "\"Other\" in investmentPriorities2"
                       }
                     ]
-                  }
-                ],
-                "dataType": "list",
-                "name": "sitePreparationDetails"
-              }
-            ],
-            "dataType": "list",
-            "name": "sitePreparationAreasControlled"
-          },
-          {
-            "name": "sitePrepCountHeader",
-            "type": "number",
-            "decimalPlaces": 0,
-            "computed": {
-              "expression": "count(sitePreparationAreasControlled, \"threatenedEcologicalCommunity\")"
-            }
-          },
-          {
-            "dataType": "text",
-            "name": "comments",
-            "validate": "maxSize[1500]"
-          },
-          {
-            "dataType": "image",
-            "name": "photographicEvidence"
-          },
-          {
-            "dataType": "boolean",
-            "name": "dataUploaded",
-            "description": ""
-          },
-          {
-            "dataType": "text",
-            "name": "projectAssuranceDetails",
-            "description": ""
-          },
-          {
-            "dataType": "list",
-            "name": "assuranceDocuments",
-            "columns": [
-              {
-                "dataType": "document",
-                "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
-              }
-            ]
-          }
-        ],
-        "modelName": "NHT - Site preparation",
-        "title": "Site preparation",
-        "viewModel": [
-          {
-            "columns": [
-              {
-                "width": "10%",
-                "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
-                "type": "selectOne"
-              },
-              {
-                "width": "20%",
-                "type": "col",
-                "title": "Total Number of people delivering this service",
-                "items": [
-                  {
-                    "source": "participationIndividualNumber",
-                    "type": "number"
-                  },
-                  {
-                    "source": "participationGroupNumber",
-                    "type": "selectOne"
-                  }
-                ]
-              },
-              {
-                "type": "col",
-                "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
-                "items": [
-                  {
-                    "source": "firstNationIndividualNumber",
-                    "type": "number"
                   },
                   {
-                    "source": "firstNationGroupNumber",
-                    "type": "selectOne"
-                  }
-                ]
-              },
-              {
-                "source": "participationDetails",
-                "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                "type": "textarea"
-              }
-            ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
-            "type": "table"
-          },
-          {
-            "preLabel": "Number of Site Preparation surveys conducted:",
-            "noEdit": true,
-            "type": "number",
-            "source": "sitePrepCountHeader"
-          },
-          {
-            "addRowText": "Add a new controlled area",
-            "userAddedRows": true,
-            "source": "sitePreparationAreasControlled",
-            "type": "repeat",
-            "items": [
-              {
-                "type": "row",
-                "css": "border-bottom",
-                "items": [
-                  {
-                    "type": "col",
-                    "css": "span2 col-border-right",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "sitesPrepared",
-                            "type": "feature",
-                            "preLabel": "Site/s where preparation was undertaken"
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "calculatedAreaPreparedHa",
-                            "type": "number",
-                            "readonly": true,
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "calculatedLengthPreparedKm",
-                            "type": "number",
-                            "readonly": true,
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Please attach mapping details",
-                            "source": "extraMappingDetails",
-                            "type": "document"
-                          }
-                        ]
-                      }
-                    ]
+                    "dataType": "date",
+                    "name": "activitiesStartDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.startDate"
+                    }
                   },
                   {
-                    "type": "col",
-                    "css": "span3 col-border-right",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Actual area (ha) / length (km) of site preparation",
-                            "helpText": "Enter the amount you will invoice for during this reporting period.",
-                            "source": "areaPreparedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "lengthPreparedKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Reason for actual being different to mapped amount",
-                            "source": "mappingNotAlignedReason",
-                            "type": "selectOne"
-                          }
-                        ]
-                      },
+                    "dataType": "date",
+                    "name": "activitiesEndDate",
+                    "description": "Specific the dates these events were held on.",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.endDate"
+                    }
+                  },
+                  {
+                    "dataType": "feature",
+                    "name": "sitesCoveredForSoilSurvey",
+                    "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
+
+
+                  },
+                  {
+                    "computed": {
+                      "expression": "$geom.areaHa(sitesCoveredForSoilSurvey)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedAreaTreatedHa",
+                    "units": "ha",
+                    "decimalPlaces": 3
+                  },
+                  {
+                    "computed": {
+                      "expression": "$geom.lengthKm(sitesCoveredForSoilSurvey)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedLengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3,
+                    "behaviour": [
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "mappingNotAlignedComments",
-                            "type": "textarea"
-                          }
-                        ]
+                        "condition": "lengthTreatedKm > 0",
+                        "type": "conditional_validation",
+                        "value": {
+                          "message": "The managed length must be mapped",
+                          "validate": "required,min[0.0001]"
+                        }
                       }
                     ]
                   },
                   {
-                    "type": "col",
-                    "css": "span3 col-border-right",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Invoiced area (ha) of site preparation",
-                            "helpText": "Enter the amount you will invoice for during this reporting period.",
-                            "source": "areaPreparedInvoicedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "areaPreparedInvoicedKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
-                          }
-                        ]
-                      },
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Reason for invoiced amount being different to actual amount",
-                            "source": "invoicedNotActualReason",
-                            "type": "selectOne"
-                          }
-                        ]
-                      },
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "calculatedAreaTreatedHa"
+                    },
+                    "dataType": "number",
+                    "name": "areaTreatedHa",
+                    "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                    "units": "ha",
+                    "decimalPlaces": 3,
+                    "validate": "required,min[0]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "mappingNotAlignedReason",
+                    "constraints": [
+                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                      "Other"
+                    ],
+                    "validate": "required",
+                    "behaviour": [
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                            "source": "invoicedNotActualComments",
-                            "type": "textarea"
-                          }
-                        ]
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
                       }
                     ]
                   },
                   {
-                    "type": "col",
-                    "css": "span2 col-border-right",
-                    "items": [
+                    "dataType": "text",
+                    "name": "mappingNotAlignedComments",
+                    "validate": "required,maxSize[100]",
+                    "behaviour": [
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Activities start date",
-                            "source": "activitiesStartDate",
-                            "type": "date"
-                          }
-                        ]
+                        "type": "visible",
+                        "condition": "\"Other\" == mappingNotAlignedReason"
                       }
                     ]
                   },
                   {
-                    "type": "col",
-                    "css": "span2 col-border-right",
-                    "items": [
+                    "dataType": "document",
+                    "name": "extraMappingDetails",
+                    "validate": "required",
+                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                    "behaviour": [
                       {
-                        "type": "row",
-                        "items": [
-                          {
-                            "preLabel": "Activities end date",
-                            "source": "activitiesEndDate",
-                            "type": "date"
-                          }
-                        ]
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
                       }
                     ]
-                  }
-                ]
-              },
-              {
-                "columns": [
-                  {
-                    "width": "10%",
-                    "source": "numberOfDaysPreparingSite",
-                    "title": "Number of days in preparing site",
-                    "type": "number"
                   },
                   {
-                    "width": "10%",
-                    "source": "industryType",
-                    "title": "Industry type",
-                    "type": "select2"
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "$geom.lengthKm(sitesCoveredForSoilSurvey)"
+                    },
+                    "dataType": "number",
+                    "name": "lengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3
                   },
                   {
-                    "width": "15%",
-                    "type": "col",
-                    "title": "Type of action",
-                    "items": [
-                      {
-                        "type": "row",
-                        "items": [
-                          {
-                            "source": "actionType",
-                            "type": "select2"
-                          }
-                        ]
-                      },
-                      {
-                        "source": "otherActionType",
-                        "placeholder": "Type of action (if Other)",
-                        "type": "text"
+                    "dataType": "text",
+                    "description": "Select the technique used to conduct the survey. If the EMSA Application tool was not used, you should select 'Other'.",
+                    "name": "emsaProtocol",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.protocol"
+                    },
+                    "constraints": {
+                      "textProperty": "label",
+                      "valueProperty": "value",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.protocols"
+                        }
                       }
-                    ]
+                    }
                   },
                   {
-                    "width": "15%",
-                    "source": "purposeOfSitePreparation",
-                    "title": "Aim of site preparation",
-                    "type": "textarea"
+                    "dataType": "stringList",
+                    "description": "Describe the technique (if Other) was selected.",
+                    "name": "otherEmsaProtocol",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methods"
+                    }
                   },
                   {
-                    "width": "20%",
-                    "source": "threatenedEcologicalCommunity",
-                    "title": "Threatened ecological community (if applicable)",
-                    "type": "text"
+                    "dataType": "text",
+                    "name": "surveyMethodology",
+                    "description": "Provide more details on what is being done.",
+                    "validate": "required,maxSize[3000]",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methodDescription"
+                    }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "invoicingThisActivity",
+                    "constraints": [
+                      "Yes",
+                      "No"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "testingDepth",
+                    "constraints": [
+                      "1-10",
+                      "11-20",
+                      "21-30",
+                      "31-40",
+                      "41-50",
+                      "51-60",
+                      "61-70",
+                      "71-80",
+                      "81-90",
+                      "91-100"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "testingObjective",
+                    "description": "How will the information obtained from the tests be used?",
+                    "validate": "required,maxSize[300]"
+                  }
+                ],
+                "minSize": 1
+              }
+            ]
+          },
+          {
+            "dataType": "lookupTable",
+            "name": "baselineIndicatorMapping",
+            "config": {
+              "source": {
+                "literal": {
+                  "Baseline dataset associated with a project outcome": "Baseline",
+                  "Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
+                }
+              }
+            }
+          },
+          {
+            "allowRowDelete": "false",
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
                   },
                   {
-                    "source": "relatedOutcomes",
-                    "type": "selectOne",
-                    "width": "15%",
-                    "title": "Which outcome statement/s relates to this survey?"
+                    "rule": "min[0]"
                   },
                   {
-                    "width": "15%",
-                    "type": "col",
-                    "title": "Which investment priority does this activity relate to?",
-                    "items": [
-                      {
-                        "source": "investmentPriorities2",
-                        "type": "select2Many"
-                      },
-                      {
-                        "source": "otherInvestmentPriority",
-                        "type": "text"
-                      }
-                    ]
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
                 ],
-                "userAddedRows": true,
-                "source": "sitePreparationDetails",
-                "type": "table"
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
               }
-            ]
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableSts"
           },
           {
-            "type": "row",
-            "items": [
-              {
-                "preLabel": "Optionally attach photos",
-                "source": "photographicEvidence",
-                "type": "image"
-              }
-            ]
+            "dataType": "number",
+            "name": "totalSurveyBaseline",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(soilSurveys, \"baselineOrIndicatorSurvey == 'Baseline' ? 1 : 0\")"
+            }
           },
           {
-            "type": "row",
-            "items": [
+            "dataType": "number",
+            "name": "totalSurveyBaselineInvoiced",
+            "validate": [
               {
-                "preLabel": "Clarification, if needed",
-                "type": "textarea",
-                "rows": 4,
-                "css": "span8",
-                "source": "comments",
-                "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyBaseline",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
-            ]
+            ],
+            "defaultValue": ""
           },
           {
-            "type": "row",
-            "items": [
+            "dataType": "number",
+            "name": "totalSurveyIndicator",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(soilSurveys, \"baselineOrIndicatorSurvey == 'Indicator' ? 1 : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalSurveyIndicatorInvoiced",
+            "defaultValue": "",
+            "validate": [
               {
-                "type": "literal",
-                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                "rule": "required"
               },
               {
-                "preLabel": "Data have been uploaded",
-                "source": "dataUploaded",
-                "type": "boolean"
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyIndicator",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ]
           },
           {
-            "type": "row",
-            "items": [
+            "dataType": "text",
+            "name": "totalInvoicedSoilMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
               {
-                "preLabel": "",
-                "source": "projectAssuranceDetails",
-                "type": "textarea",
-                "rows": 4,
-                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                "condition": "+totalSurveyIndicatorInvoiced < +totalSurveyIndicator or +totalSurveyBaselineInvoiced < +totalSurveyBaseline",
+                "type": "enable"
               }
             ]
           },
           {
-            "type": "row",
-            "items": [
-              {
-                "type": "literal",
-                "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-              }
-            ]
+            "dataType": "text",
+            "name": "comments",
+            "validate": "maxSize[1500]"
           },
           {
-            "type": "table",
-            "source": "assuranceDocuments",
-            "userAddedRows": true,
-            "disableTableUpload": true,
+            "dataType": "image",
+            "name": "photographicEvidence"
+          },
+          {
+            "dataType": "boolean",
+            "name": "dataUploaded",
+            "description": ""
+          },
+          {
+            "dataType": "text",
+            "name": "projectAssuranceDetails",
+            "description": "",
+            "validate": "required,maxSize[5000]"
+          },
+          {
+            "dataType": "list",
+            "name": "assuranceDocuments",
             "columns": [
               {
-                "title": "Attached documents",
-                "source": "attachments",
-                "type": "document"
+                "dataType": "document",
+                "name": "attachments",
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
-
-        ]
-      },
-      "modelName": null,
-      "templateName": "nhtSitePreparation",
-      "optional": true,
-      "optionalQuestionText": null,
-      "title": "Site preparation",
-      "collapsibleHeading": null,
-      "name": "NHT - Site preparation",
-      "description": null
-    },
-    {
-      "collapsedByDefault": false,
-      "template": {
-        "title": "Skills and knowledge survey",
-        "modelName": "NHT - Skills and knowledge survey",
-        "dataModel": [
+        ],
+        "modelName": "NHT - Soil testing",
+        "title": "Soil Testing",
+        "viewModel": [
           {
-            "columns": [
+            "type": "section",
+            "items": [
               {
-                "dataType": "list",
-                "name": "skillsKnowledgeSurveyBaselineDetails",
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Participation information</h3>"
+                  }
+                ]
+              },
+              {
+                "disableTableUpload": true,
                 "columns": [
                   {
-                    "dataType": "text",
-                    "name": "baselineOrIndicator",
-                    "description": "",
-                    "constraints": [
-                      "Baseline",
-                      "Indicator"
-                    ],
-                    "validate": "required"
+                    "width": "10%",
+                    "source": "participationIndividualsOrGroups",
+                    "title": "Are individuals or groups delivering this service?",
+                    "type": "selectOne"
                   },
                   {
-                    "name": "projectBaseline",
-                    "dataType": "text",
-                    "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
-                    "validate": "required",
-                    "constraints": {
-                      "textProperty": "baseline",
-                      "valueProperty": "code",
-                      "type": "pre-populated",
-                      "excludePath": "projectBaseline",
-                      "config": {
-                        "source": {
-                          "context-path": "owner.custom.details.baseline.rows"
-                        }
+                    "width": "20%",
+                    "type": "col",
+                    "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                    "items": [
+                      {
+                        "source": "participationIndividualNumber",
+                        "type": "number"
+                      },
+                      {
+                        "source": "participationGroupNumber",
+                        "type": "selectOne"
                       }
-                    }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "width": "20%",
+                    "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                    "items": [
+                      {
+                        "source": "firstNationIndividualNumber",
+                        "type": "number"
+                      },
+                      {
+                        "source": "firstNationGroupNumber",
+                        "type": "selectOne"
+                      }
+                    ]
                   },
                   {
-                    "name": "datasetSupports",
-                    "dataType": "text",
-                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
-                    "validate": "required",
-                    "constraints": {
-                      "textProperty": "name",
-                      "valueProperty": "dataSetId",
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "context-path": "owner.custom.dataSets"
-                        }
+                    "width": "20%",
+                    "source": "participationDetails",
+                    "rows": 4,
+                    "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                    "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                    "type": "textarea"
+                  }
+                ],
+                "source": "participationInformationTableSts",
+                "type": "table"
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Survey information</h3><p><b>Before completing this section, please ensure you have created a Data Set Summary information for every data set produced by the surveys you intend to report</b></p><ul><li>Each survey reported must relate to a combination of outcomes as described in your MERI plan</li><li>Each Data Set Summary recorded for a survey must be addressing the same outcomes as selected for the survey</li><li>If a survey produced more than one data set, use the New Data Set button to add each Data Set Summary under your survey</li><li>A single survey can be made up of multiple dataset</li></ul>"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Totals Summary</h3>"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(i) Total Number of baseline soil testing surveys completed for this reporting period",
+                            "source": "totalSurveyBaseline",
+                            "type": "number"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(ii) Total Number of baseline soil testing surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyBaselineInvoiced",
+                            "type": "number"
+                          }
+                        ]
                       }
-                    }
+                    ]
                   },
                   {
-                    "name": "relatedOutcomes",
-                    "dataType": "text",
-                    "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                    "validate": "required",
-                    "constraints": {
-                      "textProperty": "label",
-                      "valueProperty": "label",
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "url": "/project/outcomesByScores",
-                          "params": [{
-                            "expression": "owner.projectId",
-                            "name": "id",
-                            "type": "computed"
-                          }, {
-                            "expression": "scores",
-                            "name": "scoreIds",
-                            "type": "computed"
-                          }
-                          ]
-                        }
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iii)  Total Number of  indicator soil testing surveys completed for this reporting period",
+                            "source": "totalSurveyIndicator",
+                            "type": "number"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iv) Total Number of indicator soil testing surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyIndicatorInvoiced",
+                            "type": "number"
+                          }
+                        ]
                       }
-                    }
-                  },
-                  {
-                    "dataType": "date",
-                    "name": "activitiesStartDate",
-                    "description": "Specific the dates these events were held on",
-                    "validate": "required"
-                  },
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
                   {
-                    "dataType": "date",
-                    "name": "activitiesEndDate",
-                    "description": "Specific the dates these events were held on",
-                    "validate": "required"
-                  },
+                    "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                    "source": "totalInvoicedSoilMismatched",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": ""
+                  }
+                ]
+              },
+              {
+                "addRowText": "Add survey",
+                "removeRowText": "Delete this survey",
+                "userAddedRows": true,
+                "source": "soilSurveys",
+                "type": "repeat",
+                "items": [
                   {
-                    "dataType": "stringList",
-                    "description": "The technique used to conduct the survey.",
-                    "name": "ternSurveyTechnique",
-                    "validate": "required",
-                    "constraints": [
-                      "Tern Survey technique 1",
-                      "Tern Survey technique 1",
-                      "Tern Survey technique 1",
-                      "Other"
+                    "type": "row",
+                    "items": [
+                      {
+                        "type": "col",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s relates to this survey?"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "col",
+                        "items": [
+                          {
+                            "source": "baselineOrIndicatorSurvey",
+                            "type": "selectOne",
+                            "preLabel": "Baseline survey or indicator (follow-up) survey?"
+                          }
+                        ]
+                      }
                     ]
                   },
                   {
-                    "dataType": "number",
-                    "name": "numberOfPeopleSurveying",
-                    "validate": "required,min[0]"
+                    "type": "row",
+                    "items": [
+                      {
+                        "source": "surveyObjective",
+                        "preLabel": "Survey objective",
+                        "type": "text"
+                      }
+                    ]
                   },
                   {
-                    "dataType": "text",
-                    "description": "Please describe the Survey technique if other was selected.",
-                    "name": "otherTernSurveyTechnique",
-                    "behaviour": [
+                    "type": "repeat",
+                    "source": "soilDataSets",
+                    "userAddedRows": true,
+                    "addRowText": "New data set",
+                    "removeRowText": "Delete this data set",
+                    "items": [
                       {
-                        "condition": "ternSurveyTechnique == \"Other\"",
-                        "type": "enable_and_clear"
+                        "type": "row",
+                        "css": "border-bottom",
+                        "items": [
+                          {
+                            "type": "col",
+                            "items": [
+                              {
+                                "source": "dataSetId",
+                                "type": "selectOne",
+                                "preLabel": "Please select the data set produced by this survey.  Note it must have already been entered on the Data Set Summary tab."
+                              }
+                            ]
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "projectBaselines",
+                                    "type": "selectMany",
+                                    "preLabel": "Which project baseline/s relate to this survey?",
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "investmentPriorities2",
+                                    "preLabel": "Which investment priority does this activity relate to?",
+                                    "type": "select2Many"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity start date",
+                                    "source": "activitiesStartDate",
+                                    "type": "date"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity end date",
+                                    "source": "activitiesEndDate",
+                                    "type": "date"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Sites where soil tests were conducted",
+                                    "source": "sitesCoveredForSoilSurvey",
+                                    "type": "feature"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedAreaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedLengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Please attach mapping details",
+                                    "source": "extraMappingDetails",
+                                    "type": "document"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Actual area (ha) / length (km) where soil tests were conducted",
+                                    "source": "areaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "lengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Reason for actual being different to mapped amount",
+                                    "source": "mappingNotAlignedReason",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                                    "source": "mappingNotAlignedComments",
+                                    "type": "textarea",
+                                    "rows": 5
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique",
+                                    "source": "emsaProtocol",
+                                    "type": "selectOne",
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique (if Other)",
+                                    "source": "otherEmsaProtocol",
+                                    "type": "select2Many"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "surveyMethodology",
+                                    "preLabel": "Survey methodology",
+                                    "type": "text"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "invoicingThisActivity",
+                                    "preLabel": "Are you invoicing for this activity in this reporting period?",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "testingDepth",
+                                    "preLabel": "Testing depth (cm)",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              }
+                            ]
+                          },
+                          {
+                            "type": "col",
+                            "css": "span3 col-border-right",
+                            "items": [
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "testingObjective",
+                                    "preLabel": "Testing objective",
+                                    "type": "textarea"
+                                  }
+                                ]
+                              }
+                            ]
+                          }
+                        ]
                       }
-                    ],
-                    "validate": "required"
-                  },
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
                   {
-                    "dataType": "text",
-                    "name": "surveyMethodology",
-                    "description": "Provide more details on what is being done",
-                    "validate": "required,maxSize[3000]"
+                    "preLabel": "Optionally attach photos",
+                    "source": "photographicEvidence",
+                    "type": "image"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "Clarification, if needed",
+                    "type": "textarea",
+                    "rows": 4,
+                    "css": "span8",
+                    "source": "comments",
+                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
                   },
                   {
-                    "dataType": "text",
-                    "name": "surveyObjective",
-                    "description": "How will the information obtained from the survey be used",
-                    "validate": "required,maxSize[3000]"
+                    "preLabel": "Data have been uploaded",
+                    "source": "dataUploaded",
+                    "type": "boolean"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "",
+                    "source": "projectAssuranceDetails",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                  }
+                ]
+              },
+              {
+                "type": "table",
+                "source": "assuranceDocuments",
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "columns": [
+                  {
+                    "title": "Attached documents",
+                    "source": "attachments",
+                    "type": "document"
                   }
                 ]
               }
-            ],
-            "dataType": "list",
-            "name": "skillsKnowledgeSurveys",
-            "minSize": 1
-          },
+            ]
+          }
+        ]
+      },
+      "modelName": null,
+      "templateName": "nhtSoilTesting",
+      "optional": true,
+      "optionalQuestionText": null,
+      "title": "Soil testing",
+      "collapsibleHeading": null,
+      "name": "NHT - Soil testing",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
           {
+            "allowRowDelete": "false",
             "columns": [
-              {
-                "dataType": "species",
-                "name": "species",
-                "validate": "required"
-              },
               {
                 "dataType": "text",
-                "name": "individualsOrGroups",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
                 "constraints": [
                   "Individuals",
                   "Groups"
@@ -21142,127 +30372,323 @@
               },
               {
                 "dataType": "number",
-                "name": "numberOfIndividualsOrGroups",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
                 "validate": "required,min[0]"
               },
               {
-                "dataType": "stringList",
-                "name": "ternSurveyTechnique",
-                "validate": "required",
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
                 "constraints": [
-                  "Tern Survey technique 1",
-                  "Tern Survey technique 1",
-                  "Tern Survey technique 1",
-                  "Other"
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
                 ]
               },
               {
-                "dataType": "text",
-                "description": "Please describe the Survey technique if other was selected.",
-                "name": "otherTernSurveyTechnique",
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
                 "behaviour": [
                   {
-                    "condition": "ternSurveyTechnique == \"Other\"",
-                    "type": "enable_and_clear"
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
                 ],
-                "validate": "required"
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
               },
               {
                 "dataType": "text",
-                "name": "surveyMethodology",
-                "description": "Provide more details on what is being done",
-                "validate": "required,maxSize[3000]"
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
               },
               {
                 "dataType": "text",
-                "name": "surveyObjective",
-                "description": "How will the information obtained from the survey be used",
-                "validate": "required,maxSize[3000]"
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
               }
             ],
             "dataType": "list",
-            "name": "faunaSurveyBaselineTable"
-          },
-          {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
+            "name": "participationInformationTableSaf"
           },
           {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "columns": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "label",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "url": "/project/outcomesByScores",
+                      "params": [
+                        {
+                          "expression": "owner.projectId",
+                          "name": "id",
+                          "type": "computed"
+                        },
+                        {
+                          "expression": "scores",
+                          "name": "scoreIds",
+                          "type": "computed"
+                        }
+                      ]
+                    }
+                  }
+                }
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
+                "name": "investmentPriorities2",
+                "dataType": "text",
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
+                  }
+                }
+              },
+              {
+                "dataType": "text",
+                "name": "otherInvestmentPriority",
+                "description": "Describe the investment priority (if Other) was selected",
+                "behaviour": [
+                  {
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "text",
+                "name": "fullOrPartTime",
+                "constraints": [
+                  "Full-time",
+                  "Part-time"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "fteOfThisPosition",
+                "decimalPlaces": 3,
+                "description": "Note: This must be reported in the context of this reporting period only. For example, a full time SAF = 1, and a half time SAF = 0.5",
+                "validate": "required,min[0],max[1]"
+              },
+              {
+                "dataType": "number",
+                "name": "amountOfFteInvoicedFor",
+                "decimalPlaces": 3,
+                "description": "Note: This must be reported in the context of this reporting period only. For example, a full time SAF = 1, and a half time SAF = 0.5",
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "fteOfThisPosition",
+                      "type": "computed",
+                      "decimalPlaces": 3
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "list",
+                "name": "sustainableAgricultureFacilitators",
+                "allowRowDelete": "false",
+                "columns": [
+                  {
+                    "dataType": "text",
+                    "name": "wasPositionVacant",
+                    "constraints": [
+                      "Yes",
+                      "No"
+                    ],
+                    "validate": "required"
+                  },
+                  {
+                    "name": "yesPositionVacant",
+                    "dataType": "text",
+                    "validate": "required",
+                    "constraints": [
+                      "Yes",
+                      "No"
+                    ],
+                    "behaviour": [
+                      {
+                        "condition": "wasPositionVacant == \"Yes\"",
+                        "type": "enable_and_clear"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "noRecruitmentProcess",
+                    "behaviour": [
+                      {
+                        "condition": "yesPositionVacant == \"No\"",
+                        "type": "enable"
+                      }
+                    ],
+                    "validate": "required,maxSize[300]"
+                  },
+                  {
+                    "dataType": "date",
+                    "name": "expectedDatePositionFill",
+                    "validate": "required",
+                    "behaviour": [
+                      {
+                        "condition": "wasPositionVacant == \"Yes\" and yesPositionVacant == \"No\" or wasPositionVacant == \"Yes\" and yesPositionVacant == \"Yes\"",
+                        "type": "enable"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "coveredInterimPosition",
+                    "validate": "required,maxSize[100]",
+                    "behaviour": [
+                      {
+                        "condition": "wasPositionVacant == \"Yes\" and yesPositionVacant == \"No\" or wasPositionVacant == \"Yes\" and yesPositionVacant == \"Yes\"",
+                        "type": "enable"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "deliveryOrSubcontractorEmployed",
+                    "constraints": [
+                      "Delivery partner",
+                      "Subcontractor"
+                    ],
+                    "validate": "required"
+                  }
+                ]
               }
             ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            "dataType": "list",
+            "name": "safAreasControlled"
           },
           {
             "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+            "name": "totalAnnualFtes",
+            "validate": "min[0]",
+            "decimalPlaces": 3,
+            "computed": {
+              "expression": "sum(safAreasControlled, \"fteOfThisPosition\")/4"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalAnnualFtesInvoiced",
+            "decimalPlaces": 3,
+            "defaultValue": "",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalAnnualFtes",
+                  "type": "computed",
+                  "decimalPlaces": 3
+                },
+                "rule": "max"
               }
-            ],
-            "validate": "required,min[0]"
+            ]
           },
           {
             "dataType": "text",
-            "name": "firstNationGroupNumber",
+            "name": "totalInvoicedSafMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
             "behaviour": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
+                "condition": "+totalAnnualFtesInvoiced < +totalAnnualFtes",
                 "type": "enable"
               }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "name": "numberSkillsKnowledgeSurveysConducted",
-            "type": "number",
-            "decimalPlaces": 0,
-            "computed": {
-              "expression": "count(skillsKnowledgeSurveys, \"baselineOrIndicator\")"
-            }
+            ]
           },
           {
             "dataType": "text",
@@ -21276,12 +30702,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -21290,156 +30716,310 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
+        "modelName": "NHT - Sustainable agriculture facilitators",
+        "title": "Sustainable Agriculture Facilitators",
         "viewModel": [
           {
-            "type": "section",
+            "type": "row",
             "items": [
               {
-                "columns": [
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "width": "10%",
+                "source": "participationIndividualsOrGroups",
+                "title": "Are individuals or groups delivering this service?",
+                "type": "selectOne"
+              },
+              {
+                "width": "20%",
+                "type": "col",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
                   {
-                    "width": "10%",
-                    "source": "participationIndividualsOrGroups",
-                    "title": "Individuals or groups?",
+                    "source": "participationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "participationGroupNumber",
                     "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "width": "20%",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "firstNationIndividualNumber",
+                    "type": "number"
                   },
                   {
-                    "width": "20%",
-                    "type": "col",
-                    "title": "Total Number of people delivering this service",
+                    "source": "firstNationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
+              }
+            ],
+            "source": "participationInformationTableSaf",
+            "type": "table"
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
                     "items": [
                       {
-                        "source": "participationIndividualNumber",
-                        "type": "number"
-                      },
+                        "preLabel": "(i) Total <u>Annual</u> FTE for this reporting period",
+                        "source": "totalAnnualFtes",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
                       {
-                        "source": "participationGroupNumber",
-                        "type": "selectOne"
+                        "preLabel": "(ii) Total <u>Annual</u> FTE <u><i>invoiced</i></u> for in this reporting period",
+                        "source": "totalAnnualFtesInvoiced",
+                        "type": "number",
+                        "displayOptions": {
+                          "removeTrailingZeros": false
+                        }
                       }
                     ]
-                  },
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedSafMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "addRowText": "Add a new SAF position",
+            "userAddedRows": true,
+            "source": "safAreasControlled",
+            "type": "repeat",
+            "items": [
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "source": "<h4><u>Each SAF position must be reported on in a separate section. Please add a new section for each SAF position.</u><h4>",
+                    "type": "literal"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
                   {
+                    "css": "span3",
                     "type": "col",
-                    "width": "20%",
-                    "title": "Total Number of First Nations people delivering this service ",
                     "items": [
                       {
-                        "source": "firstNationIndividualNumber",
-                        "type": "number"
-                      },
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "source": "firstNationGroupNumber",
-                        "type": "selectOne"
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
+                          }
+                        ]
                       }
                     ]
                   },
                   {
-                    "source": "participationDetails",
-                    "rows": 4,
-                    "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                    "type": "textarea"
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
                   }
-                ],
-                "userAddedRows": false,
-                "disableTableUpload": false,
-                "source": "",
-                "type": "table"
-              },
-              {
-                "preLabel": "Number of Skills and Knowledge surveys conducted:",
-                "noEdit": true,
-                "type": "number",
-                "source": "numberSkillsKnowledgeSurveysConducted"
+                ]
               },
               {
-                "addRowText": "New survey site",
-                "userAddedRows": true,
-                "source": "skillsKnowledgeSurveys",
-                "type": "repeat",
+                "type": "row",
                 "items": [
-
                   {
-                    "type": "table",
-                    "source": "skillsKnowledgeSurveyBaselineDetails",
-                    "userAddedRows": true,
-                    "disableTableUpload": true,
-                    "columns": [
-                      {
-                        "source": "baselineOrIndicator",
-                        "type": "selectOne",
-                        "width": "10%",
-                        "title": "Baseline survey or indicator (follow-up) survey?"
-                      },
-                      {
-                        "source": "projectBaseline",
-                        "type": "selectOne",
-                        "width": "10%",
-                        "title": "Which project baseline relates to this survey?"
-                      },
-                      {
-                        "source": "datasetSupports",
-                        "type": "select2Many",
-                        "width": "10%",
-                        "title": "What dataset supports this?"
-                      },
-                      {
-                        "source": "relatedOutcomes",
-                        "type": "selectOne",
-                        "width": "10%",
-                        "title": "Which outcome statement/s relates to this survey?"
-                      },
-                      {
-                        "title": "Activities start date",
-                        "source": "activitiesStartDate",
-                        "type": "date",
-                        "width": "8%"
-                      },
-                      {
-                        "title": "Activities end date",
-                        "source": "activitiesEndDate",
-                        "type": "date",
-                        "width": "8%"
-                      },
-                      {
-                        "width": "5%",
-                        "title": "Number of people completing survey",
-                        "source": "numberOfPeopleSurveying",
-                        "type": "number"
-                      },
-                      {
-                        "width": "10%",
-                        "title": "Survey technique",
-                        "source": "ternSurveyTechnique",
-                        "type": "selectOne"
-                      },
-                      {
-                        "width": "10%",
-                        "title": "Survey technique (if Other)",
-                        "source": "otherTernSurveyTechnique",
-                        "type": "textarea"
-                      },
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "width": "10%",
-                        "rows": 4,
-                        "source": "surveyMethodology",
-                        "title": "Survey methodology",
-                        "type": "textarea"
-                      },
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "fullOrPartTime",
+                            "preLabel": "Full time or part-time employment",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
                       {
-                        "width": "10%",
-                        "rows": 4,
-                        "source": "surveyObjective",
-                        "title": "Survey objective",
-                        "type": "textarea"
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "fteOfThisPosition",
+                            "preLabel": "FTE of <u>this position</u> for this reporting period",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span4",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "amountOfFteInvoicedFor",
+                            "preLabel": "Amount of FTE for <u>this position</u> that are being invoiced for",
+                            "type": "number"
+                          }
+                        ]
                       }
                     ]
                   }
                 ]
               },
+              {
+                "columns": [
+                  {
+                    "width": "15%",
+                    "source": "wasPositionVacant",
+                    "title": "Was the position(s) vacant for any amount of time during the reporting period (not including leave)",
+                    "type": "selectOne"
+                  },
+                  {
+                    "width": "15%",
+                    "source": "yesPositionVacant",
+                    "title": "If yes, is there a recruitment process being run?",
+                    "type": "selectOne"
+                  },
+                  {
+                    "width": "20%",
+                    "source": "noRecruitmentProcess",
+                    "title": "If no, what are the reasons?",
+                    "type": "textarea"
+                  },
+                  {
+                    "width": "15%",
+                    "source": "expectedDatePositionFill",
+                    "title": "Expected date to fill the position(s)",
+                    "type": "date"
+                  },
+                  {
+                    "width": "20%",
+                    "source": "coveredInterimPosition",
+                    "title": "How is the position(s) being covered in the interim?",
+                    "type": "textarea"
+                  },
+                  {
+                    "width": "15%",
+                    "source": "deliveryOrSubcontractorEmployed",
+                    "title": "Is the position employed by delivery partner or subcontractor?",
+                    "type": "selectOne"
+                  }
+                ],
+                "source": "sustainableAgricultureFacilitators",
+                "type": "table",
+                "userAddedRows": true,
+                "disableTableUpload": true
+              }
+            ]
+          },
+          {
+            "type": "section",
+            "items": [
               {
                 "type": "row",
                 "items": [
@@ -21468,7 +31048,7 @@
                 "items": [
                   {
                     "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
                   },
                   {
                     "preLabel": "Data have been uploaded",
@@ -21481,7 +31061,6 @@
                 "type": "row",
                 "items": [
                   {
-                    "preLabel": "",
                     "source": "projectAssuranceDetails",
                     "type": "textarea",
                     "rows": 4,
@@ -21489,15 +31068,6 @@
                   }
                 ]
               },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-                  }
-                ]
-              },
               {
                 "type": "table",
                 "source": "assuranceDocuments",
@@ -21516,116 +31086,194 @@
         ]
       },
       "modelName": null,
-      "templateName": "nhtSkillsAndKnowledgeSurvey",
+      "templateName": "nhtSustainableAgricultureFacilitators",
       "optional": true,
       "optionalQuestionText": null,
-      "title": "Skills and knowledge survey",
+      "title": "Sustainable agriculture facilitators",
       "collapsibleHeading": null,
-      "name": "NHT - Skills and knowledge survey",
+      "name": "NHT - Sustainable agriculture facilitators",
       "description": null
     },
     {
       "collapsedByDefault": false,
       "template": {
+        "title": "Synthesising and finalising baseline data",
+        "modelName": "NHT - Baseline data",
         "dataModel": [
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "allowRowDelete": "false",
+            "columns": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": "required,min[0]"
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
               }
             ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "dataType": "text",
-            "name": "baselineOrIndicator",
-            "description": "",
-            "constraints": [
-              "Baseline",
-              "Indicator"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "numberOfSoilTests",
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "number",
-            "name": "numberOfSoilTestInvoice",
-            "validate": "required,min[0]"
+            "dataType": "list",
+            "name": "participationInformationTableSyn"
           },
           {
             "columns": [
+              {
+                "dataType": "list",
+                "name": "baselineDetails",
+                "columns": [
+                  {
+                    "dataType": "text",
+                    "name": "datasetName",
+                    "validate": "required"
+                  },
+                  {
+                    "name": "projectBaseline",
+                    "dataType": "text",
+                    "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
+                    "validate": "required",
+                    "constraints": {
+                      "textProperty": "baseline",
+                      "valueProperty": "code",
+                      "type": "pre-populated",
+                      "excludePath": "baselineDetailsControlled.baselineDetails.projectBaseline",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.details.baseline.rows"
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "name": "monitoringIndicator",
+                    "dataType": "stringList",
+                    "description": "",
+
+
+                    "computed": {
+                      "expression": "if(projectBaseline, x=pluck(findAll($context.owner.custom.details.monitoring.rows, \"relatedBaseline\", projectBaseline), \"data1\", \"No monitoring indicators associated with this baseline\"), '')"
+                    }
+                  },
+                  {
+                    "name": "datasetSupports",
+                    "dataType": "text",
+                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
+                    "validate": "required",
+                    "constraints": {
+                      "textProperty": "name",
+                      "valueProperty": "dataSetId",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.dataSets"
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "purpose",
+                    "validate": "required,maxSize[500]"
+                  }
+                ]
+              },
               {
                 "name": "relatedOutcomes",
                 "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
                 "validate": "required",
                 "constraints": {
                   "textProperty": "label",
@@ -21634,15 +31282,17 @@
                   "config": {
                     "source": {
                       "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
-                      }
+                      "params": [
+                        {
+                          "expression": "owner.projectId",
+                          "name": "id",
+                          "type": "computed"
+                        },
+                        {
+                          "expression": "scores",
+                          "name": "scoreIds",
+                          "type": "computed"
+                        }
                       ]
                     }
                   }
@@ -21650,20 +31300,16 @@
               },
               {
                 "name": "investmentPriorities2",
-                "dataType": "stringList",
+                "dataType": "text",
+                "description": "",
                 "validate": "required",
                 "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
                   "type": "pre-populated",
                   "config": {
                     "source": {
-                      "params": [
-                        {
-                          "expression": "owner.projectId",
-                          "name": "id",
-                          "type": "computed"
-                        }
-                      ],
-                      "url": "/project/listProjectInvestmentPriorities/"
+                      "context-path": "owner.investmentPriorities"
                     }
                   }
                 }
@@ -21671,6 +31317,7 @@
               {
                 "dataType": "text",
                 "name": "otherInvestmentPriority",
+                "description": "Describe the investment priority (if Other) was selected",
                 "behaviour": [
                   {
                     "type": "enable",
@@ -21679,99 +31326,68 @@
                 ]
               },
               {
-                "dataType": "date",
-                "name": "activitiesStartDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesEndDate",
-                "description": "Specific the dates these events were held on",
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
                 "validate": "required"
-              },
+              }
+            ],
+            "dataType": "list",
+            "name": "baselineDetailsControlled"
+          },
+          {
+            "name": "numberBaselineDataSets",
+            "type": "number",
+            "decimalPlaces": 0
+          },
+          {
+            "dataType": "number",
+            "name": "totalNumberBaselineDatasets",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(baselineDetailsControlled, \"relatedOutcomes ? 1 : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalNumberBaselineDatasetsInvoiced",
+            "validate": [
               {
-                "dataType": "feature",
-                "name": "sitesTested"
+                "rule": "required"
               },
               {
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "$geom.areaHa(sitesTested)"
-                },
-                "dataType": "number",
-                "name": "areaTestedHa",
-                "validate": [
-                  {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.areaHa(sitesTested)*0.9"
-                    }
-                  },
-                  {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.areaHa(sitesTested)*1.1"
-                    }
-                  }
-                ]
+                "rule": "min[0]"
               },
               {
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "$geom.lengthKm(sitesTested)"
+                "param": {
+                  "expression": "totalNumberBaselineDatasets",
+                  "type": "computed"
                 },
-                "dataType": "number",
-                "name": "lengthTestedKm",
-                "validate": [
-                  {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTested)*0.9"
-                    }
-                  },
-                  {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTested)*1.1"
-                    }
-                  }
-                ]
-              },
-              {
-                "dataType": "text",
-                "name": "testingTechnique",
-                "description": "What/How will these tests capture information",
-                "validate": "required,maxSize[100]"
-              },
-              {
-                "dataType": "text",
-                "name": "testingObjective",
-                "description": "How will the information obtained from the tests be used",
-                "validate": "required,maxSize[300]"
-              },
-              {
-                "dataType": "text",
-                "name": "testingDepth",
-                "description": "",
-                "validate": "required,maxSize[300]"
+                "rule": "max"
               }
             ],
-            "dataType": "list",
-            "name": "soilTestingDetails"
+            "defaultValue": ""
           },
           {
             "dataType": "text",
-            "name": "comments",
-            "validate": "maxSize[1500]"
+            "name": "totalInvoicedBaselineMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalNumberBaselineDatasetsInvoiced < +totalNumberBaselineDatasets",
+                "type": "enable"
+              }
+            ]
           },
           {
-            "dataType": "image",
-            "name": "photographicEvidence"
+            "dataType": "text",
+            "name": "comments",
+            "validate": "maxSize[1500]"
           },
           {
             "dataType": "boolean",
@@ -21779,9 +31395,9 @@
             "description": ""
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -21790,26 +31406,35 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
-        "modelName": "NHT - Soil testing",
-        "title": "Soil testing",
         "viewModel": [
           {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
             "columns": [
               {
                 "width": "10%",
                 "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
+                "title": "Are individuals or groups delivering this service?",
                 "type": "selectOne"
               },
               {
                 "width": "20%",
                 "type": "col",
-                "title": "Total Number of people delivering this service",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "participationIndividualNumber",
@@ -21822,296 +31447,435 @@
                 ]
               },
               {
-                "type": "col",
-                "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
-                "items": [
+                "type": "col",
+                "width": "20%",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "firstNationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "firstNationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
+              }
+            ],
+            "source": "participationInformationTableSyn",
+            "type": "table"
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total number of baseline datasets synthesised and finalised for this reporting period",
+                        "source": "totalNumberBaselineDatasets",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total number of baseline datasets synthesised and finalised <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalNumberBaselineDatasetsInvoiced",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedBaselineMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "addRowText": "Add a new baseline",
+            "userAddedRows": true,
+            "source": "baselineDetailsControlled",
+            "type": "repeat",
+            "items": [
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "table",
+                "source": "baselineDetails",
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "columns": [
                   {
-                    "source": "firstNationIndividualNumber",
-                    "type": "number"
+                    "source": "datasetName",
+                    "type": "text",
+                    "width": "20%",
+                    "title": "Name of Baseline Dataset"
                   },
                   {
-                    "source": "firstNationGroupNumber",
-                    "type": "selectOne"
+                    "source": "projectBaseline",
+                    "type": "selectOne",
+                    "width": "20%",
+                    "title": "Which Project Baseline are you reporting on?"
+                  },
+                  {
+                    "source": "monitoringIndicator",
+                    "type": "selectMany",
+                    "width": "20%",
+                    "title": "What monitoring indicator does the baseline support?"
+                  },
+                  {
+                    "source": "datasetSupports",
+                    "type": "select2Many",
+                    "width": "15%",
+                    "title": "What dataset supports this Project Baseline?"
+                  },
+                  {
+                    "preLabel": "",
+                    "source": "purpose",
+                    "type": "textarea",
+                    "width": "25%",
+                    "rows": 3,
+                    "placeholder": "",
+                    "title": "Purpose"
                   }
                 ]
-              },
+              }
+            ]
+          },
+
+          {
+            "type": "row",
+            "items": [
               {
-                "source": "participationDetails",
+                "preLabel": "Clarification, if needed",
+                "type": "textarea",
                 "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                "type": "textarea"
+                "css": "span8",
+                "source": "comments",
+                "placeholder": "Clarification comments include information for your project manager about the service like:\n• any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
               }
-            ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
-            "type": "table"
+            ]
           },
           {
             "type": "row",
             "items": [
               {
-                "preLabel": "Baseline survey or indicator (follow-up) survey?",
-                "css": "span3",
-                "source": "baselineOrIndicator",
-                "type": "selectOne"
-              },
-              {
-                "preLabel": "Number of soil tests conducted in targeted areas",
-                "css": "span2",
-                "source": "numberOfSoilTests",
-                "type": "number"
+                "type": "literal",
+                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
               },
               {
-                "preLabel": "How many soil tests will you be invoicing for?",
-                "css": "span2",
-                "source": "numberOfSoilTestInvoice",
-                "type": "number"
+                "preLabel": "Data have been uploaded",
+                "source": "dataUploaded",
+                "type": "boolean"
               }
             ]
           },
           {
-            "type": "section",
+            "type": "row",
             "items": [
               {
-                "columns": [
-                  {
-                    "source": "relatedOutcomes",
-                    "type": "selectOne",
-                    "width": "15%",
-                    "title": "Which outcome statement/s relates to this survey?"
-                  },
-                  {
-                    "width": "15%",
-                    "type": "col",
-                    "title": "Which investment priority does this activity relate to?",
-                    "items": [
-                      {
-                        "source": "investmentPriorities2",
-                        "type": "select2Many"
-                      },
-                      {
-                        "source": "otherInvestmentPriority",
-                        "type": "text"
-                      }
-                    ]
-                  },
-                  {
-                    "title": "Activities start date",
-                    "source": "activitiesStartDate",
-                    "type": "date",
-                    "width": "10%"
-                  },
-                  {
-                    "title": "Activities end date",
-                    "source": "activitiesEndDate",
-                    "type": "date",
-                    "width": "10%"
-                  },
-                  {
-                    "width": "5%",
-                    "source": "sitesTested",
-                    "type": "feature",
-                    "title": "Project site/s where soil tests were conducted"
-                  },
-                  {
-                    "width": "10%",
-                    "source": "areaTestedHa",
-                    "type": "number",
-                    "title": "Area (ha) where soil tests were conducted"
-                  },
-                  {
-                    "width": "5%",
-                    "source": "lengthTestedKm",
-                    "type": "number",
-                    "title": "Length (km) where soil tests were conducted"
-                  },
-                  {
-                    "width": "10%",
-                    "source": "testingTechnique",
-                    "title": "Testing technique",
-                    "type": "textarea"
-                  },
-                  {
-                    "width": "10%",
-                    "source": "testingObjective",
-                    "title": "Testing objective",
-                    "type": "textarea"
-                  },
+                "preLabel": "",
+                "source": "projectAssuranceDetails",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+              }
+            ]
+          },
+          {
+            "type": "table",
+            "source": "assuranceDocuments",
+            "userAddedRows": true,
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "title": "Attached documents",
+                "source": "attachments",
+                "type": "document"
+              }
+            ]
+          }
+        ]
+      },
+      "modelName": null,
+      "templateName": "nhtBaselineData",
+      "optional": true,
+      "optionalQuestionText": null,
+      "title": "Collecting, or synthesising baseline data",
+      "collapsibleHeading": null,
+      "name": "NHT - Baseline data",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
+          {
+            "allowRowDelete": "false",
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "number",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
                   {
-                    "width": "10%",
-                    "source": "testingDepth",
-                    "title": "Testing depth",
-                    "type": "textarea"
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
                 ],
-                "userAddedRows": true,
-                "source": "soilTestingDetails",
-                "type": "table"
+                "validate": "required,min[0]"
               },
               {
-                "type": "row",
-                "items": [
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
                   {
-                    "preLabel": "Optionally attach photos",
-                    "source": "photographicEvidence",
-                    "type": "image"
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
                 ]
               },
               {
-                "type": "row",
-                "items": [
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
                   {
-                    "preLabel": "Clarification, if needed",
-                    "type": "textarea",
-                    "rows": 4,
-                    "css": "span8",
-                    "source": "comments",
-                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
                   }
                 ]
               },
               {
-                "type": "row",
-                "items": [
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
                   {
-                    "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
                   },
                   {
-                    "preLabel": "Data have been uploaded",
-                    "source": "dataUploaded",
-                    "type": "boolean"
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
                   }
                 ]
               },
               {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "",
-                    "source": "projectAssuranceDetails",
-                    "type": "textarea",
-                    "rows": 4,
-                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
+              }
+            ],
+            "dataType": "list",
+            "name": "participationInformationTableUei"
+          },
+          {
+            "columns": [
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "label",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "url": "/project/outcomesByScores",
+                      "params": [
+                        {
+                          "expression": "owner.projectId",
+                          "name": "id",
+                          "type": "computed"
+                        },
+                        {
+                          "expression": "scores",
+                          "name": "scoreIds",
+                          "type": "computed"
+                        }
+                      ]
+                    }
                   }
-                ]
+                }
               },
               {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
+                "name": "investmentPriorities2",
+                "dataType": "text",
+                "description": "",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "owner.investmentPriorities"
+                    }
                   }
-                ]
+                }
               },
               {
-                "type": "table",
-                "source": "assuranceDocuments",
-                "userAddedRows": true,
-                "disableTableUpload": true,
-                "columns": [
+                "dataType": "text",
+                "name": "otherInvestmentPriority",
+                "behaviour": [
                   {
-                    "title": "Attached documents",
-                    "source": "attachments",
-                    "type": "document"
+                    "type": "enable",
+                    "condition": "\"Other\" in investmentPriorities2"
                   }
                 ]
-              }
-            ]
-          }
-        ]
-      },
-      "modelName": null,
-      "templateName": "nhtSoilTesting",
-      "optional": true,
-      "optionalQuestionText": null,
-      "title": "Soil testing",
-      "collapsibleHeading": null,
-      "name": "NHT - Soil testing",
-      "description": null
-    },
-    {
-      "collapsedByDefault": false,
-      "template": {
-        "dataModel": [
-          {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
-              }
-            ],
-            "validate": "required,min[0]"
-          },
-          {
-            "dataType": "text",
-            "name": "firstNationGroupNumber",
-            "behaviour": [
+              },
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "columns": [
+                "dataType": "text",
+                "name": "invoicingThisActivity",
+                "constraints": [
+                  "Yes",
+                  "No"
+                ],
+                "validate": "required"
+              },
               {
                 "dataType": "text",
                 "name": "initialOrFollowup",
@@ -22128,28 +31892,33 @@
               },
               {
                 "dataType": "feature",
-                "name": "siteOfIntervention"
+                "name": "sitesInterventionsOccurred",
+                "description": "Mapping field to be done and Area (ha) field be auto-calculated from mapping."
               },
               {
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "$geom.areaHa(siteOfIntervention)"
+                "computed": {
+                  "expression": "$geom.areaHa(sitesInterventionsOccurred)"
                 },
                 "dataType": "number",
-                "name": "areaOfInterventionHa",
-                "validate": [
-                  {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.areaHa(siteOfIntervention)*0.9"
-                    }
-                  },
+                "name": "calculatedAreaTreatedHa",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesInterventionsOccurred)"
+                },
+                "dataType": "number",
+                "name": "calculatedLengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.areaHa(siteOfIntervention)*1.1"
+                    "condition": "lengthTreatedKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
                     }
                   }
                 ]
@@ -22157,129 +31926,179 @@
               {
                 "defaultValue": {
                   "type": "computed",
-                  "expression": "$geom.lengthKm(siteOfIntervention)"
+                  "expression": "calculatedAreaTreatedHa"
                 },
                 "dataType": "number",
-                "name": "lengthOfInterventionKm",
-                "validate": [
+                "name": "areaTreatedHa",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedReason",
+                "constraints": [
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                  "Other"
+                ],
+                "validate": "required",
+                "behaviour": [
                   {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(siteOfIntervention)*0.9"
-                    }
-                  },
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedComments",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(siteOfIntervention)*1.1"
-                    }
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReason"
                   }
                 ]
               },
               {
-                "dataType": "feature",
-                "name": "relocationSite",
-                "description": "If translocation is required please map site"
+                "dataType": "document",
+                "name": "extraMappingDetails",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
+                  {
+                    "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1))",
+                    "type": "if"
+                  }
+                ]
               },
               {
                 "defaultValue": {
                   "type": "computed",
-                  "expression": "$geom.areaHa(relocationSite)"
+                  "expression": "calculatedLengthTreatedKm"
                 },
                 "dataType": "number",
-                "name": "areaOfRelocationSiteHa",
-                "validate": [
+                "name": "lengthTreatedKm",
+                "units": "km",
+                "decimalPlaces": 3
+              },
+
+              {
+                "dataType": "feature",
+                "name": "sitesInterventionsReleased",
+                "description": "Mapping field to be done and Area (ha) field be auto-calculated from mapping."
+              },
+              {
+                "computed": {
+                  "expression": "$geom.areaHa(sitesInterventionsReleased)"
+                },
+                "dataType": "number",
+                "name": "calculatedAreaTreatedHaReleased",
+                "units": "ha",
+                "decimalPlaces": 3
+              },
+              {
+                "computed": {
+                  "expression": "$geom.lengthKm(sitesInterventionsReleased)"
+                },
+                "dataType": "number",
+                "name": "calculatedLengthTreatedKmReleased",
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.areaHa(relocationSite)*0.9"
+                    "condition": "lengthTreatedKmReleased > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "The managed length must be mapped",
+                      "validate": "required,min[0.0001]"
                     }
-                  },
+                  }
+                ]
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedAreaTreatedHaReleased"
+                },
+                "dataType": "number",
+                "name": "areaTreatedHaReleased",
+                "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                "units": "ha",
+                "decimalPlaces": 3,
+                "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedReasonReleased",
+                "constraints": [
+                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                  "Other"
+                ],
+                "validate": "required",
+                "behaviour": [
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.areaHa(relocationSite)*1.1"
-                    }
+                    "condition": "not (within(areaTreatedHaReleased, calculatedAreaTreatedHaReleased, 0.1))",
+                    "type": "if"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "mappingNotAlignedCommentsReleased",
+                "validate": "required,maxSize[100]",
+                "behaviour": [
+                  {
+                    "type": "visible",
+                    "condition": "\"Other\" == mappingNotAlignedReasonReleased"
+                  }
+                ]
+              },
+              {
+                "dataType": "document",
+                "name": "extraMappingDetailsReleased",
+                "validate": "required",
+                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "behaviour": [
+                  {
+                    "condition": "not (within(areaTreatedHaReleased, calculatedAreaTreatedHaReleased, 0.1))",
+                    "type": "if"
                   }
                 ]
               },
               {
-                "dataType": "text",
-                "name": "purposeOfIntervention",
-                "description": "This field may be used to list What type of intervention is required. A list of multiple interventions need to be separated with a ';'.",
-                "validate": "required,maxSize[500]"
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "calculatedLengthTreatedKmReleased"
+                },
+                "dataType": "number",
+                "name": "lengthTreatedKmReleased",
+                "units": "km",
+                "decimalPlaces": 3
               },
               {
                 "columns": [
                   {
                     "dataType": "date",
                     "name": "activitiesStartDate",
-                    "description": "Specific the dates these events were held on",
+                    "description": "Specific the dates these events were held on.",
                     "validate": "required"
                   },
                   {
                     "dataType": "date",
                     "name": "activitiesEndDate",
-                    "description": "Specific the dates these events were held on",
-                    "validate": "required"
-                  },
-                  {
-                    "name": "relatedOutcomes",
-                    "dataType": "text",
-                    "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                    "validate": "required",
-                    "constraints": {
-                      "textProperty": "label",
-                      "valueProperty": "label",
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "url": "/project/outcomesByScores",
-                          "params": [{
-                            "expression": "owner.projectId",
-                            "name": "id",
-                            "type": "computed"
-                          }, {
-                            "expression": "scores",
-                            "name": "scoreIds",
-                            "type": "computed"
-                          }
-                          ]
-                        }
-                      }
-                    }
-                  },
-                  {
-                    "name": "investmentPriorities2",
-                    "dataType": "stringList",
-                    "validate": "required",
-                    "constraints": {
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "params": [
-                            {
-                              "expression": "owner.projectId",
-                              "name": "id",
-                              "type": "computed"
-                            }
-                          ],
-                          "url": "/project/listProjectInvestmentPriorities/"
-                        }
-                      }
-                    }
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "otherInvestmentPriority",
-                    "behaviour": [
+                    "description": "Specific the dates these events were held on.",
+                    "validate": [
                       {
-                        "type": "enable",
-                        "condition": "\"Other\" in investmentPriorities2"
+                        "rule": "required"
+                      },
+                      {
+                        "rule": "future",
+                        "param": {
+                          "expression": "formatDateForValidation(activitiesStartDate)",
+                          "type": "computed"
+                        }
                       }
                     ]
                   },
@@ -22290,7 +32109,7 @@
                   },
                   {
                     "dataType": "text",
-                    "name": "participationIndividualsOrGroups",
+                    "name": "groupsOrIndividual",
                     "constraints": [
                       "Individuals",
                       "Groups"
@@ -22301,6 +32120,12 @@
                     "dataType": "number",
                     "name": "numberOfIndividualsInvolved",
                     "validate": "required,min[0]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "purposeOfIntervention",
+                    "description": "This field may be used to list What type of intervention is required. A list of multiple interventions need to be separated with a ';'.",
+                    "validate": "required,maxSize[500]"
                   }
                 ],
                 "dataType": "list",
@@ -22310,6 +32135,76 @@
             "dataType": "list",
             "name": "interventionDetails"
           },
+          {
+            "dataType": "number",
+            "name": "totalNumberInterventionsInitial",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(interventionDetails, \"initialOrFollowup == 'Initial' ? numberOfInterventions : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalNumberInterventionsInitialInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalNumberInterventionsInitial",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "number",
+            "name": "totalNumberInterventionsFollowUp",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(interventionDetails, \"initialOrFollowup == 'Follow-up' ? numberOfInterventions : 0\")"
+            }
+          },
+          {
+            "dataType": "number",
+            "name": "totalNumberInterventionsFollowUpInvoiced",
+            "validate": [
+              {
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalNumberInterventionsFollowUp",
+                  "type": "computed"
+                },
+                "rule": "max"
+              }
+            ],
+            "defaultValue": ""
+          },
+          {
+            "dataType": "text",
+            "name": "totalInvoicedInterventionsMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
+            "behaviour": [
+              {
+                "condition": "+totalNumberInterventionsInitialInvoiced < +totalNumberInterventionsInitial or +totalNumberInterventionsFollowUpInvoiced < +totalNumberInterventionsFollowUp",
+                "type": "enable"
+              }
+            ]
+          },
           {
             "dataType": "text",
             "name": "comments",
@@ -22322,12 +32217,12 @@
           {
             "dataType": "boolean",
             "name": "dataUploaded",
-            "description": ""
+            "description": "<ul><li>Tick box to confirm data has been uploaded</li><li>URL Link (mandatory if below is ticked) in available evidence</li></ul>"
           },
           {
-            "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "dataType": "text",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -22336,26 +32231,37 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
         "modelName": "NHT - Emergency Interventions",
-        "title": "Undertaking emergency interventions to prevent extinctions",
+        "title": "Undertaking Emergency Interventions to Prevent Extinctions",
         "viewModel": [
           {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Participation information</h3>"
+              }
+            ]
+          },
+          {
+            "disableTableUpload": true,
             "columns": [
               {
                 "width": "10%",
                 "source": "participationIndividualsOrGroups",
-                "title": "Individuals or groups?",
+                "title": "Are individuals or groups delivering this service?",
                 "type": "selectOne"
               },
               {
                 "width": "20%",
                 "type": "col",
-                "title": "Total Number of people delivering this service",
+                "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                 "items": [
                   {
                     "source": "participationIndividualNumber",
@@ -22368,224 +32274,478 @@
                 ]
               },
               {
-                "type": "col",
-                "width": "20%",
-                "title": "Total Number of First Nations people delivering this service ",
+                "type": "col",
+                "width": "20%",
+                "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
+                "items": [
+                  {
+                    "source": "firstNationIndividualNumber",
+                    "type": "number"
+                  },
+                  {
+                    "source": "firstNationGroupNumber",
+                    "type": "selectOne"
+                  }
+                ]
+              },
+              {
+                "width": "20%",
+                "source": "participationDetails",
+                "rows": 4,
+                "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
+                "type": "textarea"
+              }
+            ],
+            "source": "participationInformationTableUei",
+            "type": "table"
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<h3>Totals Summary</h3>"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(i) Total number of interventions (initial) for this reporting period",
+                        "source": "totalNumberInterventionsInitial",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(ii) Total number of interventions (initial) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalNumberInterventionsInitialInvoiced",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "col",
+                "css": "span4 col-border-right",
+                "items": [
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iii) Total number of interventions (follow-up) for this reporting period",
+                        "source": "totalNumberInterventionsFollowUp",
+                        "type": "number"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
+                      {
+                        "preLabel": "(iv) Total number of interventions (follow-up) <u><i>invoiced</i></u> for this reporting period",
+                        "source": "totalNumberInterventionsFollowUpInvoiced",
+                        "type": "number"
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                "source": "totalInvoicedInterventionsMismatched",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": ""
+              }
+            ]
+          },
+          {
+            "addRowText": "Add intervention site",
+            "userAddedRows": true,
+            "source": "interventionDetails",
+            "type": "repeat",
+            "items": [
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s does this activity relate to?"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "investmentPriorities2",
+                            "preLabel": "Which investment priority does this activity relate to?",
+                            "type": "select2Many"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "css": "span3",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "invoicingThisActivity",
+                            "preLabel": "Are you invoicing for this activity in this reporting period?",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "css": "border-bottom",
                 "items": [
                   {
-                    "source": "firstNationIndividualNumber",
-                    "type": "number"
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "initialOrFollowup",
+                            "preLabel": "Initial or follow-up activity?",
+                            "type": "selectOne"
+                          }
+                        ]
+                      }
+                    ]
                   },
                   {
-                    "source": "firstNationGroupNumber",
-                    "type": "selectOne"
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "numberOfInterventions",
+                            "preLabel": "Number of interventions",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
                   }
                 ]
               },
               {
-                "source": "participationDetails",
-                "rows": 4,
-                "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
-                "type": "textarea"
-              }
-            ],
-            "userAddedRows": false,
-            "disableTableUpload": false,
-            "source": "",
-            "type": "table"
-          },
-          {
-            "type": "section",
-            "items": [
-              {
-                "addRowText": "Add intervention site",
-                "userAddedRows": true,
-                "source": "interventionDetails",
-                "type": "repeat",
+                "type": "row",
                 "items": [
                   {
-                    "type": "row",
+                    "type": "col",
+                    "css": "span3 col-border-right",
                     "items": [
                       {
-                        "preLabel": "Initial or follow-up activity?",
-                        "css": "span2",
-                        "source": "initialOrFollowup",
-                        "type": "selectOne"
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Site/s where interventions occurred (source site)",
+                            "source": "sitesInterventionsOccurred",
+                            "type": "feature"
+                          }
+                        ]
                       },
                       {
-                        "preLabel": "Number of interventions",
-                        "css": "span2",
-                        "source": "numberOfInterventions",
-                        "type": "number"
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "calculatedAreaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Please attach mapping details",
+                            "source": "extraMappingDetails",
+                            "type": "document"
+                          }
+                        ]
                       }
                     ]
                   },
                   {
-                    "type": "row",
+                    "type": "col",
+                    "css": "span3 col-border-right",
                     "items": [
                       {
-                        "preLabel": "Site/s where interventions occurred (source site)",
-                        "css": "span2",
-                        "source": "siteOfIntervention",
-                        "type": "feature"
-                      },
-                      {
-                        "preLabel": "Actual area (ha) where interventions occurred",
-                        "css": "span2",
-                        "source": "areaOfInterventionHa",
-                        "type": "number"
-                      },
-                      {
-                        "preLabel": "Actual area (ha) where interventions were relocated to (release site)",
-                        "css": "span2",
-                        "source": "relocationSite",
-                        "type": "feature"
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Actual area (ha) where interventions occurred",
+                            "source": "areaTreatedHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
                       },
                       {
-                        "preLabel": "Actual area (ha) where interventions occurred",
-                        "css": "span2",
-                        "source": "areaOfRelocationSiteHa",
-                        "type": "number"
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Reason for actual being different to mapped amount",
+                            "source": "mappingNotAlignedReason",
+                            "type": "selectOne"
+                          }
+                        ]
                       },
                       {
-                        "preLabel": "Type and goal of intervention",
-                        "css": "span3",
-                        "source": "purposeOfIntervention",
-                        "type": "textarea",
-                        "rows": 3
+                        "type": "row",
+                        "items": [
+                          {
+                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                            "source": "mappingNotAlignedComments",
+                            "type": "textarea",
+                            "rows": 5
+                          }
+                        ]
                       }
                     ]
                   },
+
                   {
-                    "columns": [
-                      {
-                        "title": "Activities start date",
-                        "source": "activitiesStartDate",
-                        "type": "date",
-                        "width": "10%"
-                      },
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "title": "Activities end date",
-                        "source": "activitiesEndDate",
-                        "type": "date",
-                        "width": "10%"
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Site/s where target species were relocated to (release site)",
+                            "source": "sitesInterventionsReleased",
+                            "type": "feature"
+                          }
+                        ]
                       },
                       {
-                        "width": "15%",
-                        "source": "relatedOutcomes",
-                        "type": "selectOne",
-                        "title": "Which outcome statement/s relates to this survey?"
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "calculatedAreaTreatedHaReleased",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": "readonly"
+                          }
+                        ]
                       },
                       {
-                        "width": "20%",
-                        "type": "col",
-                        "title": "Which investment priority does this activity relate to?",
+                        "type": "row",
                         "items": [
                           {
-                            "source": "investmentPriorities2",
-                            "type": "select2Many"
-                          },
-                          {
-                            "source": "otherInvestmentPriority",
-                            "type": "text"
+                            "preLabel": "Please attach mapping details",
+                            "source": "extraMappingDetailsReleased",
+                            "type": "document"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span3 col-border-right",
+                    "items": [
                       {
-                        "width": "25%",
-                        "source": "species",
-                        "title": "Targeted species",
-                        "type": "speciesSelect"
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Actual area (ha) where target species were relocated to (release site)",
+                            "source": "areaTreatedHaReleased",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
                       },
                       {
-                        "width": "10%",
-                        "source": "participationIndividualsOrGroups",
-                        "title": "Group or individual",
-                        "type": "selectOne"
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "Reason for actual being different to mapped amount",
+                            "source": "mappingNotAlignedReasonReleased",
+                            "type": "selectOne"
+                          }
+                        ]
                       },
                       {
-                        "width": "10%",
-                        "source": "numberOfIndividualsInvolved",
-                        "type": "number",
-                        "title": "Number of groups / individuals"
+                        "type": "row",
+                        "items": [
+                          {
+                            "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                            "source": "mappingNotAlignedCommentsReleased",
+                            "type": "textarea",
+                            "rows": 5
+                          }
+                        ]
                       }
-                    ],
-                    "userAddedRows": true,
-                    "source": "interventionSpecies",
-                    "type": "table"
+                    ]
                   }
                 ]
               },
               {
-                "type": "row",
-                "items": [
+                "columns": [
                   {
-                    "preLabel": "Optionally attach photos",
-                    "source": "photographicEvidence",
-                    "type": "image"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
+                    "width": "25%",
+                    "source": "species",
+                    "title": "Targeted species",
+                    "type": "speciesSelect"
+                  },
                   {
-                    "preLabel": "Clarification, if needed",
-                    "type": "textarea",
-                    "rows": 4,
-                    "css": "span8",
-                    "source": "comments",
-                    "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
+                    "title": "Activity start date",
+                    "source": "activitiesStartDate",
+                    "type": "date",
+                    "width": "10%"
+                  },
                   {
-                    "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                    "title": "Activity end date",
+                    "source": "activitiesEndDate",
+                    "type": "date",
+                    "width": "10%"
                   },
                   {
-                    "preLabel": "Data have been uploaded",
-                    "source": "dataUploaded",
-                    "type": "boolean"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
+                    "width": "10%",
+                    "source": "groupsOrIndividual",
+                    "title": "Group or individual",
+                    "type": "selectOne"
+                  },
                   {
-                    "preLabel": "",
-                    "source": "projectAssuranceDetails",
+                    "width": "10%",
+                    "source": "numberOfIndividualsInvolved",
+                    "type": "number",
+                    "title": "Number of groups / individuals"
+                  },
+                  {
+                    "width": "35%",
+                    "source": "purposeOfIntervention",
                     "type": "textarea",
-                    "rows": 4,
-                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+                    "title": "Type and goal of intervention"
                   }
-                ]
-              },
+                ],
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "addRowText": "Add a new species",
+                "source": "interventionSpecies",
+                "type": "table"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
               {
-                "type": "row",
-                "items": [
-                  {
-                    "type": "literal",
-                    "source": "<p><b>Evidence of Service Delivery</b></p>This field is mandatory for all <u>Agriculture</u> projects as part of the invoicing process, as well as any environment projects where you have been notified as undergoing an <u>audit or quarterly assurance check</u>. The field allows you to attach evidence against a specific service."
-                  }
-                ]
+                "preLabel": "Optionally attach photos",
+                "source": "photographicEvidence",
+                "type": "image"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "Clarification, if needed",
+                "type": "textarea",
+                "rows": 4,
+                "css": "span8",
+                "source": "comments",
+                "placeholder": "Clarification comments include information for your project manager about the service like:\n • any reported items that are not being invoiced (eg, over-achievement) \n • any extraneous circumstances that affected delivery of the service \n"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "type": "literal",
+                "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
               },
               {
-                "type": "table",
-                "source": "assuranceDocuments",
-                "userAddedRows": true,
-                "disableTableUpload": true,
-                "columns": [
-                  {
-                    "title": "Attached documents",
-                    "source": "attachments",
-                    "type": "document"
-                  }
-                ]
+                "preLabel": "Data have been uploaded",
+                "source": "dataUploaded",
+                "type": "boolean"
+              }
+            ]
+          },
+          {
+            "type": "row",
+            "items": [
+              {
+                "preLabel": "",
+                "source": "projectAssuranceDetails",
+                "type": "textarea",
+                "rows": 4,
+                "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
+              }
+            ]
+          },
+          {
+            "type": "table",
+            "source": "assuranceDocuments",
+            "userAddedRows": true,
+            "disableTableUpload": true,
+            "columns": [
+              {
+                "title": "Attached documents",
+                "source": "attachments",
+                "type": "document"
               }
             ]
           }
@@ -22604,54 +32764,344 @@
       "collapsedByDefault": false,
       "template": {
         "dataModel": [
-
           {
+            "name": "waterQualitySurveys",
+            "dataType": "list",
+            "minSize": 1,
             "columns": [
               {
+                "dataType": "text",
+                "name": "typeOfSurvey",
+                "constraints": [
+                  "Water Quality Survey",
+                  "Hydrology Survey"
+                ],
+                "validate": "required"
+              },
+              {
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
+                    }
+                  }
+                }
+              },
+              {
+                "dataType": "text",
+                "name": "baselineOrIndicatorSurvey",
+                "description": "",
+                "constraints": [
+                  "Baseline",
+                  "Indicator"
+                ],
+                "validate": "required"
+              },
+              {
+                "dataType": "text",
+                "name": "surveyObjective",
+                "description": "What the survey aim to capture? How will the information obtained from the survey be used?",
+                "validate": "required,maxSize[3000]"
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfSurveys",
+                "validate": "required,min[1],max[1]",
+                "defaultValue": 1,
+                "readonly": true
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfSurveysInvoiced",
+                "validate": "required,min[0]",
+                "defaultValue": 1
+              },
+              {
+                "dataType": "list",
+                "name": "waterQualityDataSets",
                 "columns": [
                   {
-                    "dataType": "stringList",
-                    "name": "waterBodyType",
-                    "validate": "required",
+                    "name": "dataSetId",
+                    "entityType": "au.org.ala.ecodata.DataSetSummary",
+                    "dataType": "text",
+                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
+                    "validate": "required",
+                    "constraints": {
+                      "textProperty": "name",
+                      "valueProperty": "dataSetId",
+                      "excludePath": "waterQualitySurveys.waterQualityDataSets.dataSetId",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.dataSets"
+                        },
+                        "filter": {
+                          "namespace": "dataSet",
+                          "expression": "dataSet.serviceId == 32 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
+                        }
+                      }
+                    },
+                    "behaviour": [
+                      {
+                        "type": "pre_populate",
+                        "config": {
+                          "waitForInitialisation": true,
+                          "source": {
+                            "url": "/site/geojson",
+                            "params": [
+                              {
+                                "expression": "x=find(owner.custom.dataSets, \"dataSetId\", dataSetId); x.siteId",
+                                "name": "id",
+                                "type": "computed",
+                                "required": true
+                              }
+                            ]
+                          },
+                          "target":  {
+                            "type": "singleValue",
+                            "name": "sitesCoveredForWaterQuality"
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "name": "projectBaselines",
+                    "dataType": "stringList",
+                    "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.baselines"
+                    },
+                    "constraints": {
+                      "textProperty": "baseline",
+                      "valueProperty": "code",
+                      "type": "pre-populated",
+                      "excludePath": "projectBaselines",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.details.baseline.rows"
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "name": "investmentPriorities2",
+                    "dataType": "stringList",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.investmentPriorities"
+                    },
+                    "constraints": {
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "params": [
+                            {
+                              "expression": "owner.projectId",
+                              "name": "id",
+                              "type": "computed"
+                            }
+                          ],
+                          "url": "/project/listProjectInvestmentPriorities/"
+                        }
+                      }
+                    }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "otherInvestmentPriority",
+                    "behaviour": [
+                      {
+                        "type": "enable",
+                        "condition": "\"Other\" in investmentPriorities2"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "date",
+                    "name": "activitiesStartDate",
+                    "description": "Specific the dates these events were held on.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.startDate"
+                    }
+                  },
+                  {
+                    "dataType": "date",
+                    "name": "activitiesEndDate",
+                    "description": "Specific the dates these events were held on.",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.endDate"
+                    }
+                  },
+                  {
+                    "dataType": "feature",
+                    "name": "sitesCoveredForWaterQuality",
+                    "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
+                  },
+                  {
+                    "computed": {
+                      "expression": "$geom.areaHa(sitesCoveredForWaterQuality)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedAreaTreatedHa",
+                    "units": "ha",
+                    "decimalPlaces": 3
+                  },
+                  {
+                    "computed": {
+                      "expression": "$geom.lengthKm(sitesCoveredForWaterQuality)"
+                    },
+                    "dataType": "number",
+                    "name": "calculatedLengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3,
+                    "behaviour": [
+                      {
+                        "condition": "lengthTreatedKm > 0",
+                        "type": "conditional_validation",
+                        "value": {
+                          "message": "The managed length must be mapped",
+                          "validate": "required,min[0.0001]"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "calculatedAreaTreatedHa"
+                    },
+                    "dataType": "number",
+                    "name": "areaTreatedHa",
+                    "description": "Manually enter correct figure for this reporting period if different to mapped value.",
+                    "units": "ha",
+                    "decimalPlaces": 3,
+                    "validate": "required,min[0]"
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "mappingNotAlignedReason",
                     "constraints": [
-                      "Estuary",
-                      "Freshwater stream",
-                      "Freshwater lake",
-                      "Saline stream",
-                      "Saline lake",
+                      "Mapped area simplifies more complex area/s where work was undertaken during this period",
                       "Other"
+                    ],
+                    "validate": "required",
+                    "behaviour": [
+                      {
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
+                      }
                     ]
                   },
                   {
                     "dataType": "text",
-                    "name": "otherWaterBodyType",
+                    "name": "mappingNotAlignedComments",
+                    "validate": "required,maxSize[100]",
                     "behaviour": [
                       {
-                        "condition": "waterBodyType == \"Other\"",
-                        "type": "enable_and_clear"
+                        "type": "visible",
+                        "condition": "\"Other\" == mappingNotAlignedReason"
+                      }
+                    ]
+                  },
+                  {
+                    "dataType": "document",
+                    "name": "extraMappingDetails",
+                    "validate": "required",
+                    "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                    "behaviour": [
+                      {
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
+                      }
+                    ]
+                  },
+                  {
+                    "defaultValue": {
+                      "type": "computed",
+                      "expression": "$geom.lengthKm(sitesCoveredForWaterQuality)"
+                    },
+                    "dataType": "number",
+                    "name": "lengthTreatedKm",
+                    "units": "km",
+                    "decimalPlaces": 3
+                  },
+                  {
+                    "dataType": "text",
+                    "description": "Select the technique used to conduct the survey. If the EMSA Application tool was not used, you should select 'Other'.",
+                    "name": "emsaProtocol",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.protocol"
+                    },
+                    "constraints": {
+                      "textProperty": "label",
+                      "valueProperty": "value",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.protocols"
+                        }
                       }
+                    }
+                  },
+                  {
+                    "dataType": "stringList",
+                    "description": "Describe the technique (if Other) was selected.",
+                    "name": "otherEmsaProtocol",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methods"
+                    }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "surveyMethodology",
+                    "description": "Provide more details on what is being done.",
+                    "validate": "required,maxSize[3000]",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methodDescription"
+                    }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "invoicingThisActivity",
+                    "constraints": [
+                      "Yes",
+                      "No"
                     ],
                     "validate": "required"
                   },
                   {
                     "dataType": "stringList",
-                    "description": "How/what survey will capture. The dropdown list consists of the TERN Protocols. If you did not use the TERN Technique/s you should describe the technique used in the column for other techniques.",
-                    "name": "ternSurveyTechnique",
+                    "name": "waterBodyType",
                     "validate": "required",
                     "constraints": [
-                      "Tern Survey technique 1",
-                      "Tern Survey technique 1",
-                      "Tern Survey technique 1",
+                      "Estuary",
+                      "Freshwater stream",
+                      "Freshwater lake",
+                      "Ground water",
+                      "Mound springs",
+                      "Saline stream",
+                      "Saline lake",
+                      "Stream stretch",
                       "Other"
                     ]
                   },
                   {
                     "dataType": "text",
-                    "description": "Please describe the Survey technique if other was selected.",
-                    "name": "otherTernSurveyTechnique",
+                    "name": "otherWaterBodyType",
                     "behaviour": [
                       {
-                        "condition": "ternSurveyTechnique == \"Other\"",
+                        "condition": "waterBodyType == \"Other\"",
                         "type": "enable_and_clear"
                       }
                     ],
@@ -22659,352 +33109,205 @@
                   },
                   {
                     "dataType": "text",
-                    "name": "surveyMethodology",
-                    "description": "Provide more details on what is being done",
-                    "validate": "required,maxSize[3000]"
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "surveyObjective",
-                    "description": "How will the information obtained from the survey be used",
-                    "validate": "required,maxSize[3000]"
+                    "name": "waterSurveyObjective",
+                    "validate": "maxSize[300],required",
+                    "description": "How will the information from the surveys be used?"
                   }
                 ],
-                "dataType": "list",
-                "name": "waterTypeTable"
-              },
+                "minSize": 1
+              }
+            ]
+          },
+          {
+            "dataType": "lookupTable",
+            "name": "baselineIndicatorMapping",
+            "config": {
+              "source": {
+                "literal": {
+                  "Baseline dataset associated with a project outcome": "Baseline",
+                  "Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
+                }
+              }
+            }
+          },
+          {
+            "allowRowDelete": "false",
+            "columns": [
               {
                 "dataType": "text",
-                "name": "baselineOrIndicatorSurvey",
-                "description": "",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
                 "constraints": [
-                  "Baseline",
-                  "Indicator"
+                  "Individuals",
+                  "Groups"
                 ],
                 "validate": "required"
               },
               {
-                "name": "projectBaseline",
-                "dataType": "text",
-                "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "baseline",
-                  "valueProperty": "code",
-                  "type": "pre-populated",
-                  "excludePath": "projectBaseline",
-                  "config": {
-                    "source": {
-                      "context-path": "owner.custom.details.baseline.rows"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "datasetSupports",
-                "dataType": "text",
-                "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "name",
-                  "valueProperty": "dataSetId",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "context-path": "owner.custom.dataSets"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "relatedOutcomes",
-                "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "label",
-                  "valueProperty": "label",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
-                      }
-                      ]
-                    }
-                  }
-                }
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesStartDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesEndDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "dataType": "feature",
-                "name": "sitesTreated",
-                "description": "Manually enter correct figure for this reporting period if different to mapped value"
-              },
-              {
-                "computed": {
-                  "expression": "$geom.areaHa(sitesTreated)"
-                },
-                "dataType": "number",
-                "name": "calculatedAreaTreatedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "behaviour": [
-                  {
-                    "condition": "areaInvoicedTreatedHa > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The managed area must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
-                  }
-                ]
-              },
-              {
-                "computed": {
-                  "expression": "$geom.lengthKm(sitesTreated)"
-                },
                 "dataType": "number",
-                "name": "calculatedLengthTreatedKm",
-                "units": "km",
-                "decimalPlaces": 3,
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
                 "behaviour": [
                   {
-                    "condition": "lengthTreatedKm > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The managed length must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
-                ]
-              },
-              {
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "calculatedAreaTreatedHa"
-                },
-                "dataType": "number",
-                "name": "areaTreatedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": "required,min[0]"
-              },
-              {
-                "dataType": "text",
-                "name": "mappingNotAlignedReason",
-                "constraints": [
-                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                  "Other"
                 ],
-                "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1))",
-                    "type": "visible"
-                  }
-                ]
+                "validate": "required,min[0]"
               },
               {
                 "dataType": "text",
-                "name": "mappingNotAlignedComments",
-                "validate": "required,maxSize[300]",
+                "name": "participationGroupNumber",
                 "behaviour": [
                   {
-                    "type": "visible",
-                    "condition": "\"Other\" == mappingNotAlignedReason"
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
                 ]
               },
               {
-                "dataType": "document",
-                "name": "extraMappingDetails",
-                "validate": "required",
-                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
                 "behaviour": [
                   {
-                    "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1)) or roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                    "type": "visible"
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
                   }
-                ]
-              },
-              {
-                "dataType": "number",
-                "name": "areaInvoicedTreatedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
+                ],
                 "validate": [
                   {
-                    "rule": "min[0]"
+                    "rule": "required"
                   },
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "areaTreatedHa"
-                    }
-                  }
-                ]
-              },
-              {
-                "dataType": "text",
-                "name": "invoicedNotActualReason",
-                "constraints": [
-                  "Work was undertaken over a greater area than will be invoiced for",
-                  "Other"
-                ],
-                "validate": "required",
-                "behaviour": [
+                    "rule": "min[0]"
+                  },
                   {
-                    "condition": "roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                    "type": "visible"
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
                   }
                 ]
               },
               {
                 "dataType": "text",
-                "name": "invoicedNotActualComments",
+                "name": "firstNationGroupNumber",
                 "behaviour": [
                   {
-                    "type": "visible",
-                    "condition": "\"Other\" == invoicedNotActualReason"
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
                   }
                 ],
-                "validate": "required,maxSize[300]"
-              },
-              {
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "$geom.lengthKm(sitesTreated)"
-                },
-                "dataType": "number",
-                "name": "lengthTreatedKm",
-                "units": "km",
-                "decimalPlaces": 3,
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
                 "validate": [
                   {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)*0.9"
-                    }
+                    "rule": "required"
                   },
                   {
-                    "rule": "max",
                     "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)*1.1"
-                    }
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
                   }
                 ]
               },
               {
-                "dataType": "number",
-                "name": "numberOfSurveyInvoice",
-                "validate": "required,min[0]"
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
               }
             ],
             "dataType": "list",
-            "name": "waterQualitySurveys",
-            "minSize": 1
+            "name": "participationInformationTableWhs"
           },
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
+            "dataType": "number",
+            "name": "totalSurveyBaseline",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(waterQualitySurveys, \"baselineOrIndicatorSurvey == 'Baseline' ? 1 : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "name": "totalSurveyBaselineInvoiced",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyBaseline",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "validate": "required,min[0]"
+            "defaultValue": ""
           },
           {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            "dataType": "number",
+            "name": "totalSurveyIndicator",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(waterQualitySurveys, \"baselineOrIndicatorSurvey == 'Indicator' ? 1 : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+            "name": "totalSurveyIndicatorInvoiced",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyIndicator",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "validate": "required,min[0]"
+            "defaultValue": ""
           },
           {
             "dataType": "text",
-            "name": "firstNationGroupNumber",
+            "name": "totalInvoicedWaterMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
             "behaviour": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
+                "condition": "+totalSurveyIndicatorInvoiced < +totalSurveyIndicator or +totalSurveyBaselineInvoiced < +totalSurveyBaseline",
                 "type": "enable"
               }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "name": "numberWaterQualitySurveyConducted",
-            "type": "number",
-            "decimalPlaces": 0,
-            "computed": {
-              "expression": "count(waterQualitySurveys, \"baselineOrIndicatorSurvey\")"
-            }
+            ]
           },
           {
             "dataType": "text",
@@ -23023,7 +33326,8 @@
           {
             "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "description": "",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -23032,29 +33336,40 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
         "modelName": "NHT - Water quality survey",
-        "title": "Water quality survey",
+        "title": "Water Quality or Hydrology Survey",
         "viewModel": [
           {
             "type": "section",
             "items": [
               {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Participation information</h3>"
+                  }
+                ]
+              },
+              {
+                "disableTableUpload": true,
                 "columns": [
                   {
                     "width": "10%",
                     "source": "participationIndividualsOrGroups",
-                    "title": "Individuals or groups?",
+                    "title": "Are individuals or groups delivering this service?",
                     "type": "selectOne"
                   },
                   {
                     "width": "20%",
                     "type": "col",
-                    "title": "Total Number of people delivering this service",
+                    "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                     "items": [
                       {
                         "source": "participationIndividualNumber",
@@ -23069,7 +33384,8 @@
                   {
                     "type": "col",
                     "width": "20%",
-                    "title": "Total Number of First Nations people delivering this service ",
+                    "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                     "items": [
                       {
                         "source": "firstNationIndividualNumber",
@@ -23082,294 +33398,455 @@
                     ]
                   },
                   {
+                    "width": "20%",
                     "source": "participationDetails",
                     "rows": 4,
-                    "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
+                    "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                    "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
                     "type": "textarea"
                   }
                 ],
-                "userAddedRows": false,
-                "disableTableUpload": false,
-                "source": "",
+                "source": "participationInformationTableWhs",
                 "type": "table"
               },
               {
-                "preLabel": "Number of Water Quality surveys conducted:",
-                "noEdit": true,
-                "type": "number",
-                "source": "numberWaterQualitySurveyConducted"
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Survey information</h3><p><b>Before completing this section, please ensure you have created a Data Set Summary information for every data set produced by the surveys you intend to report</b></p><ul><li>Each survey reported must relate to a combination of outcomes as described in your MERI plan</li><li>Each Data Set Summary recorded for a survey must be addressing the same outcomes as selected for the survey</li><li>If a survey produced more than one data set, use the New Data Set button to add each Data Set Summary under your survey</li><li>A single survey can be made up of multiple dataset</li></ul>"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Totals Summary</h3>"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(i) Total Number of baseline water quality surveys completed for this reporting period",
+                            "source": "totalSurveyBaseline",
+                            "type": "number"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(ii) Total Number of baseline water quality surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyBaselineInvoiced",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iii)  Total Number of  indicator water quality surveys completed for this reporting period",
+                            "source": "totalSurveyIndicator",
+                            "type": "number"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iv) Total Number of indicator water quality surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyIndicatorInvoiced",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                    "source": "totalInvoicedWaterMismatched",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": ""
+                  }
+                ]
               },
               {
-                "addRowText": "New survey site",
+                "addRowText": "Add survey",
+                "removeRowText": "Delete this survey",
                 "userAddedRows": true,
                 "source": "waterQualitySurveys",
                 "type": "repeat",
                 "items": [
                   {
                     "type": "row",
-                    "css": "border-bottom",
                     "items": [
                       {
                         "type": "col",
-                        "css": "span3 col-border-right",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "baselineOrIndicatorSurvey",
-                                "type": "selectOne",
-                                "preLabel": "Baseline survey or indicator (follow-up) survey?"
-                              }
-                            ]
+                            "source": "typeOfSurvey",
+                            "type": "selectOne",
+                            "preLabel": "Type of survey"
                           }
                         ]
                       },
                       {
                         "type": "col",
-                        "css": "span3 col-border-right",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "projectBaseline",
-                                "type": "selectOne",
-                                "preLabel": "Which project baseline relates to this survey?"
-                              }
-                            ]
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s relates to this survey?"
                           }
                         ]
                       },
                       {
                         "type": "col",
-                        "css": "span3 col-border-right",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "datasetSupports",
-                                "type": "select2Many",
-                                "preLabel": "What Dataset supports?"
-                              }
-                            ]
+                            "source": "baselineOrIndicatorSurvey",
+                            "type": "selectOne",
+                            "preLabel": "Baseline survey or indicator (follow-up) survey?"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "source": "surveyObjective",
+                        "preLabel": "Survey objective",
+                        "type": "text"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "repeat",
+                    "source": "waterQualityDataSets",
+                    "userAddedRows": true,
+                    "addRowText": "New data set",
+                    "removeRowText": "Delete this data set",
+                    "items": [
+                      {
+                        "type": "row",
+                        "css": "border-bottom",
                         "items": [
                           {
-                            "type": "row",
+                            "type": "col",
                             "items": [
                               {
-                                "source": "relatedOutcomes",
+                                "source": "dataSetId",
                                 "type": "selectOne",
-                                "preLabel": "Which outcome statement/s relates to this survey?"
+                                "preLabel": "Please select the data set produced by this survey.  Note it must have already been entered on the Data Set Summary tab."
                               }
                             ]
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Activities start date",
-                                "source": "activitiesStartDate",
-                                "type": "date"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "projectBaselines",
+                                    "type": "selectMany",
+                                    "preLabel": "Which project baseline/s relate to this survey?",
+                                    "readonly": "readonly"
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
+                          },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Activities end date",
-                                "source": "activitiesEndDate",
-                                "type": "date"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "investmentPriorities2",
+                                    "preLabel": "Which investment priority does this activity relate to?",
+                                    "type": "select2Many"
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
+                          },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Sites where water quality surveys were conducted",
-                                "source": "sitesTreated",
-                                "type": "feature"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity start date",
+                                    "source": "activitiesStartDate",
+                                    "type": "date"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "source": "calculatedAreaTreatedHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                },
-                                "readonly": "readonly"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity end date",
+                                    "source": "activitiesEndDate",
+                                    "type": "date"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "source": "calculatedLengthTreatedKm",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                },
-                                "readonly": "readonly"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Sites covered by water quality survey",
+                                    "source": "sitesCoveredForWaterQuality",
+                                    "type": "feature"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedAreaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedLengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Please attach mapping details",
+                                    "source": "extraMappingDetails",
+                                    "type": "document"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Please attach mapping details",
-                                "source": "extraMappingDetails",
-                                "type": "document"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Actual area (ha) / length (km) covered by water quality survey",
+                                    "source": "areaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "lengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Reason for actual being different to mapped amount",
+                                    "source": "mappingNotAlignedReason",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                                    "source": "mappingNotAlignedComments",
+                                    "type": "textarea",
+                                    "rows": 5
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
+                          },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Actual area (ha) covered by water quality surveys",
-                                "source": "areaTreatedHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique",
+                                    "source": "emsaProtocol",
+                                    "type": "selectOne",
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique (if Other)",
+                                    "source": "otherEmsaProtocol",
+                                    "type": "select2Many"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "source": "lengthTreatedKm",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "surveyMethodology",
+                                    "preLabel": "Survey methodology",
+                                    "type": "text"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Reason for actual being different to mapped amount",
-                                "source": "mappingNotAlignedReason",
-                                "type": "selectOne"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "invoicingThisActivity",
+                                    "preLabel": "Are you invoicing for this activity in this reporting period?",
+                                    "type": "selectOne"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "mappingNotAlignedComments",
-                                "type": "textarea",
-                                "rows": 5
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Type of Water Body",
+                                    "source": "waterBodyType",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Type of water body (if Other)",
+                                    "source": "otherWaterBodyType",
+                                    "type": "text"
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
+                          },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "How many surveys will you be invoicing for?",
-                                "source": "numberOfSurveyInvoice",
-                                "type": "number"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "waterSurveyObjective",
+                                    "preLabel": "Survey objective",
+                                    "type": "text"
+                                  }
+                                ]
                               }
                             ]
                           }
                         ]
                       }
                     ]
-                  },
-                  {
-                    "columns": [
-                      {
-                        "width": "15%",
-                        "source": "waterBodyType",
-                        "title": "Type of Water Body",
-                        "type": "selectOne"
-                      },
-                      {
-                        "width": "15%",
-                        "source": "otherWaterBodyType",
-                        "title": "Type of water body (if Other)",
-                        "type": "text"
-                      },
-                      {
-                        "width": "15%",
-                        "title": "Survey technique",
-                        "source": "ternSurveyTechnique",
-                        "type": "selectOne"
-                      },
-                      {
-                        "width": "15%",
-                        "title": "Survey technique (if Other)",
-                        "source": "otherTernSurveyTechnique",
-                        "type": "text"
-                      },
-                      {
-                        "width": "20%",
-                        "source": "surveyMethodology",
-                        "title": "Survey methodology",
-                        "type": "text"
-                      },
-                      {
-                        "width": "20%",
-                        "source": "surveyObjective",
-                        "title": "Survey objective",
-                        "type": "text"
-                      }
-                    ],
-                    "userAddedRows": true,
-                    "disableTableUpload": true,
-                    "source": "waterTypeTable",
-                    "type": "table"
                   }
                 ]
               },
@@ -23400,327 +33877,197 @@
                 "type": "row",
                 "items": [
                   {
-                    "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
-                  },
-                  {
-                    "preLabel": "Data have been uploaded",
-                    "source": "dataUploaded",
-                    "type": "boolean"
-                  }
-                ]
-              },
-              {
-                "type": "row",
-                "items": [
-                  {
-                    "preLabel": "",
-                    "source": "projectAssuranceDetails",
-                    "type": "textarea",
-                    "rows": 4,
-                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
-                  }
-                ]
-              },
-              {
-                "type": "table",
-                "source": "assuranceDocuments",
-                "userAddedRows": true,
-                "disableTableUpload": true,
-                "columns": [
-                  {
-                    "title": "Attached documents",
-                    "source": "attachments",
-                    "type": "document"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      "modelName": null,
-      "templateName": "nhtWaterQualitySurvey",
-      "optional": true,
-      "optionalQuestionText": null,
-      "title": "Water quality survey",
-      "collapsibleHeading": null,
-      "name": "NHT - Water quality survey",
-      "description": null
-    },
-    {
-      "collapsedByDefault": false,
-      "template": {
-        "dataModel": [
-          {
-            "columns": [
-              {
-                "dataType": "text",
-                "name": "baselineOrIndicatorSurvey",
-                "description": "",
-                "constraints": [
-                  "Baseline",
-                  "Indicator"
-                ],
-                "validate": "required"
-              },
-              {
-                "name": "projectBaseline",
-                "dataType": "text",
-                "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "baseline",
-                  "valueProperty": "code",
-                  "type": "pre-populated",
-                  "excludePath": "projectBaseline",
-                  "config": {
-                    "source": {
-                      "context-path": "owner.custom.details.baseline.rows"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "datasetSupports",
-                "dataType": "text",
-                "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "name",
-                  "valueProperty": "dataSetId",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "context-path": "owner.custom.dataSets"
-                    }
-                  }
-                }
-              },
-              {
-                "name": "relatedOutcomes",
-                "dataType": "text",
-                "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                "validate": "required",
-                "constraints": {
-                  "textProperty": "label",
-                  "valueProperty": "label",
-                  "type": "pre-populated",
-                  "config": {
-                    "source": {
-                      "url": "/project/outcomesByScores",
-                      "params": [{
-                        "expression": "owner.projectId",
-                        "name": "id",
-                        "type": "computed"
-                      }, {
-                        "expression": "scores",
-                        "name": "scoreIds",
-                        "type": "computed"
-                      }
-                      ]
-                    }
-                  }
-                }
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesStartDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "dataType": "date",
-                "name": "activitiesEndDate",
-                "description": "Specific the dates these events were held on",
-                "validate": "required"
-              },
-              {
-                "dataType": "feature",
-                "name": "sitesTreated"
-              },
-              {
-                "computed": {
-                  "expression": "$geom.areaHa(sitesTreated)"
-                },
-                "dataType": "number",
-                "name": "calculatedAreaTreatedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "behaviour": [
-                  {
-                    "condition": "areaInvoicedTreatedHa > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The managed area must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
-                  }
-                ]
-              },
-              {
-                "computed": {
-                  "expression": "$geom.lengthKm(sitesTreated)"
-                },
-                "dataType": "number",
-                "name": "calculatedLengthTreatedKm",
-                "units": "km",
-                "decimalPlaces": 3,
-                "behaviour": [
-                  {
-                    "condition": "lengthTreatedKm > 0",
-                    "type": "conditional_validation",
-                    "value": {
-                      "message": "The managed length must be mapped",
-                      "validate": "required,min[0.0001]"
-                    }
-                  }
-                ]
-              },
-              {
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "calculatedAreaTreatedHa"
-                },
-                "dataType": "number",
-                "name": "areaTreatedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": "required,min[0]"
-              },
-              {
-                "dataType": "text",
-                "name": "mappingNotAlignedReason",
-                "constraints": [
-                  "Mapped area simplifies more complex area/s where work was undertaken during this period",
-                  "Other"
-                ],
-                "validate": "required",
-                "behaviour": [
+                    "type": "literal",
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
+                  },
                   {
-                    "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1))",
-                    "type": "visible"
+                    "preLabel": "Data have been uploaded",
+                    "source": "dataUploaded",
+                    "type": "boolean"
                   }
                 ]
               },
               {
-                "dataType": "text",
-                "name": "mappingNotAlignedComments",
-                "validate": "required,maxSize[300]",
-                "behaviour": [
+                "type": "row",
+                "items": [
                   {
-                    "type": "visible",
-                    "condition": "\"Other\" == mappingNotAlignedReason"
+                    "preLabel": "",
+                    "source": "projectAssuranceDetails",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": "List the documentary evidence you have available for this project service. Include specifically, the document titles and location (e.g. internal IT network pathway, URLs) to assist with locating this material for future audits/assurance purposes."
                   }
                 ]
               },
               {
-                "dataType": "document",
-                "name": "extraMappingDetails",
-                "validate": "required",
-                "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
-                "behaviour": [
+                "type": "table",
+                "source": "assuranceDocuments",
+                "userAddedRows": true,
+                "disableTableUpload": true,
+                "columns": [
                   {
-                    "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1)) or roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                    "type": "visible"
+                    "title": "Attached documents",
+                    "source": "attachments",
+                    "type": "document"
                   }
                 ]
-              },
+              }
+            ]
+          }
+        ]
+      },
+      "modelName": null,
+      "templateName": "nhtWaterQualitySurvey",
+      "optional": true,
+      "optionalQuestionText": null,
+      "title": "Water Quality or Hydrology Survey",
+      "collapsibleHeading": null,
+      "name": "NHT - Water quality survey",
+      "description": null
+    },
+    {
+      "collapsedByDefault": false,
+      "template": {
+        "dataModel": [
+          {
+            "name": "weedSurveys",
+            "dataType": "list",
+            "minSize": 1,
+            "columns": [
               {
-                "dataType": "number",
-                "name": "areaInvoicedTreatedHa",
-                "units": "ha",
-                "decimalPlaces": 3,
-                "validate": [
-                  {
-                    "rule": "min[0]"
-                  },
-                  {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "areaTreatedHa"
+                "name": "relatedOutcomes",
+                "dataType": "text",
+                "description": "Select the outcome/s as defined in your MERI plan that this service was delivered to achieve.",
+                "validate": "required",
+                "constraints": {
+                  "textProperty": "label",
+                  "valueProperty": "value",
+                  "type": "pre-populated",
+                  "config": {
+                    "source": {
+                      "context-path": "outcomes"
                     }
                   }
-                ]
+                }
               },
               {
                 "dataType": "text",
-                "name": "invoicedNotActualReason",
+                "name": "baselineOrIndicatorSurvey",
+                "description": "",
                 "constraints": [
-                  "Work was undertaken over a greater area than will be invoiced for",
-                  "Other"
+                  "Baseline",
+                  "Indicator"
                 ],
-                "validate": "required",
-                "behaviour": [
-                  {
-                    "condition": "roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                    "type": "visible"
-                  }
-                ]
+                "validate": "required"
               },
               {
                 "dataType": "text",
-                "name": "invoicedNotActualComments",
-                "behaviour": [
-                  {
-                    "type": "visible",
-                    "condition": "\"Other\" == invoicedNotActualReason"
-                  }
-                ],
-                "validate": "required,maxSize[300]"
+                "name": "surveyObjective",
+                "description": "What the survey aim to capture? How will the information obtained from the survey be used?",
+                "validate": "required,maxSize[3000]"
               },
               {
-                "defaultValue": {
-                  "type": "computed",
-                  "expression": "$geom.lengthKm(sitesTreated)"
-                },
                 "dataType": "number",
-                "name": "lengthTreatedKm",
-                "units": "km",
-                "decimalPlaces": 3,
-                "validate": [
-                  {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)*0.9"
-                    }
-                  },
-                  {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)*1.1"
-                    }
-                  }
-                ]
+                "name": "numberOfSurveys",
+                "validate": "required,min[1],max[1]",
+                "defaultValue": 1,
+                "readonly": true
+              },
+              {
+                "dataType": "number",
+                "name": "numberOfSurveysInvoiced",
+                "validate": "required,min[0]",
+                "defaultValue": 1
               },
-
-
-
               {
+                "dataType": "list",
+                "name": "weedDataSets",
                 "columns": [
                   {
+                    "name": "dataSetId",
+                    "entityType": "au.org.ala.ecodata.DataSetSummary",
                     "dataType": "text",
-                    "name": "baselineOrIndicatorSurvey",
-                    "description": "",
-                    "constraints": [
-                      "Baseline",
-                      "Indicator"
+                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
+                    "validate": "required",
+                    "constraints": {
+                      "textProperty": "name",
+                      "valueProperty": "dataSetId",
+                      "excludePath": "weedSurveys.weedDataSets.dataSetId",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.custom.dataSets"
+                        },
+                        "filter": {
+                          "namespace": "dataSet",
+                          "expression": "dataSet.serviceId == 33 and dataSet.progress == 'finished' and dataSet.alreadyReported == false and baselineOrIndicatorSurvey == baselineIndicatorMapping.lookupValue(dataSet.type) and deepEquals(relatedOutcomes,dataSet.outcomesLabel)"
+                        }
+                      }
+                    },
+                    "behaviour": [
+                      {
+                        "type": "pre_populate",
+                        "config": {
+                          "waitForInitialisation": true,
+                          "source": {
+                            "url": "/site/geojson",
+                            "params": [
+                              {
+                                "expression": "x=find(owner.custom.dataSets, \"dataSetId\", dataSetId); x.siteId",
+                                "name": "id",
+                                "type": "computed",
+                                "required": true
+                              }
+                            ]
+                          },
+                          "target":  {
+                            "type": "singleValue",
+                            "name": "sitesCoveredForWeedDistribution"
+                          }
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "columns": [
+                      {
+                        "dataType": "species",
+                        "name": "species",
+                        "validate": "required"
+                      },
+                      {
+                        "dataType": "text",
+                        "name": "threatenedEcologicalCommunity",
+                        "validate": "maxSize[300]"
+                      },
+                      {
+                        "dataType": "number",
+                        "name": "estimatedCoverPercent",
+                        "validate": "required,min[0],max[100]"
+                      },
+                      {
+                        "dataType": "text",
+                        "name": "weedSurveyObjective",
+                        "validate": "maxSize[300],required",
+                        "description": "How will the information from the surveys be used?"
+                      }
                     ],
-                    "validate": "required"
+                    "dataType": "list",
+                    "name": "weedSurveySpeciesTable"
                   },
                   {
-                    "name": "projectBaseline",
-                    "dataType": "text",
+                    "name": "projectBaselines",
+                    "dataType": "stringList",
                     "description": "Select the relevant Project Baseline as listed in the Monitoring Methodology section of the MERI Plan.",
                     "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.baselines"
+                    },
                     "constraints": {
                       "textProperty": "baseline",
                       "valueProperty": "code",
                       "type": "pre-populated",
-                      "excludePath": "projectBaseline",
+                      "excludePath": "projectBaselines",
                       "config": {
                         "source": {
                           "context-path": "owner.custom.details.baseline.rows"
@@ -23729,85 +34076,72 @@
                     }
                   },
                   {
-                    "name": "datasetSupports",
-                    "dataType": "text",
-                    "description": "This section will require the Data Set Name so the Metadata fields in the Data Set Summary tab should be filled out before the Outcome Report is due. More than one dataset if relevant for this Project Baseline could be selected.",
+                    "name": "investmentPriorities2",
+                    "dataType": "stringList",
                     "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.investmentPriorities"
+                    },
                     "constraints": {
-                      "textProperty": "name",
-                      "valueProperty": "dataSetId",
                       "type": "pre-populated",
                       "config": {
                         "source": {
-                          "context-path": "owner.custom.dataSets"
+                          "params": [
+                            {
+                              "expression": "owner.projectId",
+                              "name": "id",
+                              "type": "computed"
+                            }
+                          ],
+                          "url": "/project/listProjectInvestmentPriorities/"
                         }
                       }
                     }
                   },
                   {
-                    "name": "relatedOutcomes",
                     "dataType": "text",
-                    "description": "More than one outcome statement/s if relevant for this Project Baseline could be selected.",
-                    "validate": "required",
-                    "constraints": {
-                      "textProperty": "label",
-                      "valueProperty": "label",
-                      "type": "pre-populated",
-                      "config": {
-                        "source": {
-                          "url": "/project/outcomesByScores",
-                          "params": [{
-                            "expression": "owner.projectId",
-                            "name": "id",
-                            "type": "computed"
-                          }, {
-                            "expression": "scores",
-                            "name": "scoreIds",
-                            "type": "computed"
-                          }
-                          ]
-                        }
+                    "name": "otherInvestmentPriority",
+                    "behaviour": [
+                      {
+                        "type": "enable",
+                        "condition": "\"Other\" in investmentPriorities2"
                       }
-                    }
+                    ]
                   },
                   {
                     "dataType": "date",
                     "name": "activitiesStartDate",
-                    "description": "Specific the dates these events were held on",
-                    "validate": "required"
+                    "description": "Specific the dates these events were held on.",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.startDate"
+                    }
                   },
                   {
                     "dataType": "date",
                     "name": "activitiesEndDate",
-                    "description": "Specific the dates these events were held on",
-                    "validate": "required"
+                    "description": "Specific the dates these events were held on.",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.endDate"
+                    }
                   },
                   {
                     "dataType": "feature",
-                    "name": "sitesTreated"
+                    "name": "sitesCoveredForWeedDistribution",
+                    "description": "Mapping field to be done and Area (ha)/length (km) field be auto-calculated from mapping."
                   },
                   {
                     "computed": {
-                      "expression": "$geom.areaHa(sitesTreated)"
+                      "expression": "$geom.areaHa(sitesCoveredForWeedDistribution)"
                     },
                     "dataType": "number",
                     "name": "calculatedAreaTreatedHa",
                     "units": "ha",
-                    "decimalPlaces": 3,
-                    "behaviour": [
-                      {
-                        "condition": "areaInvoicedTreatedHa > 0",
-                        "type": "conditional_validation",
-                        "value": {
-                          "message": "The managed area must be mapped",
-                          "validate": "required,min[0.0001]"
-                        }
-                      }
-                    ]
+                    "decimalPlaces": 3
                   },
                   {
                     "computed": {
-                      "expression": "$geom.lengthKm(sitesTreated)"
+                      "expression": "$geom.lengthKm(sitesCoveredForWeedDistribution)"
                     },
                     "dataType": "number",
                     "name": "calculatedLengthTreatedKm",
@@ -23831,6 +34165,7 @@
                     },
                     "dataType": "number",
                     "name": "areaTreatedHa",
+                    "description": "Manually enter correct figure for this reporting period if different to mapped value.",
                     "units": "ha",
                     "decimalPlaces": 3,
                     "validate": "required,min[0]"
@@ -23845,15 +34180,15 @@
                     "validate": "required",
                     "behaviour": [
                       {
-                        "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1))",
-                        "type": "visible"
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
                       }
                     ]
                   },
                   {
                     "dataType": "text",
                     "name": "mappingNotAlignedComments",
-                    "validate": "required,maxSize[300]",
+                    "validate": "required,maxSize[100]",
                     "behaviour": [
                       {
                         "type": "visible",
@@ -23868,174 +34203,261 @@
                     "description": "Please fill in the Mapped/Actual/Invoice fields before attaching a document here. If those fields match this field will be void. <br/>If any of these fields differ please attach your organisation's detailed map for the area, covered by this project service - during reporting period (include the scale measure for each map).",
                     "behaviour": [
                       {
-                        "condition": "not (within(calculatedAreaTreatedHa, areaTreatedHa, 0.1)) or roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                        "type": "visible"
-                      }
-                    ]
-                  },
-                  {
-                    "dataType": "number",
-                    "name": "areaInvoicedTreatedHa",
-                    "units": "ha",
-                    "decimalPlaces": 3,
-                    "validate": [
-                      {
-                        "rule": "min[0]"
-                      },
-                      {
-                        "rule": "max",
-                        "param": {
-                          "type": "computed",
-                          "expression": "areaTreatedHa"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "invoicedNotActualReason",
-                    "constraints": [
-                      "Work was undertaken over a greater area than will be invoiced for",
-                      "Other"
-                    ],
-                    "validate": "required",
-                    "behaviour": [
-                      {
-                        "condition": "roundTo(areaTreatedHa, 2) != roundTo(areaInvoicedTreatedHa, 2)",
-                        "type": "visible"
-                      }
-                    ]
-                  },
-                  {
-                    "dataType": "text",
-                    "name": "invoicedNotActualComments",
-                    "behaviour": [
-                      {
-                        "type": "visible",
-                        "condition": "\"Other\" == invoicedNotActualReason"
+                        "condition": "not (within(areaTreatedHa, calculatedAreaTreatedHa, 0.1) and within(lengthTreatedKm, calculatedLengthTreatedKm, 0.1))",
+                        "type": "if"
                       }
-                    ],
-                    "validate": "required,maxSize[300]"
+                    ]
                   },
                   {
                     "defaultValue": {
                       "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTreated)"
+                      "expression": "$geom.lengthKm(sitesCoveredForWeedDistribution)"
                     },
                     "dataType": "number",
                     "name": "lengthTreatedKm",
                     "units": "km",
-                    "decimalPlaces": 3,
-                    "validate": [
-                      {
-                        "rule": "min",
-                        "param": {
-                          "type": "computed",
-                          "expression": "$geom.lengthKm(sitesTreated)*0.9"
-                        }
-                      },
-                      {
-                        "rule": "max",
-                        "param": {
-                          "type": "computed",
-                          "expression": "$geom.lengthKm(sitesTreated)*1.1"
+                    "decimalPlaces": 3
+                  },
+                  {
+                    "dataType": "text",
+                    "description": "Select the technique used to conduct the survey. If the EMSA Application tool was not used, you should select 'Other'.",
+                    "name": "emsaProtocol",
+                    "validate": "required",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.protocol"
+                    },
+                    "constraints": {
+                      "textProperty": "label",
+                      "valueProperty": "value",
+                      "type": "pre-populated",
+                      "config": {
+                        "source": {
+                          "context-path": "owner.protocols"
                         }
                       }
-                    ]
+                    }
+                  },
+                  {
+                    "dataType": "stringList",
+                    "description": "Describe the technique (if Other) was selected.",
+                    "name": "otherEmsaProtocol",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methods"
+                    }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "surveyMethodology",
+                    "description": "Provide more details on what is being done.",
+                    "validate": "required,maxSize[3000]",
+                    "computed": {
+                      "expression": "x=find($context.owner.custom.dataSets, \"dataSetId\", dataSetId); x.methodDescription"
+                    }
+                  },
+                  {
+                    "dataType": "text",
+                    "name": "invoicingThisActivity",
+                    "constraints": [
+                      "Yes",
+                      "No"
+                    ],
+                    "validate": "required"
                   }
                 ],
-                "dataType": "list",
-                "name": "surveyBaselineTable"
+                "minSize": 1
+              }
+            ]
+          },
+          {
+            "dataType": "lookupTable",
+            "name": "baselineIndicatorMapping",
+            "config": {
+              "source": {
+                "literal": {
+                  "Baseline dataset associated with a project outcome": "Baseline",
+                  "Project progress dataset that is tracking change against an established project baseline dataset": "Indicator"
+                }
+              }
+            }
+          },
+          {
+            "allowRowDelete": "false",
+            "columns": [
+              {
+                "dataType": "text",
+                "name": "participationIndividualsOrGroups",
+                "description": "Once Individuals or groups is selected, the related number field in the next two columns will become editable to report.",
+                "constraints": [
+                  "Individuals",
+                  "Groups"
+                ],
+                "validate": "required"
               },
               {
                 "dataType": "number",
-                "name": "numberOfSurveyInvoice",
+                "name": "participationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
                 "validate": "required,min[0]"
+              },
+              {
+                "dataType": "text",
+                "name": "participationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ]
+              },
+              {
+                "dataType": "number",
+                "name": "firstNationIndividualNumber",
+                "defaultValue": 0,
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Individuals\"",
+                    "type": "enable"
+                  }
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "rule": "min[0]"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationIndividualNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "firstNationGroupNumber",
+                "behaviour": [
+                  {
+                    "condition": "participationIndividualsOrGroups == \"Groups\"",
+                    "type": "enable"
+                  }
+                ],
+                "constraints": [
+                  "0",
+                  "1-10",
+                  "11-20",
+                  "21-30",
+                  "31-40",
+                  "41-50"
+                ],
+                "validate": [
+                  {
+                    "rule": "required"
+                  },
+                  {
+                    "param": {
+                      "expression": "participationGroupNumber",
+                      "type": "computed"
+                    },
+                    "rule": "max",
+                    "message": "The number of first nation participants cannot be greater than the total number of participants"
+                  }
+                ]
+              },
+              {
+                "dataType": "text",
+                "name": "participationDetails",
+                "validate": "required, maxSize[3000]"
               }
             ],
             "dataType": "list",
-            "name": "weedDistSurveys",
-            "minSize": 1
+            "name": "participationInformationTableWds"
           },
           {
-            "dataType": "text",
-            "name": "participationIndividualsOrGroups",
-            "constraints": [
-              "Individuals",
-              "Groups"
-            ],
-            "validate": "required"
+            "dataType": "number",
+            "name": "totalSurveyBaseline",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(weedSurveys, \"baselineOrIndicatorSurvey == 'Baseline' ? 1 : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "participationIndividualNumber",
-            "behaviour": [
+            "name": "totalSurveyBaselineInvoiced",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyBaseline",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "validate": "required,min[0]"
+            "defaultValue": ""
           },
           {
-            "dataType": "text",
-            "name": "participationGroupNumber",
-            "behaviour": [
-              {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
-                "type": "enable"
-              }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
+            "dataType": "number",
+            "name": "totalSurveyIndicator",
+            "validate": "min[0]",
+            "decimalPlaces": 0,
+            "computed": {
+              "expression": "sum(weedSurveys, \"baselineOrIndicatorSurvey == 'Indicator' ? 1 : 0\")"
+            }
           },
           {
             "dataType": "number",
-            "name": "firstNationIndividualNumber",
-            "behaviour": [
+            "name": "totalSurveyIndicatorInvoiced",
+            "validate": [
               {
-                "condition": "participationIndividualsOrGroups == \"Individuals\"",
-                "type": "enable"
+                "rule": "required"
+              },
+              {
+                "rule": "min[0]"
+              },
+              {
+                "param": {
+                  "expression": "totalSurveyIndicator",
+                  "type": "computed"
+                },
+                "rule": "max"
               }
             ],
-            "validate": "required,min[0]"
+            "defaultValue": ""
           },
           {
             "dataType": "text",
-            "name": "firstNationGroupNumber",
+            "name": "totalInvoicedWeedMismatched",
+            "description": "Please provide the reason/s why you are not invoicing for the same number that have been completed and delivered, e.g. the personnel and equipment were available to deliver more than was contracted.",
+            "validate": "maxSize[400],required",
             "behaviour": [
               {
-                "condition": "participationIndividualsOrGroups == \"Groups\"",
+                "condition": "+totalSurveyIndicatorInvoiced < +totalSurveyIndicator or +totalSurveyBaselineInvoiced < +totalSurveyBaseline",
                 "type": "enable"
               }
-            ],
-            "constraints": [
-              "1-10",
-              "11-20",
-              "21-30",
-              "31-40",
-              "41-50"
-            ],
-            "validate": "required"
-          },
-          {
-            "dataType": "text",
-            "name": "participationDetails",
-            "validate": "maxSize[3000]"
-          },
-          {
-            "name": "numberWeedDistributionSurveysConducted",
-            "type": "number",
-            "decimalPlaces": 0,
-            "computed": {
-              "expression": "count(weedDistSurveys, \"baselineOrIndicatorSurvey\")"
-            }
+            ]
           },
           {
             "dataType": "text",
@@ -24054,7 +34476,8 @@
           {
             "dataType": "text",
             "name": "projectAssuranceDetails",
-            "description": ""
+            "description": "",
+            "validate": "required,maxSize[5000]"
           },
           {
             "dataType": "list",
@@ -24063,29 +34486,40 @@
               {
                 "dataType": "document",
                 "name": "attachments",
-                "description": "Please attach any Evidence of Service Delivery here"
+                "description": "Please attach any Evidence of Service Delivery here."
               }
             ]
           }
         ],
         "modelName": "NHT - Weed distribution survey",
-        "title": "Weed distribution survey",
+        "title": "Weed Distribution Survey",
         "viewModel": [
           {
             "type": "section",
             "items": [
               {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Participation information</h3>"
+                  }
+                ]
+              },
+              {
+                "disableTableUpload": true,
                 "columns": [
                   {
                     "width": "10%",
                     "source": "participationIndividualsOrGroups",
-                    "title": "Individuals or groups?",
+                    "title": "Are individuals or groups delivering this service?",
                     "type": "selectOne"
                   },
                   {
                     "width": "20%",
                     "type": "col",
-                    "title": "Total Number of people delivering this service",
+                    "title": "Total number of people delivering this service <br>(including First Nations people)<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                     "items": [
                       {
                         "source": "participationIndividualNumber",
@@ -24100,7 +34534,8 @@
                   {
                     "type": "col",
                     "width": "20%",
-                    "title": "Total Number of First Nations people delivering this service ",
+                    "title": "Total number of First Nations people delivering this service<b style=\"color:red\">*</b>",
+                    "helpText": "Please record either the total number of individuals or the number of individuals in the group that delivered this service. If you have a mix of Individuals and groups, you should report them separately by adding a row.",
                     "items": [
                       {
                         "source": "firstNationIndividualNumber",
@@ -24113,373 +34548,435 @@
                     ]
                   },
                   {
+                    "width": "20%",
                     "source": "participationDetails",
                     "rows": 4,
-                    "title": "If no First Nations people participated in the delivery of this service, what are the reasons?<br> If there was participation, please provide details.",
+                    "title": "If no First Nations people participated in the delivery of this service, <br>what are the reasons? If there was participation, please provide details.",
+                    "helpText": "If there were no First Nations people participating in the delivery of this service, please explain the reasons. If there were First Nations people involved, please outline how they were involved.",
                     "type": "textarea"
                   }
-                ],
-                "userAddedRows": false,
-                "disableTableUpload": false,
-                "source": "",
-                "type": "table"
+                ],
+                "source": "participationInformationTableWds",
+                "type": "table"
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Survey information</h3><p><b>Before completing this section, please ensure you have created a Data Set Summary information for every data set produced by the surveys you intend to report</b></p><ul><li>Each survey reported must relate to a combination of outcomes as described in your MERI plan</li><li>Each Data Set Summary recorded for a survey must be addressing the same outcomes as selected for the survey</li><li>If a survey produced more than one data set, use the New Data Set button to add each Data Set Summary under your survey</li><li>A single survey can be made up of multiple dataset</li></ul>"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "literal",
+                    "source": "<h3>Totals Summary</h3>"
+                  }
+                ]
+              },
+              {
+                "type": "row",
+                "items": [
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(i) Total Number of baseline weed distribution surveys completed for this reporting period",
+                            "source": "totalSurveyBaseline",
+                            "type": "number"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(ii) Total Number of baseline weed distribution surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyBaselineInvoiced",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  },
+                  {
+                    "type": "col",
+                    "css": "span4 col-border-right",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iii)  Total Number of  indicator weed distribution surveys completed for this reporting period",
+                            "source": "totalSurveyIndicator",
+                            "type": "number"
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "preLabel": "(iv) Total Number of indicator weed distribution surveys <u><i>invoiced</i></u> for this reporting period",
+                            "source": "totalSurveyIndicatorInvoiced",
+                            "type": "number"
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                ]
               },
               {
-                "preLabel": "Number of Weed Distribution surveys conducted:",
-                "noEdit": true,
-                "type": "number",
-                "source": "numberWeedDistributionSurveysConducted"
+                "type": "row",
+                "items": [
+                  {
+                    "preLabel": "If the total invoiced is different to the total completed, please provide the reason",
+                    "source": "totalInvoicedWeedMismatched",
+                    "type": "textarea",
+                    "rows": 4,
+                    "placeholder": ""
+                  }
+                ]
               },
               {
-                "addRowText": "New survey site",
+                "addRowText": "Add survey",
+                "removeRowText": "Delete this survey",
                 "userAddedRows": true,
-                "source": "weedDistSurveys",
+                "source": "weedSurveys",
                 "type": "repeat",
                 "items": [
                   {
                     "type": "row",
-                    "css": "border-bottom",
                     "items": [
                       {
                         "type": "col",
-                        "css": "span3 col-border-right",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "baselineOrIndicatorSurvey",
-                                "type": "selectOne",
-                                "preLabel": "Baseline survey or indicator (follow-up) survey?"
-                              }
-                            ]
+                            "source": "relatedOutcomes",
+                            "type": "selectOne",
+                            "preLabel": "Which outcome statement/s relates to this survey?"
                           }
                         ]
                       },
                       {
                         "type": "col",
-                        "css": "span3 col-border-right",
                         "items": [
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "projectBaseline",
-                                "type": "selectOne",
-                                "preLabel": "Which project baseline relates to this survey?"
-                              }
-                            ]
+                            "source": "baselineOrIndicatorSurvey",
+                            "type": "selectOne",
+                            "preLabel": "Baseline survey or indicator (follow-up) survey?"
                           }
                         ]
-                      },
+                      }
+                    ]
+                  },
+                  {
+                    "type": "row",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "source": "datasetSupports",
-                                "type": "select2Many",
-                                "preLabel": "What dataset supports this?"
-                              }
-                            ]
-                          }
-                        ]
-                      },
+                        "source": "surveyObjective",
+                        "preLabel": "Survey objective",
+                        "type": "text"
+                      }
+                    ]
+                  },
+                  {
+                    "type": "repeat",
+                    "source": "weedDataSets",
+                    "userAddedRows": true,
+                    "addRowText": "New data set",
+                    "removeRowText": "Delete this data set",
+                    "items": [
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
+                        "css": "border-bottom",
                         "items": [
                           {
-                            "type": "row",
+                            "type": "col",
                             "items": [
                               {
-                                "source": "relatedOutcomes",
+                                "source": "dataSetId",
                                 "type": "selectOne",
-                                "preLabel": "Which outcome statement/s relates to this survey?"
-                              }
-                            ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
-                          {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Activities start date",
-                                "source": "activitiesStartDate",
-                                "type": "date"
+                                "preLabel": "Please select the data set produced by this survey.  Note it must have already been entered on the Data Set Summary tab."
                               }
                             ]
                           }
                         ]
                       },
                       {
-                        "type": "col",
-                        "css": "span3 col-border-right",
+                        "type": "row",
                         "items": [
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Activities end date",
-                                "source": "activitiesEndDate",
-                                "type": "date"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "projectBaselines",
+                                    "type": "selectMany",
+                                    "preLabel": "Which project baseline/s relate to this survey?",
+                                    "readonly": "readonly"
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
+                          },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Sites surveyed for weed distribution",
-                                "source": "sitesTreated",
-                                "type": "feature"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "investmentPriorities2",
+                                    "preLabel": "Which investment priority does this activity relate to?",
+                                    "type": "select2Many"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "source": "calculatedAreaTreatedHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                },
-                                "readonly": "readonly"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity start date",
+                                    "source": "activitiesStartDate",
+                                    "type": "date"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "source": "calculatedLengthTreatedKm",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                },
-                                "readonly": "readonly"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Activity end date",
+                                    "source": "activitiesEndDate",
+                                    "type": "date"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Please attach mapping details",
-                                "source": "extraMappingDetails",
-                                "type": "document"
-                              }
-                            ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
-                          {
-                            "type": "row",
-                            "items": [
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Sites covered by weed distribution survey",
+                                    "source": "sitesCoveredForWeedDistribution",
+                                    "type": "feature"
+                                  }
+                                ]
+                              },
                               {
-                                "preLabel": "Actual area (ha) / length (km) surveyed for weed distribution",
-                                "source": "areaTreatedHa",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
-                              }
-                            ]
-                          },
-                          {
-                            "type": "row",
-                            "items": [
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedAreaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
                               {
-                                "source": "lengthTreatedKm",
-                                "type": "number",
-                                "displayOptions": {
-                                  "displayUnits": true
-                                }
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "calculatedLengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    },
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Please attach mapping details",
+                                    "source": "extraMappingDetails",
+                                    "type": "document"
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Reason for actual being different to mapped amount",
-                                "source": "mappingNotAlignedReason",
-                                "type": "selectOne"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Actual area (ha) / length (km) covered by weed distribution survey",
+                                    "source": "areaTreatedHa",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "lengthTreatedKm",
+                                    "type": "number",
+                                    "displayOptions": {
+                                      "displayUnits": true
+                                    }
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Reason for actual being different to mapped amount",
+                                    "source": "mappingNotAlignedReason",
+                                    "type": "selectOne"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
+                                    "source": "mappingNotAlignedComments",
+                                    "type": "textarea",
+                                    "rows": 5
+                                  }
+                                ]
                               }
                             ]
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "mappingNotAlignedComments",
-                                "type": "textarea",
-                                "rows": 5
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique",
+                                    "source": "emsaProtocol",
+                                    "type": "selectOne",
+                                    "readonly": "readonly"
+                                  }
+                                ]
+                              },
+                              {
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "preLabel": "Survey technique (if Other)",
+                                    "source": "otherEmsaProtocol",
+                                    "type": "select2Many"
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      },
-                      {
-                        "type": "col",
-                        "css": "span3 col-border-right",
-                        "items": [
+                          },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "How many surveys will you be invoicing for?",
-                                "source": "numberOfSurveyInvoice",
-                                "type": "number"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "surveyMethodology",
+                                    "preLabel": "Survey methodology",
+                                    "type": "text"
+                                  }
+                                ]
                               }
                             ]
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  {
-                    "columns": [
-                      {
-                        "source": "baselineOrIndicatorSurvey",
-                        "type": "selectOne",
-                        "width": "10%",
-                        "title": "Baseline survey or indicator (follow-up) survey?"
-                      },
-                      {
-                        "source": "projectBaseline",
-                        "type": "selectOne",
-                        "width": "10%",
-                        "title": "Which project baseline relates to this survey?"
-                      },
-                      {
-                        "source": "datasetSupports",
-                        "type": "select2Many",
-                        "width": "15%",
-                        "title": "What dataset supports?"
-                      },
-                      {
-                        "source": "relatedOutcomes",
-                        "type": "selectOne",
-                        "width": "15%",
-                        "title": "Which outcome statement/s relates to this survey?"
-                      },
-                      {
-                        "title": "Activities start date",
-                        "source": "activitiesStartDate",
-                        "type": "date",
-                        "width": "10%"
-                      },
-                      {
-                        "title": "Activities end date",
-                        "source": "activitiesEndDate",
-                        "type": "date",
-                        "width": "10%"
-                      },
-                      {
-                        "width": "10%",
-                        "title": "Sites surveyed for Weed Distribution",
-                        "type": "col",
-                        "items": [
-                          {
-                            "source": "sitesTreated",
-                            "type": "feature"
-                          },
-                          {
-                            "source": "calculatedAreaTreatedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            },
-                            "readonly": "readonly"
-                          },
-                          {
-                            "source": "calculatedLengthTreatedKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            },
-                            "readonly": "readonly"
                           },
                           {
-                            "type": "row",
+                            "type": "col",
+                            "css": "span3 col-border-right",
                             "items": [
                               {
-                                "preLabel": "Please attach mapping details",
-                                "source": "extraMappingDetails",
-                                "type": "document"
+                                "type": "row",
+                                "items": [
+                                  {
+                                    "source": "invoicingThisActivity",
+                                    "preLabel": "Are you invoicing for this activity in this reporting period?",
+                                    "type": "selectOne"
+                                  }
+                                ]
                               }
                             ]
                           }
                         ]
                       },
                       {
-                        "width": "20%",
-                        "type": "col",
-                        "title": "Actual area (ha) surveyed for Weed Distribution",
-                        "helpText": "Enter the amount you will invoice for during this reporting period.",
-                        "items": [
+                        "columns": [
                           {
-                            "source": "areaTreatedHa",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
+                            "width": "40%",
+                            "source": "species",
+                            "title": "Target species recorded",
+                            "type": "speciesSelect"
                           },
                           {
-                            "source": "lengthTreatedKm",
-                            "type": "number",
-                            "displayOptions": {
-                              "displayUnits": true
-                            }
+                            "width": "10%",
+                            "source": "estimatedCoverPercent",
+                            "title": "Estimated weed cover (%)",
+                            "type": "number"
                           },
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "preLabel": "Reason for actual being different to mapped amount",
-                                "source": "mappingNotAlignedReason",
-                                "type": "selectOne"
-                              }
-                            ]
+                            "width": "25%",
+                            "source": "threatenedEcologicalCommunity",
+                            "title": "Threatened ecological communities (if applicable)",
+                            "type": "text"
                           },
                           {
-                            "type": "row",
-                            "items": [
-                              {
-                                "placeholder": "Please enter the reason/s the mapping didn't align with the invoiced amount",
-                                "source": "mappingNotAlignedComments",
-                                "type": "textarea",
-                                "rows": 5
-                              }
-                            ]
+                            "width": "25%",
+                            "source": "weedSurveyObjective",
+                            "title": "Survey Objective",
+                            "type": "text"
                           }
-                        ]
+                        ],
+                        "userAddedRows": true,
+                        "disableTableUpload": true,
+                        "source": "weedSurveySpeciesTable",
+                        "type": "table"
                       }
-                    ],
-                    "userAddedRows": true,
-                    "source": "surveyBaselineTable",
-                    "type": "table"
+                    ]
                   }
                 ]
               },
@@ -24511,7 +35008,7 @@
                 "items": [
                   {
                     "type": "literal",
-                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements."
+                    "source": "<p><b>Available Evidence</b></p>This field is mandatory for all projects as part of the invoicing process. Please list evidence you have retained for this service and provide information to where the evidence is stored (links/file location data). Refer to the Project Service Evidence Guide and the Project Service Summaries for information on the evidence requirements.<b style=\"color:red\">*</b>"
                   },
                   {
                     "preLabel": "Data have been uploaded",
diff --git a/forms/other/regionalCapacityServicesReport.json b/forms/other/regionalCapacityServicesReport.json
index f75056e7e..1220ffc38 100644
--- a/forms/other/regionalCapacityServicesReport.json
+++ b/forms/other/regionalCapacityServicesReport.json
@@ -10,7 +10,6 @@
       "templateName": "regionalCapacityServicesReport",
       "template": {
         "dataModel": [
-
           {
             "name": "governanceAndFinancialFrameworksOnTrack",
             "dataType": "text",
@@ -33,7 +32,7 @@
           },
           {
             "name": "whsUndergoneReview",
-            "description":"Service Providers shall review the organisation's WHS management system (Manual/plan or policy) at planned intervals (not exceeding 3 years) to ensure its continuing suitability, adequacy, and effectiveness. Trigger to warrant a review may include:<ul><li>Change in Executive Staff</li><li>Changes in Legislation</li><li>As a result of an incident or event</li><li>As a result of an internal or external audit or assurance activity.</li></ul>",
+            "description": "Service Providers shall review the organisation's WHS management system (Manual/plan or policy) at planned intervals (not exceeding 3 years) to ensure its continuing suitability, adequacy, and effectiveness. Trigger to warrant a review may include:<ul><li>Change in Executive Staff</li><li>Changes in Legislation</li><li>As a result of an incident or event</li><li>As a result of an internal or external audit or assurance activity.</li></ul>",
             "dataType": "text",
             "validate": "required",
             "constraints": [
@@ -79,7 +78,7 @@
           },
           {
             "name": "whsIncidentsOccured",
-            "description":"A WHS Notifiable incident is defined within Work Health and Safety Act (Cth) 2011 Part 3 – Incident Notification.<br>Refer to Deed of Standing offer clause 42 Work Health and Safety for further information on these requirements.",
+            "description": "A WHS Notifiable incident is defined within Work Health and Safety Act (Cth) 2011 Part 3 – Incident Notification.<br>Refer to Deed of Standing offer clause 42 Work Health and Safety for further information on these requirements.",
             "dataType": "text",
             "validate": "required",
             "constraints": [
@@ -189,15 +188,15 @@
           {
             "columns": [
               {
-              "name": "workshopEventType",
-              "dataType": "text",
+                "name": "workshopEventType",
+                "dataType": "text",
                 "validate": "required,maxSize[500]",
-              "behaviour": [
-                {
-                  "type": "enable_and_clear",
-                  "condition": "communityConductWorkshops == \"Yes\""
-                }
-              ]
+                "behaviour": [
+                  {
+                    "type": "enable_and_clear",
+                    "condition": "communityConductWorkshops == \"Yes\""
+                  }
+                ]
               },
               {
                 "name": "workshopTitle",
@@ -266,7 +265,7 @@
                 "behaviour": [
                   {
                     "type": "enable_and_clear",
-                    "condition": "communityConductWorkshops == \"Yes\""
+                    "condition": "supportCommunityWorkshops == \"Yes\""
                   }
                 ]
               },
@@ -277,7 +276,7 @@
                 "behaviour": [
                   {
                     "type": "enable_and_clear",
-                    "condition": "communityConductWorkshops == \"Yes\""
+                    "condition": "supportCommunityWorkshops == \"Yes\""
                   }
                 ]
               },
@@ -288,7 +287,7 @@
                 "behaviour": [
                   {
                     "type": "enable_and_clear",
-                    "condition": "communityConductWorkshops == \"Yes\""
+                    "condition": "supportCommunityWorkshops == \"Yes\""
                   }
                 ]
               }
@@ -317,7 +316,6 @@
               }
             ]
           },
-
           {
             "name": "communicationMaterialPublished",
             "dataType": "text",
@@ -349,7 +347,6 @@
         "modelName": "Regional capacity services - reporting",
         "title": "Regional capacity services - reporting",
         "viewModel": [
-
           {
             "type": "row",
             "items": [
@@ -511,7 +508,7 @@
             "type": "row",
             "items": [
               {
-                "preLabel": "Q5b. Please confirm that you have reported via the IPPRS this period, and this report has been uploaded to the documents tab in MERIT.",
+                "preLabel": "Q5b. Please confirm that you have reported via the IPPRS this period, and this report has been attached.",
                 "source": "reportedToIpprs",
                 "type": "boolean"
               }
@@ -523,7 +520,7 @@
               {
                 "type": "document",
                 "source": "ipprsReport",
-                "preLabel": "Please attach the document here"
+                "preLabel": "Please attach the document here."
               }
             ]
           },
diff --git a/forms/rlp/rlpOutputReport.json b/forms/rlp/rlpOutputReport.json
index e3c709d42..3cba6cb23 100644
--- a/forms/rlp/rlpOutputReport.json
+++ b/forms/rlp/rlpOutputReport.json
@@ -13091,53 +13091,65 @@
                 "name": "sitesTested"
               },
               {
-                "defaultValue": {
-                  "type": "computed",
+                "computed": {
                   "expression": "$geom.areaHa(sitesTested)"
                 },
                 "dataType": "number",
                 "name": "areaTestedHa",
-                "validate": [
-                  {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.areaHa(sitesTested)*0.9"
-                    }
-                  },
+                "units": "ha",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.areaHa(sitesTested)*1.1"
+                    "condition": "areaTestedChangeHa > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "",
+                      "validate": "required,min[0.0001]"
                     }
                   }
                 ]
               },
               {
-                "defaultValue": {
-                  "type": "computed",
+                "computed": {
                   "expression": "$geom.lengthKm(sitesTested)"
                 },
                 "dataType": "number",
                 "name": "lengthTestedKm",
-                "validate": [
-                  {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTested)*0.9"
-                    }
-                  },
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTested)*1.1"
+                    "condition": "lengthTestedChangeKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "",
+                      "validate": "required,min[0.0001]"
                     }
                   }
                 ]
               },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "areaTestedHa"
+                },
+                "dataType": "number",
+                "name": "areaTestedChangeHa",
+                "validate": "min[0]",
+                "decimalPlaces": 3,
+                "units": "ha"
+              },
+              {
+                "defaultValue": {
+                  "type": "computed",
+                  "expression": "lengthTestedKm"
+                },
+                "dataType": "number",
+                "name": "lengthTestedChangeKm",
+                "validate": "min[0]",
+                "decimalPlaces": 3,
+                "units": "km"
+              },
               {
                 "dataType": "text",
                 "name": "testingTechnique",
@@ -13194,11 +13206,6 @@
                     "title": "Initial or follow-up activity?",
                     "type": "selectOne"
                   },
-                  {
-                    "dataType": "text",
-                    "name": "comment",
-                    "validate": "maxSize[1500]"
-                  },
                   {
                     "width": "10%",
                     "source": "numberOfSoilTests",
@@ -13211,23 +13218,74 @@
                     "title": "Date range",
                     "type": "text"
                   },
-                  {
-                    "width": "5%",
-                    "source": "sitesTested",
-                    "type": "feature",
-                    "title": "Project site/s where soil tests were conducted"
-                  },
                   {
                     "width": "10%",
-                    "source": "areaTestedHa",
-                    "type": "number",
-                    "title": "Area (ha) where soil tests were conducted"
+                    "type": "col",
+                    "title": "Project site/s where soil tests were conducted",
+                    "items": [
+                      {
+                        "type": "feature",
+                        "source": "sitesTested"
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "type": "number",
+                            "source": "areaTestedHa",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": true
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "type": "number",
+                            "source": "lengthTestedKm",
+                            "displayOptions": {
+                              "displayUnits": true
+                            },
+                            "readonly": true
+                          }
+                        ]
+                      }
+                    ]
                   },
                   {
-                    "width": "10%",
-                    "source": "lengthTestedKm",
-                    "type": "number",
-                    "title": "Length (km) where soil tests were conducted"
+                    "width": "15%",
+                    "title": "Actual Area (ha) / length (km) where soil tests were conducted",
+                    "helpText": "Manually enter correct figure if different to mapped value.",
+                    "type": "col",
+                    "items": [
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "areaTestedChangeHa",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
+                      },
+                      {
+                        "type": "row",
+                        "items": [
+                          {
+                            "source": "lengthTestedChangeKm",
+                            "type": "number",
+                            "displayOptions": {
+                              "displayUnits": true
+                            }
+                          }
+                        ]
+                      }
+                    ]
                   },
                   {
                     "width": "18%",
diff --git a/gradle.properties b/gradle.properties
index f0774b89f..54451aee0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
-meritVersion=3.0.2
-grailsVersion=5.3.2
+meritVersion=3.1-SNAPSHOT
+grailsVersion=5.3.5
 grailsGradlePluginVersion=5.3.0
 groovyVersion=3.0.11
 gormVersion=7.3.2
diff --git a/grails-app/assets/components/javascript/reportStatus.js b/grails-app/assets/components/javascript/reportStatus.js
new file mode 100644
index 000000000..6e6c0ba25
--- /dev/null
+++ b/grails-app/assets/components/javascript/reportStatus.js
@@ -0,0 +1,28 @@
+ko.components.register('report-status', {
+    viewModel: function (params) {
+        var self = this;
+        self.statusLabel = params.reportStatus;
+        var labelNamespace = 'report.status.';
+        if (params.reportType && params.reportType != '') {
+            labelNamespace += params.reportType + '.';
+        }
+        var status = params.reportStatus || '';
+        $i18nAsync(labelNamespace+status, null, function(value) {
+            self.statusLabel = value || '';
+        });
+        self.badgeClass = '';
+        switch(params.reportStatus) {
+            case PublicationStatus.PUBLISHED:
+                self.badgeClass = 'badge-success';
+                break;
+            case PublicationStatus.SUBMITTED:
+                self.badgeClass = 'badge-warning';
+                break;
+            case PublicationStatus.CANCELLED:
+                self.badgeClass = 'badge-danger';
+            default:
+                self.badgeClass = '';
+        }
+    },
+    template: componentService.getTemplate('report-status')
+});
\ No newline at end of file
diff --git a/grails-app/assets/components/template/report-status.html b/grails-app/assets/components/template/report-status.html
new file mode 100644
index 000000000..80140c69b
--- /dev/null
+++ b/grails-app/assets/components/template/report-status.html
@@ -0,0 +1,3 @@
+<!-- ko if: statusLabel -->
+    <p><span data-bind="class:badgeClass, text:statusLabel" class="badge"></span></p>
+<!-- /ko -->
\ No newline at end of file
diff --git a/grails-app/assets/javascripts/common-bs4.js b/grails-app/assets/javascripts/common-bs4.js
index 0ba5c503e..1da15d2e0 100644
--- a/grails-app/assets/javascripts/common-bs4.js
+++ b/grails-app/assets/javascripts/common-bs4.js
@@ -18,6 +18,7 @@
 //= require fieldcapture-application
 //= require healthCheck
 //= require knockout-utils
+//= require utils
 //= require knockout-dates
 //= require knockout-custom-bindings
 //= require wmd/wmd.js
@@ -55,3 +56,14 @@ ReportStatus = {
         return status && status.toLowerCase() == this.CANCELLED;
     }
 }
+
+PublicationStatus = {
+    PUBLISHED: 'published',
+    SUBMITTED: 'pendingApproval',
+    UNPUBLISHED: 'unpublished',
+    CANCELLED: 'cancelled',
+
+    isReadOnly: function(status) {
+        return status && status != '' && status != this.UNPUBLISHED;
+    }
+}
diff --git a/grails-app/assets/javascripts/dataSets.js b/grails-app/assets/javascripts/dataSets.js
index 77831ac15..194d6e3ec 100644
--- a/grails-app/assets/javascripts/dataSets.js
+++ b/grails-app/assets/javascripts/dataSets.js
@@ -1,3 +1,5 @@
+
+var MONITOR_APP = 'Monitor';
 /**
  * This view model backs the "Data set summary" tab that is optionally displayed on project
  * pages that support it.
@@ -20,17 +22,44 @@ var DataSetsViewModel =function(dataSets, projectService, config) {
         window.location.href = config.newDataSetUrl;
     };
 
+    /** Only new data sets will have a created date, return true if any of the data sets have one */
+    self.supportsDateColumn = _.find(dataSets, function(dataSet) {
+        return dataSet.dateCreated;
+    });
+    function serviceName(serviceId) {
+        var service = _.find(config.services || [], function(service) {
+            return service.id == serviceId
+        });
+        return (service && service.name);
+    }
+
+    function reportName(reportId) {
+        var report = _.find(config.reports || [], function(report) {
+            return report.reportId == reportId
+        });
+        return (report && report.name);
+    }
+
     /** View model backing for a single row in the data set summary table */
     function DataSetSummary(dataSet) {
 
-        this.editUrl = config.editDataSetUrl + '?dataSetId='+dataSet.dataSetId;
-        this.viewUrl = config.viewDataSetUrl + '?dataSetId='+dataSet.dataSetId;
+        this.editUrl = config.editDataSetUrl + '?dataSetId=' + dataSet.dataSetId;
+        this.viewUrl = config.viewDataSetUrl + '?dataSetId=' + dataSet.dataSetId;
         this.name = dataSet.name;
+        this.createdIn = dataSet.collectionApp === MONITOR_APP ? MONITOR_APP : 'MERIT';
         this.progress = dataSet.progress;
-        this.deleteDataSet = function() {
-            bootbox.confirm("Are you sure?", function(yes) {
+        this.dateCreated = ko.observable(dataSet.dateCreated).extend({simpleDate: false});
+        this.lastUpdated = ko.observable(dataSet.lastUpdated).extend({simpleDate: false});
+        this.service = dataSet.serviceId ? (serviceName(dataSet.serviceId) || 'Unsupported service') : '';
+        this.report = dataSet.reportId ? reportName(dataSet.reportId) : '';
+        this.reportUrl = config.viewReportUrl + '?reportId=' + dataSet.reportId;
+        this.publicationStatus = dataSet.publicationStatus;
+
+        this.readOnly = PublicationStatus.isReadOnly(dataSet.publicationStatus);
+        this.deleteDataSet = function () {
+            bootbox.confirm("Are you sure?", function (yes) {
                 if (yes) {
-                    projectService.deleteDataSet(dataSet.dataSetId).done(function() {
+                    projectService.deleteDataSet(dataSet.dataSetId).done(function () {
                         blockUIWithMessage("Refreshing page...");
                         window.location.href = config.returnToUrl;
                     });
@@ -54,12 +83,11 @@ var DataSetsViewModel =function(dataSets, projectService, config) {
  */
 var DataSetViewModel = function(dataSet, projectService, options) {
     var self = this;
-
     var config = _.defaults({validationContainerSelector:'.validationEngineContainer'}, options);
-    $(config.validationContainerSelector).validationEngine();
-
     dataSet = dataSet || {};
+    self.dateCreated = dataSet.dateCreated;
     self.dataSetId = dataSet.dataSetId;
+    self.surveyId = dataSet.surveyId; // Data set summaries created by a submission from the Monitor app will have a surveyId
     self.name = ko.observable(dataSet.name );
     self.grantId = dataSet.grantId;
     self.projectName = dataSet.projectName;
@@ -78,17 +106,58 @@ var DataSetViewModel = function(dataSet, projectService, options) {
         }
     });
 
+    self.projectBaselines = options.projectBaselines;
     self.type = ko.observable(dataSet.type);
+    self.baselines = ko.observableArray(dataSet.baselines);
+    self.otherDataSetType = ko.observable(dataSet.otherDataSetType);
     self.term = ko.observable(dataSet.term);
-
+    var selectedServiceAndOutcome = _.find(options.projectOutcomes || [], function(outcome) {
+        return outcome.serviceId == dataSet.serviceId && _.isEqual(outcome.outcomes, dataSet.projectOutcomes);
+    });
+    self.serviceAndOutcomes = ko.observable(selectedServiceAndOutcome && selectedServiceAndOutcome.label);
+    self.projectProtocols = config.projectProtocols;
+    self.protocol = ko.observable(dataSet.protocol);
+    self.projectOutcomeList = ko.observableArray(options.projectOutcomes);
+    self.serviceId = ko.computed(function() {
+        var selectedOutcome = _.find(options.projectOutcomes || [], function(serviceAndOutcome) {
+            return serviceAndOutcome.label == self.serviceAndOutcomes();
+        });
+        return selectedOutcome && selectedOutcome.serviceId;
+    });
+    self.projectOutcomes = ko.computed(function() {
+        var selectedOutcome = _.find(options.projectOutcomes || [], function(serviceAndOutcome) {
+            return serviceAndOutcome.label == self.serviceAndOutcomes();
+        });
+        return selectedOutcome && selectedOutcome.outcomes;
+    });
     if (dataSet.measurementTypes && !_.isArray(dataSet.measurementTypes)) {
         dataSet.measurementTypes = [dataSet.measurementTypes];
     }
     self.measurementTypes = ko.observableArray(dataSet.measurementTypes);
     self.methods = ko.observableArray(dataSet.methods);
+
+    /** Applies a standard method description for emsa protocols */
+    function syncMethodDescriptionToProtocol(protocol) {
+        var emsaMethodDescription = 'See EMSA Protocols Manual: https://www.tern.org.au/emsa-protocols-manual';
+        if (protocol && protocol != 'other') {
+            self.methodDescription(emsaMethodDescription);
+        }
+        else if (self.methodDescription() == emsaMethodDescription) {
+            self.methodDescription('');
+        }
+    }
     self.methodDescription = ko.observable(dataSet.methodDescription);
-    self.collectionApp = ko.observable(dataSet.collectionApp);
+    syncMethodDescriptionToProtocol(dataSet.protocol);
+
+    self.protocol.subscribe(function(protocol) {
+        syncMethodDescriptionToProtocol(protocol);
+    });
+
+
+    self.collectionApp = ko.observable();
     self.location = ko.observable(dataSet.location);
+    self.siteId = ko.observable(dataSet.siteId);
+    self.siteUrl = options.viewSiteUrl + '/' + dataSet.siteId;
     self.startDate = ko.observable(dataSet.startDate).extend({simpleDate:false});
     self.endDate = ko.observable(dataSet.endDate).extend({simpleDate:false});
     self.endDate.subscribe(function (endDate) {
@@ -99,18 +168,33 @@ var DataSetViewModel = function(dataSet, projectService, options) {
     });
     self.addition = ko.observable(dataSet.addition);
     self.threatenedSpeciesIndex = ko.observable(dataSet.threatenedSpeciesIndex);
-    self.collectorType = ko.observable(dataSet.collectorType);
-    self.qa = ko.observable(dataSet.qa);
-    self.published = ko.observable(dataSet.published);
-    self.storageType = ko.observable(dataSet.storageType);
+    self.threatenedSpeciesIndexUploadDate = ko.observable(dataSet.threatenedSpeciesIndexUploadDate).extend({simpleDate:false});
     self.publicationUrl = ko.observable(dataSet.publicationUrl);
-    self.format = ko.observable(dataSet.format);
+    self.format = ko.observable();
+    self.collectionApp.subscribe(function(collectionApp) {
+        if (collectionApp == MONITOR_APP) {
+            self.format('Database Table');
+            self.publicationUrl('Biodiversity Data Repository (URL pending)');
+        }
+    });
+    self.collectionApp(dataSet.collectionApp); // Set this after declaration to trigger the subscription above.
+
     if (dataSet.sensitivities && !_.isArray(dataSet.sensitivities)) {
         dataSet.sensitivities = [dataSet.sensitivities];
     }
+
+    self.sizeInKB = ko.observable(dataSet.sizeInKB);
+    self.sizeUnknown = ko.observable(dataSet.sizeUnknown);
+    self.format.subscribe(function(format) {
+        if (!self.sizeInKB()) {
+             if (['Database Table', 'Database View', 'ESRI REST'].indexOf(format) >=0) {
+                 self.sizeUnknown(true);
+             }
+        }
+    });
+    self.format(dataSet.format);
     self.sensitivities = ko.observableArray(dataSet.sensitivities);
-    self.owner = ko.observable(dataSet.owner);
-    self.custodian = ko.observable(dataSet.custodian);
+    self.otherSensitivity = ko.observable(dataSet.otherSensitivity);
     self.progress = ko.observable(dataSet.progress);
     self.markedAsFinished = ko.observable(dataSet.progress === 'finished');
     self.markedAsFinished.subscribe(function (finished) {
@@ -118,11 +202,22 @@ var DataSetViewModel = function(dataSet, projectService, options) {
     });
     self.dataCollectionOngoing = ko.observable(dataSet.dataCollectionOngoing);
     self.dataCollectionOngoing.subscribe(function (dataCollectionOngoing) {
-        self.dataCollectionOngoing(dataCollectionOngoing);
         if(dataCollectionOngoing) {
             $(options.endDateSelector).val(null).trigger('change');
         }
     });
+    self.validateEndDate = function() {
+        if (!self.dataCollectionOngoing()) {
+            if (!self.endDate()) {
+                return 'This field is required';
+            }
+            if (self.endDate() < self.startDate()) {
+                return 'Date must be after '+self.startDate.formattedDate();
+            }
+        }
+    };
+
+    self.isAutoCreated = dataSet.surveyId != null;
 
     self.validate = function() {
         return $(config.validationContainerSelector).validationEngine('validate');
@@ -133,7 +228,7 @@ var DataSetViewModel = function(dataSet, projectService, options) {
 
         if (valid) {
             var dataSet = ko.mapping.toJS(self,
-                {ignore: ['grantId', 'projectName', 'programName', 'validate', 'save', 'cancel', 'investmentOtherSelected']});
+                {ignore: ['grantId', 'projectName', 'programName', 'validate', 'save', 'cancel', 'investmentOtherSelected', 'siteUrl', 'isAutoCreated', 'serviceAndOutcomes', 'projectOutcomeList', 'projectBaselines', 'projectProtocols']});
             projectService.saveDataSet(dataSet).done(function() {
                 // return to project
                 window.location.href = config.returnToUrl;
@@ -147,4 +242,16 @@ var DataSetViewModel = function(dataSet, projectService, options) {
         // return to project
         window.location.href = config.returnToUrl;
     }
+
+    self.uniqueName = function() {
+        var invalidNames = config.invalidNames || [];
+        if (invalidNames.indexOf(self.name()) >= 0) {
+            return "This name is used by another data set.  Please use a unique name";
+        }
+    }
+
+    self.attachValidation = function () {
+        $(config.validationContainerSelector).validationEngine();
+        window.uniqueName = self.uniqueName; // Setup the validation function for the name field.
+    }
 };
diff --git a/grails-app/assets/javascripts/document.js b/grails-app/assets/javascripts/document.js
index 7d1f1af21..1422c4767 100644
--- a/grails-app/assets/javascripts/document.js
+++ b/grails-app/assets/javascripts/document.js
@@ -4,6 +4,8 @@ var DOCUMENT_EMBEDDED_VIDEO = 'embeddedVideo';
 var DOCUMENT_PROJECT_LOGIC = 'projectLogic';
 var DOCUMENT_CONTRACT_ASSURANCE = 'contractAssurance';
 var DOCUMENT_AUDITABLE_OUTPUTS = 'auditableOutputs';
+var DOCUMENT_SUPPORT_AND_OVERHEADS = 'projectSupportAndOverheadsEvidence';
+var DOCUMENT_PROJECT_SERVICE_EVIDENCE = 'projectServiceEvidence'
 
 var documentRoles =
     [
@@ -11,7 +13,9 @@ var documentRoles =
         {id: DOCUMENT_EMBEDDED_VIDEO, name:'Embedded Video', isPublicRole:true},
         {id: DOCUMENT_PROJECT_LOGIC, name: 'Project Logic', isPublicRole:false},
         {id: DOCUMENT_CONTRACT_ASSURANCE, name:'Contract Assurance', isPublicRole:false},
-        {id: DOCUMENT_AUDITABLE_OUTPUTS, name:'Auditable Outputs', isPublicRole:false}
+        {id: DOCUMENT_AUDITABLE_OUTPUTS, name:'Auditable Outputs', isPublicRole:false},
+        {id: DOCUMENT_SUPPORT_AND_OVERHEADS, name:'Project Support & Overheads Evidence', isPublicRole:false},
+        {id: DOCUMENT_PROJECT_SERVICE_EVIDENCE, name:'Project Service Evidence', isPublicRole:false}
         ];
 /**
  * A view model to capture metadata about a document and manage progress / feedback as a file is uploaded.
diff --git a/grails-app/assets/javascripts/enterActivityData.js b/grails-app/assets/javascripts/enterActivityData.js
index a7dc0a078..9fa570071 100644
--- a/grails-app/assets/javascripts/enterActivityData.js
+++ b/grails-app/assets/javascripts/enterActivityData.js
@@ -28,13 +28,14 @@ var Master = function (activityId, config) {
     var activityStorageKey = options.activityStorageKey;
 
     // client models register their name and methods to participate in saving
-    self.register = function (modelInstanceName, getMethod, isDirtyMethod, resetMethod, saveCallback) {
+    self.register = function (modelInstanceName, getMethod, isDirtyMethod, resetMethod, saveCallback, beforeSaveCallback) {
         self.subscribers.push({
             model: modelInstanceName,
             get: getMethod,
             isDirty: isDirtyMethod,
             reset: resetMethod,
-            saveCallback: saveCallback
+            saveCallback: saveCallback,
+            beforeSaveCallback: beforeSaveCallback
         });
         if (ko.isObservable(isDirtyMethod)) {
             isDirtyMethod.subscribe(function() {
@@ -208,9 +209,11 @@ var Master = function (activityId, config) {
             dirtyFlag: ko.simpleDirtyFlag,
             viewRootElementId: 'ko' + options.namespace
         };
+        // This was an observable but it's causing dirty checks to fail when the context changes state.
+        context.lifecycleState = {state:'initialising'};
         var config = _.defaults(options, defaults);
         var viewModel = new config.constructorFunction(output, config.model.dataModel, context, config);
-
+        context.lifecycleState.state = 'modelCreated';
         viewModel.initialise(output.data).done(function () {
 
             // Check for locally saved data for this output - this will happen in the event of a session timeout
@@ -231,7 +234,9 @@ var Master = function (activityId, config) {
             }
 
             // register with the master controller so this model can participate in the save cycle
-            self.register(viewModel, viewModel.modelForSaving, viewModel.dirtyFlag.isDirty, viewModel.dirtyFlag.reset);
+            self.register(viewModel, viewModel.modelForSaving, viewModel.dirtyFlag.isDirty, viewModel.dirtyFlag.reset, null, viewModel.clearDataIfOutputMarkedAsNotCompleted);
+
+            context.lifecycleState.state = 'initialised';
 
         });
     }
@@ -277,6 +282,13 @@ var Master = function (activityId, config) {
             valid = self.validate();
         }
 
+        // Notify each output that a save is about to occur.  This is for clearing data
+        // from sections marked "Output not completed"
+        _.each(self.subscribers, function(obj) {
+            if (_.isFunction(obj.beforeSaveCallback)) {
+                obj.beforeSaveCallback();
+            }
+        });
         var jsData = self.modelAsJS(valid);
 
         if (jsData === undefined) {
diff --git a/grails-app/assets/javascripts/managementUnitReport.js b/grails-app/assets/javascripts/entityReport.js
similarity index 66%
rename from grails-app/assets/javascripts/managementUnitReport.js
rename to grails-app/assets/javascripts/entityReport.js
index 02c9cc771..efe1fbca4 100644
--- a/grails-app/assets/javascripts/managementUnitReport.js
+++ b/grails-app/assets/javascripts/entityReport.js
@@ -1,27 +1,27 @@
-function ManagementUnitReportSelectorViewModel(options) {
+function EntityReportSelectorViewModel(options) {
     var self = this;
     var config = _.defaults(options);
 
     var now = convertToSimpleDate(new Date());
     var d = new Date();
-    d.setFullYear(2018, 6, 1);
+    d.setFullYear(config.fromYear || 2018, config.fromMonth || 6, config.fromDate || 1);
     self.fromDate = ko.observable(d).extend({simpleDate:false});
     self.toDate = ko.observable(now).extend({simpleDate:false});
 
-    self.muReportDownload = function () {
+    self.entityReportDownload = function () {
         var summaryFlag = false;
-        return generateMuReport(summaryFlag)
+        return generateEntityReport(summaryFlag)
     };
 
-    self.muReportDownloadSummary = function() {
+    self.entityReportDownloadSummary = function() {
         var summaryFlag = true;
-        generateMuReport(summaryFlag);
+        generateEntityReport(summaryFlag);
     };
 
-    function generateMuReport(summaryFlag) {
+    function generateEntityReport(summaryFlag) {
         var json = {fromDate:self.fromDate(), toDate:self.toDate(), summaryFlag: summaryFlag}
         return $.ajax({
-            url: config.generateMUReportInPeriodUrl,
+            url: config.generateEntityReportInPeriodUrl,
             type: 'GET',
             data: json,
             dataType:'json',
@@ -33,7 +33,7 @@ function ManagementUnitReportSelectorViewModel(options) {
                 var details = data['details']
                 var message = data['message']
                 var detailsIcon = ' <i class="fa fa-info-circle showDownloadDetailsIcon" data-toggle="collapse" href="#downloadDetails"></i>'
-                var detailsPanel = '<div class="collapse" id="downloadDetails"><a id="muReportDownloadLink" href='+config.generateMUReportInPeriodUrl +'/' + details+'>Try this link, if you cannot get an email confirmation</a></div>'
+                var detailsPanel = '<div class="collapse" id="downloadDetails"><a id="entityReportDownloadLink" href='+config.downloadUrl +'/' + details+'>Try this link, if you cannot get an email confirmation</a></div>'
                 bootbox.alert(message + detailsIcon + detailsPanel)
             }
         }).fail(function() {
diff --git a/grails-app/assets/javascripts/knockout-custom-bindings.js b/grails-app/assets/javascripts/knockout-custom-bindings.js
index df275d240..09f0e494e 100644
--- a/grails-app/assets/javascripts/knockout-custom-bindings.js
+++ b/grails-app/assets/javascripts/knockout-custom-bindings.js
@@ -391,4 +391,548 @@ ko.bindingHandlers['jqueryValidationEngine'] = {
 
     element.setAttribute('data-validation-engine', 'validate[funcCallRequired[globalValidations.'+namespace+']]')
   }
-}
\ No newline at end of file
+}
+
+
+function pad(number, length){
+  var str = "" + number
+  while (str.length < length) {
+    str = '0'+str
+  }
+  return str
+}
+//wrapper for an observable that protects value until committed
+// CG - Changed the way the protected observable works from value doesn't change until commit to
+// value changes as edits are made with rollback.  This was to enable cross field dependencies in a table
+// row - using a temp variable meant observers were not notified of changes until commit.
+ko.protectedObservable = function(initialValue) {
+  //private variables
+  var _current = ko.observable(initialValue);
+  var _committed = initialValue;
+
+  var result = ko.dependentObservable({
+    read: _current,
+    write: function(newValue) {
+      _current(newValue);
+    }
+  });
+
+  //commit the temporary value to our observable, if it is different
+  result.commit = function() {
+    _committed = _current();
+  };
+
+  //notify subscribers to update their value with the original
+  result.reset = function() {
+    _current(_committed);
+  };
+
+  return result;
+};
+
+// This binding allows dates to be displayed as simple text that can be clicked to access
+//  a date picker for in-place editing.
+// A user prompt appears if the model has no value. this can be customised.
+// A calendar icon is added after the bound element as a visual indicator that the date can be edited.
+// A computed 'hasChanged' property provides an observable isDirty flag for external save/revert mechanisms.
+// The 'datepicker' binding is applied to the element to integrate the bootstrap datepicker.
+// NOTE you can use the datepicker binding directly if you have an input as your predefined element.
+ko.bindingHandlers.clickToPickDate = {
+  init: function(element, valueAccessor, allBindingsAccessor, viewModel) {
+    var observable = valueAccessor(),
+        userPrompt = $(element).attr('data-prompt'),
+        prompt = userPrompt || 'Click to edit',
+        icon = $('<i class="icon-calendar open-datepicker" title="Click to change date"></i>');
+
+    observable.originalValue = observable.date();
+    observable.hasChanged = ko.computed(function () {
+      //console.log("original: " + observable.originalValue + " current: " + observable.date());
+      var original = observable.originalValue.getTime();
+      var current = observable.date().getTime();
+      return (original != current) && (!isNaN(original) || !isNaN(current));
+    });
+
+    $(element).parent().append(icon);
+
+    ko.applyBindingsToNode(element, {
+      text: ko.computed(function() {
+        // todo: style default text as grey
+        return ko.utils.unwrapObservable(observable) !== "" ? observable.formattedDate() : prompt;
+      }),
+      datepicker: observable.date
+    });
+  }
+};
+
+/*
+This binding allows text values to be displayed as simple text that can be clicked to access
+ an input control for in-place editing.
+ */
+ko.bindingHandlers.clickToEdit = {
+  init: function(element, valueAccessor) {
+    var observable = valueAccessor(),
+        link = document.createElement("a"),
+        input = document.createElement("input"),
+        dblclick = $(element).attr('data-edit-on-dblclick'),
+        userPrompt = $(element).attr('data-prompt'),
+        prompt = userPrompt || (dblclick ? 'Double-click to edit' : 'Click to edit'),
+        linkBindings;
+
+    // add any classes specified for the link element
+    $(link).addClass($(element).attr('data-link-class'));
+    // add any classes specified for the input element
+    $(input).addClass($(element).attr('data-input-class'));
+
+    element.appendChild(link);
+    element.appendChild(input);
+
+    observable.editing = ko.observable(false);
+    observable.stopEditing = function () {
+      $(input).blur();
+      observable.editing(false)
+    };
+
+    linkBindings = {
+      text: ko.computed(function() {
+        // todo: style default text as grey
+        var value = ko.utils.unwrapObservable(observable);
+        return value !== "" ? value : prompt;
+      }),
+      visible: ko.computed(function() {
+        return !observable.editing();
+      })
+    };
+
+    // bind to either the click or dblclick event
+    if (dblclick) {
+      linkBindings.event = { dblclick: observable.editing.bind(null, true) };
+    } else {
+      linkBindings.click = observable.editing.bind(null, true);
+    }
+
+    ko.applyBindingsToNode(link, linkBindings);
+
+    ko.applyBindingsToNode(input, {
+      value: observable,
+      visible: observable.editing,
+      hasfocus: observable.editing
+    });
+
+    // quit editing on enter key
+    $(input).keydown(function(e) {
+      if (e.which === 13) {
+        observable.stopEditing();
+      }
+    });
+  }
+};
+
+/*
+This binding allows small non-negative integers in the model to be displayed as a number of ticks
+ and edited by spinner buttons.
+ */
+ko.bindingHandlers.ticks = {
+  init: function(element, valueAccessor) {
+    var observable = valueAccessor(),
+        $parent = $(element).parent(),
+        $buttons,
+        $widget = $('<div class="tick-controls btn-group btn-group-vertical"></div>');
+
+    $parent.css('padding','4px');
+    $widget.append($('<button class="up btn btn-mini"><i class="icon-chevron-up"></i></button>'));
+    $widget.append($('<button class="down btn btn-mini"><i class="icon-chevron-down"></i></button>'));
+    $parent.append($widget);
+    $buttons = $parent.find('button');
+
+    $buttons.hide();
+
+    ko.utils.registerEventHandler($parent, "mouseover", function() {
+      $buttons.show();
+    });
+
+    ko.utils.registerEventHandler($parent, "mouseout", function() {
+      $buttons.hide();
+    });
+
+    ko.utils.registerEventHandler($buttons, "click", function() {
+      var isUp = $(this).hasClass('up'),
+          value = Number(observable());
+      if (isNaN(value)) { value = 0; }
+
+      if (isUp) {
+        observable("" + (value + 1));
+      } else {
+        if (value > 0) {
+          observable("" + (value - 1));
+        }
+      }
+      return false;
+    });
+  },
+  update: function(element, valueAccessor) {
+    var observable = valueAccessor(), value,
+        tick = '<i class="icon-ok"></i>', ticks = "";
+    if (observable) {
+      value = Number(ko.utils.unwrapObservable(observable));
+      if (isNaN(value)) {
+        $(element).html("");
+      } else {
+        //$(element).html(value);
+        $(element).empty();
+        for (i=0; i < value; i++) {
+          ticks += tick;
+        }
+        $(element).html(ticks);
+      }
+    }
+  }
+};
+
+// handles simple or deferred computed objects
+// see activity/edit.gsp for an example of use
+ko.extenders.async = function(computedDeferred, initialValue) {
+
+  var plainObservable = ko.observable(initialValue), currentDeferred;
+  plainObservable.inProgress = ko.observable(false);
+
+  ko.computed(function() {
+    if (currentDeferred) {
+      currentDeferred.reject();
+      currentDeferred = null;
+    }
+
+    var newDeferred = computedDeferred();
+    if (newDeferred &&
+        (typeof newDeferred.done == "function")) {
+
+      // It's a deferred
+      plainObservable.inProgress(true);
+
+      // Create our own wrapper so we can reject
+      currentDeferred = $.Deferred().done(function(data) {
+        plainObservable.inProgress(false);
+        plainObservable(data);
+      });
+      newDeferred.done(currentDeferred.resolve);
+    } else {
+      // A real value, so just publish it immediately
+      plainObservable(newDeferred);
+    }
+  });
+
+  return plainObservable;
+};
+
+ko.bindingHandlers.fileUploadNoImage = {
+  init: function(element, options) {
+    var dropzone = $(element).parent();
+    var defaults = {autoUpload:true, dropZone: dropzone};
+    var settings = {};
+    $.extend(settings, defaults, options());
+    $(element).fileupload(settings);
+  }
+}
+
+// A handy binding to iterate over the properties of an object.
+ko.bindingHandlers.foreachprop = {
+  transformObject: function (obj) {
+    var properties = [];
+    for (var key in obj) {
+      if (obj.hasOwnProperty(key)) {
+        properties.push({ key: key, value: obj[key] });
+      }
+    }
+    return properties;
+  },
+  init: function(element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
+    var value = ko.utils.unwrapObservable(valueAccessor()),
+        properties = ko.bindingHandlers.foreachprop.transformObject(value);
+    ko.applyBindingsToNode(element, { foreach: properties });
+    return { controlsDescendantBindings: true };
+  }
+};
+
+// Compares this column to the current sort parameters and displays the appropriate sort icons.
+// If this is the column that the model is currently sorted by, then shows an up or down icon
+//  depending on the current sort order.
+// Usage example: <th data-bind="sortIcon:sortParamsObject,click:sortBy" data-column="type">Type</th>
+// The sortIcon binding takes an object or observable that contains a 'by' property and an 'order' property.
+// The data-column attr defines the model value that the column holds. This is compared to the
+//  current sort by value to see if this is the active column.
+ko.bindingHandlers.sortIcon = {
+  update: function(element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
+    var $element = $(element),
+        name = $element.data('column'),
+        $icon = $element.find('i'),
+        className = "icon-blank",
+        sortParams = ko.utils.unwrapObservable(valueAccessor());
+    // see if this is the active sort column
+    if (sortParams.by() === name) {
+      // and if so, choose an icon based on sort order
+      className = sortParams.order() === 'desc' ? 'icon-chevron-down' : 'icon-chevron-up';
+    }
+    // insert the icon markup if it doesn't exist
+    if ($icon.length === 0) {
+      $icon = $("<i class='icon-blank'></i>").appendTo($element);
+    }
+    // set the computed class
+    $icon.removeClass('icon-chevron-down').removeClass('icon-chevron-up').removeClass('icon-blank').addClass(className);
+  }
+};
+
+/**
+ * A vetoableObservable is an observable that provides a mechanism to prevent changes to its value under certain
+ * conditions.  When a change is notified, the vetoCheck function is executed - if it returns false the change is
+ * disallowed and the vetoCallback function is invoked.  Otherwise the change is allowed and the noVetoCallback
+ * function is invoked.
+ * The only current example of it's use is when the type of an activity is changed, it
+ * can potentially invalidate any target score values that have been supplied by the user - hence the user is
+ * asked if they wish to proceed, and if so, the targets can be removed.
+ * @param initialValue the initial value for the observable.
+ * @param vetoCheck a function or string that will be invoked when the value of the vetoableObservable changes.  Returning
+ * false from this function will disallow the change.  If a string is supplied, it is used as the question text
+ * for a window.confirm function.
+ * @param noVetoCallback this callback will be invoked when a change to the vetoableObservable is allowed.
+ * @param vetoCallback this callback will be invoked when a change to the vetoableObservable is disallowed (has been vetoed).
+ * @returns {*}
+ */
+ko.vetoableObservable = function(initialValue, vetoCheck, noVetoCallback, vetoCallback) {
+  //private variables
+  var _current = ko.observable(initialValue);
+
+  var vetoFunction = typeof (vetoCheck) === 'function' ? vetoCheck : function() {
+    return window.confirm(vetoCheck);
+  };
+  var result = ko.dependentObservable({
+    read: _current,
+    write: function(newValue) {
+
+      // The equality check is treating undefined as equal to an empty string to prevent
+      // the initial population of the value with an empty select option from triggering the veto.
+      if (_current() !== newValue && (_current() !== undefined || newValue !== '')) {
+
+        if (vetoFunction()) {
+          _current(newValue);
+          if (noVetoCallback !== undefined) {
+            noVetoCallback();
+          }
+        }
+        else {
+          _current.notifySubscribers();
+          if (vetoCallback !== undefined) {
+            vetoCallback();
+          }
+        }
+      }
+
+    }
+  });
+
+  return result;
+};
+
+/**
+ *
+ * @param target the knockoutjs object being extended.
+ * @param options {currencySymbol, decimalSeparator, thousandsSeparator}
+ */
+ko.extenders.currency = function(target, options) {
+
+  var symbol, d,t;
+  if (options !== undefined) {
+    symbol = options.currencySymbol;
+    d = options.decimalSeparator;
+    t = options.thousandsSeparator;
+  }
+  target.formattedCurrency = ko.computed(function() {
+    var n = target(),
+        c = isNaN(c = Math.abs(c)) ? 2 : c,
+        d = d == undefined ? "." : d,
+        t = t == undefined ? "," : t,
+        s = n < 0 ? "-" : "",
+        sym = symbol == undefined ? "$" : symbol,
+        i = parseInt(n = Math.abs(+n || 0).toFixed(c)) + "",
+        j = (j = i.length) > 3 ? j % 3 : 0;
+    return sym + s + (j ? i.substr(0, j) + t : "") + i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) + (c ? d + Math.abs(n - i).toFixed(c).slice(2) : "");
+  });
+  return target;
+};
+
+// custom validator to ensure that only one of two fields is populated
+function exclusive (field, rules, i, options) {
+  var otherFieldId = rules[i+2], // get the id of the other field
+      otherValue = $('#'+otherFieldId).val(),
+      thisValue = field.val(),
+      message = rules[i+3];
+  // checking thisValue is technically redundant as this validator is only called
+  // if there is a value in the field
+  if (otherValue !== '' && thisValue !== '') {
+    return message;
+  } else {
+    return true;
+  }
+};
+
+/**
+ * Converts markdown formatted text into html, filters an allowed list of tags.  (To prevent script injection).
+ * @param target the knockout observable holding the text.
+ * @param options unused.
+ * @returns {*}
+ */
+ko.extenders.markdown = function(target, options) {
+  var converter = new window.Showdown.converter();
+  var filterOptions = window.WMDEditor.defaults.tagFilter;
+
+  target.markdownToHtml = ko.computed(function() {
+    var text = target();
+    if (text) {
+      text = text.replace(/<[^<>]*>?/gi, function (tag) {
+        return (tag.match(filterOptions.allowedTags) || tag.match(filterOptions.patternLink) || tag.match(filterOptions.patternImage) || tag.match(filterOptions.patternAudio)) ? tag : "";
+      });
+    }
+    else {
+      text = '';
+    }
+    return converter.makeHtml(text);
+  });
+  return target;
+};
+
+
+ko.bindingHandlers.stagedImageUpload = {
+  init: function(element, valueAccessor, allBindings, viewModel, bindingContext) {
+
+    var defaultConfig = {
+      maxWidth: 300,
+      minWidth:150,
+      minHeight:150,
+      maxHeight: 300,
+      previewSelector: '.preview'
+    };
+    var size = ko.observable();
+    var progress = ko.observable();
+    var error = ko.observable();
+    var complete = ko.observable(true);
+
+    var uploadProperties = {
+      size: size,
+      progress: progress,
+      error:error,
+      complete:complete
+    };
+    var innerContext = bindingContext.createChildContext(bindingContext);
+    ko.utils.extend(innerContext, uploadProperties);
+
+    var target = valueAccessor();
+    var $elem = $(element);
+    var role = $elem.data('role');
+    var ownerKey = $elem.data('owner-type');
+    var ownerValue = $elem.data('owner-id');
+    var url = $elem.data('url');
+    var owner = {};
+    owner[ownerKey] = ownerValue;
+    var config = {
+      url:url,
+      role: role,
+      owner:owner
+    };
+    config = $.extend({}, defaultConfig, config);
+
+    // Expected to be a ko.observableArray
+    $(element).fileupload({
+      url:config.url,
+      autoUpload:true
+    }).on('fileuploadadd', function(e, data) {
+      complete(false);
+      progress(1);
+    }).on('fileuploadprocessalways', function(e, data) {
+      if (data.files[0].preview) {
+        if (config.previewSelector !== undefined) {
+          var previewElem = $(element).parent().find(config.previewSelector);
+          previewElem.append(data.files[0].preview);
+        }
+      }
+    }).on('fileuploadprogressall', function(e, data) {
+      progress(Math.floor(data.loaded / data.total * 100));
+      size(data.total);
+    }).on('fileuploaddone', function(e, data) {
+
+      var result = data.result;
+
+      if (!result) {
+        result = {};
+        error('No response from server');
+      }
+
+      if (result.files[0]) {
+        target.push(ko.bindingHandlers.stagedImageUpload.toDocument(result.files[0], config));
+        complete(true);
+      }
+      else {
+        error(result.error);
+      }
+
+    }).on('fileuploadfail', function(e, data) {
+      error(data.errorThrown);
+    });
+
+    ko.applyBindingsToDescendants(innerContext, element);
+
+    return { controlsDescendantBindings: true };
+  },
+  toDocument:function(f, config) {
+
+    var data = {
+      thumbnailUrl: f.thumbnail_url,
+      url: f.url,
+      contentType: f.contentType,
+      filename: f.name,
+      filesize: f.size,
+      dateTaken: f.isoDate,
+      lat: f.decimalLatitude,
+      lng: f.decimalLongitude,
+      name: f.name,
+      type: 'image',
+      role:config.role
+    };
+
+    return $.extend({}, data, config.owner);
+  }
+};
+
+var ACTIVITY_PROGRESS_CLASSES = {
+  'planned':'btn-warning',
+  'started':'btn-success',
+  'finished':'btn-info',
+  'deferred':'btn-danger',
+  'cancelled':'btn-inverse',
+  'corrected':'btn-danger'
+};
+
+
+/** Returns a bootstrap class used to style activity progress labels */
+function activityProgressClass(progress) {
+  return ACTIVITY_PROGRESS_CLASSES[progress];
+}
+
+/** Allows a subscription to an observable that passes both the old and new value to the callback */
+ko.subscribable.fn.subscribeChanged = function (callback) {
+  var savedValue = this.peek();
+  return this.subscribe(function (latestValue) {
+    var oldValue = savedValue;
+    savedValue = latestValue;
+    callback(latestValue, oldValue);
+  });
+};
+
+ko.extenders.url = function(target) {
+  var result = ko.pureComputed({
+    read:target,
+    write: function(url) {
+      var value = typeof url == 'string' && url.indexOf("://") < 0? ("http://" + url): url;
+      target(value);
+    }
+  });
+  result(target());
+  return result;
+};
diff --git a/grails-app/assets/javascripts/knockout-dates.js b/grails-app/assets/javascripts/knockout-dates.js
deleted file mode 100644
index 6101e70c6..000000000
--- a/grails-app/assets/javascripts/knockout-dates.js
+++ /dev/null
@@ -1,835 +0,0 @@
-/*
-Handles the display and editing of UTC dates.
-
-Declares a Knockout extender that allows UTC ISODates to be displayed and edited as simple dates in the form
- dd-MM-yyyy and with local timezone adjustment. Hours and minutes can optionally be shown and edited.
-
-Declares a custom binding that allows dates to be changed using the Bootstrap datepicker
- (https://github.com/eternicode/bootstrap-datepicker).
-
-The date values in the ViewModel are maintained as UTC dates as strings in ISO format (ISO8601 without milliseconds).
-
-The extender adds a 'formattedDate' property to the observable. It is this property that should be bound
- to an element, eg
-
-    <input data-bind="value: myDate.formattedDate" type=...../> or
-    <span data-bind="text: myDate.formattedDate" />
-
-The date is defined in the view model like this:
-
-    self.myDate = ko.observable("${myDate}").extend({simpleDate: false});
-
-The boolean indicates whether to show the time as well.
-
-The extender also adds a 'date' property to the observable that holds the value as a Javascript date object.
-This is used by the datepicker custom binding.
-
-The custom binding listens for changes via the datepicker as well as direct edits to the input field and
- updates the model. It also updates the datepicker on change to the model.
-
-*/
-
-(function(){
-
-    // creates an ISO8601 date string but without millis - to match the format used by the java thingy for BSON dates
-    Date.prototype.toISOStringNoMillis = function() {
-        function pad(n) { return n < 10 ? '0' + n : n }
-        return this.getUTCFullYear() + '-'
-            + pad(this.getUTCMonth() + 1) + '-'
-            + pad(this.getUTCDate()) + 'T'
-            + pad(this.getUTCHours()) + ':'
-            + pad(this.getUTCMinutes()) + ':'
-            + pad(this.getUTCSeconds()) + 'Z';
-    };
-
-    // Use native ISO date parsing or shim for old browsers (IE8)
-    var D= new Date('2011-06-02T09:34:29+02:00');
-    if(!D || +D!== 1307000069000){
-        Date.fromISO= function(s){
-            var day, tz,
-                rx=/^(\d{4}\-\d\d\-\d\d([tT ][\d:\.]*)?)([zZ]|([+\-])(\d\d):(\d\d))?$/,
-                p= rx.exec(s) || [];
-            if(p[1]){
-                day= p[1].split(/\D/);
-                for(var i= 0, L= day.length; i<L; i++){
-                    day[i]= parseInt(day[i], 10) || 0;
-                }
-                day[1]-= 1;
-                day= new Date(Date.UTC.apply(Date, day));
-                if(!day.getDate()) return NaN;
-                if(p[5]){
-                    tz= (parseInt(p[5], 10)*60);
-                    if(p[6]) tz+= parseInt(p[6], 10);
-                    if(p[4]== '+') tz*= -1;
-                    if(tz) day.setUTCMinutes(day.getUTCMinutes()+ tz);
-                }
-                return day;
-            }
-            return NaN;
-        }
-    }
-    else{
-        Date.fromISO= function(s){
-            return new Date(s);
-        }
-    }
-})();
-
-function isValidDate(d) {
-    if ( Object.prototype.toString.call(d) !== "[object Date]" )
-        return false;
-    return !isNaN(d.getTime());
-}
-
-function convertToSimpleDate(isoDate, includeTime) {
-    if (!isoDate) { return ''}
-    if (typeof isoDate === 'object') {
-        // assume a date object
-        if (!isValidDate(isoDate)) {
-            return '';
-        }
-    }
-    // Format the stage labels using Melbourne/Sydney/Canberra time to avoid problems where the date starts
-    // at midnight and displays as the previous day in other timezones.
-    var date = moment.tz(isoDate, "Australia/Sydney");
-    var format = includeTime ? "DD-MM-YYYY HH:mm" : "DD-MM-YYYY";
-    return date.format(format);
-}
-
-/**
- * Displays the supplied date as the financial year it falls into.  *Note* this routine will subtract
- * a day from the supplied date to catch report ranges that start and end on the 1st of July. e.g. 30-06-2017T14:00:00Z - 30-06-2017T14:00:00Z
- *
- * @param date the date to format - must be a ISO 8601 formatted string.
- * @return a String of the form "2016 / 2017"
- */
-function isoDateToFinancialYear(date) {
-    var parsedDate = moment(date).subtract(1, 'days');
-    var year = parsedDate.year();
-    // If the month is July - December, the financial year ends with the following year
-    if (parsedDate.month() >= 6) {
-        year++;
-    }
-
-    return (year-1) + '/' + year;
-}
-
-function convertToIsoDate(date) {
-    if (typeof date === 'string') {
-        if (date.length === 20 && date.charAt(19) === 'Z') {
-            // already an ISO date string
-            return date;
-        } else if (date.length > 9){
-            // assume a short date of the form dd-mm-yyyy
-            var year = date.substr(6,4),
-                month = Number(date.substr(3,2))- 1,
-                day = date.substr(0,2),
-                hours = date.length > 12 ? date.substr(11,2) : 0,
-                minutes = date.length > 15 ? date.substr(14,2) : 0;
-            var dt = new Date(year, month, day, hours, minutes);
-            if (isValidDate(dt)) {
-                return dt.toISOStringNoMillis();
-            }
-            else {
-                return '';
-            }
-        } else {
-            return '';
-        }
-    } else if (typeof date === 'object') {
-        // assume a date object
-        if (isValidDate(date)) {
-            return date.toISOStringNoMillis();
-        }
-        else {
-            return '';
-        }
-
-    } else {
-        return '';
-    }
-}
-
-function stringToDate(date) {
-    if (typeof date === 'string') {
-        if (date.length === 20 && date.charAt(19) === 'Z') {
-            // already an ISO date string
-            return Date.fromISO(date);
-        } else if (date.length > 9){
-            // assume a short date of the form dd-mm-yyyy
-            var year = date.substr(6,4),
-                month = Number(date.substr(3,2))- 1,
-                day = date.substr(0,2),
-                hours = date.length > 12 ? date.substr(11,2) : 0,
-                minutes = date.length > 15 ? date.substr(14,2) : 0;
-            return new Date(year, month, day, hours, minutes);
-        } else {
-            return undefined;
-        }
-    } else if (typeof date === 'object') {
-        // assume a date object
-        return date;
-    } else {
-        return undefined;
-    }
-}
-
-(function() {
-
-    // This extends an observable that holds a UTC ISODate. It creates properties that hold:
-    //  a JS Date object - useful with datepicker; and
-    //  a simple formatted date of the form dd-mm-yyyy useful for display.
-    // The formatted date will include hh:MM if the includeTime argument is true
-    ko.extenders.simpleDate = function (target, includeTime) {
-        target.date = ko.computed({
-            read: function () {
-                return Date.fromISO(target());
-            },
-
-            write: function (newValue) {
-                if (newValue) {
-                    var current = target(),
-                        valueToWrite = convertToIsoDate(newValue);
-
-                    if (valueToWrite !== current) {
-                        target(valueToWrite);
-                    }
-                } else {
-                    // date has been cleared
-                    target("");
-                }
-            }
-        });
-        target.formattedDate = ko.computed({
-            read: function () {
-                return convertToSimpleDate(target(), includeTime);
-            },
-
-            write: function (newValue) {
-                if (newValue) {
-                    var current = target(),
-                        valueToWrite = convertToIsoDate(newValue);
-
-                    if (valueToWrite !== current) {
-                        target(valueToWrite);
-                    }
-                }
-            }
-        });
-        target.date(target());
-        target.formattedDate(target());
-
-        return target;
-    };
-
-    /* Custom binding for Bootstrap datepicker */
-    // This binds an element and a model observable to the bootstrap datepicker.
-    // The element can be an input or container such as span, div, td.
-    // The datepicker is 2-way bound to the model. An input element will be updated automatically,
-    //  other elements may need an explicit text binding to the formatted model date (see
-    //  clickToPickDate for an example of a simple element).
-    ko.bindingHandlers.datepicker = {
-        init: function(element, valueAccessor, allBindingsAccessor) {
-            // set current date into the element
-            var $element = $(element),
-                initialDate = ko.utils.unwrapObservable(valueAccessor()),
-                initialDateStr = convertToSimpleDate(initialDate);
-            if ($element.is('input')) {
-                $element.val(initialDateStr);
-            } else {
-                $element.data('date', initialDateStr);
-            }
-
-            var defaults = {format: 'dd-mm-yyyy', autoclose: true};
-            var options = _.defaults(allBindingsAccessor().datepickerOptions || {}, defaults);
-
-            //initialize datepicker with some optional options
-            $element.datepicker(options);
-
-            // if the parent container holds any element with the class 'open-datepicker'
-            // then add a hook to do so
-            $element.parent().find('.open-datepicker').click(function () {
-                if (!$element.prop('disabled')) {
-                    $element.datepicker('show');
-                }
-            });
-
-            var changeHandler = function(event) {
-                var value = valueAccessor();
-                if (ko.isObservable(value)) {
-                    value(event.date);
-                }
-            };
-
-            //when a user changes the date via the datepicker, update the view model
-            ko.utils.registerEventHandler(element, "changeDate", changeHandler);
-            ko.utils.registerEventHandler(element, "hide", changeHandler);
-
-            //when a user changes the date via the input, update the view model
-            ko.utils.registerEventHandler(element, "change", function() {
-                var value = valueAccessor();
-                if (ko.isObservable(value)) {
-                    value(stringToDate(element.value));
-                    $(element).trigger('blur');  // This is to trigger revalidation of the date field to remove existing validation errors.
-                }
-            });
-        },
-        update: function(element, valueAccessor)   {
-            var widget = $(element).data("datepicker");
-            //when the view model is updated, update the widget
-            if (widget) {
-                var date = ko.utils.unwrapObservable(valueAccessor());
-                widget.date = date;
-                if (!isNaN(widget.date)) {
-                    widget.setDate(widget.date);
-                }
-            }
-        }
-    };
-
-}());
-
-function pad(number, length){
-    var str = "" + number
-    while (str.length < length) {
-        str = '0'+str
-    }
-    return str
-}
-
-//wrapper for an observable that protects value until committed
-// CG - Changed the way the protected observable works from value doesn't change until commit to
-// value changes as edits are made with rollback.  This was to enable cross field dependencies in a table
-// row - using a temp variable meant observers were not notified of changes until commit.
-ko.protectedObservable = function(initialValue) {
-    //private variables
-    var _current = ko.observable(initialValue);
-    var _committed = initialValue;
-
-    var result = ko.dependentObservable({
-        read: _current,
-        write: function(newValue) {
-           _current(newValue);
-        }
-    });
-
-    //commit the temporary value to our observable, if it is different
-    result.commit = function() {
-        _committed = _current();
-    };
-
-    //notify subscribers to update their value with the original
-    result.reset = function() {
-        _current(_committed);
-    };
-
-    return result;
-};
-
-// This binding allows dates to be displayed as simple text that can be clicked to access
-//  a date picker for in-place editing.
-// A user prompt appears if the model has no value. this can be customised.
-// A calendar icon is added after the bound element as a visual indicator that the date can be edited.
-// A computed 'hasChanged' property provides an observable isDirty flag for external save/revert mechanisms.
-// The 'datepicker' binding is applied to the element to integrate the bootstrap datepicker.
-// NOTE you can use the datepicker binding directly if you have an input as your predefined element.
-ko.bindingHandlers.clickToPickDate = {
-    init: function(element, valueAccessor, allBindingsAccessor, viewModel) {
-        var observable = valueAccessor(),
-            userPrompt = $(element).attr('data-prompt'),
-            prompt = userPrompt || 'Click to edit',
-            icon = $('<i class="icon-calendar open-datepicker" title="Click to change date"></i>');
-
-        observable.originalValue = observable.date();
-        observable.hasChanged = ko.computed(function () {
-            //console.log("original: " + observable.originalValue + " current: " + observable.date());
-            var original = observable.originalValue.getTime();
-            var current = observable.date().getTime();
-            return (original != current) && (!isNaN(original) || !isNaN(current));
-        });
-
-        $(element).parent().append(icon);
-
-        ko.applyBindingsToNode(element, {
-            text: ko.computed(function() {
-                // todo: style default text as grey
-                return ko.utils.unwrapObservable(observable) !== "" ? observable.formattedDate() : prompt;
-            }),
-            datepicker: observable.date
-        });
-    }
-};
-
-/*
-This binding allows text values to be displayed as simple text that can be clicked to access
- an input control for in-place editing.
- */
-ko.bindingHandlers.clickToEdit = {
-    init: function(element, valueAccessor) {
-        var observable = valueAccessor(),
-            link = document.createElement("a"),
-            input = document.createElement("input"),
-            dblclick = $(element).attr('data-edit-on-dblclick'),
-            userPrompt = $(element).attr('data-prompt'),
-            prompt = userPrompt || (dblclick ? 'Double-click to edit' : 'Click to edit'),
-            linkBindings;
-
-        // add any classes specified for the link element
-        $(link).addClass($(element).attr('data-link-class'));
-        // add any classes specified for the input element
-        $(input).addClass($(element).attr('data-input-class'));
-
-        element.appendChild(link);
-        element.appendChild(input);
-
-        observable.editing = ko.observable(false);
-        observable.stopEditing = function () {
-            $(input).blur();
-            observable.editing(false)
-        };
-
-        linkBindings = {
-            text: ko.computed(function() {
-                // todo: style default text as grey
-                var value = ko.utils.unwrapObservable(observable);
-                return value !== "" ? value : prompt;
-            }),
-            visible: ko.computed(function() {
-                return !observable.editing();
-            })
-        };
-
-        // bind to either the click or dblclick event
-        if (dblclick) {
-            linkBindings.event = { dblclick: observable.editing.bind(null, true) };
-        } else {
-            linkBindings.click = observable.editing.bind(null, true);
-        }
-
-        ko.applyBindingsToNode(link, linkBindings);
-
-        ko.applyBindingsToNode(input, {
-            value: observable,
-            visible: observable.editing,
-            hasfocus: observable.editing
-        });
-
-        // quit editing on enter key
-        $(input).keydown(function(e) {
-            if (e.which === 13) {
-                observable.stopEditing();
-            }
-        });
-    }
-};
-
-/*
-This binding allows small non-negative integers in the model to be displayed as a number of ticks
- and edited by spinner buttons.
- */
-ko.bindingHandlers.ticks = {
-    init: function(element, valueAccessor) {
-        var observable = valueAccessor(),
-            $parent = $(element).parent(),
-            $buttons,
-            $widget = $('<div class="tick-controls btn-group btn-group-vertical"></div>');
-
-        $parent.css('padding','4px');
-        $widget.append($('<button class="up btn btn-mini"><i class="icon-chevron-up"></i></button>'));
-        $widget.append($('<button class="down btn btn-mini"><i class="icon-chevron-down"></i></button>'));
-        $parent.append($widget);
-        $buttons = $parent.find('button');
-
-        $buttons.hide();
-
-        ko.utils.registerEventHandler($parent, "mouseover", function() {
-            $buttons.show();
-        });
-
-        ko.utils.registerEventHandler($parent, "mouseout", function() {
-            $buttons.hide();
-        });
-
-        ko.utils.registerEventHandler($buttons, "click", function() {
-            var isUp = $(this).hasClass('up'),
-                value = Number(observable());
-            if (isNaN(value)) { value = 0; }
-
-            if (isUp) {
-                observable("" + (value + 1));
-            } else {
-                if (value > 0) {
-                    observable("" + (value - 1));
-                }
-            }
-            return false;
-        });
-    },
-    update: function(element, valueAccessor) {
-        var observable = valueAccessor(), value,
-            tick = '<i class="icon-ok"></i>', ticks = "";
-        if (observable) {
-            value = Number(ko.utils.unwrapObservable(observable));
-            if (isNaN(value)) {
-                $(element).html("");
-            } else {
-                //$(element).html(value);
-                $(element).empty();
-                for (i=0; i < value; i++) {
-                    ticks += tick;
-                }
-                $(element).html(ticks);
-            }
-        }
-    }
-};
-
-// handles simple or deferred computed objects
-// see activity/edit.gsp for an example of use
-ko.extenders.async = function(computedDeferred, initialValue) {
-
-    var plainObservable = ko.observable(initialValue), currentDeferred;
-    plainObservable.inProgress = ko.observable(false);
-
-    ko.computed(function() {
-        if (currentDeferred) {
-            currentDeferred.reject();
-            currentDeferred = null;
-        }
-
-        var newDeferred = computedDeferred();
-        if (newDeferred &&
-            (typeof newDeferred.done == "function")) {
-
-            // It's a deferred
-            plainObservable.inProgress(true);
-
-            // Create our own wrapper so we can reject
-            currentDeferred = $.Deferred().done(function(data) {
-                plainObservable.inProgress(false);
-                plainObservable(data);
-            });
-            newDeferred.done(currentDeferred.resolve);
-        } else {
-            // A real value, so just publish it immediately
-            plainObservable(newDeferred);
-        }
-    });
-
-    return plainObservable;
-};
-
-ko.bindingHandlers.fileUploadNoImage = {
-    init: function(element, options) {
-        var dropzone = $(element).parent();
-        var defaults = {autoUpload:true, dropZone: dropzone};
-        var settings = {};
-        $.extend(settings, defaults, options());
-        $(element).fileupload(settings);
-    }
-}
-
-// A handy binding to iterate over the properties of an object.
-ko.bindingHandlers.foreachprop = {
-    transformObject: function (obj) {
-        var properties = [];
-        for (var key in obj) {
-            if (obj.hasOwnProperty(key)) {
-                properties.push({ key: key, value: obj[key] });
-            }
-        }
-        return properties;
-    },
-    init: function(element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
-        var value = ko.utils.unwrapObservable(valueAccessor()),
-            properties = ko.bindingHandlers.foreachprop.transformObject(value);
-        ko.applyBindingsToNode(element, { foreach: properties });
-        return { controlsDescendantBindings: true };
-    }
-};
-
-// Compares this column to the current sort parameters and displays the appropriate sort icons.
-// If this is the column that the model is currently sorted by, then shows an up or down icon
-//  depending on the current sort order.
-// Usage example: <th data-bind="sortIcon:sortParamsObject,click:sortBy" data-column="type">Type</th>
-// The sortIcon binding takes an object or observable that contains a 'by' property and an 'order' property.
-// The data-column attr defines the model value that the column holds. This is compared to the
-//  current sort by value to see if this is the active column.
-ko.bindingHandlers.sortIcon = {
-    update: function(element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
-        var $element = $(element),
-            name = $element.data('column'),
-            $icon = $element.find('i'),
-            className = "icon-blank",
-            sortParams = ko.utils.unwrapObservable(valueAccessor());
-        // see if this is the active sort column
-        if (sortParams.by() === name) {
-            // and if so, choose an icon based on sort order
-            className = sortParams.order() === 'desc' ? 'icon-chevron-down' : 'icon-chevron-up';
-        }
-        // insert the icon markup if it doesn't exist
-        if ($icon.length === 0) {
-            $icon = $("<i class='icon-blank'></i>").appendTo($element);
-        }
-        // set the computed class
-        $icon.removeClass('icon-chevron-down').removeClass('icon-chevron-up').removeClass('icon-blank').addClass(className);
-    }
-};
-
-/**
- * A vetoableObservable is an observable that provides a mechanism to prevent changes to its value under certain
- * conditions.  When a change is notified, the vetoCheck function is executed - if it returns false the change is
- * disallowed and the vetoCallback function is invoked.  Otherwise the change is allowed and the noVetoCallback
- * function is invoked.
- * The only current example of it's use is when the type of an activity is changed, it
- * can potentially invalidate any target score values that have been supplied by the user - hence the user is
- * asked if they wish to proceed, and if so, the targets can be removed.
- * @param initialValue the initial value for the observable.
- * @param vetoCheck a function or string that will be invoked when the value of the vetoableObservable changes.  Returning
- * false from this function will disallow the change.  If a string is supplied, it is used as the question text
- * for a window.confirm function.
- * @param noVetoCallback this callback will be invoked when a change to the vetoableObservable is allowed.
- * @param vetoCallback this callback will be invoked when a change to the vetoableObservable is disallowed (has been vetoed).
- * @returns {*}
- */
-ko.vetoableObservable = function(initialValue, vetoCheck, noVetoCallback, vetoCallback) {
-    //private variables
-    var _current = ko.observable(initialValue);
-
-    var vetoFunction = typeof (vetoCheck) === 'function' ? vetoCheck : function() {
-        return window.confirm(vetoCheck);
-    };
-    var result = ko.dependentObservable({
-        read: _current,
-        write: function(newValue) {
-
-            // The equality check is treating undefined as equal to an empty string to prevent
-            // the initial population of the value with an empty select option from triggering the veto.
-            if (_current() !== newValue && (_current() !== undefined || newValue !== '')) {
-
-                if (vetoFunction()) {
-                    _current(newValue);
-                    if (noVetoCallback !== undefined) {
-                        noVetoCallback();
-                    }
-                }
-                else {
-                    _current.notifySubscribers();
-                    if (vetoCallback !== undefined) {
-                        vetoCallback();
-                    }
-                }
-            }
-
-        }
-    });
-
-    return result;
-};
-
-/**
- *
- * @param target the knockoutjs object being extended.
- * @param options {currencySymbol, decimalSeparator, thousandsSeparator}
- */
-ko.extenders.currency = function(target, options) {
-
-    var symbol, d,t;
-    if (options !== undefined) {
-        symbol = options.currencySymbol;
-        d = options.decimalSeparator;
-        t = options.thousandsSeparator;
-    }
-    target.formattedCurrency = ko.computed(function() {
-        var n = target(),
-            c = isNaN(c = Math.abs(c)) ? 2 : c,
-            d = d == undefined ? "." : d,
-            t = t == undefined ? "," : t,
-            s = n < 0 ? "-" : "",
-            sym = symbol == undefined ? "$" : symbol,
-            i = parseInt(n = Math.abs(+n || 0).toFixed(c)) + "",
-            j = (j = i.length) > 3 ? j % 3 : 0;
-        return sym + s + (j ? i.substr(0, j) + t : "") + i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) + (c ? d + Math.abs(n - i).toFixed(c).slice(2) : "");
-    });
-    return target;
-};
-
-// custom validator to ensure that only one of two fields is populated
-function exclusive (field, rules, i, options) {
-    var otherFieldId = rules[i+2], // get the id of the other field
-        otherValue = $('#'+otherFieldId).val(),
-        thisValue = field.val(),
-        message = rules[i+3];
-    // checking thisValue is technically redundant as this validator is only called
-    // if there is a value in the field
-    if (otherValue !== '' && thisValue !== '') {
-        return message;
-    } else {
-        return true;
-    }
-};
-
-/**
- * Converts markdown formatted text into html, filters an allowed list of tags.  (To prevent script injection).
- * @param target the knockout observable holding the text.
- * @param options unused.
- * @returns {*}
- */
-ko.extenders.markdown = function(target, options) {
-    var converter = new window.Showdown.converter();
-    var filterOptions = window.WMDEditor.defaults.tagFilter;
-
-    target.markdownToHtml = ko.computed(function() {
-        var text = target();
-        if (text) {
-            text = text.replace(/<[^<>]*>?/gi, function (tag) {
-                return (tag.match(filterOptions.allowedTags) || tag.match(filterOptions.patternLink) || tag.match(filterOptions.patternImage) || tag.match(filterOptions.patternAudio)) ? tag : "";
-            });
-        }
-        else {
-            text = '';
-        }
-        return converter.makeHtml(text);
-    });
-    return target;
-};
-
-
-ko.bindingHandlers.stagedImageUpload = {
-    init: function(element, valueAccessor, allBindings, viewModel, bindingContext) {
-
-        var defaultConfig = {
-            maxWidth: 300,
-            minWidth:150,
-            minHeight:150,
-            maxHeight: 300,
-            previewSelector: '.preview'
-        };
-        var size = ko.observable();
-        var progress = ko.observable();
-        var error = ko.observable();
-        var complete = ko.observable(true);
-
-        var uploadProperties = {
-            size: size,
-            progress: progress,
-            error:error,
-            complete:complete
-        };
-        var innerContext = bindingContext.createChildContext(bindingContext);
-        ko.utils.extend(innerContext, uploadProperties);
-
-        var target = valueAccessor();
-        var $elem = $(element);
-        var role = $elem.data('role');
-        var ownerKey = $elem.data('owner-type');
-        var ownerValue = $elem.data('owner-id');
-        var url = $elem.data('url');
-        var owner = {};
-        owner[ownerKey] = ownerValue;
-        var config = {
-            url:url,
-            role: role,
-            owner:owner
-        };
-        config = $.extend({}, defaultConfig, config);
-
-         // Expected to be a ko.observableArray
-        $(element).fileupload({
-            url:config.url,
-            autoUpload:true
-        }).on('fileuploadadd', function(e, data) {
-            complete(false);
-            progress(1);
-        }).on('fileuploadprocessalways', function(e, data) {
-            if (data.files[0].preview) {
-                if (config.previewSelector !== undefined) {
-                    var previewElem = $(element).parent().find(config.previewSelector);
-                    previewElem.append(data.files[0].preview);
-                }
-            }
-        }).on('fileuploadprogressall', function(e, data) {
-            progress(Math.floor(data.loaded / data.total * 100));
-            size(data.total);
-        }).on('fileuploaddone', function(e, data) {
-
-            var result = data.result;
-
-            if (!result) {
-                result = {};
-                error('No response from server');
-            }
-
-            if (result.files[0]) {
-                target.push(ko.bindingHandlers.stagedImageUpload.toDocument(result.files[0], config));
-                complete(true);
-            }
-            else {
-                error(result.error);
-            }
-
-        }).on('fileuploadfail', function(e, data) {
-            error(data.errorThrown);
-        });
-
-        ko.applyBindingsToDescendants(innerContext, element);
-
-        return { controlsDescendantBindings: true };
-    },
-    toDocument:function(f, config) {
-
-        var data = {
-            thumbnailUrl: f.thumbnail_url,
-            url: f.url,
-            contentType: f.contentType,
-            filename: f.name,
-            filesize: f.size,
-            dateTaken: f.isoDate,
-            lat: f.decimalLatitude,
-            lng: f.decimalLongitude,
-            name: f.name,
-            type: 'image',
-            role:config.role
-        };
-
-        return $.extend({}, data, config.owner);
-    }
-};
-
-var ACTIVITY_PROGRESS_CLASSES = {
-    'planned':'btn-warning',
-    'started':'btn-success',
-    'finished':'btn-info',
-    'deferred':'btn-danger',
-    'cancelled':'btn-inverse',
-    'corrected':'btn-danger'
-};
-
-
-/** Returns a bootstrap class used to style activity progress labels */
-function activityProgressClass(progress) {
-    return ACTIVITY_PROGRESS_CLASSES[progress];
-}
-
-/** Allows a subscription to an observable that passes both the old and new value to the callback */
-ko.subscribable.fn.subscribeChanged = function (callback) {
-    var savedValue = this.peek();
-    return this.subscribe(function (latestValue) {
-        var oldValue = savedValue;
-        savedValue = latestValue;
-        callback(latestValue, oldValue);
-    });
-};
-
-ko.extenders.url = function(target) {
-    var result = ko.pureComputed({
-        read:target,
-        write: function(url) {
-            var value = typeof url == 'string' && url.indexOf("://") < 0? ("http://" + url): url;
-            target(value);
-        }
-    });
-    result(target());
-    return result;
-};
-
diff --git a/grails-app/assets/javascripts/meriplan.js b/grails-app/assets/javascripts/meriplan.js
index 2ef572626..c296723ca 100644
--- a/grails-app/assets/javascripts/meriplan.js
+++ b/grails-app/assets/javascripts/meriplan.js
@@ -82,6 +82,7 @@ function MERIPlan(project, projectService, config) {
             self.meriPlan().services.addServiceTarget(serviceTarget);
         });
         self.risks.load(meriPlan.risks);
+        self.applyAutoSave();
         self.attachFloatingSave();
 
     };
@@ -210,6 +211,15 @@ function MERIPlan(project, projectService, config) {
         window.open(url,'meri-plan-report');
     };
 
+    self.meriPlanChanges = function() {
+        var url = config.meriPlanChangesUrl;
+        window.open(url,'meri-planchanges-report');
+    };
+
+    self.isPlanEditable = function() {
+        return projectService.isEditable();
+    }
+
     self.unlockPlanForCorrection = function () {
 
         var $declaration = $(config.declarationModalSelector);
@@ -255,8 +265,7 @@ function MERIPlan(project, projectService, config) {
 
     self.cancelProjectDetailsEdits = function () {
         self.meriPlan().cancelAutosave();
-
-        document.location.reload(true);
+        self.unlockPlanAndReload("Reloading project...");
     };
 
     self.isProjectDetailsSaved = ko.computed(function () {
@@ -383,6 +392,15 @@ function MERIPlan(project, projectService, config) {
     self.removeMonitoringIndicator = function(row) {
         self.meriPlan().monitoring.removeRow(row);
     }
+    /** Called by the extendedBaselineMonitoring template to remove any monitoring indicators associated with a
+     * removed baseline */
+    self.removeBaseline = function(baseline) {
+        var code = ko.utils.unwrapObservable(baseline.code);
+        self.meriPlan().monitoring.rows.remove(function(row) {
+            return ko.utils.unwrapObservable(row.relatedBaseline) == code;
+        });
+        self.meriPlan().baseline.removeRow(baseline);
+    }
     self.addKEQ = function () {
         self.meriPlan().keq.rows.push(new GenericRowViewModel());
     };
@@ -469,6 +487,10 @@ function MERIPlan(project, projectService, config) {
         self.saveMeriPlan(false);
     };
 
+    self.saveMeriPlanAndUnlock = function() {
+        self.saveMeriPlan(false, true);
+    }
+
 
     self.selectedOutcomes = ko.pureComputed(function() {
         var outcomes = [];
@@ -484,17 +506,40 @@ function MERIPlan(project, projectService, config) {
         return $('<span><strong>'+outcome.text+'</strong> - ' + (description || '<i>No outcome statement supplied</i>') +'</span>');
     }
 
+    self.unlockPlanAndReload = function(message) {
+        blockUIWithMessage(message);
+        window.location.href = config.removeMeriPlanEditLockUrl;
+    };
+
     // Save project details
-    self.saveMeriPlan = function(enableSubmit){
+    self.saveMeriPlan = function(enableSubmit, unlock){
 
         var meriPlan = self.meriPlan();
         meriPlan.status('active');
         meriPlan.lastUpdated = new Date().toISOStringNoMillis();
+
+        var valid = false;
+        // Only mark the plan as finished if the user has ticked the checkbox and the validation routine passes.
+        meriPlan.progress = ActivityProgress.started;
+        var markedAsFinished = meriPlan.markAsFinished();
+        if (markedAsFinished) {
+            valid =  $('#project-details-validation').validationEngine('validate');
+            meriPlan.markAsFinished(valid);
+            meriPlan.progress = valid ? ActivityProgress.finished : ActivityProgress.started;
+        }
         blockUIWithMessage("Saving MERI Plan...");
+
         meriPlan.saveWithErrorDetection(function() {
 
+            if (!valid && markedAsFinished && !enableSubmit) {
+                bootbox.alert("Your MERI plan cannot be marked as complete until all validation errors are resolved");
+            }
+            if (unlock) {
+                if (!markedAsFinished || valid) {
+                    self.unlockPlanAndReload("MERI Plan saved and unlocked.  Reloading project...");
+                }
+            }
             if(enableSubmit) {
-                var valid =  $('#project-details-validation').validationEngine('validate');
                 if (valid) {
                     blockUIWithMessage("Submitting MERI Plan...");
                     self.submitChanges();
@@ -518,6 +563,32 @@ function MERIPlan(project, projectService, config) {
 
     };
 
+    self.applyAutoSave = function() {
+        autoSaveModel(
+            self.meriPlan(),
+            config.projectUpdateUrl,
+            {
+                storageKey: config.meriStorageKey || 'meriPlan-' + project.projectId,
+                autoSaveIntervalInSeconds: config.autoSaveIntervalInSeconds || 60,
+                restoredDataWarningSelector: '#restoredData',
+                resultsMessageSelector: '.save-details-result-placeholder',
+                timeoutMessageSelector: '#timeoutMessage',
+                errorMessage: "Failed to save MERI Plan: ",
+                successMessage: 'MERI Plan saved',
+                preventNavigationIfDirty: true,
+                defaultDirtyFlag: ko.dirtyFlag,
+                dirtyFlagRateLimitMs: 500,
+                healthCheckUrl: config.healthCheckUrl
+            });
+    }
+
+    if (!projectService.isProjectDetailsLocked()) {
+        // This was in DetailsViewModel to support the (never released) MERI plan load function.
+        // It's been moved back here as having in the DetailsViewModel was causing issues with the new MERI
+        // plan because orphaned services get detected as dirty and the user is prompted to save them, even when
+        // the page is in read only mode.
+        self.applyAutoSave();
+    }
     var $floatingSave = $('#floating-save');
     var floatingSaveVisible = false;
     function checkSaveStatus(dirty) {
@@ -606,7 +677,7 @@ function MERIPlan(project, projectService, config) {
     };
 }
 
-function ReadOnlyMeriPlan(project, projectService, config) {
+function ReadOnlyMeriPlan(project, projectService, config, changed) {
     var self = this;
     if (!project.custom) {
         project.custom = {};
@@ -641,6 +712,9 @@ function ReadOnlyMeriPlan(project, projectService, config) {
             } else if (projectService.isSubmitted()) {
                 result = {text: 'This plan has been submitted for approval', badgeClass: 'badge-info'};
             }
+            else if (!projectService.isPlanComplete()) {
+                result = {text: 'This plan has not been completed', badgeClass: 'badge-warning'};
+            }
         }
         return result;
     });
@@ -649,6 +723,10 @@ function ReadOnlyMeriPlan(project, projectService, config) {
     self.isProjectDetailsLocked = ko.computed(function () {
         return projectService.isProjectDetailsLocked();
     });
+
+    self.editMeriPlan = function() {
+        window.location.href = config.editMeriPlanUrl;
+    };
     var riskModel;
     if (config.useRlpRisksModel) {
         riskModel = rlpRiskModel();
@@ -687,24 +765,32 @@ function ReadOnlyMeriPlan(project, projectService, config) {
      * @returns {string} A string containing the labels for the scoreIds
      */
     self.targetMeasureLabels = function(scoreIds) {
-        var result = '';
+        var labels = [];
+
         scoreIds = ko.utils.unwrapObservable(scoreIds);
         for (var i=0; i<scoreIds.length; i++) {
             var scoreId = scoreIds[i];
             for (var j=0; j<self.allTargetMeasures.length; j++) {
                 if (self.allTargetMeasures[j].scoreId == scoreId) {
-                    result = result + self.allTargetMeasures[j].label;
+                    labels.push(self.allTargetMeasures[j].label);
                 }
             }
         }
-        return result;
+        return labels;
     }
 
     _.extend(self, new Risks(project.risks, riskModel, disableFlag, config.risksStorageKey));
     self.selectedTargetMeasures = ko.observableArray();
     var details = new DetailsViewModel(project.custom.details, project, self.periods, self.risks, self.allTargetMeasures, self.selectedTargetMeasures, config);
     self.meriPlan = ko.observable(details);
+
+    if (changed) {
+        var changedDetails = new DetailsViewModel(changed.custom.details, project, self.periods, self.risks, self.allTargetMeasures, self.selectedTargetMeasures, config);
+        self.meriPlanChanged = ko.observable(changedDetails);
+    }
+
     self.detailsLastUpdated = ko.observable(project.custom.details.lastUpdated).extend({simpleDate: true});
+
     self.isAgricultureProject = ko.computed(function () {
         var agricultureOutcomeStartIndex = 4;
         var selectedPrimaryOutcome = self.meriPlan().outcomes.primaryOutcome.description();
@@ -780,11 +866,8 @@ function ReadOnlyMeriPlan(project, projectService, config) {
                 self.selectedTargetMeasures.push(service);
             }
         }
-
-        _.each(self.selectedTargetMeasures(), function(selectedService) {
-            if (!serviceOutcomeMap[selectedService.scoreId]) {
-                self.selectedTargetMeasures.remove(selectedService)
-            }
+        self.selectedTargetMeasures.remove(function(selectedService) {
+            return !serviceOutcomeMap[selectedService.scoreId];
         });
 
         return services;
@@ -808,8 +891,13 @@ function DetailsViewModel(o, project, budgetHeaders, risks, allServices, selecte
             self.services = new ServicesViewModel(o.serviceIds, config.services, project.outputTargets, budgetHeaders);
         }
 
-        self.description = ko.observable(project.description);
         self.name = ko.observable(project.name);
+        self.description = ko.observable(project.description);
+        /* this is a quick workaround to make the MERIPLAN comparison work, using the name field above will not render the comparison
+        but it's needed in the DatasetSpec integration test, it will fail otherwise due to blank project name. */
+        self.nameComparison = ko.observable(o.name);
+        self.descriptionComparison = ko.observable(o.description);
+
         self.programName = config.programName;
         self.projectEvaluationApproach = ko.observable(o.projectEvaluationApproach);
         self.relatedProjects = ko.observable(o.relatedProjects);
@@ -820,6 +908,8 @@ function DetailsViewModel(o, project, budgetHeaders, risks, allServices, selecte
             }
         }
     }
+    self.progress = o.progress;
+    self.markAsFinished = ko.observable(o.progress == ActivityProgress.finished);
     self.activities = new ActivitiesViewModel(o.activities, config.programActivities || []);
     self.status = ko.observable(o.status);
     self.obligations = ko.observable(o.obligations);
@@ -891,23 +981,11 @@ function DetailsViewModel(o, project, budgetHeaders, risks, allServices, selecte
         return json;
     };
 
-    autoSaveModel(
-        self,
-        config.projectUpdateUrl,
-        {
-            storageKey:config.meriStorageKey || 'meriPlan-'+project.projectId,
-            autoSaveIntervalInSeconds:config.autoSaveIntervalInSeconds || 60,
-            restoredDataWarningSelector:'#restoredData',
-            resultsMessageSelector:'.save-details-result-placeholder',
-            timeoutMessageSelector:'#timeoutMessage',
-            errorMessage:"Failed to save MERI Plan: ",
-            successMessage: 'MERI Plan saved',
-            preventNavigationIfDirty:true,
-            defaultDirtyFlag:ko.dirtyFlag,
-            dirtyFlagRateLimitMs: 500,
-            healthCheckUrl:config.healthCheckUrl
-        });
+    if (config.locked) {
+        autoSaveConfig.lockedEntity = project.projectId;
+    }
 };
+
 /** Removes nulls from arrays after toJSON is called */
 function outcomesToJSON(outcomeArray) {
     return _.filter(_.map(outcomeArray, function (outcome) {
@@ -1043,9 +1121,14 @@ function ServiceOutcomeTargetsViewModel(serviceIds, outputTargets, forecastPerio
         };
 
         self.hasData = function() {
-            return _.find(self.outcomeTargets(), function(outcomeTarget) {
+            var hasTarget = _.find(self.outcomeTargets(), function(outcomeTarget) {
                 return (outcomeTarget.target() && outcomeTarget.target() != 0);
             });
+            var hasPeriodTarget = _.find(self.periodTargets, function(periodTarget) {
+                return (periodTarget.target() && periodTarget.target() != 0);
+            });
+
+            return hasTarget || hasPeriodTarget;
         };
 
         self.toJSON = function() {
@@ -1390,10 +1473,23 @@ function GenericViewModel(o, propertyNames, codePrefix, arrayPropertyNames, numD
         return new GenericRowViewModel(row, propertyNames, arrayPropertyNames)
     };
 
+    function nextCode() {
+        var maxCodeNumber = 1;
+        for (var i=0; i<self.rows().length; i++) {
+            var code = ko.utils.unwrapObservable(self.rows()[i].code);
+            if (code) {
+                var num = parseInt(code.substring(codePrefix.length));
+                if (num > maxCodeNumber) {
+                    maxCodeNumber = num;
+                }
+            }
+        }
+        return codePrefix+(maxCodeNumber+1);
+    }
     function newObj() {
         var obj = {};
         if (codePrefix) {
-            obj.code = codePrefix + (self.rows().length+1);
+            obj.code = nextCode();
         }
         return obj;
     }
diff --git a/grails-app/assets/javascripts/projectService.js b/grails-app/assets/javascripts/projectService.js
index f84bab31e..e430dca7b 100644
--- a/grails-app/assets/javascripts/projectService.js
+++ b/grails-app/assets/javascripts/projectService.js
@@ -15,7 +15,7 @@ ProjectStatus = {
 };
 
 PROJECT_EXTERNAL_ID_TYPES =  [
-    'TECH_ONE_CODE', 'INTERNAL_ORDER_NUMBER', 'GRANT_AWARD', 'RELATED_PROJECT'
+    'TECH_ONE_CODE', 'INTERNAL_ORDER_NUMBER', 'GRANT_AWARD', 'RELATED_PROJECT', 'TECH_ONE_CONTRACT_NUMBER'
 ];
 
 /**
@@ -235,6 +235,10 @@ function ProjectService(project, options) {
         });
     };
 
+    self.isEditable = function() {
+        return (project.planStatus == PlanStatus.NOT_APPROVED || !project.planStatus);
+    }
+
     self.isSubmittedOrApproved = function() {
         return (project.planStatus == PlanStatus.APPROVED || project.planStatus == PlanStatus.SUBMITTED);
     };
@@ -251,7 +255,7 @@ function ProjectService(project, options) {
     };
 
     self.isProjectDetailsLocked = ko.computed(function () {
-            return self.isCompletedOrTerminated() || self.isSubmittedOrApproved();
+        return !config.userHoldsMeriPlanLock || self.isCompletedOrTerminated() || self.isSubmittedOrApproved();
     });
 
     self.isApproved = function() {
@@ -271,6 +275,10 @@ function ProjectService(project, options) {
         return self.areExternalIdsValid(project.externalIds);
     };
 
+    self.isPlanComplete = function() {
+        return project.custom && project.custom.details && project.custom.details.progress == ActivityProgress.finished;
+    }
+
     /** The list of external ids needs to include at least one SAP Internal Order or one Tech One Project Code */
     self.areExternalIdsValid = function(externalIds) {
         var requiredIdTypes = ['INTERNAL_ORDER_NUMBER', 'TECH_ONE_CODE'];
@@ -327,6 +335,7 @@ function ProjectService(project, options) {
                         approvedPlans.push(
                             {
                                 openMeriPlanUrl: config.viewHistoricalMeriPlanUrl+"?documentId="+meriPlan.documentId,
+                                openMeriPlanChangesUrl: config.viewMeriPlanChangesUrl+"?documentId="+meriPlan.documentId,
                                 userDisplayName:meriPlan.userDisplayName,
                                 dateApproved:convertToSimpleDate(meriPlan.date, true),
                                 reason:meriPlan.reason,
diff --git a/grails-app/assets/javascripts/projects.js b/grails-app/assets/javascripts/projects.js
index baa888c02..abbf05790 100644
--- a/grails-app/assets/javascripts/projects.js
+++ b/grails-app/assets/javascripts/projects.js
@@ -22,6 +22,9 @@
 //= require projectService
 //= require components.js
 //= require_self
+//= require prettytextdiff/jquery.pretty-text-diff.min.js
+//= require prettytextdiff/diff_match_patch.js
+//= require htmldiff.js
 
 /*
     Utilities for managing project representations.
@@ -1044,7 +1047,7 @@ function ProjectPageViewModel(project, sites, activities, organisations, userRol
         };
         sitesViewModel.typeFilter.subscribe(function(filterValue) {
 
-            if (filterValue == 'Both') {
+            if (filterValue == 'All') {
                 filterValue = "";  // Clear the search.
             }
             $sitesTable.DataTable().column(2).search(filterValue).draw();
@@ -1116,16 +1119,68 @@ function ProjectPageViewModel(project, sites, activities, organisations, userRol
 
     self.initialiseDataSets = function() {
         var dataSetsConfig = {
+            services: config.services,
             dataSetsSelector: config.dataSetsSelector || '#project-data-sets',
             newDataSetUrl:  config.newDataSetUrl,
             editDataSetUrl: config.editDataSetUrl,
             deleteDataSetUrl: config.deleteDataSetUrl,
             viewDataSetUrl: config.viewDataSetUrl,
-            returnToUrl: config.returnToUrl
+            returnToUrl: config.returnToUrl,
+            reports: project.reports || [],
+            viewReportUrl: config.viewReportUrl
         };
         var projectService = new ProjectService({}, config);
         var viewModel = new DataSetsViewModel(project.custom && project.custom.dataSets, projectService, dataSetsConfig);
         ko.applyBindings(viewModel, $(dataSetsConfig.dataSetsSelector)[0]);
+
+        var dataTableConfig = {
+            columnDefs: [
+                {
+                    target: 0,
+                    sortable: false
+                },
+                {
+                    target: 1,
+                    sortable: true
+                },
+                {
+                    target: 2,
+                    visible: true
+                },
+                {
+                    target: 4,
+                    sortable: true,
+                    orderData: 5
+                },
+                {
+                    target: 5,
+                    visible: false,
+                    searchable: false
+                },
+                {
+                    target: 6,
+                    sortable:true,
+                    orderData: 7
+                },
+                {
+                    target: 7,
+                    visible: false,
+                    searchable: false
+                },
+
+            ],
+            order: [4, 'desc']
+        };
+        if (!viewModel.supportsDateColumn) {
+            dataTableConfig.columnDefs[2].visible = false;
+            dataTableConfig.columnDefs[3].visible = false;
+            dataTableConfig.columnDefs[5].visible = false;
+            dataTableConfig.columnDefs[6].visible = false;
+            dataTableConfig.order = [1, 'asc'];
+        }
+
+        $(dataSetsConfig.dataSetsSelector).find('table').dataTable(dataTableConfig);
+
     };
 
     self.initialiseAdminTab = function() {
@@ -1133,8 +1188,12 @@ function ProjectPageViewModel(project, sites, activities, organisations, userRol
         var meriPlanSection = document.getElementById("edit-meri-plan");
         if (meriPlanSection) {
             ko.applyBindings(self.meriPlan, meriPlanSection);
-            self.meriPlan.meriPlan().dirtyFlag.reset();
-            self.meriPlan.attachFloatingSave();
+            // The dirty flag is only attached if the MERI plan is in edit mode.
+            if (self.meriPlan.meriPlan().dirtyFlag) {
+                self.meriPlan.meriPlan().dirtyFlag.reset();
+                self.meriPlan.attachFloatingSave();
+            }
+
         }
 
         // When the MERI plan is approved, the announcements move to their own section, otherwise they
diff --git a/grails-app/assets/javascripts/sites.js b/grails-app/assets/javascripts/sites.js
index 0249afcbe..c74a78867 100644
--- a/grails-app/assets/javascripts/sites.js
+++ b/grails-app/assets/javascripts/sites.js
@@ -994,6 +994,18 @@ var SitesViewModel =  function(sites, map, mapFeatures, isUserEditor, projectId)
         if (!site.type) {
             site.type = 'worksArea';
         }
+        site.filterType = 'P';
+        site.filterTypeLabel = 'Planning site';
+        if (site.type === 'compound') {
+            site.filterType = 'R';
+            site.filterTypeLabel = 'Reporting site';
+        }
+        else if (site.externalIds && site.externalIds[0] && site.externalIds[0].idType == 'MONITOR_PLOT_GUID') {
+            site.filterType = 'E';
+            site.filterTypeLabel = 'Site created via EMSA protocol using the Monitor App';
+        }
+
+        site.readOnly = site.type == 'compound' || PublicationStatus.isReadOnly(site.publicationStatus);
         return site;
     });
     self.selectedSiteIds = ko.computed(function() {
@@ -1028,7 +1040,7 @@ var SitesViewModel =  function(sites, map, mapFeatures, isUserEditor, projectId)
         }
         return '';
     };
-    self.typeOptions = ['Both', 'P', 'R'];
+    self.typeOptions = ['All', 'P', 'R', 'E'];
     self.typeFilter = ko.observable(self.typeOptions[0]);
 
     // Animation callbacks for the lists
@@ -1159,7 +1171,7 @@ var SitesViewModel =  function(sites, map, mapFeatures, isUserEditor, projectId)
     };
     this.editSite = function (site) {
         if (site.type != 'compound') {
-            var url = fcConfig.siteEditUrl + '/' + site.siteId + '?returnTo=' + encodeURIComponent(fcConfig.returnTo);
+            var url = fcConfig.siteEditUrl + '/' + site.siteId;
             document.location.href = url;
         }
         else {
@@ -1184,9 +1196,9 @@ var SitesViewModel =  function(sites, map, mapFeatures, isUserEditor, projectId)
         });
     };
     this.viewSite = function (site) {
-        var url = fcConfig.siteViewUrl + '/' + site.siteId + '?returnTo=' + encodeURIComponent(fcConfig.returnTo);
+        var url = fcConfig.siteViewUrl + '/' + site.siteId;
         if (projectId) {
-            url += '&projectId='+projectId;
+            url += '?projectId='+projectId;
         }
         document.location.href = url;
     };
diff --git a/grails-app/assets/stylesheets/dataSets.css b/grails-app/assets/stylesheets/dataSets.css
index 85d71f872..1ddf4e35e 100644
--- a/grails-app/assets/stylesheets/dataSets.css
+++ b/grails-app/assets/stylesheets/dataSets.css
@@ -6,21 +6,41 @@
 *= require_self
 */
 
-table td.actions, table th.actions {
-    width:10%;
+table.dataset-summary td.actions, table.dataset-summary th.actions {
+    width:3em;
 }
-table td.dataset-name, table th.dataset-name {
+table.dataset-summary td.dataset-name, table.dataset-summary th.dataset-name {
     width:65%;
 }
-table td.report-start, table th.report-start {
+table.dataset-summary td.report-start, table.dataset-summary th.report-start {
     width:15%;
 }
-div.otherPriority {
-    margin-top: 10px;
+
+table.dataset-summary td.dataset-progress, table.dataset-summary th.dataset-progress {
+    width:10em;
+}
+
+table.dataset-summary-with-dates td.actions, table.dataset-summary-with-dates th.actions {
+    width:3em;
+}
+table.dataset-summary-with-dates td.dataset-name, table.dataset-summary-with-dates th.dataset-name {
+    width:30%;
 }
-table td.dataset-progress, table th.dataset-progress {
+
+table.dataset-summary-with-dates td.service, table.dataset-summary-with-dates th.service {
+    width:20%;
+}
+table.dataset-summary-with-dates td.report, table.dataset-summary-with-dates th.report {
+    width:20%;
+}
+table.dataset-summary td.dataset-progress, table.dataset-summary th.dataset-progress {
     width:10em;
 }
+
 #dataCollectionOngoingDiv {
     margin-top: 10px;
 }
+
+div.otherPriority, div.other {
+    margin-top: 5px;
+}
\ No newline at end of file
diff --git a/grails-app/assets/stylesheets/meriplan.css b/grails-app/assets/stylesheets/meriplan.css
index 9482b5573..d952e67c3 100644
--- a/grails-app/assets/stylesheets/meriplan.css
+++ b/grails-app/assets/stylesheets/meriplan.css
@@ -114,6 +114,9 @@ table tr.header th {
 
 .meri-plan .document-url {
     width: 20%;
+    white-space: pre-wrap;
+    word-break: break-word;
+    word-wrap: break-word;
 }
 
 .meri-plan .service {
@@ -508,4 +511,9 @@ input#changeProjectStartDate {
 
 .meri-plan .textarea-view {
     white-space: pre-wrap;
+}
+
+.meri-plan .meriList {
+    margin-left: 0;
+    padding-left: 1rem;
 }
\ No newline at end of file
diff --git a/grails-app/assets/stylesheets/project.css b/grails-app/assets/stylesheets/project.css
index 3b56b5aa3..3cfdd9b10 100644
--- a/grails-app/assets/stylesheets/project.css
+++ b/grails-app/assets/stylesheets/project.css
@@ -13,6 +13,7 @@
 *= require blog
 *= require dataSets
 *= require activity.css
+*= require prettytextdiff/pretty_text_diff_basic.css
 *= require_self
 */
 
@@ -350,4 +351,9 @@ li.select2-search input {
 
 .project-config-warning {
 	color: orange;
+}
+
+.meri-buttons .btn {
+	float: right;
+	margin-left: 5px;
 }
\ No newline at end of file
diff --git a/grails-app/conf/application.groovy b/grails-app/conf/application.groovy
index 1f467b699..e4572a068 100644
--- a/grails-app/conf/application.groovy
+++ b/grails-app/conf/application.groovy
@@ -272,7 +272,7 @@ environments {
         ecodata.baseUrl = 'http://localhost:8080/ws/'
         upload.images.url = grails.serverURL+'/image/'
         upload.images.path = "~/data/${appName}/images/"
-        emailFilter = /[A-Z0-9._%-]+@csiro\.au|chris\.godwin\.ala@gmail.com/
+        emailFilter = /[A-z0-9._%-]+@csiro\.au|chris\.godwin\.ala@gmail.com|[A-z0-9._%-]+@dcceew\.gov\.au/
         logging.dir = '.'
         ecodata.service.url = 'http://localhost:8080/ws'
         espSupportEmail='ESPmonitoring@environment.gov.au'
diff --git a/grails-app/conf/spring/resources.groovy b/grails-app/conf/spring/resources.groovy
index fb9fe24c8..082f11924 100644
--- a/grails-app/conf/spring/resources.groovy
+++ b/grails-app/conf/spring/resources.groovy
@@ -2,6 +2,7 @@
 import au.org.ala.merit.hub.HubAwareLinkGenerator
 import au.org.ala.merit.StatisticsFactory
 import au.org.ala.merit.CheckRisksAndThreatsTask
+import au.org.ala.merit.reports.NHTOutputReportLifecycleListener
 import au.org.ala.merit.util.ProjectGroupingHelper
 
 // Place your Spring DSL code here
@@ -17,4 +18,7 @@ beans = {
     checkForRisksAndThreatsTask(CheckRisksAndThreatsTask)
 
     projectGroupingHelper(ProjectGroupingHelper)
+
+    // The non-standard case is used because the name is derived from the activity type
+    NHTOutputReport(NHTOutputReportLifecycleListener)
 }
diff --git a/grails-app/controllers/au/org/ala/merit/DataSetController.groovy b/grails-app/controllers/au/org/ala/merit/DataSetController.groovy
index 70805226c..3dc6b3c84 100644
--- a/grails-app/controllers/au/org/ala/merit/DataSetController.groovy
+++ b/grails-app/controllers/au/org/ala/merit/DataSetController.groovy
@@ -2,6 +2,7 @@ package au.org.ala.merit
 
 import au.org.ala.merit.PreAuthorise
 import au.org.ala.merit.ProjectService
+import au.org.ala.merit.config.ProgramConfig
 import grails.converters.JSON
 import org.springframework.http.HttpStatus
 
@@ -28,7 +29,7 @@ class DataSetController {
         if (!project) {
             return [projectId:projectId, project: null]
         }
-        Map config = projectService.getProgramConfiguration(project)
+        ProgramConfig config = projectService.getProgramConfiguration(project)
         String programName = config.program?.name ?: project.associatedSubProgram
         List outcomes = projectService.getAllProjectOutcomes(project)
         if (!outcomes) {
@@ -47,11 +48,48 @@ class DataSetController {
         if (!priorities) {
             priorities = ['n/a']
         }
-        if (priorities){
-            priorities << 'Other'
+
+
+        List outcomeGroups = []
+        List projectServices = projectService.getProjectServices(project)
+        project.outputTargets?.each { Map outputTarget ->
+            if (outputTarget.outcomeTargets) {
+                Map service = projectServices.find{it.scores?.find{score -> score.scoreId == outputTarget.scoreId}}
+                if (service) {
+                    outputTarget.outcomeTargets.each {
+                        outcomeGroups << [
+                                serviceId: service.id,
+                                service: service.name,
+                                outcomes:it.relatedOutcomes,
+                                label:service.name+" "+it.relatedOutcomes
+                        ]
+                    }
+                }
+                else {
+                    log.warn("No service found for scoreId ${outputTarget.scoreId} in project ${project.projectId}")
+                 }
+            }
+        }
+        outcomeGroups = outcomeGroups.findAll{it.outcomes}.unique{it.label}.sort{it.label}
+
+        List projectBaselines = projectService.listProjectBaselines(project)
+        projectBaselines = projectBaselines?.collect{
+            // Only projects used the 2023 revision of the MERI plan will have a code attribute for their baselines
+            String label = it.code ? it.code + ' - '+ it.baseline : it.baseline
+            String value = it.code ?: it.baseline
+            [label:label, value: value]
+        }
+
+        List projectProtocols = projectService.listProjectProtocols(project).collect{
+            [label:it.name, value:it.externalId]
         }
+        projectProtocols << [label:'Other', value:'other']
+
+        List dataSetNames = project.custom?.dataSets?.collect{it.name}
 
-        [projectId:projectId, programName:programName, priorities:priorities, outcomes: outcomes, project:project]
+        [projectId:projectId, programName:programName, supportsOutcomeTargets:config.supportsOutcomeTargets(),
+         priorities:priorities, outcomes: outcomes, project:project, projectOutcomes:outcomeGroups,
+         projectBaselines:projectBaselines, projectProtocols:projectProtocols, dataSetNames:dataSetNames]
     }
 
     // Note that authorization is done against a project, so the project id must be supplied to the method.
@@ -60,6 +98,10 @@ class DataSetController {
 
         Map projectData = projectData(id)
         Map dataSet = projectData.project?.custom?.dataSets?.find{it.dataSetId == dataSetId}
+        if (dataSet) {
+            projectData.dataSetNames?.remove(dataSet.name)
+        }
+
         if (!dataSet) {
             render status: HttpStatus.NOT_FOUND
         }
diff --git a/grails-app/controllers/au/org/ala/merit/ManagementUnitController.groovy b/grails-app/controllers/au/org/ala/merit/ManagementUnitController.groovy
index 409e5befc..966297fd3 100644
--- a/grails-app/controllers/au/org/ala/merit/ManagementUnitController.groovy
+++ b/grails-app/controllers/au/org/ala/merit/ManagementUnitController.groovy
@@ -1,23 +1,14 @@
 package au.org.ala.merit
 
 import au.org.ala.merit.command.EditManagementUnitReportCommand
-import au.org.ala.merit.command.ManagementUnitReportCommand
 import au.org.ala.merit.command.PrintManagementUnitReportCommand
 import au.org.ala.merit.command.SaveReportDataCommand
 import au.org.ala.merit.command.ViewManagementUnitReportCommand
 import au.org.ala.merit.util.ProjectGroupingHelper
 import grails.converters.JSON
 import grails.core.GrailsApplication
-import grails.plugin.cache.Cacheable
 import grails.web.mapping.LinkGenerator
 import org.apache.http.HttpStatus
-
-import java.text.DateFormat
-import java.text.ParseException
-import java.text.SimpleDateFormat
-
-import static ReportService.ReportMode
-
 /**
  * Processes requests relating to MUs
  */
@@ -29,7 +20,6 @@ class ManagementUnitController {
 
     ReportService reportService
     ActivityService activityService
-    PdfGenerationService pdfGenerationService
     ProjectService projectService
     ProjectGroupingHelper projectGroupingHelper
 
@@ -239,19 +229,6 @@ class ManagementUnitController {
         chain(action:'editReport', id:id, params:[reportId:reportId])
     }
 
-    private Map activityReportModel(String managementUnitId, String reportId, ReportMode mode, Integer formVersion = null) {
-        Map mu = managementUnitService.get(managementUnitId)
-        Map config = mu.config
-        Map model = reportService.activityReportModel(reportId, mode, formVersion)
-
-        model.context = mu
-        model.returnTo = createLink(action:'index', id:managementUnitId)
-        model.contextViewUrl = model.returnTo
-        model.reportHeaderTemplate = '/managementUnit/managementUnitReportHeader'
-        model.config = config
-        model
-    }
-
     @PreAuthorise(accessLevel = 'readOnly', redirectController = 'managementUnit')
     def viewReport(ViewManagementUnitReportCommand cmd) {
         if (cmd.hasErrors()) {
@@ -262,38 +239,15 @@ class ManagementUnitController {
         render model:cmd.model, view:'/activity/activityReportView'
     }
 
-    @PreAuthorise(accessLevel = 'readOnly', redirectController = 'managementUnit')
-    def reportPDF(String id, String reportId) {
-
-        if (!id || !reportId) {
-            error('An invalid report was selected for download', id)
+    @PreAuthorise(accessLevel = 'readOnly')
+    def printManagementUnitReport(PrintManagementUnitReportCommand cmd) {
+        if (cmd.hasErrors()) {
+            error(cmd.errors.toString(), cmd.id)
             return
         }
-        Map reportUrlConfig = [action: 'viewReportCallback', id: id, params:[reportId:reportId]]
-
-        Map pdfGenParams = [:]
-        if (params.orientation) {
-            pdfGenParams.orientation = params.orientation
-        }
-        boolean result = pdfGenerationService.generatePDF(reportUrlConfig, pdfGenParams, response)
-        if (!result) {
-            render view: '/error', model: [error: "An error occurred generating the project report."]
-        }
-    }
 
-    /**
-     * This is designed as a callback from the PDF generation service.  It produces a HTML report that will
-     * be converted into PDF.
-     * @param id the project id
-     */
-    def viewReportCallback(PrintManagementUnitReportCommand cmd) {
+        render model:cmd.model, view:'/activity/activityReportView'
 
-        if (pdfGenerationService.authorizePDF(request)) {
-            render view:'/activity/activityReportView', model:cmd.model
-        }
-        else {
-            render status:HttpStatus.SC_UNAUTHORIZED
-        }
     }
 
     @PreAuthorise(accessLevel = 'editor')
@@ -396,39 +350,6 @@ class ManagementUnitController {
         render featureCollection as JSON
     }
 
-    @PreAuthorise(accessLevel='siteReadOnly')
-    def generateReportsInPeriod(){
-
-        String startDate = params.fromDate
-        String endDate = params.toDate
-
-        try{
-
-            def user = userService.getUser()
-            def extras =[:]
-            extras.summaryFlag = params.summaryFlag
-
-            String email = user.userName
-            extras.put("systemEmail", grailsApplication.config.getProperty('fieldcapture.system.email.address'))
-            extras.put("senderEmail", grailsApplication.config.getProperty('fieldcapture.system.email.address'))
-            extras.put("email", email)
-
-            String reportDownloadBaseUrl= grailsLinkGenerator.link(controller:'download',action:'get', absolute: true)
-            extras.put("reportDownloadBaseUrl", reportDownloadBaseUrl)
-
-            def resp = managementUnitService.generateReports(startDate, endDate,extras)
-            render resp as JSON
-
-        }catch (ParseException e){
-            def message = [message: 'Error: You need to provide startDate and endDate in the format of yyyy-MM-dd ']
-            response.setContentType("application/json")
-            render message as JSON
-        }catch(Exception e){
-            def message = [message: 'Fatal: '+ e.message]
-            render message as JSON
-        }
-    }
-
     /**
      * Star or unstar a management unit for a user
      * Action is determined by the URI endpoint, either: /add | /remove
diff --git a/grails-app/controllers/au/org/ala/merit/OrganisationController.groovy b/grails-app/controllers/au/org/ala/merit/OrganisationController.groovy
index 8336de9db..1ee5634d3 100644
--- a/grails-app/controllers/au/org/ala/merit/OrganisationController.groovy
+++ b/grails-app/controllers/au/org/ala/merit/OrganisationController.groovy
@@ -1,6 +1,7 @@
 package au.org.ala.merit
 
 import au.org.ala.merit.command.EditOrganisationReportCommand
+import au.org.ala.merit.command.PrintOrganisationReportCommand
 import au.org.ala.merit.command.SaveReportDataCommand
 import au.org.ala.merit.command.ViewOrganisationReportCommand
 import au.org.ala.merit.util.ProjectGroupingHelper
@@ -103,7 +104,7 @@ class OrganisationController {
         Map projectGroups = projectGroupingHelper.groupProjectsByProgram(projects, programGroups, ["organisationId:"+organisation.organisationId], true)
 
         [about     : [label: 'About', visible: true, stopBinding: false, type:'tab', default:!reportingVisible, displayedPrograms:projectGroups.displayedPrograms, servicesDashboard:[visible:true]],
-         projects : [label: 'Reporting', template:"/shared/projectListByProgram", visible: reportingVisible, stopBinding:true, default:reportingVisible, type: 'tab', reports:organisation.reports, adHocReportTypes:adHocReportTypes, reportOrder:reportOrder, hideDueDate:true, displayedPrograms:projectGroups.displayedPrograms],
+         projects : [label: 'Reporting', template:"/shared/projectListByProgram", visible: reportingVisible, stopBinding:true, default:reportingVisible, type: 'tab', reports:organisation.reports, adHocReportTypes:adHocReportTypes, reportOrder:reportOrder, hideDueDate:true, displayedPrograms:projectGroups.displayedPrograms, reportsFirst:true, declarationType:SettingPageType.RDP_REPORT_DECLARATION],
          sites     : [label: 'Sites', visible: reportingVisible, type: 'tab', stopBinding:true, projectCount:organisation.projects?.size()?:0, showShapefileDownload:hasAdminAccess],
          dashboard : [label: 'Dashboard', visible: reportingVisible, stopBinding:true, type: 'tab', template:'/shared/dashboard', reports:dashboardReports],
          admin     : [label: 'Admin', visible: hasAdminAccess, type: 'tab', template:'admin', showEditAnnoucements:showEditAnnoucements, availableReportCategories:availableReportCategories]]
@@ -249,7 +250,7 @@ class OrganisationController {
         }
     }
 
-    @PreAuthorise(accessLevel = 'admin')
+    @PreAuthorise(accessLevel = 'admin', projectIdParam = 'entityId')
     def addUserAsRoleToOrganisation() {
         String userId = params.userId
         String organisationId = params.entityId
@@ -268,7 +269,7 @@ class OrganisationController {
         }
     }
 
-    @PreAuthorise(accessLevel = 'admin')
+    @PreAuthorise(accessLevel = 'admin', projectIdParam = 'entityId')
     def removeUserWithRoleFromOrganisation() {
         String userId = params.userId
         String role = params.role
@@ -498,7 +499,22 @@ class OrganisationController {
         }
 
         if (cmd.report.type == ReportService.PERFORMANCE_MANAGEMENT_REPORT) {
-            viewOrEditOrganisationReport(cmd.report, false)
+            viewOrEditOrganisationReport(cmd.model, false)
+        }
+        else {
+            render model:cmd.model, view:'/activity/activityReportView'
+        }
+    }
+
+    @PreAuthorise(accessLevel = 'readOnly')
+    def printOrganisationReport(PrintOrganisationReportCommand cmd) {
+        if (cmd.hasErrors()) {
+            error(cmd.errors.toString(), cmd.id)
+            return
+        }
+
+        if (cmd.report.type == ReportService.PERFORMANCE_MANAGEMENT_REPORT) {
+            viewOrEditOrganisationReport(cmd.model, false)
         }
         else {
             render model:cmd.model, view:'/activity/activityReportView'
@@ -544,19 +560,20 @@ class OrganisationController {
         render result as JSON
     }
 
-    private def viewOrEditOrganisationReport(Map report, Boolean edit) {
-        int version = report.toDate < "2017-01-01T00:00:00Z" ? 1 : 2
-        Map organisation = organisationService.get(report.organisationId)
-        if (organisationService.isUserAdminForOrganisation(report.organisationId)) {
-            Map model = reportService.performanceReportModel(report.reportId, version)
+    private def viewOrEditOrganisationReport(Map cmdModel, Boolean edit) {
+        int version = cmdModel.report.toDate < "2017-01-01T00:00:00Z" ? 1 : 2
+        Map organisation = organisationService.get(cmdModel.report.organisationId)
+        if (organisationService.isUserAdminForOrganisation(cmdModel.report.organisationId)) {
+            Map model = reportService.performanceReportModel(cmdModel.report.reportId, version)
             model.state = organisation.state ?: 'Unknown'
             model.organisation = organisation
-
             if (reportService.excludesNotApproved(model.report)) {
                 model.submittingUserName = authService.getUserForUserId(model.report.submittedBy)?.displayName ?: 'Unknown user'
                 model.submissionDate = DateUtils.displayFormatWithTime(model.report.dateSubmitted)
                 edit = false
             }
+
+            model.printView = (cmdModel.printView) ? cmdModel.printView : false
             String view = edit ? '/report/performanceReport' : '/report/performanceReportView'
 
             render view: view, model:model
@@ -567,26 +584,6 @@ class OrganisationController {
         }
     }
 
-    def performanceReportPDF(String reportId) {
-        Map report = reportService.get(reportId)
-
-        if (organisationService.isUserAdminForOrganisation(report.organisationId)) {
-
-            int version = report.toDate < "2017-01-01T00:00:00Z" ? 1 : 2
-            Map model = reportService.performanceReportModel(reportId, version)
-            model.edit = false
-
-            String page = g.include(controller:'organisation', action:'viewOrganisationReport', id:reportId, params:[reportId:reportId])
-
-            response.setContentType('application/pdf')
-            pdfConverterService.convertToPDF(page, response.outputStream)
-        }
-        else {
-            flash.message = "You don't have permission to view the report"
-            chain(action:'index', id: report.organisationId)
-        }
-    }
-
     @PreAuthorise(accessLevel = 'admin')
     def createAdHocReport(String id) {
 
diff --git a/grails-app/controllers/au/org/ala/merit/ProgramController.groovy b/grails-app/controllers/au/org/ala/merit/ProgramController.groovy
index ead346b14..f28b01ec3 100644
--- a/grails-app/controllers/au/org/ala/merit/ProgramController.groovy
+++ b/grails-app/controllers/au/org/ala/merit/ProgramController.groovy
@@ -1,5 +1,6 @@
 package au.org.ala.merit
 
+import au.org.ala.merit.command.PrintProgramReportCommand
 import au.org.ala.merit.command.SaveReportDataCommand
 import grails.converters.JSON
 import org.apache.http.HttpStatus
@@ -15,7 +16,6 @@ class ProgramController {
     def programService, documentService, userService, roleService, commonService, webService, siteService
     ReportService reportService
     ActivityService activityService
-    PdfGenerationService pdfGenerationService
     BlogService blogService
     ManagementUnitService managementUnitService
 
@@ -336,39 +336,15 @@ class ProgramController {
         render model:model, view:'/activity/activityReportView'
     }
 
-    @PreAuthorise(accessLevel = 'editor')
-    def reportPDF(String id, String reportId) {
-
-        if (!id || !reportId) {
-            error('An invalid report was selected for download', id)
+    @PreAuthorise(accessLevel = 'readOnly')
+    def printProgramReport(PrintProgramReportCommand cmd) {
+        if (cmd.hasErrors()) {
+            error(cmd.errors.toString(), cmd.id)
             return
         }
-        Map reportUrlConfig = [action: 'viewReportCallback', id: id, params:[reportId:reportId]]
-
-        Map pdfGenParams = [:]
-        if (params.orientation) {
-            pdfGenParams.orientation = params.orientation
-        }
-        boolean result = pdfGenerationService.generatePDF(reportUrlConfig, pdfGenParams, response)
-        if (!result) {
-            render view: '/error', model: [error: "An error occurred generating the project report."]
-        }
-    }
 
-    /**
-     * This is designed as a callback from the PDF generation service.  It produces a HTML report that will
-     * be converted into PDF.
-     * @param id the project id
-     */
-    def viewReportCallback(String id, String reportId) {
+        render model:cmd.model, view:'/activity/activityReportView'
 
-        if (pdfGenerationService.authorizePDF(request)) {
-            Map model = activityReportModel(id, reportId, ReportMode.PRINT)
-            render view:'/activity/activityReportView', model:model
-        }
-        else {
-            render status:HttpStatus.SC_UNAUTHORIZED
-        }
     }
 
     @PreAuthorise(accessLevel = 'editor')
diff --git a/grails-app/controllers/au/org/ala/merit/ProjectController.groovy b/grails-app/controllers/au/org/ala/merit/ProjectController.groovy
index 1201add06..9f3709853 100644
--- a/grails-app/controllers/au/org/ala/merit/ProjectController.groovy
+++ b/grails-app/controllers/au/org/ala/merit/ProjectController.groovy
@@ -1,11 +1,13 @@
 package au.org.ala.merit
 
+import au.org.ala.merit.command.MeriPlanChangesReportCommand
 import au.org.ala.merit.command.MeriPlanReportCommand
 import au.org.ala.merit.command.ProjectSummaryReportCommand
 import au.org.ala.merit.command.ReportCommand
 import au.org.ala.merit.command.SaveReportDataCommand
 import au.org.ala.merit.config.ProgramConfig
 import au.org.ala.merit.config.ReportConfig
+import au.org.ala.merit.reports.ReportLifecycleListener
 import au.org.ala.merit.reports.ReportGenerationOptions
 import grails.converters.JSON
 import grails.core.GrailsApplication
@@ -31,14 +33,15 @@ class ProjectController {
     static String MERI_PLAN_TEMPLATE = "meriPlan"
 
     def projectService, metadataService, commonService, activityService, userService, webService, roleService
-    def siteService, documentService, reportService, blogService, pdfGenerationService
+    def siteService, documentService, reportService, blogService
     GrailsApplication grailsApplication
+    LockService lockService
 
     private def espOverview(Map project, Map user, ProgramConfig config) {
 
         Map projectArea = null
         if (project.sites) {
-            projectArea = project.sites?.find({ it.type == 'projectArea' })
+            projectArea = project.sites?.find({ it.type == SiteService.SITE_TYPE_PROJECT_AREA })
             if (!projectArea) {
                 projectArea = project.sites[0]
             }
@@ -101,7 +104,10 @@ class ProjectController {
             } else {
                 project.sites?.sort { it.name }
                 project.projectSite = project.sites?.find { it.siteId == project.projectSiteId }
-                def roles = roleService.getRoles()
+                List roles = roleService.getRoles()
+                if (config.supportsParatoo) {
+                    roles = roles + [RoleService.PROJECT_SURVEYOR_ROLE]
+                }
 
                 def members = projectService.getMembersForProjectId(id)
                 def admins = members.findAll { it.role == "admin" }.collect { it.userName }.join(",")
@@ -160,6 +166,7 @@ class ProjectController {
         def meriPlanEnabled = user?.hasViewAccess || ((project.associatedProgram == 'National Landcare Programme' && project.associatedSubProgram == 'Regional Funding'))
         def meriPlanVisibleToUser = project.planStatus == 'approved' || user?.isAdmin || user?.isCaseManager || user?.hasViewAccess
         boolean userHasViewAccess = user?.hasViewAccess ?: false
+        boolean showMeriPlanComparison = config.supportsMeriPlanComparison
 
         def publicImages = project.documents.findAll {
             it.public == true && it.thirdPartyConsentDeclarationMade == true && it.type == 'image'
@@ -185,6 +192,9 @@ class ProjectController {
         boolean adminTabVisible = user?.isEditor || user?.isAdmin || user?.isCaseManager || user?.hasViewAccess
         boolean showMeriPlanHistory = config.supportsMeriPlanHistory && userService.userIsSiteAdmin()
         boolean datasetsVisible = config.includesContent(ProgramConfig.ProjectContent.DATA_SETS) && userHasViewAccess
+        if (datasetsVisible && project.custom?.dataSets) {
+            projectService.filterDataSetSummaries(project.custom?.dataSets)
+        }
         def model = [overview       : [label: 'Overview', visible: true, default: true, type: 'tab', publicImages: imagesModel, displayOutcomes: false, blog: blog, hasNewsAndEvents: hasNewsAndEvents, hasProjectStories: hasProjectStories, canChangeProjectDates: canChangeProjectDates, outcomes:project.outcomes, objectives:config.program?.config?.objectives],
                      documents      : [label: 'Documents', visible: config.includesContent(ProgramConfig.ProjectContent.DOCUMENTS), type: 'tab', user:user, template:'docs', activityPeriodDescriptor:config.activityPeriodDescriptor ?: 'Stage'],
                      details        : [label: 'MERI Plan', default: false, disabled: !meriPlanEnabled, visible: meriPlanVisible, meriPlanVisibleToUser: meriPlanVisibleToUser, risksAndThreatsVisible: canViewRisks, announcementsVisible: true, project:project, type: 'tab', template:'viewMeriPlan', meriPlanTemplate:MERI_PLAN_TEMPLATE+'View', config:config, activityPeriodDescriptor:config.activityPeriodDescriptor ?: 'Stage'],
@@ -200,7 +210,7 @@ class ProjectController {
         else if (template == RLP_TEMPLATE) {
 
             // The RLP Project Template doesn't need site details or activities.
-            project.sites = new JSONArray(project.sites?.collect{new JSONObject([name:it.name, siteId:it.siteId, lastUpdated:it.lastUpdated, type:it.type, extent:[:]])} ?: [])
+            project.sites = new JSONArray(project.sites?.collect{new JSONObject([name:it.name, siteId:it.siteId, lastUpdated:it.lastUpdated, type:it.type, extent:[:], publicationStatus:it.publicationStatus, externalIds:it.externalIds])} ?: [])
             project.remove('activities')
             model.overview.template = 'rlpOverview'
 
@@ -222,7 +232,8 @@ class ProjectController {
             model.details.visible = model.details.visible && userHasViewAccess
 
             boolean reportsVisible = config.includesContent(ProgramConfig.ProjectContent.REPORTING) && userHasViewAccess
-            Map reportingTab = [label: 'Reporting', visible:reportsVisible, type:'tab', template:'projectReporting', reports:project.reports, stopBinding:true, services: config.services, scores:scores, hideDueDate:true, isAdmin:user?.isAdmin, isGrantManager:user?.isCaseManager]
+
+            Map reportingTab = [label: 'Reporting', visible:reportsVisible, type:'tab', template:'projectReporting', reports:project.reports, stopBinding:true, services: config.services, scores:scores, hideDueDate:true, isAdmin:user?.isAdmin, isGrantManager:user?.isCaseManager, declarationTemplate:config.getDeclarationTemplate()]
             if (reportingTab.visible) {
                 reportingTab.reportOrder = config?.projectReports?.collect{
                     [category:it.category, description:it.description, banner:it.banner, rejectionReasonCategoryOptions:it.rejectionReasonCategoryOptions?:[]]}?.unique({it.category}) ?: []
@@ -242,6 +253,7 @@ class ProjectController {
             rlpModel.admin.hidePrograms = true
             rlpModel.admin.showAnnouncementsTab = false
             rlpModel.admin.risksAndThreatsVisible = risksAndThreatsVisible
+            rlpModel.admin.showMeriPlanComparison = showMeriPlanComparison
 
             model = buildRLPTargetsModel(rlpModel, project)
         }
@@ -598,6 +610,16 @@ class ProjectController {
         render result as JSON
     }
 
+
+    @PreAuthorise(accessLevel = "admin")
+    def lockMeriPlan(String id) {
+        Map result = projectService.lockMeriPlanForEditing(id)
+        if (result.error) {
+            flash.message = "An error occurred while attempting to lock the MERI Plan: ${result.error}"
+        }
+        redirect action:'index', id:id
+    }
+
     @PreAuthorise(accessLevel = 'caseManager')
     def ajaxUnlockPlanForCorrection(String id) {
         def result = projectService.unlockPlanForCorrection(id, params.declaration)
@@ -633,20 +655,6 @@ class ProjectController {
         projectSummaryReportCommand()
     }
 
-    @PreAuthorise(accessLevel = 'admin')
-    def projectReportPDF(String id) {
-
-        Map reportUrlConfig = [controller: 'report', action: 'projectReportCallback', id: id, absolute: true, params: [fromStage: params.fromStage, toStage: params.toStage, sections: params.sections]]
-        Map pdfGenParams = [:]
-        if (params.orientation == 'landscape') {
-            pdfGenParams.options = '-O landscape'
-        }
-        boolean result = pdfGenerationService.generatePDF(reportUrlConfig, pdfGenParams, response)
-        if (!result) {
-            render view: '/error', model: [error: "An error occurred generating the project report."]
-        }
-    }
-
     /**
      * Accepts a MERI Plan as an attached file and attempts to convert it into a format compatible with
      * MERIT.
@@ -823,28 +831,22 @@ class ProjectController {
     }
 
     @PreAuthorise(accessLevel = 'editor')
-    def overrideLockAndEdit(String id, String reportId) {
-        reportService.overrideLock(reportId, g.createLink(action:'viewReport', id:id, params:[reportId:reportId], absolute: true))
-        chain(action:'editReport', id:id, params:[reportId:reportId])
+    def removeMeriPlanEditLock(String id) {
+        lockService.unlock(id)
+        redirect action:'index', id:id
     }
 
-    @PreAuthorise(accessLevel = 'readOnly')
-    def reportPDF(String id, String reportId) {
-        if (!id || !reportId || !projectService.doesReportBelongToProject(id, reportId)) {
-            error('An invalid report was selected for download', id)
-            return
-        }
-
-        Map reportUrlConfig = [action: 'viewReportCallback', id: id, params:[reportId:reportId]]
+    @PreAuthorise(accessLevel = 'admin')
+    def overrideMeriPlanLockAndEdit(String id) {
+        String url = g.createLink(action:'index', id:id)
+        projectService.overrideLock(id, url)
+        redirect action:'index', id:id
 
-        Map pdfGenParams = [:]
-        if (params.orientation) {
-            pdfGenParams.orientation = params.orientation
-        }
-        boolean result = pdfGenerationService.generatePDF(reportUrlConfig, pdfGenParams, response)
-        if (!result) {
-            render view: '/error', model: [error: "An error occurred generating the project report."]
-        }
+    }
+    @PreAuthorise(accessLevel = 'editor')
+    def overrideLockAndEdit(String id, String reportId) {
+        reportService.overrideLock(reportId, g.createLink(action:'viewReport', id:id, params:[reportId:reportId], absolute: true))
+        chain(action:'editReport', id:id, params:[reportId:reportId])
     }
 
     @PreAuthorise(accessLevel = 'admin')
@@ -857,23 +859,6 @@ class ProjectController {
         render result as JSON
     }
 
-    /**
-     * This is designed as a callback from the PDF generation service.  It produces a HTML report that will
-     * be converted into PDF.
-     * @param id the project id
-     */
-    def viewReportCallback(String id, String reportId) {
-
-        if (pdfGenerationService.authorizePDF(request)) {
-            Map model = activityReportModel(id, reportId, ReportMode.PRINT)
-
-            render view:'/activity/activityReportView', model:model
-        }
-        else {
-            render status:HttpStatus.SC_UNAUTHORIZED
-        }
-    }
-
     @PreAuthorise(accessLevel = 'readOnly', redirectController = "home")
     def ajaxProjectSites(String id) {
         Map result = projectService.projectSites(id)
@@ -881,22 +866,34 @@ class ProjectController {
         render result as JSON
     }
 
+
+
     private Map activityReportModel(String projectId, String reportId, ReportMode mode, Integer formVersion = null) {
 
         Map project = projectService.get(projectId)
         List sites = project.remove('sites')
         Map config = projectService.getProgramConfiguration(project)
         Map model = reportService.activityReportModel(reportId, mode, formVersion)
+        ReportLifecycleListener reportData = reportService.reportLifeCycleListener(model.activity.type)
+
         model.metaModel = projectService.filterOutputModel(model.metaModel, project, model.activity)
 
         model.outputModels.each { k, v ->
             if (v.scores) {
                 Map outputConfig = model.metaModel.outputConfig.find {it.outputName == k}
-                outputConfig?.outputContext = new JSONObject([scores:v.scores])
+                if (!outputConfig) {
+                    log.warn("Missing outputConfig for "+k)
+                }
+                else {
+                    outputConfig.outputContext = new JSONObject([scores:v.scores])
+                    outputConfig.outputContext.putAll(reportData.getOutputData(project, outputConfig, model.report))
+                }
+
             }
         }
 
         model.context = new HashMap(project)
+        model.context.putAll(reportData.getContextData(project, model.report))
         model.returnTo = g.createLink(action:'exitReport', id:projectId, params:[reportId:reportId])
         model.contextViewUrl = g.createLink(action:'index', id:projectId)
         model.reportHeaderTemplate = '/project/rlpProjectReportHeader'
@@ -1013,12 +1010,15 @@ class ProjectController {
     }
 
     private boolean hasTarget(value) {
-        value != 0 && value != "0"
+        if (value instanceof String) {
+            return value && value != "0"
+        }
+        value && value != 0
     }
 
     private boolean hasFinancialYearTarget(Map targetRow) {
         def financialYearTarget = targetRow.financialYearTarget
-        financialYearTarget != 0 && financialYearTarget != "0"
+        hasTarget(financialYearTarget)
     }
 
     @PreAuthorise(accessLevel ='siteAdmin')
@@ -1077,6 +1077,24 @@ class ProjectController {
         }
     }
 
+    @PreAuthorise(accessLevel = 'admin')
+    def viewMeriPlanChanges(MeriPlanChangesReportCommand meriPlanChangesReportCommand) {
+        Map model
+        // Only grant/project managers can view historical MERI plans.
+        if (meriPlanChangesReportCommand.documentId && !userService.userIsSiteAdmin()) {
+            render status:HttpStatus.SC_UNAUTHORIZED
+        }
+        else {
+            model = meriPlanChangesReportCommand.meriPlanChangesReportModel()
+            if (!model.error) {
+                render view:'/project/meriPlanChangesReport', model:model
+            }
+            else {
+                render status: HttpStatus.SC_NOT_FOUND
+            }
+        }
+    }
+
     /**
      * This method returns the investment priorities listed in the primary and secondary outcome sections of the
      * RLP MERI plan into a single list for the purposes of pre-populating one of the RLP outcomes reporting forms.
@@ -1097,8 +1115,9 @@ class ProjectController {
 
     @PreAuthorise(accessLevel = 'editor')
     def monitoringProtocolFormCategories() {
+        String MONITORING_TAG = 'survey'
         List<Map> forms = activityService.monitoringProtocolForms()
-
+        forms = forms.findAll{MONITORING_TAG in it.tags}
         List<String> categories = forms?.collect{
             [label:g.message(code:it.category, default:it.category.capitalize()), value:it.category]}?.unique()?.sort({it.label})
         render categories as JSON
diff --git a/grails-app/controllers/au/org/ala/merit/ReportController.groovy b/grails-app/controllers/au/org/ala/merit/ReportController.groovy
index b58c33725..fcaadfc0c 100644
--- a/grails-app/controllers/au/org/ala/merit/ReportController.groovy
+++ b/grails-app/controllers/au/org/ala/merit/ReportController.groovy
@@ -1,8 +1,6 @@
 package au.org.ala.merit
 
-import au.ala.org.ws.security.RequireApiKey
-import au.org.ala.merit.command.MeriPlanReportCommand
-import au.org.ala.merit.command.ProjectSummaryReportCommand
+
 import au.org.ala.merit.command.Reef2050PlanActionReportCommand
 import au.org.ala.merit.command.Reef2050PlanActionReportSummaryCommand
 import grails.converters.JSON
@@ -11,15 +9,22 @@ import org.joda.time.DateTime
 import org.joda.time.Interval
 import org.joda.time.Period
 
-import static au.org.ala.merit.DashboardTagLib.*
+import java.text.ParseException
+
+import static au.org.ala.merit.DashboardTagLib.estimateHeight
 
 class ReportController {
 
-    def webService, cacheService, searchService, metadataService, activityService, projectService, organisationService, commonService, statisticsFactory, reportService, userService, projectConfigurationService, pdfGenerationService, settingService
+    def webService, cacheService, searchService, metadataService, activityService, projectService, organisationService, commonService, statisticsFactory, reportService, userService, projectConfigurationService, settingService
 
     static defaultAction = "dashboard"
 
     def loadReport() {
+        if (!params.report) {
+            render status: HttpStatus.SC_BAD_REQUEST
+            return
+        }
+
         forward action: params.report+'Report', params:params
     }
 
@@ -486,58 +491,18 @@ class ReportController {
         render view:'_statistics', layout:'ajax', model:[statistics:statistics.statistics]
     }
 
-    /**
-     * Provides a way for the pdf generation service to callback into MERIT without requiring user credentials.
-     * (It uses an IP filter / API Key instead).
-     */
-    @RequireApiKey
-    def projectReportCallback(String id, ProjectSummaryReportCommand projectSummaryReportCommand) {
-
-        if (pdfGenerationService.authorizePDF(request)) {
-            Map model = projectSummaryReportCommand()
-            model.printable = 'pdf'
-            render view:'/project/projectReport', model: model
-        }
-        else {
-            render status:HttpStatus.SC_UNAUTHORIZED
-        }
-
-    }
-
-    private def reef2050PlanActionReportPDF(Reef2050PlanActionReportCommand command) {
-        boolean approvedActivitiesOnly =  userService.userIsAlaOrFcAdmin() ? command.approvedActivitiesOnly : true
-        Map reportUrlConfig = [controller: 'report', action: 'reef2050PlanActionReportCallback', absolute: true, params:[approvedActivitiesOnly:approvedActivitiesOnly, periodEnd:command.periodEnd, type:command.type]]
-        Map pdfGenParams = [orientation:'landscape']
-
-        boolean result = pdfGenerationService.generatePDF(reportUrlConfig, pdfGenParams, response)
-        if (!result) {
-            render view: '/error', model: [error: "Arror generating the PDF of the Reef 2050 Plan Report"]
-        }
-    }
-
-    @RequireApiKey
-    def reef2050PlanActionReportCallback(Reef2050PlanActionReportCommand command) {
-        if (pdfGenerationService.authorizePDF(request)) {
-            Map model = command.produceReport(true)
-            render model:model, view: 'reef2050PlanActionReportPrintable'
-        }
-        else {
-            render status:HttpStatus.SC_UNAUTHORIZED
-        }
-
-    }
-
     def reef2050PlanActionReport(Reef2050PlanActionReportCommand command) {
-        if (command.format == 'pdf') {
-            reef2050PlanActionReportPDF(command)
-        }
-        else if (command.format == 'dashboard') {
+        Map model = [:]
+        if (command.format == 'dashboard') {
             Reef2050PlanActionReportSummaryCommand summary = new Reef2050PlanActionReportSummaryCommand(activityService: command.activityService, approvedActivitiesOnly:  command.approvedActivitiesOnly)
-            Map model = [reportConfig:summary.reportSummary().collect{it.toMap()}, approvedActivitiesOnly: command.approvedActivitiesOnly]
+            model = [reportConfig:summary.reportSummary().collect{it.toMap()}, approvedActivitiesOnly: command.approvedActivitiesOnly]
             render model: model, view: 'reef2050PlanAdminDashboardReport'
         }
         else {
-            Map model = command.produceReport()
+            model = command.produceReport()
+            if (command.format == 'pdf') {
+                model.printView = true
+            }
             render model:model, view: 'reef2050PlanActionReportPrintable'
         }
     }
@@ -558,4 +523,39 @@ class ReportController {
         render view: '/report/_reportingHistory', model: [reportingHistory: reportingHistory]
     }
 
+    @PreAuthorise(accessLevel='siteReadOnly')
+    def generateReportsInPeriod(){
+
+        String startDate = params.fromDate
+        String endDate = params.toDate
+
+        try{
+
+            def user = userService.getUser()
+            def extras =[:]
+            extras.summaryFlag = params.summaryFlag
+
+            String email = user.userName
+            extras.put("hubId", SettingService.hubConfig?.hubId)
+            extras.put("entity", params.entity)
+            extras.put("systemEmail", grailsApplication.config.getProperty('fieldcapture.system.email.address'))
+            extras.put("senderEmail", grailsApplication.config.getProperty('fieldcapture.system.email.address'))
+            extras.put("email", email)
+
+            String reportDownloadBaseUrl= grailsLinkGenerator.link(controller:'download',action:'get', absolute: true)
+            extras.put("reportDownloadBaseUrl", reportDownloadBaseUrl)
+
+            def resp = reportService.generateReports(startDate, endDate,extras)
+            render resp as JSON
+
+        }catch (ParseException e){
+            def message = [message: 'Error: You need to provide startDate and endDate in the format of yyyy-MM-dd ']
+            response.setContentType("application/json")
+            render message as JSON
+        }catch(Exception e){
+            def message = [message: 'Fatal: '+ e.message]
+            render message as JSON
+        }
+    }
+
 }
diff --git a/grails-app/controllers/au/org/ala/merit/SiteController.groovy b/grails-app/controllers/au/org/ala/merit/SiteController.groovy
index 02db2615f..0a1c0da84 100644
--- a/grails-app/controllers/au/org/ala/merit/SiteController.groovy
+++ b/grails-app/controllers/au/org/ala/merit/SiteController.groovy
@@ -27,13 +27,14 @@ class SiteController {
     }
 
     def createForProject(){
-        def project = projectService.getRich(params.projectId)
+        def project = projectService.get(params.projectId, 'all')
         // permissions check
         if (!projectService.canUserEditProject(userService.getCurrentUserId(), params.projectId)) {
             flash.message = "Access denied: User does not have <b>editor</b> permission for projectId ${params.projectId}"
             redirect(controller:'project', action:'index', id: params.projectId)
         }
-        render view: 'edit', model: [create:true, project:project, documents:[]]
+
+        render view: 'edit', model: [create:true, project:project, documents:[], siteTypes:siteTypes(null, project)]
     }
 
     def index(String id) {
@@ -46,6 +47,7 @@ class SiteController {
             if (!isUserMemberOfSiteProjects(site)) {
                 flash.message = "Access denied: User does not have permission to view site: ${id}"
                 redirect(controller:'home', action:'index')
+                return
             }
 
             List userProjects = site.projects?.findAll { projectService.canUserViewProject(user?.userId, it.projectId) }
@@ -55,8 +57,8 @@ class SiteController {
             if (params.projectId) {
                 selectedProject = userProjects.find{it.projectId == params.projectId}
             }
-            else if (userProjects.size() == 1) {
-                selectedProject = userProjects[0]
+            else if (userProjects.size() >= 1) {
+                selectedProject = userProjects[0] // Just pick a random project for context if navigation wasn't from the project.
             }
 
             // Filter visible activities to those the user has access to.
@@ -116,11 +118,39 @@ class SiteController {
             flash.message = "Access denied: User does not have <b>editor</b> permission to edit site: ${id}"
             redirect(controller:'home', action:'index')
         } else {
-            if (result.site.type == SiteService.SITE_TYPE_COMPOUND) {
+            if (SiteService.isReadOnly(result.site)) {
                 redirect(action:'index', id:id)
             }
-            result
         }
+
+        Map site = result.site
+        Map project = null
+        // Don't allow a site to be a project area if it:
+        // 1) Isn't associated with a project
+        // 2) Is associated with more than one project.
+        if (site.projects && site.projects.size() == 1) {
+            project = projectService.get(site.projects[0], 'all')
+        }
+        result.siteTypes = siteTypes(site, project)
+        result
+    }
+
+    /**
+     * Returns a List to use to render the site type dropdown.
+     * Projects are only allowed to have one project area, and project areas can only be associated with a
+     * single Project.
+     *
+     * @param project If this site is for a single project, supplying it here will allow a check whether
+     * the site is allowed to be a project area.
+     * @return
+     */
+    private List<Map> siteTypes(Map site, Map project) {
+        List siteTypes = [SiteService.SITE_TYPE_WORKS_AREA, SiteService.SITE_TYPE_SURVEY_AREA]
+        if (site?.type == SiteService.SITE_TYPE_PROJECT_AREA || (project && !projectService.hasProjectArea(project))) {
+            siteTypes << SiteService.SITE_TYPE_PROJECT_AREA
+        }
+
+        siteTypes.collect{[value:it, label:g.message(code:'site.type.'+it, default:it)]}
     }
 
     def downloadShapefile(String id) {
@@ -140,6 +170,25 @@ class SiteController {
         }
     }
 
+    /** Returns geojon for a site */
+    def geojson(String id) {
+        Map site = siteService.get(id)
+        if (!site) {
+            Map resp = [status:HttpStatus.SC_NOT_FOUND]
+            render resp as JSON
+            return
+        }
+        if (!isUserMemberOfSiteProjects(site)) {
+            Map resp = [status:HttpStatus.SC_UNAUTHORIZED]
+            render resp as JSON
+            return
+        }
+
+        Map resp = siteService.getSiteGeoJson(site.siteId)
+        resp = resp?.resp ?: resp // Render the geojson directly if successful, otherwise render the ecodata response including the status
+        render resp as JSON
+    }
+
     @PreAuthorise(accessLevel = 'editor')
     def ajaxDeleteSitesFromProject(String id){
 
@@ -154,7 +203,7 @@ class SiteController {
         List siteIds = payload.siteIds
 
         project?.sites?.each { site ->
-            if (site.type == SiteService.SITE_TYPE_COMPOUND) {
+            if (SiteService.isReadOnly(site)) {
                 siteIds.remove(site.siteId)
             }
         }
@@ -176,7 +225,7 @@ class SiteController {
             return
         }
         Map site = siteService.get(id)
-        if (!projectService.canUserEditProject(userService.getCurrentUserId(), projectId) || site.type == SiteService.SITE_TYPE_COMPOUND) {
+        if (!projectService.canUserEditProject(userService.getCurrentUserId(), projectId) || SiteService.isReadOnly(site)) {
             render status:403, text: "Access denied: User does not have permission to edit sites for project: ${projectId}"
             return
         }
@@ -194,7 +243,7 @@ class SiteController {
     def ajaxDelete(String id) {
         // permissions check
         Map site = siteService.get(id)
-        if (!isUserMemberOfSiteProjects(site) || site.type == SiteService.SITE_TYPE_COMPOUND) {
+        if (!isUserMemberOfSiteProjects(site) || SiteService.isReadOnly(site)) {
             render status:403, text: "Access denied: User does not have permission to edit site: ${id}"
             return
         }
@@ -214,7 +263,7 @@ class SiteController {
         log.debug("Updating site: " + id)
         Map site = siteService.get(id)
         // permissions check
-        if (!isUserMemberOfSiteProjects(site) || site.type == SiteService.SITE_TYPE_COMPOUND) {
+        if (!isUserMemberOfSiteProjects(site) || SiteService.isReadOnly(site)) {
             render status:403, text: "Access denied: User does not have permission to edit site: ${id}"
             return
         }
@@ -238,10 +287,10 @@ class SiteController {
     }
 
     def siteUpload() {
-        String projectId = params.projectId
+        String projectId = params.id ?: params.projectId
         if (!projectService.canUserEditProject(userService.getCurrentUserId(), projectId)) {
-            flash.message = "Access denied: User does not have <b>editor</b> permission for projectId ${params.projectId}"
-            redirect(controller:'project', action:'index', id: params.projectId)
+            flash.message = "Access denied: User does not have <b>editor</b> permission for projectId ${projectId}"
+            redirect(controller:'project', action:'index', id: projectId)
         }
         else if (request.respondsTo('getFile')) {
 
@@ -255,23 +304,23 @@ class SiteController {
                     break
                 case 'kmz':
                     uploadKmz(projectId, file)
-                    redirect(controller:'project', id:params.projectId)
+                    redirect(controller:'project', id:projectId)
                     return
                 case 'kml':
                     uploadKml(projectId, file)
-                    redirect(controller:'project', id:params.projectId)
+                    redirect(controller:'project', id:projectId)
                     return
                 default:
                     flash.message = "Unsupported file type.  Please attach a shapefile, kmz or kml file"
-                    result = [view:'upload', model:[projectId: projectId, returnTo:params.returnTo]]
+                    result = [view:'upload', model:[projectId: projectId]]
             }
 
-            result.model.putAll([projectId: projectId, returnTo:params.returnTo])
+            result.model.putAll([projectId: projectId])
             render result
 
         }
         else {
-            render view:'upload', model:[projectId: projectId, returnTo:params.returnTo]
+            render view:'upload', model:[projectId: projectId]
         }
     }
 
@@ -320,7 +369,7 @@ class SiteController {
             def message ='There was an error uploading the shapefile.  Please send an email to support for further assistance.'
 
             flash.message = "An error was encountered when processing the shapefile: ${message}"
-            return [view:'upload', model:[projectId: projectId, returnTo:params.returnTo]]
+            return [view:'upload', model:[projectId: projectId]]
         }
     }
 
diff --git a/grails-app/controllers/au/org/ala/merit/UrlMappings.groovy b/grails-app/controllers/au/org/ala/merit/UrlMappings.groovy
index 520e3c175..d8ade46b9 100644
--- a/grails-app/controllers/au/org/ala/merit/UrlMappings.groovy
+++ b/grails-app/controllers/au/org/ala/merit/UrlMappings.groovy
@@ -118,6 +118,16 @@ class UrlMappings {
             action = 'download'
         }
 
+        "/site/siteUpload/$projectId" {
+            controller = 'site'
+            action = 'upload'
+        }
+
+        "/site/upload/$projectId" {
+            controller = 'site'
+            action = 'upload'
+        }
+
         "500"(view:'/error')
         "404"(view:'/404')
         "/$hub/$controller/ws/$action/$id" {
diff --git a/grails-app/i18n/messages.properties b/grails-app/i18n/messages.properties
index 80a9b7308..586f309de 100644
--- a/grails-app/i18n/messages.properties
+++ b/grails-app/i18n/messages.properties
@@ -301,6 +301,7 @@ label.F=<i class=\"icon-remove\"></i>
 label.role.admin=Admin
 label.role.caseManager=Grant Manager
 label.role.editor=Editor
+label.role.projectParticipant=Field Data Collector
 label.docType=Type
 label.project=Project
 label.site=Site
@@ -341,10 +342,27 @@ label.externalId.GRANT_AWARD=Grant Award ID
 label.externalId.TECH_ONE_CODE=Tech One Project Code
 label.externalId.GRANT_OPPORTUNITY=Grant Opportunity ID
 label.externalId.RELATED_PROJECT=Related Project ID
+label.externalId.TECH_ONE_CONTRACT_NUMBER=Tech One Contract Number
 
 label.merit.projectID = MERIT Project ID
 label.merit.externalID = External ID
 label.merit.grantAwardID = Grant Award ID
 label.merit.grantID = Grant ID
 
-label.collapsible.heading = About:
\ No newline at end of file
+label.collapsible.heading = About:
+
+attach.document.subtitle = Please ensure that no documents containing sensitive data are uploaded. Information on what is considered sensitive ecological data can be found at
+attach.document.subtitle.link = Sensitive Ecological Data Access and Management Policy - DCCEEW
+attach.document.help = Sensitivities can include Personally Identifiable Information such as name, address, email and phone; or can be culturally or ecologically sensitive such as the location of sacred sites, threatened species nesting sites, or threatened plants.  If in doubt, please contact your Project Manager or the MERIT Team for advice.
+project.description.help = Do not include locations of "almost extinct" threatened species.
+
+
+site.type.worksArea=Works Area
+site.type.surveyArea=Survey Area
+site.type.projectArea=Project Extent
+
+report.status.published=Report approved
+report.status.pendingApproval=Report submitted
+report.status.unpublished=Report not submitted
+report.status.cancelled=Report not required
+report.status.=
\ No newline at end of file
diff --git a/grails-app/services/au/org/ala/merit/ActivityService.groovy b/grails-app/services/au/org/ala/merit/ActivityService.groovy
index 9d6845683..05a69046c 100644
--- a/grails-app/services/au/org/ala/merit/ActivityService.groovy
+++ b/grails-app/services/au/org/ala/merit/ActivityService.groovy
@@ -1,8 +1,6 @@
 package au.org.ala.merit
 
 import au.org.ala.ecodata.forms.ActivityFormService
-import au.org.ala.merit.DateUtils
-import grails.converters.JSON
 import grails.plugin.cache.Cacheable
 import groovy.util.logging.Slf4j
 import org.joda.time.DateTime
@@ -14,6 +12,7 @@ class ActivityService {
 
     def webService, grailsApplication, metadataService, reportService, projectService, emailService, userService
     ActivityFormService activityFormService
+    LockService lockService
 
     public static final String PROGRESS_PLANNED = 'planned'
     public static final String PROGRESS_FINISHED = 'finished'
@@ -178,27 +177,20 @@ class ActivityService {
     }
 
     Map lock(String activityId) {
-        String path = "lock/lock/"+activityId
-        webService.doPost(grailsApplication.config.getProperty('ecodata.baseUrl')+path,[:])
+       lockService.lock(activityId)
     }
 
     Map lock(Map activity) {
-        lock(activity.activityId)
+        lockService.lock(activity.activityId)
     }
 
     Map unlock(String activityId, Boolean force = false) {
-        String path = "lock/unlock/"+activityId
-        webService.doPost(grailsApplication.config.getProperty('ecodata.baseUrl')+path,[force:force])
+        lockService.unlock(activityId, force)
     }
 
     void stealLock(String activityId, String activityUrl) {
         Map activity = get(activityId)
-        Map result = [error:'No lock']
-        if (activity.lock) {
-            result = unlock(activityId, true)
-            emailService.sendLockStolenEmail(activity.lock, activityUrl)
-        }
-        result
+        lockService.stealLock(activityId, activity, activityUrl, SettingPageType.ACTIVITY_LOCK_STOLEN_EMAIL_SUBJECT, SettingPageType.ACTIVITY_LOCK_STOLEN_EMAIL)
     }
 
     def isReport(activity) {
@@ -290,7 +282,7 @@ class ActivityService {
 
         Map resp = activityFormService.searchActivityForms(criteria)
         List<Map> forms = resp?.resp ?: []
-        forms = forms.collect{[externalId:it.externalId, name:it.name, formVersion:it.formVersion, category:it.category]}
+        forms = forms.collect{[externalIds:it.externalIds, externalId:it.externalIds?.find{it.idType?.name == "MONITOR_PROTOCOL_GUID"}?.externalId, name:it.name, formVersion:it.formVersion, category:it.category, tags:it.tags]}
 
         forms
     }
diff --git a/grails-app/services/au/org/ala/merit/EmailService.groovy b/grails-app/services/au/org/ala/merit/EmailService.groovy
index 52b0132b3..57f05e670 100644
--- a/grails-app/services/au/org/ala/merit/EmailService.groovy
+++ b/grails-app/services/au/org/ala/merit/EmailService.groovy
@@ -151,12 +151,12 @@ class EmailService {
         )
     }
 
-    def sendLockStolenEmail(Map lock, String url) {
+    def sendLockStolenEmail(Map lock, String url, SettingPageType emailSubjectTemplate, SettingPageType emailBodyTemplate) {
         def currentUser = userService.lookupUser(userService.currentUserId)
         def userHoldingLock = userService.lookupUser(lock.userId)
         createAndSend(
-                SettingPageType.LOCK_STOLEN_EMAIL_SUBJECT,
-                SettingPageType.LOCK_STOLEN_EMAIL,
+                SettingPageType.ACTIVITY_LOCK_STOLEN_EMAIL_SUBJECT,
+                SettingPageType.ACTIVITY_LOCK_STOLEN_EMAIL,
                 [user:currentUser.displayName, url:url],
                 [userHoldingLock.email],
                 [currentUser.email],
diff --git a/grails-app/services/au/org/ala/merit/ImportService.groovy b/grails-app/services/au/org/ala/merit/ImportService.groovy
index 244818d2d..c3eb87124 100644
--- a/grails-app/services/au/org/ala/merit/ImportService.groovy
+++ b/grails-app/services/au/org/ala/merit/ImportService.groovy
@@ -667,10 +667,10 @@ class ImportService {
                         siteService.addPhotoPoint(site.siteId, createPhotoPoint(site))
                     }
                 }
-                if (!prj.sites?.find{it.type == 'projectArea'}) {
+                if (!prj.sites?.find{it.type == SiteService.SITE_TYPE_PROJECT_AREA}) {
                     Map siteCoords = createProjectArea(prj.sites)
                     String projectAreaSiteName = "Project area for "+prj.name
-                    Map projectArea = [extent: [source: 'drawn', geometry: siteCoords], projects: [projectId], name: projectAreaSiteName, description: projectAreaSiteName, externalId:'', type:'projectArea', visibility:'private']
+                    Map projectArea = [extent: [source: 'drawn', geometry: siteCoords], projects: [projectId], name: projectAreaSiteName, description: projectAreaSiteName, externalId:'', type:SiteService.SITE_TYPE_PROJECT_AREA, visibility:'private']
                     siteService.create(projectArea)
 
                     // Re-query the project to pick up the new project area site.
@@ -732,7 +732,7 @@ class ImportService {
 
 
     private void createActivities(Map project) {
-        String projectAreaId = project.sites.find{it.type == 'projectArea'}.siteId
+        String projectAreaId = project.sites.find{it.type == SiteService.SITE_TYPE_PROJECT_AREA}.siteId
         List activitiesToCreate = [
                 [
                         type:'ESP Species',
diff --git a/grails-app/services/au/org/ala/merit/LockService.groovy b/grails-app/services/au/org/ala/merit/LockService.groovy
new file mode 100644
index 000000000..e4ea7fe99
--- /dev/null
+++ b/grails-app/services/au/org/ala/merit/LockService.groovy
@@ -0,0 +1,30 @@
+package au.org.ala.merit
+
+import grails.core.GrailsApplication
+
+/** Handles locking and unlocking of activities and projects. */
+class LockService {
+
+    EmailService emailService
+    WebService webService
+    GrailsApplication grailsApplication
+
+    Map lock(String entityId) {
+        String path = "lock/lock/"+entityId
+        webService.doPost(grailsApplication.config.getProperty('ecodata.baseUrl')+path,[:])
+    }
+
+    Map unlock(String entityId, Boolean force = false) {
+        String path = "lock/unlock/"+entityId
+        webService.doPost(grailsApplication.config.getProperty('ecodata.baseUrl')+path,[force:force])
+    }
+
+    Map stealLock(String entityId, Map entity, String url, SettingPageType emailSubjectTemplate, SettingPageType emailBodyTemplate) {
+        Map result = [error:'No lock']
+        if (entity.lock) {
+            result = unlock(entityId, true)
+            emailService.sendLockStolenEmail(entity.lock, url, emailSubjectTemplate, emailBodyTemplate)
+        }
+        result
+    }
+}
diff --git a/grails-app/services/au/org/ala/merit/ManagementUnitService.groovy b/grails-app/services/au/org/ala/merit/ManagementUnitService.groovy
index 6491b9bcc..bb2a0cfca 100644
--- a/grails-app/services/au/org/ala/merit/ManagementUnitService.groovy
+++ b/grails-app/services/au/org/ala/merit/ManagementUnitService.groovy
@@ -8,7 +8,6 @@ import grails.core.GrailsApplication
 import grails.plugin.cache.Cacheable
 import groovy.util.logging.Slf4j
 import org.grails.web.json.JSONArray
-import org.joda.time.DateTimeZone
 
 @Slf4j
 class ManagementUnitService {
@@ -263,24 +262,4 @@ class ManagementUnitService {
         String url = "${grailsApplication.config.getProperty('ecodata.baseUrl')}" + "managementunit/"+id+"/report"
         webService.getJson(url)
     }
-    /**
-     * Download [all] management unit reports in a given period
-     * @param startDate
-     * @param endDate
-     * @param emails for sending email to user
-     * @return
-     */
-    def generateReports(String startDate, String endDate, Map extras = null){
-
-        // The end date is the last day of the period (e.g. 2020-06-30) but reports will end at midnight of the next day (e.g. 2020-07-01T00:00:00)
-        // so add a day or two to achieve this.
-
-        String isoStartDate = DateUtils.format(DateUtils.parse(startDate).plusDays(1).withZone(DateTimeZone.UTC))
-        String isoEndDate = DateUtils.format(DateUtils.parse(endDate).plusDays(1).withZone(DateTimeZone.UTC))
-
-        String url = "${grailsApplication.config.getProperty('ecodata.baseUrl')}" + "managementunit/generateReportsInPeriod?startDate=${isoStartDate}&endDate=${isoEndDate}"
-        url += '&' + extras.collect { k,v -> "$k=$v" }.join('&')
-        def resp = webService.getJson(url)
-        return resp
-    }
 }
diff --git a/grails-app/services/au/org/ala/merit/MetadataService.groovy b/grails-app/services/au/org/ala/merit/MetadataService.groovy
index ff626fa7a..10603bce4 100644
--- a/grails-app/services/au/org/ala/merit/MetadataService.groovy
+++ b/grails-app/services/au/org/ala/merit/MetadataService.groovy
@@ -250,7 +250,7 @@ class MetadataService {
 
     def getAccessLevels() {
         return cacheService.get('accessLevels',{
-            webService.getJson(grailsApplication.config.getProperty('ecodata.baseUrl') +  "permissions/getAllAccessLevels")
+            webService.getJson(grailsApplication.config.getProperty('ecodata.baseUrl') +  "permissions/getAllAccessLevels?baseLevel=${RoleService.PROJECT_SURVEYOR_ROLE}")
         })
     }
 
diff --git a/grails-app/services/au/org/ala/merit/OrganisationService.groovy b/grails-app/services/au/org/ala/merit/OrganisationService.groovy
index d9a0eca2e..de1c447f8 100644
--- a/grails-app/services/au/org/ala/merit/OrganisationService.groovy
+++ b/grails-app/services/au/org/ala/merit/OrganisationService.groovy
@@ -24,22 +24,11 @@ class OrganisationService {
             [type: 'Performance expectations framework - self assessment worksheet', period: Period.years(1), bulkEditable: true, businessDaysToCompleteReport:5, adhoc:true]
     ]
 
-    /** Overrides the parent to add Green Army reports to the results */
     def get(String id, view = '') {
 
         String url = "${grailsApplication.config.getProperty('ecodata.baseUrl')}organisation/$id?view=$view"
         Map organisation = webService.getJson(url)
 
-        def projects = []
-        def resp = projectService.search(organisationId: id, isMERIT:true, view:'enhanced')
-        if (resp?.resp?.projects) {
-            projects += resp.resp.projects
-        }
-        resp = projectService.search(orgIdSvcProvider: id, isMERIT:true, view:'enhanced')
-        if (resp?.resp?.projects) {
-            projects += resp.resp.projects.findAll{!projects.find{project -> project.projectId == it.projectId} }
-        }
-        organisation.projects = projects
         if (view != 'flat') {
             organisation.reports = getReportsForOrganisation(organisation, getReportConfig(id))
         }
diff --git a/grails-app/services/au/org/ala/merit/PdfGenerationService.groovy b/grails-app/services/au/org/ala/merit/PdfGenerationService.groovy
deleted file mode 100644
index bf7b309eb..000000000
--- a/grails-app/services/au/org/ala/merit/PdfGenerationService.groovy
+++ /dev/null
@@ -1,83 +0,0 @@
-package au.org.ala.merit
-
-import grails.core.GrailsApplication
-import groovy.util.logging.Slf4j
-
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpServletResponse
-
-/**
- * Interacts with the ALA pdfgen service to produce a PDF version of an HTML page.
- * Handles basic authorization.
- */
-@Slf4j
-class PdfGenerationService {
-
-    WebService webService
-    CommonService commonService
-    def grailsLinkGenerator
-    GrailsApplication grailsApplication
-
-    /**
-     * This is simple way of authorizing the generation of a report on behalf of the PDF generation service.
-     * Because this state is maintained between requests, this mechanism introduces session affinity requirement which
-     * we can get away with as there is currently only one instance of BioCollect.  Possibly a JSONToken
-     * style authorization would work better.
-     */
-    static Set PDF_AUTHORIZATION_STORAGE = Collections.synchronizedSet(new HashSet())
-    static final String TOKEN_PARAM = "token"
-    static final String PDFGEN_PATH = "api/pdf"
-
-    /** reports can be slow to produce, so we are using a long timeout */
-    static final int TIMEOUT = 10 * 60 * 1000
-
-    /**
-     * Generates a PDF from the supplied URL information and configures the supplied response to return the PDF.
-     * @param reportUrlDetails used to generate a URL that will produce a HTML version of the report.  Must be in the form of a grails map e.g [controller:'report', action:'myreport']
-     * @param pdfParams parameters to be passed to wkthmltopdf, The only currently supported parameter is [orentation:landscape] will produce a landscape report.
-     * @param response the HttpServletResponse being produced.  The response returned from the pdfgen server will be copied to this response.
-     * @return true if the generation was successful, false otherwise.  If true is returned, no further modifications to the response should be made by the client.
-     */
-    boolean generatePDF(Map reportUrlDetails, Map pdfParams, HttpServletResponse response) {
-        String token = UUID.randomUUID().toString()
-        PDF_AUTHORIZATION_STORAGE.add(token)
-
-        reportUrlDetails.absolute = true
-        if (reportUrlDetails.params) {
-            reportUrlDetails.params.token = token
-        }
-        else {
-            reportUrlDetails.params = [token:token]
-        }
-
-        String reportUrl = grailsLinkGenerator.link(reportUrlDetails)
-        Map pdfGenParams = [docUrl: reportUrl, cacheable: false, options:'--viewport-size 1280x1024']
-        if (pdfParams?.orientation == 'landscape') {
-            pdfGenParams.options += ' -O landscape'
-        }
-
-        String url = grailsApplication.config.getProperty('pdfgen.baseURL') + PDFGEN_PATH + commonService.buildUrlParamsFromMap(pdfGenParams)
-        Map result
-        try {
-            result = webService.proxyGetRequest(response, url, false, false, TIMEOUT)
-        }
-        catch (Exception e) {
-            result = [error: e.message]
-            log.error("Error generating PDF for URL ${reportUrl}: ", e)
-        }
-        finally {
-            PDF_AUTHORIZATION_STORAGE.remove(token)
-        }
-        return result.error ? false : true
-    }
-
-    /**
-     * Checks that the supplied request is authorized to generate a report.  This method needs to be invoked by the
-     * callback method that does the work of generating the report.
-     * @param request the callback from the pdfgen server.
-     * @return true if the request is authorized.
-     */
-    boolean authorizePDF(HttpServletRequest request) {
-        return PDF_AUTHORIZATION_STORAGE.contains(request.getParameter(TOKEN_PARAM))
-    }
-}
diff --git a/grails-app/services/au/org/ala/merit/ProjectService.groovy b/grails-app/services/au/org/ala/merit/ProjectService.groovy
index 888248b54..ae3298a6a 100644
--- a/grails-app/services/au/org/ala/merit/ProjectService.groovy
+++ b/grails-app/services/au/org/ala/merit/ProjectService.groovy
@@ -3,6 +3,7 @@ package au.org.ala.merit
 import au.org.ala.merit.config.EmailTemplate
 import au.org.ala.merit.config.ProgramConfig
 import au.org.ala.merit.config.ReportConfig
+import au.org.ala.merit.reports.ReportLifecycleListener
 import au.org.ala.merit.reports.ReportGenerationOptions
 import au.org.ala.merit.reports.ReportGenerator
 import au.org.ala.merit.reports.ReportOwner
@@ -43,6 +44,7 @@ class ProjectService  {
     def webService, grailsApplication, siteService, activityService, emailService, documentService, userService, metadataService, settingService, reportService, auditService, speciesService, commonService
     ProjectConfigurationService projectConfigurationService
     def programService
+    LockService lockService
 
     def get(id, levelOfDetail = "", includeDeleted = false) {
 
@@ -61,6 +63,16 @@ class ProjectService  {
 
     }
 
+    void filterDataSetSummaries(List dataSetSummaries) {
+        List protocolNamesToHide = grailsApplication.config.getProperty('hidden.dataSet.protocols', List.class, ['Plot Selection', 'Plot Layout and Visit'])
+        List<Map> forms = activityService.monitoringProtocolForms()
+
+        dataSetSummaries.removeAll { Map dataSetSummary ->
+            Map protocolForm = forms.find{it.externalId == dataSetSummary.protocol}
+            protocolForm && (protocolForm.name in protocolNamesToHide)
+        }
+    }
+
     /**
      * Returns a filtered project view based on user needs.  This will be implemented in ecodata as a part of the
      * API changes but for now implementing it here is OK
@@ -344,7 +356,7 @@ class ProjectService  {
             // the "custom" Map which can contain properties "details" (the MERI plan) and "dataSets" (data set summaries)
             // The longer term solution for this is to model Projects explicitly/correctly in ecodata
             if (projectDetails.custom) {
-                projectDetails.custom.details?.lastUpdated = DateUtils.format(new Date())
+                projectDetails.custom.details?.lastUpdated = DateUtils.formatAsISOStringNoMillis(new Date())
 
                 Map custom = currentProject.custom ?: [:]
                 custom.putAll(projectDetails.custom)
@@ -413,18 +425,48 @@ class ProjectService  {
         userCanEdit
     }
 
+    Map lockMeriPlanForEditing(String projectId) {
+        Map project = get(projectId)
+        if (!project.planStatus || project.planStatus == PLAN_NOT_APPROVED) {
+            Map resp = lockService.lock(projectId)
+            if (resp.resp && !resp.resp.error) {
+                return [message:'success']
+            }
+            else {
+                return [error:resp?.resp?.error]
+            }
+        }
+        return [error:'Invalid plan status']
+    }
+
+    Map overrideLock(String projectId, String entityUrl) {
+        Map project = get(projectId)
+        lockService.stealLock(projectId, project, entityUrl, SettingPageType.PROJECT_LOCK_STOLEN_EMAIL_SUBJECT, SettingPageType.PROJECT_LOCK_STOLEN_EMAIL)
+        // This is done in the projectService instead of the lockService as the
+        // same use case for an Activity has the lock aquired as a part of the redirect
+        lockService.lock(projectId)
+    }
+
+
     def submitPlan(String projectId) {
         def project = get(projectId)
 
         if (!project.planStatus || project.planStatus == PLAN_NOT_APPROVED) {
-            def resp = update(projectId, [planStatus:PLAN_SUBMITTED])
-            if (resp.resp && !resp.resp.error) {
-
-                sendEmail({ProgramConfig programConfig -> programConfig.getPlanSubmittedTemplate()}, project, RoleService.PROJECT_ADMIN_ROLE)
-                return [message:'success']
+            if (project.lock && project.lock?.userId != userService.getCurrentUserId()) {
+                return [error:'MERI plan is locked by another user']
             }
             else {
-                return [error:"Update failed: ${resp?.resp?.error}"]
+                if (project.lock) {
+                    lockService.unlock(projectId)
+                }
+                def resp = update(projectId, [planStatus: PLAN_SUBMITTED])
+                if (resp.resp && !resp.resp.error) {
+
+                    sendEmail({ ProgramConfig programConfig -> programConfig.getPlanSubmittedTemplate() }, project, RoleService.PROJECT_ADMIN_ROLE)
+                    return [message: 'success']
+                } else {
+                    return [error: "Update failed: ${resp?.resp?.error}"]
+                }
             }
         }
         return [error:'Invalid plan status']
@@ -468,7 +510,7 @@ class ProjectService  {
 
     def rejectPlan(String projectId) {
         def project = get(projectId)
-        if (requiresMERITAdminToModifyPlan(project) && !userService.userIsAlaOrFcAdmin()) {
+        if (project.planStatus == PLAN_APPROVED && requiresMERITAdminToModifyPlan(project) && !userService.userIsAlaOrFcAdmin()) {
             return [error: 'Only MERIT admins can return MERI plans for this program']
         }
         if (project.planStatus in [PLAN_SUBMITTED, PLAN_APPROVED]) {
@@ -606,7 +648,7 @@ class ProjectService  {
         // Some projects have extra stage reports after the end date due to legacy data so this checks we've got the last stage within the project dates
         List validReports = project.reports?.findAll{it.fromDate < project.plannedEndDate ? it.fromDate : project.plannedStartDate}
 
-        List incompleteReports = (validReports?.findAll{it.publicationStatus != ReportService.REPORT_APPROVED && it.publicationStatus != ReportService.REPORT_CANCELLED})?:[]
+        List incompleteReports = (validReports?.findAll{PublicationStatus.requiresAction(it.publicationStatus)})?:[]
 
         return incompleteReports.size() ==1 && incompleteReports[0].reportId == approvedReportId
     }
@@ -1669,8 +1711,11 @@ class ProjectService  {
     }
 
     List outcomesByScores(String projectId, List scoreIds) {
-
         Map project = get(projectId)
+        outcomesByScores(project, scoreIds)
+    }
+
+    List outcomesByScores(Map project, List scoreIds) {
         List outcomes = []
         scoreIds.each { String scoreId ->
             Map target = project.outputTargets?.find{it.scoreId == scoreId}
@@ -1835,7 +1880,7 @@ class ProjectService  {
         Map projectSites = siteService.getProjectSites(projectId)
         if (projectSites && !projectSites.error) {
             List sites = projectSites.sites
-            Map projectArea = projectSites?.find { it.properties?.type == 'projectArea' }
+            Map projectArea = projectSites?.find { it.properties?.type == SiteService.SITE_TYPE_PROJECT_AREA }
             if (projectArea) {
                 result.projectArea = projectArea
             }
@@ -1845,7 +1890,7 @@ class ProjectService  {
                     site.properties.category = 'Reporting Sites'
                     result.features << site
                 }
-                else if (site.properties?.type != 'projectArea') {
+                else if (site.properties?.type != SiteService.SITE_TYPE_PROJECT_AREA) {
                     site.properties.category = 'Planning Sites'
                     result.features << site
                 }
@@ -1860,6 +1905,10 @@ class ProjectService  {
         result
     }
 
+    boolean hasProjectArea(Map project) {
+        project?.sites?.find{it.type == SiteService.SITE_TYPE_PROJECT_AREA}
+    }
+
     /**
      * Searches the audit trail for updates where the MERI plan has been approved and returns a summary of
      * those audit messages for display (and possible retreival) to the user.
@@ -1951,6 +2000,19 @@ class ProjectService  {
         project?.custom?.details?.assets?.collect{it.description}?.findAll{it}
     }
 
+    List listProjectBaselines(Map project) {
+        project?.custom?.details?.baseline?.rows
+    }
+
+    List listProjectProtocols(Map project) {
+        List<Map> forms = activityService.monitoringProtocolForms()
+        List baselineProtocols = project?.custom?.details?.baseline?.rows?.collect{it.protocols}?.flatten() ?:[]
+        List monitoringProtocols = project?.custom?.details?.monitoring?.rows?.collect{it.protocols}?.flatten() ?:[]
+
+        List modules = (baselineProtocols + monitoringProtocols).unique().findAll{it}
+        forms?.findAll{it.category in modules}
+    }
+
     /**
      * Returns a map with key=<project priority>, value=<Ag or Env>
      * The map is used to determine whether the priority is associated with
@@ -2044,9 +2106,11 @@ class ProjectService  {
         if(!dataSet.dataCollectionOngoing) {
             dataSet.dataCollectionOngoing = false
         }
+        dataSet.lastUpdated = DateUtils.formatAsISOStringNoMillis(new Date())
 
         if (!dataSet.dataSetId) {
             dataSet.dataSetId = UUID.randomUUID().toString()
+            dataSet.dateCreated = DateUtils.formatAsISOStringNoMillis(new Date())
             project.custom.dataSets << dataSet
         }
         else {
@@ -2080,4 +2144,69 @@ class ProjectService  {
         return project.reports.size() > 0
     }
 
+    /**
+     * Updates all of the data set summaries for the supplied data set ids with the supplied properties.
+     * @param dataSetIds
+     * @param properties
+     * @return
+     */
+    Map bulkUpdateDataSetSummaries(String projectId, String reportId, List dataSetIds, Map properties) {
+        boolean dirty = false
+        List errors = []
+        Map project = get(projectId)
+        dataSetIds?.each { String dataSetId ->
+
+            Map dataSet = project.custom?.dataSets?.find{it.dataSetId == dataSetId}
+            if (dataSet) {
+                // Associate the data set with the report
+                if (!dataSet.reportId) {
+                    dataSet.reportId = reportId
+                    dirty = true
+                }
+                else if (dataSet.reportId != reportId) {
+                    Map report = project.reports?.find({it.reportId == dataSet.reportId})
+                    String reportLabel = report?.name ?: dataSet.reportId
+                    errors << "Data set ${dataSet.name} is already associated with report ${reportLabel}. " +
+                            "Datasets can only be selected once into all outputs reports, please ensure that you have" +
+                            " selected the correct dataset before attempting to save the report again. " +
+                            "If you have selected the wrong dataset into another report, you will need to remove it" +
+                            " from that report before you can select it into this report. " +
+                            "If the problem persists, please contact support."
+                    return
+                }
+
+                properties.each { String key, value ->
+                    if (dataSet[key] != value) {
+                        dataSet[key] = value
+                        dirty = true
+                    }
+                }
+            }
+            else {
+                errors << "Report ${reportId} references data set ${dataSetId} which does not exist in project ${projectId}"
+            }
+        }
+        // Disassociate any data sets that were removed from the report
+        project.custom?.dataSets.findAll { Map dataSet ->
+            dataSet.reportId == reportId && !(dataSet.dataSetId in dataSetIds)
+        }.each {
+            it.reportId = null
+            it.publicationStatus = null
+            dirty = true
+        }
+
+        Map result = [:]
+        if (dirty) {
+            // Save the changes to the data sets
+            result = updateUnchecked(project.projectId, [custom: project.custom])
+            if (result?.error) {
+                errors << result.error
+            }
+        }
+        if (errors) {
+            result.error = errors.join("\n")
+        }
+        result
+    }
+
 }
diff --git a/grails-app/services/au/org/ala/merit/ReportService.groovy b/grails-app/services/au/org/ala/merit/ReportService.groovy
index 7f8ded67b..dbd0645b1 100644
--- a/grails-app/services/au/org/ala/merit/ReportService.groovy
+++ b/grails-app/services/au/org/ala/merit/ReportService.groovy
@@ -3,22 +3,19 @@ package au.org.ala.merit
 import au.org.ala.merit.config.EmailTemplate
 import au.org.ala.merit.config.ProgramConfig
 import au.org.ala.merit.config.ReportConfig
+import au.org.ala.merit.reports.ReportLifecycleListener
 import au.org.ala.merit.reports.ReportGenerator
 import au.org.ala.merit.reports.ReportOwner
 import grails.plugin.cache.Cacheable
 import groovy.util.logging.Slf4j
 import org.apache.commons.io.FilenameUtils
 import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
 import org.joda.time.Period
 
 @Slf4j
 class ReportService {
 
-    public static final String REPORT_APPROVED = 'published'
-    public static final String REPORT_SUBMITTED = 'pendingApproval'
-    public static final String REPORT_NOT_APPROVED = 'unpublished'
-    public static final String REPORT_CANCELLED = 'cancelled'
-
     public static final int HOME_PAGE_IMAGE_SIZE = 500
 
     public static final String REPORT_TYPE_SINGLE_ACTIVITY = 'Single'
@@ -168,11 +165,11 @@ class ReportService {
     }
 
     boolean excludesNotApproved(Map report) {
-        return report.publicationStatus == REPORT_SUBMITTED || report.publicationStatus == REPORT_APPROVED || report.publicationStatus == REPORT_CANCELLED
+        return PublicationStatus.isReadOnly(report.publicationStatus)
     }
 
     boolean isApproved(Map report) {
-        return report.publicationStatus == REPORT_APPROVED
+        return PublicationStatus.isApproved(report.publicationStatus)
     }
 
     List search(Map criteria) {
@@ -258,6 +255,8 @@ class ReportService {
         Map report = get(reportId)
 
         if (!resp.error) {
+            ReportLifecycleListener listener = reportLifeCycleListener(report)
+            listener.reportSubmitted(report, reportActivityIds, reportOwner)
             activityService.submitActivitiesForPublication(reportActivityIds)
             emailService.sendEmail(emailTemplate, [reportOwner:reportOwner, report:report], ownerUsersAndRoles, RoleService.PROJECT_ADMIN_ROLE)
         }
@@ -303,6 +302,8 @@ class ReportService {
         Map report = get(reportId)
 
         if (!resp.error) {
+            ReportLifecycleListener listener = reportLifeCycleListener(report)
+            listener.reportApproved(report, reportActivityIds, reportOwner)
             activityService.approveActivitiesForPublication(reportActivityIds)
             emailService.sendEmail(emailTemplate, [reportOwner:reportOwner, report:report, reason:reason], ownerUsersAndRoles, RoleService.GRANT_MANAGER_ROLE)
         }
@@ -332,6 +333,8 @@ class ReportService {
         Map report = get(reportId)
 
         if (!resp.error) {
+            ReportLifecycleListener listener = reportLifeCycleListener(report)
+            listener.reportRejected(report, reportActivityIds, reportOwner)
             activityService.rejectActivitiesForPublication(reportActivityIds)
             emailService.sendEmail(emailTemplate, [reportOwner:reportOwner, report:report, categories: reasonCategories, reason:reason], ownerUsersAndRoles, RoleService.GRANT_MANAGER_ROLE)
         }
@@ -347,6 +350,8 @@ class ReportService {
         Map report = get(reportId)
 
         if (!resp.error) {
+            ReportLifecycleListener listener = reportLifeCycleListener(report)
+            listener.reportCancelled(report, reportActivityIds, reportOwner)
             activityService.cancelActivitiesForPublication(reportActivityIds)
         }
         else {
@@ -459,7 +464,12 @@ class ReportService {
             return [success:false, error:"Cannot delete data for an approved or submitted report"]
         }
 
-        webService.doPost(grailsApplication.config.getProperty('ecodata.baseUrl')+"report/reset/"+report.reportId, [:])
+        Map resp = webService.doPost(grailsApplication.config.getProperty('ecodata.baseUrl')+"report/reset/"+report.reportId, [:])
+        if (!resp.error) {
+            ReportLifecycleListener listener = reportLifeCycleListener(report)
+            listener.reportReset(report)
+        }
+        resp
     }
 
     def findReportsForUser(String userId) {
@@ -887,7 +897,7 @@ class ReportService {
         Map filter = state?[type:'DISCRETE', property:'data.state']:[:]
         Map config = [groups:filter, childAggregations: aggregations, label:'Performance assessment by state']
 
-        Map searchCriteria = [type:['Performance Management Framework - Self Assessment', 'Performance Management Framework - Self Assessment v2'], publicationStatus:REPORT_APPROVED, dateProperty:'toDate', 'startDate':(year-1)+'-07-01T10:00:00Z', 'endDate':year+'-07-01T10:00:00Z']
+        Map searchCriteria = [type:['Performance Management Framework - Self Assessment', 'Performance Management Framework - Self Assessment v2'], publicationStatus:PublicationStatus.APPROVED, dateProperty:'toDate', 'startDate':(year-1)+'-07-01T10:00:00Z', 'endDate':year+'-07-01T10:00:00Z']
 
         String url =  grailsApplication.config.getProperty('ecodata.baseUrl')+"report/runReport"
 
@@ -931,7 +941,7 @@ class ReportService {
             model.themes = []
             model.locked = activity.lock != null
         }
-        else if (mode == ReportMode.PRINT) {
+        if (mode == ReportMode.PRINT) {
             model.printView = true
         }
         // Custom report types don't necessarily have an associated activity but the canEdit only uses that
@@ -986,4 +996,53 @@ class ReportService {
         history
     }
 
+    /**
+     * Download [all] management unit reports in a given period
+     * @param startDate
+     * @param endDate
+     * @param emails for sending email to user
+     * @return
+     */
+    def generateReports(String startDate, String endDate, Map extras = null){
+
+        // The end date is the last day of the period (e.g. 2020-06-30) but reports will end at midnight of the next day (e.g. 2020-07-01T00:00:00)
+        // so add a day or two to achieve this.
+
+        String isoStartDate = DateUtils.format(DateUtils.parse(startDate).plusDays(1).withZone(DateTimeZone.UTC))
+        String isoEndDate = DateUtils.format(DateUtils.parse(endDate).plusDays(1).withZone(DateTimeZone.UTC))
+
+        String url = "${grailsApplication.config.getProperty('ecodata.baseUrl')}" + "report/generateReportsInPeriod?startDate=${isoStartDate}&endDate=${isoEndDate}"
+        url += '&' + extras.collect { k,v -> "$k=$v" }.join('&')
+        def resp = webService.getJson(url)
+        return resp
+    }
+
+    ReportLifecycleListener reportLifeCycleListener(Map report) {
+        ReportLifecycleListener listener
+        if (report.activityType && report.activityId) {
+            listener = reportLifeCycleListener(report.activityType)
+        }
+        if (!listener) {
+            listener = new ReportLifecycleListener()
+        }
+        listener
+    }
+
+    ReportLifecycleListener reportLifeCycleListener(String activityType) {
+        ReportLifecycleListener reportData = null
+        // Remove all spaces from the activityType
+        String reportDataBeanName = activityType.replaceAll("\\s", "")
+
+        if (grailsApplication.mainContext.containsBean(reportDataBeanName)) {
+            reportData = grailsApplication.mainContext.getBean(reportDataBeanName)
+        }
+
+        if (!reportData) {
+            reportData = new ReportLifecycleListener()
+        }
+        else {
+            log.debug("Found custom reportData bean "+reportDataBeanName+" for activity type "+activityType)
+        }
+        reportData
+    }
 }
diff --git a/grails-app/services/au/org/ala/merit/RoleService.groovy b/grails-app/services/au/org/ala/merit/RoleService.groovy
index 74f149a56..278f73c71 100644
--- a/grails-app/services/au/org/ala/merit/RoleService.groovy
+++ b/grails-app/services/au/org/ala/merit/RoleService.groovy
@@ -30,7 +30,7 @@ class RoleService {
     public static final String PROJECT_FC_READ_ONLY_ROLE = 'ROLE_FC_READ_ONLY'
     public static final String PROJECT_FC_OFFICER_ROLE = 'ROLE_FC_OFFICER'
     public static final String PROJECT_FC_ADMIN_ROLE = 'ROLE_FC_ADMIN'
-
+    public static final String PROJECT_SURVEYOR_ROLE = 'projectParticipant'
 
     /**
      * A check against this role will pass if the user has any hub or any Project role.  This is more of a permission
@@ -105,7 +105,7 @@ class RoleService {
     }
 
     Set getAllowedUserRoles() {
-        return new HashSet([PROJECT_ADMIN_ROLE, PROJECT_EDITOR_ROLE])
+        return new HashSet([PROJECT_ADMIN_ROLE, PROJECT_EDITOR_ROLE, PROJECT_SURVEYOR_ROLE])
     }
 
     public Set getHubRoles() {
diff --git a/grails-app/services/au/org/ala/merit/SiteService.groovy b/grails-app/services/au/org/ala/merit/SiteService.groovy
index a7f60c513..d1840b6ac 100644
--- a/grails-app/services/au/org/ala/merit/SiteService.groovy
+++ b/grails-app/services/au/org/ala/merit/SiteService.groovy
@@ -25,6 +25,17 @@ class SiteService {
 
     /** A site with the extent derived from the convex hull of a set of geojson features */
     public static final String SITE_TYPE_COMPOUND = 'compound'
+    /** A site representing the area in which project activities are being conducted */
+    public static final String SITE_TYPE_PROJECT_AREA = 'projectArea'
+    /** A site representing an area in which one or more project activities will take place */
+    public static final String SITE_TYPE_WORKS_AREA = 'worksArea'
+/** A site representing an area in which one or more project surveys will take place */
+    public static final String SITE_TYPE_SURVEY_AREA = 'surveyArea'
+
+
+    static isReadOnly(Map site) {
+        site?.type == SITE_TYPE_COMPOUND || PublicationStatus.isReadOnly(site.publicationStatus)
+    }
 
     def projectsForSite(siteId) {
         get(siteId)?.projects
diff --git a/grails-app/services/au/org/ala/merit/WebService.groovy b/grails-app/services/au/org/ala/merit/WebService.groovy
index 9a69a1a29..9fb6855f4 100644
--- a/grails-app/services/au/org/ala/merit/WebService.groovy
+++ b/grails-app/services/au/org/ala/merit/WebService.groovy
@@ -374,7 +374,7 @@ class WebService {
             conn.setDoOutput(true)
             conn.setRequestProperty("Content-Type", "application/json;charset=${charEncoding}");
             if (useToken) {
-                conn.setRequestProperty("Authorization", getToken())
+                addTokenHeader(conn)
             }
             else {
                 conn.setRequestProperty("Authorization", grailsApplication.config.getProperty('api_key'));
@@ -419,7 +419,7 @@ class WebService {
             conn = new URL(url).openConnection()
             conn.setRequestMethod("DELETE")
             if (useToken) {
-                conn.setRequestProperty("Authorization", getToken())
+                addTokenHeader(conn)
             }
             else {
                 conn.setRequestProperty("Authorization", grailsApplication.config.getProperty('api_key'))
@@ -479,7 +479,12 @@ class WebService {
                 }
             }
             if (useToken) {
-                headers.'Authorization' = getToken()
+                if (grailsApplication.config.getProperty('spatial.supports_jwt', Boolean.class, true)) {
+                    headers.'Authorization' = getToken()
+                }
+                else {
+                    headers.'apiKey' = grailsApplication.config.getProperty('api_key')
+                }
             }
             else {
                 headers.'Authorization' = grailsApplication.config.getProperty('api_key')
@@ -523,5 +528,14 @@ class WebService {
         }
         result
     }
+
+    private void addTokenHeader(conn) {
+        if (grailsApplication.config.getProperty('spatial.supports_jwt', Boolean.class, true)) {
+            conn.setRequestProperty("Authorization", getToken())
+        }
+        else {
+            conn.setRequestProperty("apiKey", grailsApplication.config.getProperty('api_key'));
+        }
+    }
 }
 
diff --git a/grails-app/taglib/au/org/ala/merit/FCTagLib.groovy b/grails-app/taglib/au/org/ala/merit/FCTagLib.groovy
index 7a12e5622..58bef8126 100644
--- a/grails-app/taglib/au/org/ala/merit/FCTagLib.groovy
+++ b/grails-app/taglib/au/org/ala/merit/FCTagLib.groovy
@@ -1,15 +1,23 @@
 package au.org.ala.merit
 
 import au.org.ala.cas.util.AuthenticationCookieUtils
+import au.org.ala.merit.config.ProgramConfig
 import au.org.ala.web.AuthService
 import bootstrap.Attribute
+import com.naleid.grails.MarkdownService
 import grails.converters.JSON
 import grails.web.servlet.mvc.GrailsParameterMap
+import groovy.util.logging.Slf4j
 import groovy.xml.MarkupBuilder
 import org.apache.commons.lang.WordUtils
 import org.grails.web.json.JSONArray
 import org.grails.web.json.JSONObject
+import org.owasp.html.HtmlChangeListener
+import org.owasp.html.HtmlPolicyBuilder
+import org.owasp.html.PolicyFactory
+import org.owasp.html.Sanitizers
 
+@Slf4j
 class FCTagLib {
 
     static namespace = "fc"
@@ -17,7 +25,12 @@ class FCTagLib {
     def commonService
     def userService
     def settingService
+    MarkdownService markdownService
     AuthService authService
+    MetadataService metadataService
+
+    /** Allow simple formatting, links and text within p and divs by default */
+    def policy = (Sanitizers.FORMATTING & Sanitizers.LINKS & Sanitizers.BLOCKS) & new HtmlPolicyBuilder().allowTextIn("p", "div").toFactory()
 
     def textField = { attrs ->
         def outerClass = attrs.remove 'outerClass'
@@ -669,21 +682,21 @@ class FCTagLib {
     def footerContent = { attrs ->
         def content = settingService.getSettingText(SettingPageType.FOOTER) as String
         if (content) {
-            out << content.markdownToHtml()
+            out << markdownToHtmlAndSanitise(content)
         }
     }
 
     def announcementContent = { attrs ->
         def content = settingService.getSettingText(SettingPageType.ANNOUNCEMENT) as String
         if (content) {
-            out << content.markdownToHtml()
+            out << markdownToHtmlAndSanitise(content)
         }
     }
 
     def homePageTitle = { attrs ->
         def content = settingService.getSettingText(SettingPageType.TITLE) as String
         if (content) {
-            out << content
+            out << markdownToHtmlAndSanitise(content)
         }
     }
 
@@ -696,7 +709,7 @@ class FCTagLib {
         SettingPageType settingType = attrs.settingType
         def content = settingService.getSettingText(settingType) as String
         if (content) {
-            out << content.markdownToHtml()
+            out << markdownToHtmlAndSanitise(content)
         }
     }
 
@@ -877,15 +890,189 @@ class FCTagLib {
 
         out << '<span class="original hide">'
         if (original && original.size() > i) {
-            out << original[i][property]
+            (attrs.property) ? out << original[i][property] : out << original[i]
+        }
+        out << '</span>'
+        out << '<span class="changed hide">'
+        if (changed && changed.size() > i) {
+            (attrs.property) ? out << changed[i][property] : out << changed[i]
+        }
+        out << '</span>'
+        out << '<span class="diff"></span>'
+
+    }
+
+    def renderComparisonOutputTargets = { attrs ->
+
+        List original = attrs.original
+        List changed = attrs.changed
+        int i = attrs.i
+        String property = attrs.property
+
+        out << '<span class="original hide">'
+        if (original && original.size() > i) {
+            (attrs.property) ? out << original[i][property][0].collect{it}.join(',') : out << original[i][0]
+        }
+        out << '</span>'
+        out << '<span class="changed hide">'
+        if (changed && changed.size() > i) {
+            (attrs.property) ? out << changed[i][property][0].collect{it}.join(',') : out << changed[i][0]
+        }
+        out << '</span>'
+        out << '<span class="diff"></span>'
+
+    }
+
+    def renderComparisonList = { attrs ->
+
+        List original = attrs.original
+        List changed = attrs.changed
+        int i = attrs.i
+        String property = attrs.property
+
+        out << '<span class="original hide">'
+        if (original && original.size() > i) {
+            if (original[i][property] instanceof List) {
+                out << fakeBulletedList(original[i][property])
+            } else {
+                out << original[i][property]
+            }
+
+        }
+        out << '</span>'
+        out << '<span class="changed hide">'
+        if (changed && changed.size() > i) {
+            if (changed[i][property] instanceof List) {
+                out << fakeBulletedList(changed[i][property])
+            } else {
+                out << changed[i][property]
+            }
+        }
+        out << '</span>'
+        out << '<span class="diff"></span>'
+
+    }
+
+    def renderComparisonMonitoring = { attrs ->
+
+        String code = attrs.code
+        List original = attrs.original
+        List changed = attrs.changed
+        int i = attrs.i
+        String property = attrs.property
+        ProgramConfig config = attrs.config
+
+        def origMonitoringList = original
+        def resultOrigMonitoringList = []
+        for (def monitoring : origMonitoringList) {
+            if (code && code == monitoring.relatedBaseline) {
+                resultOrigMonitoringList = monitoring
+            }
+        }
+
+        def changedMonitoringList = changed
+        def resultChangedMonitoringList = []
+        for (def monitoring : changedMonitoringList) {
+            if (code && code == monitoring.relatedBaseline) {
+                resultChangedMonitoringList = monitoring
+            }
+        }
+
+        out << '<span class="original hide">'
+        if (resultOrigMonitoringList && resultOrigMonitoringList.size() > i) {
+            if (property == 'relatedTargetMeasures') {
+                out << getScoreLabels(resultOrigMonitoringList[property], config, true)
+            } else {
+                if (resultOrigMonitoringList[property] instanceof List) {
+                    out << resultOrigMonitoringList[property].collect{it}.join(',')
+                } else {
+                    out << resultOrigMonitoringList[property]
+                }
+            }
+
+        }
+        out << '</span>'
+
+        out << '<span class="changed hide">'
+        if (resultChangedMonitoringList && resultChangedMonitoringList.size() > i) {
+            if (property == 'relatedTargetMeasures') {
+                out << getScoreLabels(resultChangedMonitoringList[property], config, true)
+            } else {
+                if (resultChangedMonitoringList[property] instanceof List) {
+                    out << resultChangedMonitoringList[property].collect{it}.join(',')
+                } else {
+                    out << resultChangedMonitoringList[property]
+                }
+            }
+
+        }
+        out << '</span>'
+        out << '<span class="diff"></span>'
+    }
+
+    def renderComparisonScoreLabel = { attrs ->
+
+        List original = attrs.original
+        List changed = attrs.changed
+        int i = attrs.i
+        boolean includeService = attrs.includeService
+        String property = attrs.property
+        ProgramConfig config = attrs.config
+        try {
+            out << '<span class="original hide">'
+            if (original && original.size() > i) {
+                out << getScoreLabels(original[i][property], config, includeService)
+            }
+            out << '</span>'
+        } catch(Exception e) {
+            log.debug "\n Changed index is greater than the original"
+        }
+
+        out << '<span class="changed hide">'
+        if (changed && changed.size() > i) {
+            out << getScoreLabels(changed[i][property], config, includeService)
         }
         out << '</span>'
+
+        out << '<span class="diff"></span>'
+
+    }
+
+    def renderComparisonService = { attrs ->
+
+        List original = attrs.original
+        List changed = attrs.changed
+        int i = attrs.i
+        ProgramConfig programConfig = attrs.programConfig
+
+        try {
+            out << '<span class="original hide">'
+            if (original && original.size() > i) {
+                out << serviceLabel(original[i].scoreId, programConfig)
+            }
+            out << '</span>'
+
+        } catch(Exception e) {
+            log.debug "\n Changed index is greater than the original"
+        }
+
         out << '<span class="changed hide">'
         if (changed && changed.size() > i) {
-            out << changed[i][property]
+            out << serviceLabel(changed[i].scoreId, programConfig)
         }
         out << '</span>'
+
         out << '<span class="diff"></span>'
+
+    }
+
+    private static String serviceLabel(String scoreId, ProgramConfig programConfig) {
+        Map service = programConfig.services.find { Map service ->
+            service.scores.find{ Map score ->
+                score.scoreId == scoreId
+            }
+        }
+        service?.name ?: 'Unsupported service'
     }
 
     def status = { attrs ->
@@ -979,4 +1166,88 @@ class FCTagLib {
 
         out << ids.collect{it.externalId}.join(',')
     }
+
+    def markdownToHtml = { Map attrs, body ->
+        String text = attrs.text ?: body()
+
+        out << markdownToHtmlAndSanitise(text)
+    }
+
+    private String markdownToHtmlAndSanitise(String text) {
+        String html = markdownService.markdown(text)
+        internalSanitise(policy, html)
+    }
+
+    private static String internalSanitise(PolicyFactory policyFactory, String input, String imageId = '', String metadataName = '') {
+        policyFactory.sanitize(input, new HtmlChangeListener<Object>() {
+            void discardedTag(Object context, String elementName) {
+                log.warn("Dropping element $elementName in $imageId.$metadataName")
+            }
+            void discardedAttributes(Object context, String tagName, String... attributeNames) {
+                log.warn("Dropping attributes $attributeNames from $tagName in $imageId.$metadataName")
+            }
+        }, null)
+    }
+
+    private static String getScoreLabels(def scoreIds, ProgramConfig config, Boolean includeService) {
+        List labels = []
+        if (scoreIds instanceof List) {
+            for (String scoreId : scoreIds) {
+                labels.add(scoreLabel(scoreId, config, includeService))
+            }
+        } else {
+            labels.add(scoreLabel(scoreIds, config, includeService))
+        }
+
+        return fakeBulletedList(labels)
+    }
+
+    private static String fakeBulletedList(List items, int spaceAfterCharacterCount = 20) {
+        String result = ''
+        if (items.size() == 1) {
+            result = items[0]
+        } else {
+            for (int i=0; i<items.size(); i++) {
+                String item = items[i]
+                result += '\u2022&nbsp;'
+
+                // replace any space characters in blocks of 20 characters or so with non-breaking spaces
+                // to fake formatting a bulleted list.
+                int count = 0
+                item.tokenize(' \t').eachWithIndex { String word, int index ->
+                    count += word.length()
+                    result += word
+                    if (count < spaceAfterCharacterCount) {
+                        result += '&nbsp;'
+                    }
+                    else {
+                        result += ' '
+                        count = 0
+                    }
+                }
+
+                if (i<items.size() -1) {
+                    result += ', '
+                }
+            }
+
+        }
+        result
+    }
+
+    private static String scoreLabel(String scoreId, ProgramConfig config, Boolean includeService) {
+        String label
+        config.services.find { Map service ->
+            service.scores.find{ Map score ->
+                if (score.scoreId == scoreId) {
+                    label = score.label
+                    if (includeService) {
+                        label = (service?.name ?: 'Unsupported service') + ' - ' + (label ?: 'Unsupported target measure')
+                    }
+                }
+                label
+            }
+        }
+        label ?: 'Unsupported target measure'
+    }
 }
diff --git a/grails-app/views/activity/activityReportView.gsp b/grails-app/views/activity/activityReportView.gsp
index 7470b2dda..d0a606336 100644
--- a/grails-app/views/activity/activityReportView.gsp
+++ b/grails-app/views/activity/activityReportView.gsp
@@ -131,6 +131,10 @@
 <!-- templates -->
 <g:render template="/shared/documentTemplate"/>
 
+<g:if test="${printView}">
+    <asset:javascript src="print-instructions.js"/>
+    <g:render template="/shared/pdfInstructions"/>
+</g:if>
 <asset:javascript src="common-bs4.js"/>
 <asset:javascript src="forms-manifest.js"/>
 
diff --git a/grails-app/views/admin/_permissionTable.gsp b/grails-app/views/admin/_permissionTable.gsp
index 6044622c4..a62db0056 100644
--- a/grails-app/views/admin/_permissionTable.gsp
+++ b/grails-app/views/admin/_permissionTable.gsp
@@ -70,7 +70,11 @@
                             $clone.find('.memUserName').text(el.displayName);
                             $clone.find('.memUserRole select').val(el.role);
                             $clone.find('.memUserRole select').attr("id", el.userId);
-                            $clone.find('.memUserRole span').text(decodeCamelCase(el.role).replace('Case','Grant')); // TODO: i18n this
+                            var roleName = decodeCamelCase(el.role).replace('Case','Grant');
+                            if (_.isFunction(window.$i18n)) {
+                                roleName = $i18n('label.role.'+el.role, roleName);
+                            }
+                            $clone.find('.memUserRole span').text(roleName);
                             $('.membersTbody').append($clone);
                         });
                     } else {
diff --git a/grails-app/views/admin/adminReports.gsp b/grails-app/views/admin/adminReports.gsp
index 28ae2b024..2ec2b27c9 100644
--- a/grails-app/views/admin/adminReports.gsp
+++ b/grails-app/views/admin/adminReports.gsp
@@ -20,9 +20,9 @@
 <h3>Administrator Reports</h3>
 <content tag="pageTitle">Administrator Reports</content>
 
-<h4>Organisation data download:</h4>
+<h4>Performance Management Framework data download</h4>
 
-<a id="orgDataDownload" class="btn btn-sm" href="#">Download Organisation Report Data</a>
+<a id="orgDataDownload" class="btn btn-sm" href="#">Download Performance Management Framework data</a>
 
 <h4>Management unit report download:</h4>
 <form id="mu-report-selector">
@@ -31,18 +31,39 @@
         <div class="col-sm-2 pl-0 pr-1">
             <label for="fromDate">Start date</label>
             <div class="input-group input-append">
-                <fc:datePicker targetField="fromDate.date" bs4="bs4" class="form-control form-control-sm dateControl" name="fromDate"  data-validation-engine="validate[date]"  size="form-control form-control-sm dateControl"/>
+                <fc:datePicker targetField="fromDate.date" bs4="bs4" class="form-control form-control-sm dateControl" name="muFromDate"  data-validation-engine="validate[date]"  size="form-control form-control-sm dateControl"/>
             </div>
         </div>
         <div class="col-sm-2 pl-0 pr-1">
             <label for="toDate">End date</label>
             <div class="input-group input-append">
-                <fc:datePicker targetField="toDate.date" bs4="bs4" class="form-control form-control-sm dateControl" name="toDate" data-validation-engine="validate[date]"  size="form-control form-control-sm dateControl"/>
+                <fc:datePicker targetField="toDate.date" bs4="bs4" class="form-control form-control-sm dateControl" name="muToDate" data-validation-engine="validate[date]"  size="form-control form-control-sm dateControl"/>
             </div>
         </div>
     </div>
-    <a id="muReportDownload" data-bind="click:muReportDownload" class="btn btn-sm" href="#">Management Unit - Activities</a>
-    <a id="muReportDownloadSummary" data-bind="click:muReportDownloadSummary" class="btn btn-sm" href="#">Core Reports - Status</a>
+    <a id="muReportDownload" data-bind="click:entityReportDownload" class="btn btn-sm" href="#">Management Unit - Activities</a>
+    <a id="muReportDownloadSummary" data-bind="click:entityReportDownloadSummary" class="btn btn-sm" href="#">Core Reports - Status</a>
+</form>
+
+<h4>Organisation report download:</h4>
+<form id="org-report-selector">
+    <label class="control-label">Select reporting period: </label>
+    <div class="row mb-2">
+        <div class="col-sm-2 pl-0 pr-1">
+            <label for="orgFromDate">Start date</label>
+            <div class="input-group input-append">
+                <fc:datePicker targetField="fromDate.date" bs4="bs4" class="form-control form-control-sm dateControl" name="orgFromDate"  data-validation-engine="validate[date]"  size="form-control form-control-sm dateControl"/>
+            </div>
+        </div>
+        <div class="col-sm-2 pl-0 pr-1">
+            <label for="orgToDate">End date</label>
+            <div class="input-group input-append">
+                <fc:datePicker targetField="toDate.date" bs4="bs4" class="form-control form-control-sm dateControl" name="orgToDate" data-validation-engine="validate[date]"  size="form-control form-control-sm dateControl"/>
+            </div>
+        </div>
+    </div>
+    <a id="orgReportDownload" data-bind="click:entityReportDownload" class="btn btn-sm" href="#">Organisation - Activities</a>
+    <a id="orgReportDownloadSummary" data-bind="click:entityReportDownloadSummary" class="btn btn-sm" href="#">Core Reports - Status</a>
 </form>
 
 
@@ -81,7 +102,7 @@
         <div class="form-group row">
             <div class="col-sm-4 mr-3"></div>
             <div class="controls">
-            <button class="btn btn-sm btn-success" data-bind="click:go">View Report</button>
+            <button id="viewReportBtn" class="btn btn-sm btn-success" data-bind="click:go">View Report</button>
             </div>
         </div>
     </form>
@@ -92,7 +113,7 @@
 
 <asset:javascript src="common-bs4.js"/>
 <asset:javascript src="reef2050Report.js"/>
-<asset:javascript src="managementUnitReport.js"/>
+<asset:javascript src="entityReport.js"/>
 <script>
     $(function () {
         var SELECTED_REPORT_KEY = 'selectedAdminReport';
@@ -143,11 +164,19 @@
 
     });
 
-    var generateMUReportInPeriodUrl = "${g.createLink(controller:'managementUnit', action:'generateReportsInPeriod')}";
+    var generateMUReportInPeriodUrl = "${g.createLink(controller:'report', action:'generateReportsInPeriod', params: [entity: 'managementUnit'])}";
     var optionsReport = {
-        generateMUReportInPeriodUrl: generateMUReportInPeriodUrl
+        generateEntityReportInPeriodUrl: generateMUReportInPeriodUrl,
+        downloadUrl: "${g.createLink(controller:"download",action:"get")}"
+    };
+    ko.applyBindings(new EntityReportSelectorViewModel(optionsReport), document.getElementById('mu-report-selector'));
+
+    var optionsOrgReport = {
+        generateEntityReportInPeriodUrl: "${g.createLink(controller:'report', action:'generateReportsInPeriod', params: [entity: 'organisation'])}",
+        downloadUrl: "${g.createLink(controller:"download",action:"get")}",
+        fromYear: 2023
     };
-    ko.applyBindings(new ManagementUnitReportSelectorViewModel(optionsReport), document.getElementById('mu-report-selector'));
+    ko.applyBindings(new EntityReportSelectorViewModel(optionsOrgReport), document.getElementById('org-report-selector'));
 
 
 </script>
diff --git a/grails-app/views/blog/_editBlogEntry.gsp b/grails-app/views/blog/_editBlogEntry.gsp
index 2a6926f3d..ac2715b18 100644
--- a/grails-app/views/blog/_editBlogEntry.gsp
+++ b/grails-app/views/blog/_editBlogEntry.gsp
@@ -1,5 +1,7 @@
 <form id="blogEntry" class="validationEngineContainer">
 
+    <h4><label class="col-form-label row-cols-sm-1" style="font-size: small"><g:message code="attach.document.subtitle"/><a href="https://www.dcceew.gov.au/environment/environmental-information-data/information-policy/sensitive-ecological-data-access-and-management-policy" target="_blank"> <g:message code="attach.document.subtitle.link"/></a>
+        <fc:iconHelp helpTextCode="attach.document.help"></fc:iconHelp></label></h4>
     <div class="form-group row required">
         <label class="control-label col-sm-3"
                for="type">Type: <fc:iconHelp>What type of entry is this?</fc:iconHelp></label>
diff --git a/grails-app/views/dataSet/_editDataSet.gsp b/grails-app/views/dataSet/_editDataSet.gsp
index ff1e46a1b..ff19b9a41 100644
--- a/grails-app/views/dataSet/_editDataSet.gsp
+++ b/grails-app/views/dataSet/_editDataSet.gsp
@@ -3,7 +3,7 @@
     <div class="form-group row">
         <label for="title" class="col-sm-5 col-form-label required">1. Dataset title</label>
         <div class="col-sm-7">
-            <input type="text" class="form-control" id="title" placeholder="" data-validation-engine="validate[required,maxSize[150]]" data-bind="value:name">
+            <input type="text" class="form-control" id="title" placeholder="" data-validation-engine="validate[required,maxSize[150],funcCall[uniqueName]]" data-bind="value:name">
         </div>
     </div>
     <div class="row form-subheading">
@@ -44,12 +44,12 @@
     <div class="form-group row">
         <label for="investmentPriority" class="col-sm-5 col-form-label required">6. What primary or secondary investment priorities or assets does this dataset relate to?</label>
         <div class="col-sm-7">
-            <g:select multiple="multiple" from="${priorities}" name="investmentPriority" class="form-control" id="investmentPriority" data-validation-engine="validate[required]" data-bind="selectedOptions:investmentPriorities"/>
-            <div class="otherPriority">
-                <textarea type="text" class="form-control otherPriorityTextArea" placeholder="Note: This Other Priorities box only enable if other is selected" data-bind="enable: investmentOtherSelected(), value: otherInvestmentPriority"></textarea>            </div>
+            <g:select multiple="multiple" from="${priorities}" name="investmentPriority" class="form-control" id="investmentPriority" data-validation-engine="validate[required]" data-bind="multiSelect2:{value:investmentPriorities}"/>
         </div>
 
     </div>
+%{--    Support for legacy data set summaries / projects without outcome targets --}%
+    <g:if test="${!supportsOutcomeTargets}">
     <div class="form-group row">
         <label for="term" class="col-sm-5 col-form-label">7. Is this data being collected for reporting against short or medium term outcome statements?</label>
         <div class="col-sm-7">
@@ -61,8 +61,19 @@
             </select>
         </div>
     </div>
+    </g:if>
+    <g:else>
+
     <div class="form-group row">
-        <label for="type" class="col-sm-5 col-form-label required">8. Is this (a) a baseline dataset associated with a project outcome i.e. against which, change will be measured, (b) a project progress dataset that is tracking change against an established project baseline dataset or (c) a standalone, foundational dataset to inform future management interventions?</label>
+    <label for="projectOutcomes" class="col-sm-5 col-form-label required">7. Which project service and outcome/s does this data set support? <br/>  <b><i>This data set summary will only be able to be invoiced for the service selected here</i></b>.</label>
+        <div class="col-sm-7">
+            <select id="projectOutcomes" class="form-control" data-bind="options:projectOutcomeList, optionsText:'label', optionsValue: 'label', optionsCaption:'Please select...', value:serviceAndOutcomes" data-validation-engine="validate[required]"></select>
+        </div>
+    </div>
+    </g:else>
+
+    <div class="form-group row">
+        <label for="type" class="col-sm-5 col-form-label required">8a. Is this (a) a baseline dataset associated with a project outcome i.e. against which, change will be measured, (b) a project progress dataset that is tracking change against an established project baseline dataset or (c) a standalone, foundational dataset to inform future management interventions?</label>
         <div class="col-sm-7">
             <select class="form-control" id="type" data-validation-engine="validate[required]" data-bind="value:type">
                 <option></option>
@@ -71,12 +82,32 @@
                 <option>Standalone, foundational dataset to inform future management interventions</option>
                 <option>Other</option>
             </select>
+            <div class="otherDataSetType other">
+                <textarea type="text" class="form-control otherPriorityTextArea" placeholder="Note: This field will only enable if Other is selected" data-bind="enable: type() == 'Other', value: otherDataSetType"></textarea>
+            </div>
+
         </div>
     </div>
+
     <div class="form-group row">
-        <label for="measurementTypes" class="col-sm-5 col-form-label required">9. What types of measurements or observations does the dataset include? <br/>To select more than one answer, hold down the ‘CTRL’ button whilst selecting an option from the drop-down list</label>
+        <label for="projectBaseline" class="col-sm-5 col-form-label required">8b. Which project baseline does this data set relate to or describe?</label>
         <div class="col-sm-7">
-            <select multiple="multiple" type="text" class="form-control" id="measurementTypes" data-validation-engine="validate[required]" data-bind="selectedOptions:measurementTypes">
+            <select multiple="multiple" class="form-control" id="projectBaseline" data-validation-engine="validate[required]" data-bind="options:projectBaselines, optionsText:'label', optionsValue:'value', optionsCaption:'Please select...', multiSelect2:{value:baselines}"></select>
+        </div>
+    </div>
+
+    <div class="form-group row">
+        <label for="protocol" class="col-sm-5 col-form-label required">9a. What EMSA protocol was used when collecting the data?</label>
+        <div class="col-sm-7">
+            <select class="form-control" id="protocol" data-validation-engine="validate[required]" data-bind="options:projectProtocols, optionsText:'label', optionsValue:'value', optionsCaption:'Please select...', value:protocol">
+            </select>
+        </div>
+    </div>
+
+    <div class="form-group row">
+        <label for="measurementTypes" class="col-sm-5 col-form-label required">9b. What types of measurements or observations does the dataset include? <br/>To select more than one answer, hold down the ‘CTRL’ button whilst selecting an option from the drop-down list</label>
+        <div class="col-sm-7">
+            <select multiple="multiple" type="text" class="form-control" id="measurementTypes" data-validation-engine="validate[required]" data-bind="disable: protocol() != 'other', multiSelect2:{value:measurementTypes}">
                 <option>Abundance</option>
                 <option>Adoption - climate and market demands</option>
                 <option>Adoption - land resource management practices</option>
@@ -93,7 +124,6 @@
                 <option>Habitat condition</option>
                 <option>Interventions</option>
                 <option>Opportune records</option>
-                <option>Other</option>
                 <option>Participation</option>
                 <option>Publication of materials</option>
                 <option>Recruitment - Fauna, flora</option>
@@ -116,69 +146,74 @@
     <div class="form-group row">
         <label for="methods" class="col-sm-5 col-form-label required">10. Identify the method(s) used to collect the data. <br/>To select more than one answer, hold down the ‘CTRL’ button whilst selecting an option from the drop-down list</label>
         <div class="col-sm-7">
-            <select class="form-control" multiple="multiple" id="methods" data-validation-engine="validate[required]" data-bind="selectedOptions:methods">
-                <option>Genetic sampling</option>
-                <option>Hair, track, dung sampling</option>
-                <option>Area sampling</option>
-                <option>Water quality sampling</option>
+            <select class="form-control" multiple="multiple" id="methods" data-validation-engine="validate[required]" data-bind="disable: protocol() != 'other', multiSelect2:{value:methods}">
                 <option>Active searching</option>
                 <option>Aerial photography</option>
+                <option>Area sampling</option>
                 <option>Call playback</option>
                 <option>Camera trapping</option>
                 <option>Data extraction</option>
                 <option>Distance sampling</option>
+                <option>Genetic sampling</option>
                 <option>Grab sampling</option>
+                <option>Ground cover monitoring</option>
                 <option>Habitat condition assessment</option>
+                <option>Hair, track, dung sampling</option>
                 <option>Mark-recapture</option>
                 <option>Meta-analysis</option>
-                <option>Other</option>
+                <option>Participant surveys</option>
                 <option>Photopoints</option>
                 <option>Plotless sampling</option>
                 <option>Quadrat sampling</option>
-                <option>Participant surveys</option>
                 <option>Soil sampling and analysis</option>
                 <option>Surber sampling</option>
                 <option>Surveying - Fauna, Flora</option>
                 <option>Transect sampling</option>
                 <option>Trapping</option>
                 <option>Vegetation mapping</option>
-                <option>Ground cover monitoring
+                <option>Water quality sampling</option>
+
             </select>
         </div>
     </div>
     <div class="form-group row">
         <label for="methodDescription" class="col-sm-5 col-form-label required">11. Describe the method used to collect the data in detail.</label>
         <div class="col-sm-7">
-            <textarea rows="4"  class="form-control" id="methodDescription" placeholder="" data-validation-engine="validate[required,maxSize[2000]]" data-bind="value:methodDescription"></textarea>
+            <textarea rows="4"  class="form-control" id="methodDescription" placeholder="" data-validation-engine="validate[required,maxSize[2000]]" data-bind="disable: protocol() != 'other', value:methodDescription"></textarea>
         </div>
     </div>
     <div class="form-group row">
-        <label for="collectionApp" class="col-sm-5 col-form-label">12. Identify any apps used during data collection.</label>
+        <label for="collectionApp" class="col-sm-5 col-form-label">12. Identify any apps used during data collection. <p>Where the 'Monitor' app has not been used, please provide details</p></label>
         <div class="col-sm-7">
             <input type="text"  class="form-control" id="collectionApp" placeholder="" data-bind="value:collectionApp">
         </div>
     </div>
     <div class="form-group row">
         <label for="location" class="col-sm-5 col-form-label">13. Provide a coordinate centroid for the area surveyed.
-        (For biophysical/ecological surveys where an app was not used, and where there are no sensitivities in providing a location).
+        (For biophysical/ecological surveys where an app was not used, and where there are no sensitivities in providing a location). <p>For biophysical/ecological surveys where an app was not used, and where there are no sensitivities in providing a location</p>
         </label>
         <div class="col-sm-7">
+            <!-- ko if:!siteId() -->
             <input type="text" class="form-control" id="location" placeholder="" data-bind="value:location">
+            <!-- /ko -->
+            <!-- ko if:siteId() -->
+            <span class="form-control"> <a data-bind="attr:{href:siteUrl}" target="_blank">Spatial data has been supplied for this data set</a></span>
+            <!-- /ko -->
         </div>
     </div>
     <div class="form-group row">
-        <label for="startDate" class="col-sm-5 col-form-label">14. First collection date.</label>
+        <label for="startDate" class="col-sm-5 col-form-label required">14. First collection date.</label>
         <div class="col-sm-3">
             <div class="input-group input-append">
-                <fc:datePicker type="text"   bs4="true" class="form-control" id="startDate" name="startDate" placeholder="" targetField="startDate.date"/>
+                <fc:datePicker type="text" bs4="true" class="form-control" id="startDate" name="startDate" placeholder="" targetField="startDate.date" autocomplete="off" data-validation-engine="validate[required,past[now]]"/>
             </div>
         </div>
     </div>
     <div class="form-group row">
-        <label for="endDate" class="col-sm-5 col-form-label">15. Last collection date.</label>
+        <label for="endDate" class="col-sm-5 col-form-label required">15. Last collection date.</label>
         <div class="col-sm-3">
             <div class="input-group input-append">
-                <fc:datePicker type="text"  bs4="true" class="form-control" id="endDate" placeholder="" data-validation-engine="validate[future[startDate]" targetField="endDate.date"/>
+                <fc:datePicker type="text"  bs4="true" class="form-control" id="endDate" placeholder="" data-bind="jqueryValidationEngine:{validationFunction:validateEndDate}, datepicker:endDate.date, disable:dataCollectionOngoing" targetField="" autocomplete="off"/>
 
             </div>
         </div>
@@ -202,7 +237,7 @@
     </div>
 
     <div class="form-group row">
-        <label for="threatenedSpeciesIndex" class="col-sm-5 col-form-label">16a. Has your data been included in the Threatened Species Index?</label>
+        <label for="threatenedSpeciesIndex" class="col-sm-5 col-form-label">16a. Has your data been uploaded to the Threatened Species Index?</label>
         <div class="col-sm-7">
             <select class="form-control" id="threatenedSpeciesIndex" data-bind="value:threatenedSpeciesIndex">
                 <option></option>
@@ -213,75 +248,28 @@
         </div>
     </div>
 
-    <div class="row form-subheading">
-        <div class="col-12">
-            Dataset accessibility
-        </div>
-    </div>
-    <div class="form-group row">
-        <label for="collectorType" class="col-sm-5 col-form-label required">17. Who developed the dataset?</label>
-        <div class="col-sm-7">
-            <select type="text"  class="form-control" id="collectorType"  data-validation-engine="validate[required]" data-bind="value:collectorType">
-                <option></option>
-                <option>University researcher</option>
-                <option>Specialist consultant</option>
-                <option>Service Provider staff</option>
-                <option>State Government agency staff</option>
-                <option>Community member/volunteer</option>
-                <option>Other</option>
-            </select>
-        </div>
-    </div>
     <div class="form-group row">
-        <label for="qa" class="col-sm-5 col-form-label required">18. Has a quality assurance check been undertaken on the data?</label>
-        <div class="col-sm-7">
-            <select class="form-control" id="qa" data-validation-engine="validate[required]" data-bind="value:qa">
-                <option></option>
-                <option>Yes</option>
-                <option>No</option>
-                <option>Don't know</option>
-            </select>
-        </div>
-    </div>
-    <div class="form-group row">
-        <label for="published" class="col-sm-5 col-form-label required">19. Has the data contributed to a publication?</label>
-        <div class="col-sm-7">
-            <select class="form-control" id="published" data-validation-engine="validate[required]" data-bind="value:published">
-                <option></option>
-                <option>Yes</option>
-                <option>No</option>
-                <option>Don't know</option>
-            </select>
+        <label for="threatenedSpeciesIndex" class="col-sm-5 col-form-label required">16b. Date of upload, if you answered 'Yes' to 16a above.</label>
+        <div class="col-sm-3">
+            <div class="input-group input-append">
+                <fc:datePicker type="text" bs4="true" class="form-control" id="threatenedSpeciesIndexUploadDate" placeholder="" data-validation-engine="validate[required]" data-bind="datepicker:threatenedSpeciesIndexUploadDate.date, enable: threatenedSpeciesIndex() == 'Yes'" targetField="" required="true" autocomplete="off"/>
+            </div>
         </div>
     </div>
-    <div class="form-group row">
-        <label for="storageType" class="col-sm-5 col-form-label required">20. Where is the data held?</label>
-        <div class="col-sm-7">
-            <select class="form-control" id="storageType" data-validation-engine="validate[required]" data-bind="value:storageType">
-                <option></option>
-                <option>Aurion</option>
-                <option>Cloud</option>
-                <option>CM9</option>
-                <option>External Hard Drive</option>
-                <option>Oracle Database</option>
-                <option>Other Database</option>
-                <option>Protected Enclave</option>
-                <option>Shared Drive</option>
-                <option>Sharepoint</option>
-                <option>SPIRE</option>
-                <option>Unknown</option>
-                <option>Stored internally</option>
-            </select>
+
+    <div class="row form-subheading">
+        <div class="col-12">
+            Dataset accessibility
         </div>
     </div>
     <div class="form-group row">
-        <label for="publicationUrl" class="col-sm-5 col-form-label">21. For all public datasets, please provide the published location. If stored internally by your organisation, write ‘stored internally’.</label>
+        <label for="publicationUrl" class="col-sm-5 col-form-label">17. Please provide the location/system of where the dataset is held. If possible, provide a URL of the published location. If stored internally by your organisation, write ‘stored internally’.</label>
         <div class="col-sm-7">
             <input type="text"  class="form-control" id="publicationUrl" placeholder="" data-bind="value:publicationUrl">
         </div>
     </div>
     <div class="form-group row">
-        <label for="format" class="col-sm-5 col-form-label required">22. What format is the dataset?</label>
+        <label for="format" class="col-sm-5 col-form-label required">18. What format is the dataset?</label>
         <div class="col-sm-7">
             <select class="form-control" id="format" data-validation-engine="validate[required]" data-bind="value:format">
                 <option></option>
@@ -299,8 +287,27 @@
         </div>
     </div>
 
+
+    <div class="form-group row">
+        <div class="col-sm-5">
+            <label for="sizeinkb" class="col-form-label required">19. What is the size of the dataset (KB)?</label>
+            <p>If you don't know the size, check the 'Unknown' checkbox</p>
+        </div>
+
+        <div class="col-sm-3">
+            <input type="number" class="form-control" id="sizeinkb" placeholder="" data-validation-engine="validate[required]" data-bind="enable:!sizeUnknown(), value:sizeInKB">
+
+        </div>
+        <div class="col-sm-4">
+            <div class="form-check">
+                <input id="sizeUnknown" type="checkbox" class="form-check-input" data-bind="checked:sizeUnknown">
+                <label for="sizeUnknown" class="form-check-label">Unknown</label>
+            </div>
+        </div>
+    </div>
+
     <div class="form-group row">
-        <label for="sensitivities" class="col-sm-5 col-form-label required">23. Are there any sensitivities in the dataset?</label>
+        <label for="sensitivities" class="col-sm-5 col-form-label required">20. Are there any sensitivities in the dataset?</label>
         <div class="col-sm-7">
             <select class="form-control" multiple="multiple" id="sensitivities" data-validation-engine="validate[required]" data-bind="selectedOptions:sensitivities">
                 <option>No</option>
@@ -311,30 +318,13 @@
                 <option>Legally sensitive</option>
                 <option>Other</option>
             </select>
+            <div class="otherSensitivity other">
+                <textarea type="text" class="form-control otherSensitivityTextArea" placeholder="Note: This field will only enable if Other is selected" data-bind="enable: sensitivities() && sensitivities().indexOf('Other') >= 0, value: otherSensitivity"></textarea>
+            </div>
         </div>
-    </div>
-
-    <div class="form-group row">
-        <div class="col-sm-5">
-            <label for="owner" class="col-form-label required">24. Primary source of data (organisation or individual that owns or maintains the dataset)</label>
-            <p>Please include the contact name, physical address, email address and phone number where possible</p>
-        </div>
-
 
-        <div class="col-sm-7">
-            <textarea rows="2" class="form-control" id="owner" placeholder="" data-validation-engine="validate[required,maxSize[200]]" data-bind="value:owner"></textarea>
-        </div>
     </div>
 
-    <div class="form-group row">
-        <div class="col-sm-5 col-form-label">
-            <label for="custodian" class="required">25. Dataset custodian (name of contact to obtain access to dataset)</label>
-            <p>Please include the contact name, physical address, email address and phone number where possible</p>
-        </div>
-        <div class="col-sm-7">
-            <textarea rows="2" class="form-control" id="custodian" placeholder="" data-validation-engine="validate[required,maxSize[300]]" data-bind="value:custodian"></textarea>
-        </div>
-    </div>
 </form>
 
 
diff --git a/grails-app/views/dataSet/_viewDataSet.gsp b/grails-app/views/dataSet/_viewDataSet.gsp
index c4fe4b8c9..0a2b0bab4 100644
--- a/grails-app/views/dataSet/_viewDataSet.gsp
+++ b/grails-app/views/dataSet/_viewDataSet.gsp
@@ -51,12 +51,25 @@
         </div>
 
     </div>
+    %{--    Support for legacy data set summaries --}%
+    <!-- ko if:term() -->
     <div class="form-group row">
         <label class="col-sm-5 col-form-label">7. Is this data being collected for reporting against short or medium term outcome statements?</label>
         <div class="col-sm-7">
             <span data-bind="text:term"></span>
         </div>
     </div>
+    <!-- /ko -->
+
+    <!-- ko if:!term() -->
+    <div class="form-group row">
+        <label class="col-sm-5 col-form-label">7. Which project service and outcome/s does this data set support? </label>
+        <div class="col-sm-7">
+            <span data-bind="text:serviceAndOutcomes"></span>
+        </div>
+    </div>
+    <!-- /ko -->
+
     <div class="form-group row">
         <label class="col-sm-5 col-form-label required">8. Is this (a) a baseline dataset associated with a project outcome i.e. against which, change will be measured, (b) a project progress dataset that is tracking change against an established project baseline dataset or (c) a standalone, foundational dataset to inform future management interventions?</label>
         <div class="col-sm-7">
@@ -98,7 +111,12 @@
         (For biophysical/ecological surveys where an app was not used, and where there are no sensitivities in providing a location).
         </label>
         <div class="col-sm-7">
+            <!-- ko if:!siteId() -->
             <span data-bind="text:location"></span>
+            <!-- /ko -->
+            <!-- ko if:siteId() -->
+            <span> <a data-bind="attr:{href:siteUrl}" target="_blank">Spatial data has been supplied for this data set</a></span>
+            <!-- /ko -->
         </div>
     </div>
     <div class="form-group row">
@@ -125,78 +143,58 @@
     </div>
 
     <div class="form-group row">
-        <label class="col-sm-5 col-form-label">16a. Has your data been included in the Threatened Species Index?</label>
+        <label class="col-sm-5 col-form-label">16a. Has your data been uploaded to the Threatened Species Index?</label>
         <div class="col-sm-7">
             <span data-bind="text:threatenedSpeciesIndex"></span>
         </div>
     </div>
-
-    <div class="row form-subheading">
-        <div class="col-12">
-            <i>Dataset accessibility</i>
-        </div>
-    </div>
-    <div class="form-group row">
-        <label class="col-sm-5 col-form-label required">17. Who developed the dataset?</label>
-        <div class="col-sm-7">
-            <span data-bind="text:collectorType"></span>
-        </div>
-    </div>
-    <div class="form-group row">
-        <label class="col-sm-5 col-form-label required">18. Has a quality assurance check been undertaken on the data?</label>
-        <div class="col-sm-7">
-            <span data-bind="text:qa"></span>
-        </div>
-    </div>
     <div class="form-group row">
-        <label class="col-sm-5 col-form-label required">19. Has the data contributed to a publication?</label>
-        <div class="col-sm-7">
-            <span data-bind="text:published"></span>
+        <label class="col-sm-5 col-form-label required">16b. Date of upload, if you answered 'Yes' to 16a above.</label>
+        <div class="col-sm-3">
+            <div class="input-group input-append">
+                <span data-bind="text:threatenedSpeciesIndexUploadDate.formattedDate"></span>
+            </div>
         </div>
     </div>
-    <div class="form-group row">
-        <label class="col-sm-5 col-form-label required">20. Where is the data held?</label>
-        <div class="col-sm-7">
-            <span data-bind="text:storageType"></span>
+    <div class="row form-subheading">
+        <div class="col-12">
+            <i>Dataset accessibility</i>
         </div>
     </div>
     <div class="form-group row">
-        <label class="col-sm-5 col-form-label">21. For all public datasets, please provide the published location. If stored internally by your organisation, write ‘stored internally’.</label>
+        <label class="col-sm-5 col-form-label">17. Please provide the location/system of where the dataset is held. If possible, provide a URL of the published location. If stored internally by your organisation, write ‘stored internally’.</label>
         <div class="col-sm-7">
             <span data-bind="text:publicationUrl"></span>
         </div>
     </div>
-    <div class="form-group row">
-        <label class="col-sm-5 col-form-label required">22. What format is the dataset?</label>
-        <div class="col-sm-7">
-            <span data-bind="text:format"></span>
-        </div>
-    </div>
 
     <div class="form-group row">
-        <label class="col-sm-5 col-form-label required">23. Are there any sensitivities in the dataset?</label>
+        <label class="col-sm-5 col-form-label">18. What format is the dataset?</label>
         <div class="col-sm-7">
-            <span data-bind="text:sensitivities"></span>
+            <span data-bind="text:format"></span>
         </div>
     </div>
 
     <div class="form-group row">
         <div class="col-sm-5">
-            <label class="col-form-label required">24. Primary source of data (organisation or individual that owns or maintains the dataset)</label>
-            <p>Please include the contact name, physical address, email address and phone number where possible</p>
+            <label class="col-form-label">19. What is the size of the dataset (KB)?</label>
+            <p>If you don't know the size, check the 'Unknown' checkbox</p>
         </div>
-        <div class="col-sm-7">
-            <span data-bind="text:owner"></span>
+
+        <div class="col-sm-3">
+            <!-- ko if:!sizeUnknown() -->
+            <span data-bind="text:sizeInKB"></span>
+            <!-- /ko -->
+            <!-- ko if:sizeUnknown() -->
+            <span>Unknown</span>
+            <!-- /ko -->
         </div>
     </div>
 
     <div class="form-group row">
-        <div class="col-sm-5 col-form-label">
-            <label class="required">25. Dataset custodian (name of contact to obtain access to dataset)</label>
-            <p>Please include the contact name, physical address, email address and phone number where possible</p>
-        </div>
+        <label class="col-sm-5 col-form-label required">20. Are there any sensitivities in the dataset?</label>
         <div class="col-sm-7">
-            <span data-bind="text:custodian"></span>
+            <span data-bind="text:sensitivities"></span><span data-bind="text:otherSensitivity"></span>
         </div>
     </div>
 </form>
diff --git a/grails-app/views/dataSet/create.gsp b/grails-app/views/dataSet/create.gsp
index a636351cb..93a6553cd 100644
--- a/grails-app/views/dataSet/create.gsp
+++ b/grails-app/views/dataSet/create.gsp
@@ -9,10 +9,12 @@
         var fcConfig = {
             serverUrl: "${grailsApplication.config.getProperty('grails.serverURL')}",
             dataSetUpdateUrl: "${createLink(action:'save', id:projectId)}",
+            viewSiteUrl: "${createLink(controller: 'site', action:'index')}",
             returnToUrl: "${g.createLink(controller:'project', action:'index', id:projectId)}"
         };
     </script>
     <asset:stylesheet src="common-bs4.css"/>
+    <asset:stylesheet src="select2-theme-bootstrap4/select2-bootstrap.css"/>
     <asset:stylesheet src="dataSets.css"/>
 
 </head>
@@ -42,13 +44,21 @@
 
 <asset:javascript src="common-bs4.js"/>
 <asset:javascript src="projectService.js"/>
+<asset:javascript src="select2/js/select2.full.js"/>
+<asset:javascript src="forms-knockout-bindings.js"/>
 <asset:javascript src="dataSets.js"/>
 <script>
     var project = {};
     var projectService = new ProjectService(project, fcConfig);
     var config = _.extend(fcConfig, {endDateSelector:"#endDate"});
+    config.projectOutcomes = <fc:modelAsJavascript model="${projectOutcomes}" default="[]"/>;
+    config.projectBaselines = <fc:modelAsJavascript model="${projectBaselines}" default="[]"/>;
+    config.projectProtocols = <fc:modelAsJavascript model="${projectProtocols}" default="[]"/>;
+    config.invalidNames = <fc:modelAsJavascript model="${dataSetNames}" default="[]"/>;
     var viewModel = new DataSetViewModel({}, projectService, config);
+    $.fn.select2.defaults.set( "theme", "bootstrap" );
     ko.applyBindings(viewModel);
+    viewModel.attachValidation();
 </script>
 <asset:deferredScripts/>
 </body>
diff --git a/grails-app/views/dataSet/edit.gsp b/grails-app/views/dataSet/edit.gsp
index 6a5631e5a..240f5cd75 100644
--- a/grails-app/views/dataSet/edit.gsp
+++ b/grails-app/views/dataSet/edit.gsp
@@ -9,10 +9,12 @@
         var fcConfig = {
             serverUrl: "${grailsApplication.config.getProperty('grails.serverURL')}",
             dataSetUpdateUrl: "${createLink(action:'save', id:projectId)}",
+            viewSiteUrl: "${createLink(controller: 'site', action:'index')}",
             returnToUrl: "${g.createLink(controller:'project', action:'index', id:projectId)}"
         };
     </script>
     <asset:stylesheet src="common-bs4.css"/>
+    <asset:stylesheet src="select2-theme-bootstrap4/select2-bootstrap.css"/>
     <asset:stylesheet src="dataSets.css"/>
 
 </head>
@@ -42,14 +44,22 @@
 
 <asset:javascript src="common-bs4.js"/>
 <asset:javascript src="projectService.js"/>
+<asset:javascript src="select2/js/select2.full.js"/>
+<asset:javascript src="forms-knockout-bindings.js"/>
 <asset:javascript src="dataSets.js"/>
 <script>
     var project = {};
     var dataSet = <fc:modelAsJavascript model="${dataSet}"/>;
     var projectService = new ProjectService(project, fcConfig);
     var config = _.extend(fcConfig, {endDateSelector:"#endDate"});
-    var viewModel = new DataSetViewModel(dataSet, projectService, fcConfig);
+    config.projectOutcomes = <fc:modelAsJavascript model="${projectOutcomes}" default="[]"/>;
+    config.projectBaselines = <fc:modelAsJavascript model="${projectBaselines}" default="[]"/>;
+    config.projectProtocols = <fc:modelAsJavascript model="${projectProtocols}" default="[]"/>;
+    config.invalidNames = <fc:modelAsJavascript model="${dataSetNames}" default="[]"/>;
+    var viewModel = new DataSetViewModel(dataSet, projectService, config);
+    $.fn.select2.defaults.set( "theme", "bootstrap" );
     ko.applyBindings(viewModel);
+    viewModel.attachValidation();
 </script>
 <asset:deferredScripts/>
 </body>
diff --git a/grails-app/views/dataSet/view.gsp b/grails-app/views/dataSet/view.gsp
index 0d1dfe26d..dc6457791 100644
--- a/grails-app/views/dataSet/view.gsp
+++ b/grails-app/views/dataSet/view.gsp
@@ -9,6 +9,7 @@
         var fcConfig = {
             serverUrl: "${grailsApplication.config.getProperty('grails.serverURL')}",
             dataSetUpdateUrl: "${createLink(action:'save', id:projectId)}",
+            viewSiteUrl: "${createLink(controller: 'site', action:'index')}",
             returnToUrl: "${g.createLink(controller:'project', action:'index', id:projectId)}"
         };
     </script>
diff --git a/grails-app/views/home/_downloadAllAsXlsx.gsp b/grails-app/views/home/_downloadAllAsXlsx.gsp
index 2c6f2acff..3604a51f0 100644
--- a/grails-app/views/home/_downloadAllAsXlsx.gsp
+++ b/grails-app/views/home/_downloadAllAsXlsx.gsp
@@ -37,6 +37,10 @@
         <g:each in="${['RLP Outcomes', 'RLP Project Details', 'RLP Key Threats', 'RLP Services and Targets']}" var="name">
             <li><label class="checkbox"><input type="checkbox" name="tabs" value="${name.replaceAll(' ','_')}" data-validation-engine="validate[minCheckbox[1]]">${name}</label></li>
         </g:each>
+        <!-- RDP project -->
+        <g:each in="${['RDP Outcomes', 'RDP Project Details', 'RDP Key Threats', 'RDP Services and Targets']}" var="name">
+            <li><label class="checkbox"><input type="checkbox" name="tabs" value="${name.replaceAll(' ','_')}" data-validation-engine="validate[minCheckbox[1]]">${name}</label></li>
+        </g:each>
     </ul>
 
     <strong>Electorate Coord</strong><br/>
diff --git a/grails-app/views/home/about.gsp b/grails-app/views/home/about.gsp
index ef3453b31..c8403eff1 100644
--- a/grails-app/views/home/about.gsp
+++ b/grails-app/views/home/about.gsp
@@ -34,7 +34,7 @@
         <div class="row">
             <div class="col-md-7">
                 <div class="" id="aboutDescription" style="margin-top:20px;">
-                    <markdown:renderHtml>${content}</markdown:renderHtml>
+                    <fc:markdownToHtml>${content}</fc:markdownToHtml>
                 </div>
             </div><!-- /.spanN  -->
             <g:if test="${showNews}">
diff --git a/grails-app/views/managementUnit/index.gsp b/grails-app/views/managementUnit/index.gsp
index 5e0357804..9d2d41c4d 100644
--- a/grails-app/views/managementUnit/index.gsp
+++ b/grails-app/views/managementUnit/index.gsp
@@ -12,7 +12,7 @@
             viewReportUrl: '${createLink(action:"viewReport", id:managementUnit.managementUnitId)}',
             editReportUrl: "${createLink(action:"editReport", id:managementUnit.managementUnitId)}",
             resetReportUrl: "${createLink(action:'resetReport', id:managementUnit.managementUnitId)}",
-            reportPDFUrl: "${createLink(action:"reportPDF", id:managementUnit.managementUnitId)}",
+            reportPDFUrl: "${createLink(action:"printManagementUnitReport", id:managementUnit.managementUnitId)}",
             approveReportUrl: "${createLink(action:"ajaxApproveReport", id:managementUnit.managementUnitId)}",
             submitReportUrl: "${createLink(action:"ajaxSubmitReport", id:managementUnit.managementUnitId)}",
             rejectReportUrl: "${createLink(action:"ajaxRejectReport", id:managementUnit.managementUnitId)}",
diff --git a/grails-app/views/organisation/editAnnouncements.gsp b/grails-app/views/organisation/editAnnouncements.gsp
index 7171e81bf..b7e86988c 100644
--- a/grails-app/views/organisation/editAnnouncements.gsp
+++ b/grails-app/views/organisation/editAnnouncements.gsp
@@ -7,8 +7,7 @@
     var fcConfig = {
         organisationViewUrl: "${createLink(controller:'organisation', action:'index', id:organisation.organisationId)}",
         saveAnnouncementsUrl: "${createLink(controller:'organisation', action:'saveAnnouncements', id:organisation.organisationId, params:[format:'json'])}",
-        bulkUploadAnnouncementsUrl: "${createLink(controller: 'organisation', id:organisation.organisationId, action:'bulkUploadAnnouncements', params:[format:'json'])}",
-        returnTo: "${params.returnTo}"
+        bulkUploadAnnouncementsUrl: "${createLink(controller: 'organisation', id:organisation.organisationId, action:'bulkUploadAnnouncements', params:[format:'json'])}"
         },
         here = document.location.href;
     </script>
diff --git a/grails-app/views/organisation/index.gsp b/grails-app/views/organisation/index.gsp
index 61c887d78..ee063c7a8 100644
--- a/grails-app/views/organisation/index.gsp
+++ b/grails-app/views/organisation/index.gsp
@@ -24,7 +24,7 @@
             editReportUrl: "${g.createLink(action:'editOrganisationReport', id:organisation.organisationId)}",
             resetReportUrl: "${createLink(action:'resetReport', id:organisation.organisationId)}",
             regenerateOrganisationReportsUrl: "${createLink(action:"regenerateOrganisationReports", id:organisation.organisationId)}",
-            reportPDFUrl: "${g.createLink(action:'performanceReportPDF')}",
+            reportPDFUrl: "${createLink(action:"printOrganisationReport", id:organisation.organisationId)}",
             organisationMembersUrl: "${loadPermissionsUrl}",
             imageLocation:"${assetPath(src:'/')}",
             logoLocation:"${assetPath(src:'/filetypes')}",
@@ -39,11 +39,12 @@
             approveReportUrl: '${g.createLink( action:'ajaxApproveReport', id:"${organisation.organisationId}")}',
             rejectReportUrl: '${g.createLink( action:'ajaxRejectReport', id:"${organisation.organisationId}")}',
             cancelReportUrl: "${createLink(action:'ajaxCancelReport', id:organisation.organisationId)}/",
-
+            reportsHistoryUrl:"${createLink(controller: 'report', action:'reportingHistory')}",
             returnTo: '${g.createLink(action:'index', id:"${organisation.organisationId}")}',
             dashboardCategoryUrl: "${g.createLink(controller: 'report', action: 'activityOutputs', params: [fq:'organisationFacet:'+organisation.name])}",
             reportOwner: {organisationId:'${organisation.organisationId}'},
             projects : <fc:modelAsJavascript model="${organisation.projects}"/>
+
         };
     </script>
     <asset:stylesheet src="common-bs4.css"/>
diff --git a/grails-app/views/program/edit.gsp b/grails-app/views/program/edit.gsp
index 9db10abf0..338f07ffc 100644
--- a/grails-app/views/program/edit.gsp
+++ b/grails-app/views/program/edit.gsp
@@ -54,7 +54,7 @@
         ko.applyBindings(programViewModel);
         $('.validationEngineContainer').validationEngine();
 
-         $('.parentProgramId').select2({theme: "bootstrap4"});
+         $('.parentProgramId').select2({theme: "bootstrap"});
     });
 
 </asset:script>
diff --git a/grails-app/views/program/index.gsp b/grails-app/views/program/index.gsp
index 89c11a82b..2a098516a 100644
--- a/grails-app/views/program/index.gsp
+++ b/grails-app/views/program/index.gsp
@@ -13,7 +13,7 @@
             viewReportUrl: '${createLink(action:"viewReport", id:program.programId)}',
             editReportUrl: "${createLink(action:"editReport", id:program.programId)}",
             resetReportUrl: "${createLink(action:'resetReport', id:program.programId)}",
-            reportPDFUrl: "${createLink(action:"reportPDF", id:program.programId)}",
+            reportPDFUrl: "${createLink(action:"printProgramReport", id:program.programId)}",
             approveReportUrl: "${createLink(action:"ajaxApproveReport", id:program.programId)}",
             submitReportUrl: "${createLink(action:"ajaxSubmitReport", id:program.programId)}",
             rejectReportUrl: "${createLink(action:"ajaxRejectReport", id:program.programId)}",
diff --git a/grails-app/views/project/_banner.gsp b/grails-app/views/project/_banner.gsp
index 00764f9b6..151b5e634 100644
--- a/grails-app/views/project/_banner.gsp
+++ b/grails-app/views/project/_banner.gsp
@@ -5,7 +5,7 @@
         <div class="col-12">
             <div class="alert alert-banner">
                 <span style="font-size:${bannerConfig.fontSize?:'1.4em'}">
-                <markdown:renderHtml>${bannerConfig.message}</markdown:renderHtml>
+                <fc:markdownToHtml>${bannerConfig.message}</fc:markdownToHtml>
                 </span>
             </div>
         </div>
diff --git a/grails-app/views/project/_configurableMeriPlanChangesView.gsp b/grails-app/views/project/_configurableMeriPlanChangesView.gsp
new file mode 100644
index 000000000..f27963a63
--- /dev/null
+++ b/grails-app/views/project/_configurableMeriPlanChangesView.gsp
@@ -0,0 +1,12 @@
+<div id="meriplan-changes" class="meri-plan space-after" data-bind="let:{details:meriPlan(), detailsChanged:meriPlanChanged()}">
+<g:each var="content" in="${config?.meriPlanContents}">
+    <div class="row">
+        <div class="col-sm-12 p-3">
+        <g:if test="${!(mode in content.excludedModes?:[])}">
+            <g:render template="/project/meriPlanChanges/${content.template}" model="${content.model}"/>
+        </g:if>
+        </div>
+    </div>
+</g:each>
+
+</div>
diff --git a/grails-app/views/project/_editMeriPlan.gsp b/grails-app/views/project/_editMeriPlan.gsp
index 0ce348ad0..cfd6166e3 100644
--- a/grails-app/views/project/_editMeriPlan.gsp
+++ b/grails-app/views/project/_editMeriPlan.gsp
@@ -43,7 +43,7 @@
 	</div>
 </div>
 </script>
-<script id="editablePlanTmpl">
+<script id="editablePlanTmpl" type="text/html">
 
 </script>
 <script id="completedProjectTmpl" type="text/html">
@@ -70,18 +70,27 @@
 <g:render template="/shared/declaration" model="[divId:'unlockPlan',  declarationType:au.org.ala.merit.SettingPageType.UNLOCK_PLAN_DECLARATION]"/>
 <g:render template="meriPlanApprovalModal"/>
 <div class="row mb-4">
-	<div class="col-sm-6">
+	<div class="col-sm-3">
 		<div class="control-group">
 			<span class="badge text-white" style="font-size: 13px;" data-bind="text:meriPlanStatus().text, css:meriPlanStatus().badgeClass"></span>
 			<span data-bind="if:detailsLastUpdated"> <br/>Last update date : <span data-bind="text:detailsLastUpdated.formattedDate"></span></span>
 		</div>
 	</div>
+	<div class="meri-buttons col-sm-9 ml-auto">
+		<button type="button" class="btn btn-sm btn-info" data-bind="click: meriPlanPDF">Display Printable MERI Plan</button>
+
+
+	<g:if test="${showMeriPlanComparison}">
+
+		<button type="button" class="btn btn-sm btn-info" data-bind="click: meriPlanChanges">Compare with the latest approved MERI Plan</button>
+
+	</g:if>
 <g:if test="${showMeriPlanHistory}">
-	<div class="col-sm-6">
-		<div class="pull-right"><a class="btn btn-info btn-sm meri-history-toggle" data-bind="click:toggleMeriPlanHistory, text:meriPlanHistoryVisible() ? 'Hide approval history' : 'Show approval history'">Show MERI plan approvals</a></div>
-	</div>
+
+		<a class="btn btn-info btn-sm meri-history-toggle" data-bind="click:toggleMeriPlanHistory, text:meriPlanHistoryVisible() ? 'Hide approval history' : 'Show approval history'">Show MERI plan approvals</a>
 </g:if>
 
+	</div>
 </div>
 
 <g:if test="${showMeriPlanHistory}">
@@ -101,10 +110,7 @@
 			<th class="ref">Change Order Numbers</th>
 			<th class="comments">Comments</th>
 			<th class="approver">Approved by</th>
-			<th class="open">Open</th>
-			<g:if test="${fc.userIsAlaOrFcAdmin()}">
-				<th class="delete-approval">Delete</th>
-			</g:if>
+			<th class="report-actions">Actions</th>
 		</tr>
 		</thead>
 		<tbody data-bind="foreach:approvedPlans">
@@ -113,10 +119,27 @@
 			<td class="ref" data-bind="text:referenceDocument"></td>
 			<td class="comments" data-bind="text:reason"></td>
 			<td class="approver"><span data-bind="text:userDisplayName"></span></td>
-			<td class="open"><a target="_meriPlan" data-bind="attr:{href:openMeriPlanUrl}"><i class="fa fa-external-link"></i></a></td>
-			<g:if test="${fc.userIsAlaOrFcAdmin()}">
-				<td class="delete-approval"><i class="fa fa-remove" data-bind="click:$parent.deleteApproval"></i></td>
-			</g:if>
+			<td class="report-actions">
+				<a class="btn btn-container btn-sm" target="_meriPlan" data-bind="attr:{href:openMeriPlanUrl}">
+					<i class="fa fa-external-link" title="Open">
+					</i></a>
+				<g:if test="${showMeriPlanComparison}">
+					<a class="btn btn-container btn-sm" target="_meriPlan" data-bind="attr:{href:openMeriPlanChangesUrl}">
+						<i class="fa fa-code-fork" title="View Changes"></i>
+					</a>
+				</g:if>
+				<g:else>
+					<a class="btn btn-container btn-sm" class="btn btn-container btn-sm disabled-icon">
+						<i class="fa fa-code-fork" title="View Changes"></i>
+					</a>
+				</g:else>
+
+				<g:if test="${fc.userIsAlaOrFcAdmin()}">
+					<a class="btn btn-container btn-sm pull-right" href="javascript:void(0)" title="Delete"
+					   data-bind="click:$parent.deleteApproval"><i class="fa fa-remove" style="color:red;"></i>
+					</a>
+				</g:if>
+			</td>
 		</tr>
 		</tbody>
 	</table>
@@ -143,52 +166,36 @@
 
 <g:if test="${projectContent.details.visible}">
 	<div class="save-details-result-placeholder"></div>
-	<div class="row space-after">
-		<div class="col-sm-12">
-			<div class="form-actions">
-				<div class="form-check">
-					<input type="checkbox" class="form-check-input" id="caseStudy" data-bind="checked: meriPlan().caseStudy, disable: isProjectDetailsLocked()">
-					<label for="caseStudy" class="form-check-label">&nbsp;Are you willing for your project to be used as a case study by the Department?</label>
-				</div>
-				<br/>
-				<button type="button" data-bind="click: saveProjectDetails, disable: isProjectDetailsLocked()" class="btn btn-sm btn-primary">Save changes</button>
-				<button type="button" class="btn btn-sm btn-danger" data-bind="click: cancelProjectDetailsEdits">Cancel</button>
-				<button type="button" class="btn btn-sm btn-info" data-bind="click: meriPlanPDF">Display Printable MERI Plan</button>
 
-				<!--  Admin - submit to approval. -->
-				<g:if test="${user?.isAdmin}">
-				<div>
-					<div data-bind="if: !isSubmittedOrApproved()">
-						<hr/>
-						<b>Admin actions:</b>
-						<g:if test="${showMERIActivityWarning}">
-						<ul>
-							<li>You will not be able to report activity data until your MERI plan has been approved by your case manager.</li>
-						</ul>
-						</g:if>
-						<g:if test="${allowMeriPlanUpload}">
-							<div class="btn fileinput-button"
-								 data-bind="fileUploadNoImage:meriPlanUploadConfig"><i class="fa fa-plus"></i> <input
-									type="file" name="meriPlan"><span>Upload MERI Plan</span></div>
-						</g:if>
-						<button type="button" data-bind="click: saveAndSubmitChanges" class="btn btn-sm btn-info saveAndSubmitChanges">Submit for approval</button>
-					</div>
-					<div data-bind="if: isSubmittedOrApproved()">
-                        <g:if test="${showMERIActivityWarning}">
-						<hr/>
+	<!-- ko if:isPlanEditable() -->
+	<g:if test="${project.lock && (project.lock.userId !=  user.userId)}">
+		<div class="row mb-2">
+			<div class="col-sm-12 pl-3 pr-3">
+				<div class="alert alert-danger meri-locked">
+					<p class="text-dark">This form has been locked for editing by <fc:userDisplayName userId="${project.lock.userId}" defaultValue="an unknown user"/> since ${au.org.ala.merit.DateUtils.displayFormatWithTime(project.lock.dateCreated)}</p>
+					<p class="text-dark">To edit anyway, click the button below.  Note that if the user is currently making edits, those edits will be lost.</p>
+					<a href="${createLink(action:'overrideMeriPlanLockAndEdit', id:project.projectId)}"><button type="button" class="btn btn-sm btn-danger"><i class="fa fa-edit"></i> Edit Anyway</button></a>
 
-						<b>Admin:</b>
-						<ul>
-							<li>You will not be able to report activity data until your MERI plan has been approved by your case manager.</li>
-						</ul>
-						</g:if>
-					</div>
 				</div>
-				</g:if>
 			</div>
-
 		</div>
-	</div>
+	</g:if>
+	<g:if test="${!project.lock}">
+		<div data-bind="if:isPlanEditable()" class="row mb-2">
+			<div class="col-sm-12 pl-3 pr-3">
+				<div class="alert alert-danger report-locked">
+					<p class="text-dark">You must unlock the plan to edit it, and when finished you must save your work by pressing the "Save changes and finish editing" or the "Submit for approval" button below otherwise your work will not be saved. Do not close or press back on your browser to exit or your work will be lost.</p>
+					<a id="lockMeriPlan" href="${createLink(action:'lockMeriPlan', id:project.projectId)}"><button type="button" class="btn btn-sm btn-danger"><i class="fa fa-edit"></i> Lock for Editing</button></a>
+				</div>
+			</div>
+		</div>
+		<div class="form-actions">Admin actions: <g:render template="submitMeriPlanButton" model="${[clickCallback:'submitChanges']}"/></div>
+
+	</g:if>
+	<!-- /ko -->
+        <!-- ko if:isPlanEditable() -->
+	<g:render template="meriPlanEditActions"/>
+	<!-- /ko -->
 
 	<div class="controls">
 		<b>From: </b><span data-bind="text: plannedStartDate.formattedDate"></span>  <b>To: </b> <span data-bind="text: plannedEndDate.formattedDate"></span>
@@ -200,53 +207,9 @@
 
 <div class="save-details-result-placeholder"></div>
 
-<div class="row space-after">
-	<div class="col-sm-12">
-		<div class="form-actions">
-			<div class="form-check">
-				<input class="form-check-input" id="caseStudy2" type="checkbox"  data-bind="checked: meriPlan().caseStudy, disable: isProjectDetailsLocked()" />
-				<label for="caseStudy2" class="form-check-label">&nbsp;Are you willing for your project to be used as a case study by the Department?</label>
-			</div>
-			<br/>
 
-			<button type="button" data-bind="click: saveProjectDetails, disable: isProjectDetailsLocked()" class="btn btn-sm btn-primary">Save changes</button>
-			<button type="button" class="btn btn-sm btn-danger" data-bind="click: cancelProjectDetailsEdits">Cancel</button>
-			<g:if test="${projectContent.details.visible}"><button type="button" class="btn btn-sm btn-info" data-bind="click: meriPlanPDF">Display Printable MERI Plan</button></g:if>
+	<g:render template="meriPlanEditActions"/>
 
-			<!--  Admin - submit to approval. -->
-			<g:if test="${user?.isAdmin}">
-			<div>
-				<div data-bind="if:!isSubmittedOrApproved()">
-					<hr/>
-					<b>Admin actions:</b>
-					<g:if test="${showActivityWarning}">
-					<ul>
-						<li>You will not be able to report activity data until your MERI plan has been approved by your grant manager.</li>
-					</ul>
-					</g:if>
-					<g:if test="${allowMeriPlanUpload}">
-						<div class="btn fileinput-button"
-							 data-bind="fileUploadNoImage:meriPlanUploadConfig"><i class="fa fa-plus"></i>
-							<input type="file" name="meriPlan"><span>Upload MERI Plan</span>
-						</div>
-					</g:if>
-					<button type="button" data-bind="click: saveAndSubmitChanges" class="btn btn-sm btn-info saveAndSubmitChanges">Submit for approval</button>
-				</div>
-				<div data-bind="if: isSubmittedOrApproved()">
-                    <g:if test="${showMERIActivityWarning}">
-                    <hr/>
-					<b>Admin:</b>
-					<ul>
-						<li>You will not be able to report activity data until your MERI plan has been approved by your grant manager.</li>
-					</ul>
-					</g:if>
-				</div>
-			</div>
-			</g:if>
-		</div>
-
-	</div>
-</div>
 
 <div id="floating-save" style="display:none;">
 	<div class="transparent-background"></div>
diff --git a/grails-app/views/project/_editProject.gsp b/grails-app/views/project/_editProject.gsp
index cc362aceb..6daeb88a0 100644
--- a/grails-app/views/project/_editProject.gsp
+++ b/grails-app/views/project/_editProject.gsp
@@ -70,7 +70,9 @@
 <div class="row mb-2">
     <div class="col-sm-12">
         <div class="control-group">
-            <label for="description" class="control-label">Project description</label>
+            <label for="description" class="control-label">Project description
+                <fc:iconHelp helpTextCode="project.description.help"></fc:iconHelp>
+            </label>
             <div class="controls">
                 <textarea data-bind="value:description" class="form-control form-control-sm input-large" id="description" rows="3" cols="50"></textarea>
             </div>
diff --git a/grails-app/views/project/_meriPlanEditActions.gsp b/grails-app/views/project/_meriPlanEditActions.gsp
new file mode 100644
index 000000000..0a23964e0
--- /dev/null
+++ b/grails-app/views/project/_meriPlanEditActions.gsp
@@ -0,0 +1,59 @@
+<g:if test="${project.lock?.userId == user.userId}">
+    <div class="row space-after">
+        <div class="col-sm-12 pl-3 pr-3">
+            <div class="alert alert-danger meri-lock-held">
+                <p class="text-dark"><i class="fa fa-lock"></i> You currently hold an editing lock for this MERI plan.  No other users will be able to edit the plan until you release the lock using "Save changes and finish editing", "Submit for approval", or "Cancel" buttons.</p>
+            </div>
+        </div>
+        <div class="col-sm-12">
+            <div class="form-actions">
+
+                <div class="form-check ml-2 mb-2">
+                    <input type="checkbox" class="form-check-input" id="caseStudy" data-bind="checked: meriPlan().caseStudy, disable: isProjectDetailsLocked()">
+                    <label for="caseStudy" class="form-check-label">Are you willing for your project to be used as a case study by the Department?</label>
+                </div>
+                <br/>
+
+                <div class="alert alert-secondary form-check">
+                    <label for="planFinished" class="ml-2 form-check-label"><input type="checkbox" class="form-check-input" id="planFinished" data-bind="checked: meriPlan().markAsFinished, disable: isProjectDetailsLocked()"> Mark the MERI plan as complete</label> <fc:iconHelp>The "Submit for approval" function will not be available until the MERI plan is marked as complete</fc:iconHelp>
+                </div>
+                <button type="button" data-bind="click: saveProjectDetails, disable: isProjectDetailsLocked()" class="btn btn-sm btn-primary">Save changes</button>
+                <button type="button" data-bind="click: saveMeriPlanAndUnlock, disable: isProjectDetailsLocked()" class="btn btn-sm btn-primary">Save changes and finish editing</button>
+                <button type="button" class="btn btn-sm btn-danger" data-bind="click: cancelProjectDetailsEdits">Cancel</button>
+
+
+            <!--  Admin - submit to approval. -->
+                <g:if test="${user?.isAdmin}">
+                    <div>
+                        <div data-bind="if: !isSubmittedOrApproved()">
+                            <hr/>
+                            <b>Admin actions:</b>
+                            <g:if test="${showMERIActivityWarning}">
+                                <ul>
+                                    <li>You will not be able to report activity data until your MERI plan has been approved by your case manager.</li>
+                                </ul>
+                            </g:if>
+                            <g:if test="${allowMeriPlanUpload}">
+                                <div class="btn fileinput-button"
+                                     data-bind="fileUploadNoImage:meriPlanUploadConfig"><i class="fa fa-plus"></i> <input
+                                        type="file" name="meriPlan"><span>Upload MERI Plan</span></div>
+                            </g:if>
+                            <g:render template="submitMeriPlanButton"/>
+                        </div>
+                        <div data-bind="if: isSubmittedOrApproved()">
+                            <g:if test="${showMERIActivityWarning}">
+                                <hr/>
+
+                                <b>Admin:</b>
+                                <ul>
+                                    <li>You will not be able to report activity data until your MERI plan has been approved by your case manager.</li>
+                                </ul>
+                            </g:if>
+                        </div>
+                    </div>
+                </g:if>
+            </div>
+
+        </div>
+    </div>
+</g:if>
\ No newline at end of file
diff --git a/grails-app/views/project/_projectReporting.gsp b/grails-app/views/project/_projectReporting.gsp
index d1d333552..4d4d2ab0c 100644
--- a/grails-app/views/project/_projectReporting.gsp
+++ b/grails-app/views/project/_projectReporting.gsp
@@ -43,8 +43,9 @@
         </div>
     </g:elseif>
 </div>
+<g:set var="declarationTemplate" value="${declarationTemplate}"/>
 <g:render template="/shared/categorizedReporting"></g:render>
-<g:render template="/shared/declaration" model="${[declarationType:au.org.ala.merit.SettingPageType.RLP_REPORT_DECLARATION]}"/>
+<g:render template="/shared/declaration" model="${[declarationType:declarationTemplate]}"/>
 <g:render template="/shared/reportRejectionModal"/>
 <script type="text/html" id="adjustment-instructions">
 <fc:getSettingContent settingType="${au.org.ala.merit.SettingPageType.REPORT_ADJUSTMENT_INSTRUCTIONS}"/>
diff --git a/grails-app/views/project/_rlpOverview.gsp b/grails-app/views/project/_rlpOverview.gsp
index 94c1056ae..78136cde7 100644
--- a/grails-app/views/project/_rlpOverview.gsp
+++ b/grails-app/views/project/_rlpOverview.gsp
@@ -125,7 +125,7 @@
                         <tr>
                             <th></th>
                             <th class="outcome">Outcomes</th>
-                            <th class="priority">Primary Investment Priority</th>
+                            <th class="priority">Investment Priority</th>
                         </tr>
                         </thead>
                         <tbody>
diff --git a/grails-app/views/project/_submitMeriPlanButton.gsp b/grails-app/views/project/_submitMeriPlanButton.gsp
new file mode 100644
index 000000000..6ed5e8a9a
--- /dev/null
+++ b/grails-app/views/project/_submitMeriPlanButton.gsp
@@ -0,0 +1 @@
+<button type="button" data-bind="click: ${clickCallback ?: 'saveAndSubmitChanges'}, enable: meriPlan().markAsFinished" class="btn btn-sm btn-info saveAndSubmitChanges">Submit for approval</button><fc:iconHelp html="true">The MERI plan must have the "Mark the MERI plan as complete" checkbox ticked before it can be submitted.  <p>To finish editing and mark the MERI plan as complete, press the "Lock for Editing" button</p></fc:iconHelp>
\ No newline at end of file
diff --git a/grails-app/views/project/dataset/_dataSets.gsp b/grails-app/views/project/dataset/_dataSets.gsp
index 659ecbd71..70d3d5ad5 100644
--- a/grails-app/views/project/dataset/_dataSets.gsp
+++ b/grails-app/views/project/dataset/_dataSets.gsp
@@ -9,11 +9,18 @@
             </div>
         </div>
     </div>
-    <table class="table table-striped">
+    <table class="table table-striped w-100" data-bind="dataTable:dataTableConfig, css: { 'dataset-summary-with-dates':supportsDateColumn, 'dataset-summary':!supportsDateColumn }">
         <thead>
         <tr>
             <th class="actions">Actions</th>
             <th class="dataset-name">Title</th>
+            <th class="service">Service <fc:iconHelp>This data set can only be reported against the service specified</fc:iconHelp></th>
+            <th class="report">Report <fc:iconHelp>If this data set has been used in a report, it is displayed here</fc:iconHelp></th>
+            <th class="date-created">Date created</th>
+            <th class="date-created-hidden">Date created (ISO format)</th>
+            <th class="last-updated">Date last updated</th>
+            <th class="last-updated-hidden">Date last updated (ISO format)</th>
+            <th class="created-in">Created in</th>
             <th class="dataset-progress">Status</th>
         </tr>
         </thead>
@@ -23,17 +30,26 @@
                 <a class="btn btn-container btn-sm" data-bind="attr:{href:viewUrl}">
                     <i class="fa fa-eye" title="View this dataset"></i>
                 </a>
-                <a class="btn btn-container btn-sm" data-bind="attr:{href:editUrl}">
+                <a class="btn btn-container btn-sm" data-bind="visible:!readOnly,attr:{href:editUrl}">
                     <i class="fa fa-edit" title="Edit this dataset"></i>
                 </a>
-                <a class="btn btn-container btn-sm" href="#" data-bind="click:deleteDataSet">
+                <a class="btn btn-container btn-sm" href="#" data-bind="visible:!readOnly,click:deleteDataSet">
                     <i class="fa fa-remove" title="Delete this dataset"></i>
                 </a>
             </td>
             <td class="dataset-name" data-bind="text:name"></td>
-            <td><button type="button" class="btn btn-sm" data-bind="activityProgress:progress">
+            <td class="service" data-bind="text:service"></td>
+            <th class="report"><a data-bind="text:report, attr:{href:reportUrl}"></a></th>
+            <td class="date-created" data-bind="text:dateCreated.formattedDate"></td>
+            <td class="date-created-hidden" data-bind="text:dateCreated"></td>
+            <td class="last-updated" data-bind="text:lastUpdated.formattedDate"></td>
+            <td class="last-updated-hidden" data-bind="text:lastUpdated"></td>
+            <td class="created-in" data-bind="text:createdIn"></td>
+            <td>
+                <report-status params="reportStatus:publicationStatus"></report-status>
+                <button type="button" class="btn btn-sm" data-bind="activityProgress:progress">
                 <span data-bind="text: progress"></span>
-            </button>
+                </button>
             </td>
         </tr>
         </tbody>
diff --git a/grails-app/views/project/index.gsp b/grails-app/views/project/index.gsp
index ce0cdbf9c..62a682cfd 100644
--- a/grails-app/views/project/index.gsp
+++ b/grails-app/views/project/index.gsp
@@ -24,7 +24,7 @@
                 activityViewUrl: "${createLink(controller: 'activity', action: 'index')}",
                 siteCreateUrl: "${createLink(controller: 'site', action: 'createForProject', params: [projectId:project.projectId])}",
                 siteSelectUrl: "${createLink(controller: 'site', action: 'select', params:[projectId:project.projectId, returnTo:createLink(controller: 'project', action: 'index', id: project.projectId)])}",
-                siteUploadUrl: "${createLink(controller: 'site', action: 'siteUpload', params:[projectId:project.projectId, returnTo:createLink(controller: 'project', action: 'index', id: project.projectId)])}",
+                siteUploadUrl: "${createLink(controller: 'site', action: 'siteUpload', id: project.projectId)}",
                 starProjectUrl: "${createLink(controller: 'project', action: 'starProject')}",
                 addUserRoleUrl: "${createLink(controller: 'user', action: 'addUserAsRoleToProject')}",
                 removeUserWithRoleUrl: "${createLink(controller: 'user', action: 'removeUserWithRole')}",
@@ -55,6 +55,8 @@
                 projectReportUrl: "${createLink(controller:'project', action:'projectReport', id:project.projectId)}",
                 projectReportPDFUrl: "${createLink(controller:'project', action:'projectReportPDF', id:project.projectId)}",
                 meriPlanPDFUrl: "${createLink(controller:'project', action:'viewMeriPlan', id:project.projectId)}",
+                meriPlanChangesUrl: "${createLink(controller:'project', action:'viewMeriPlanChanges', id:project.projectId)}",
+                viewMeriPlanChangesUrl: "${createLink(controller:'project', action:"viewMeriPlanChanges", id:project.projectId)}",
                 sitesPhotoPointsUrl: "${createLink(controller:'project', action:'projectSitePhotos', id:project.projectId)}",
                 organisationSearchUrl: "${createLink(controller: 'organisation', action: 'search')}",
                 submitReportUrl: "${createLink(controller: 'project', action: 'ajaxSubmitReport', id:project.projectId)}/",
@@ -67,13 +69,14 @@
                 reportCreateUrl: '${g.createLink( action:'createReport', id:project.projectId)}',
                 viewReportUrl: '${createLink(action:"viewReport", id:project.projectId)}',
                 editReportUrl: "${createLink(action:"editReport", id:project.projectId)}",
-                reportPDFUrl: "${createLink(action:"reportPDF", id:project.projectId)}",
+                reportPDFUrl: "${createLink(action:"printableReport", id:project.projectId)}",
                 deleteActivitiesUrl: "${createLink(controller: 'project', action: 'ajaxDeleteReportActivities', id:project.projectId)}/",
                 submitPlanUrl: "${createLink(controller:'project', action:'ajaxSubmitPlan', id:project.projectId)}",
                 modifyPlanUrl: "${createLink(controller:'project', action:'ajaxRejectPlan', id:project.projectId)}",
                 approvalPlanUrl: "${createLink(controller:'project', action:'ajaxApprovePlan', id:project.projectId)}",
                 rejectPlanUrl: "${createLink(controller:'project', action:'ajaxRejectPlan', id:project.projectId)}",
                 unlockPlanForCorrectionUrl: "${createLink(controller:'project', action:'ajaxUnlockPlanForCorrection', id:project.projectId)}",
+                removeMeriPlanEditLockUrl: "${createLink(controller:'project', action:'removeMeriPlanEditLock', id:project.projectId)}",
                 finishedCorrectingPlanUrl: "${createLink(controller:'project', action:'ajaxFinishedCorrectingPlan', id:project.projectId)}",
                 projectScoresUrl: "${createLink(action:'serviceScores', id:project.projectId)}",
                 healthCheckUrl: "${createLink(controller:'ajax', action:'keepSessionAlive')}",
@@ -99,7 +102,7 @@
                 monitoringProtocolsUrl:"${createLink(action:'monitoringProtocolFormCategories', id: project.projectId)}"
 
             },
-            here = window.location.href;
+            here = "${createLink(action:'index', id: project.projectId)}";
 
         fcConfig.project = <fc:renderProject project="${project}"/>;
     </script>
@@ -259,6 +262,9 @@
 
 var config = {
     meriPlanPDFUrl: fcConfig.meriPlanPDFUrl,
+    meriPlanChangesUrl: fcConfig.meriPlanChangesUrl,
+    viewMeriPlanChangesUrl: fcConfig.viewMeriPlanChangesUrl,
+    removeMeriPlanEditLockUrl: fcConfig.removeMeriPlanEditLockUrl,
     saveTargetsUrl: fcConfig.projectUpdateUrl,
     documentUpdateUrl: fcConfig.documentUpdateUrl,
     projectUpdateUrl: fcConfig.projectUpdateUrl,
@@ -296,8 +302,8 @@ var config = {
     config.themes = themes;
             var services = <fc:modelAsJavascript model="${config.services}" default="[]"/>;
 
-    config.useAlaMap = ${Boolean.valueOf(projectContent.site.useAlaMap)};
-    config.showSiteType = ${Boolean.valueOf(projectContent.site.showSiteType)};
+    config.useAlaMap = ${Boolean.valueOf(projectContent.site?.useAlaMap)};
+    config.showSiteType = ${Boolean.valueOf(projectContent.site?.showSiteType)};
     config.services = services;
 
     config.useRlpTemplate = ${config.getProjectTemplate() == au.org.ala.merit.config.ProgramConfig.ProjectTemplate.RLP};
@@ -317,8 +323,9 @@ var config = {
     config.programObjectives = <fc:modelAsJavascript model="${config.program?.config?.objectives ?: []}"/>
     config.programActivities = <fc:modelAsJavascript model="${config.program?.config?.activities?.collect { it.name } ?: []}"/>
     config.excludeFinancialYearData = ${config.program?.config?.excludeFinancialYearData ?: false};
-    config.canModifyMeriPlan = ${projectContent.admin.canModifyMeriPlan};;
-
+    config.canModifyMeriPlan = ${projectContent.admin.canModifyMeriPlan};
+    config.userHoldsMeriPlanLock = ${project.lock?.userId == user?.userId};
+    config.viewReportUrl = fcConfig.viewReportUrl;
     project.mapFeatures =  $.parseJSON('${mapFeatures?.encodeAsJavaScript()}');
     var viewModel = new ProjectPageViewModel(project, project.sites, project.activities || [], organisations, userRoles, config);
     viewModel.loadPrograms(programs);
@@ -491,7 +498,7 @@ var config = {
             //Page loading indicator.
 			$('.spinner').hide();
         	$('.tab-content').fadeIn();
-        	$('.programId').select2({theme: "bootstrap4"});
+        	$('.programId').select2({theme: "bootstrap"});
 
         	new LockService({unlockUrl:fcConfig.unlockActivityUrl}).unlockAll();
 
diff --git a/grails-app/views/project/meriPlan/_additionalOutcomes.gsp b/grails-app/views/project/meriPlan/_additionalOutcomes.gsp
index 7d771a069..783000a2f 100644
--- a/grails-app/views/project/meriPlan/_additionalOutcomes.gsp
+++ b/grails-app/views/project/meriPlan/_additionalOutcomes.gsp
@@ -16,7 +16,7 @@
         </td>
         <td class="priority">
             <!-- ko if:!details.outcomes.secondaryOutcomeSupportsMultiplePriorities($data.description()) -->
-            <select data-bind="value:asset, options: details.outcomes.outcomePriorities(description()), optionsCaption: 'Please select', select2:{preserveColumnWidth:48}, disable: $parent.isProjectDetailsLocked()" class="form-control form-control-sm asset"></select>
+            <select data-bind="value:asset, options: details.outcomes.outcomePriorities(description()), optionsCaption: 'Please select', select2:{preserveColumnWidth:48}, disable: $parent.isProjectDetailsLocked()" class="form-control form-control-sm asset" <g:if test="!disablePriorityValidation">data-validation-engine="validate[required]"></g:if></select></select>
             <!-- /ko -->
             <!-- ko if:details.outcomes.secondaryOutcomeSupportsMultiplePriorities($data.description()) -->
             <ul class="list-unstyled" data-bind="foreach:details.outcomes.outcomePriorities(description())">
diff --git a/grails-app/views/project/meriPlan/_attachmentFooter.gsp b/grails-app/views/project/meriPlan/_attachmentFooter.gsp
index 2c4842a96..70d5dd085 100644
--- a/grails-app/views/project/meriPlan/_attachmentFooter.gsp
+++ b/grails-app/views/project/meriPlan/_attachmentFooter.gsp
@@ -1,2 +1,2 @@
 <h4>${heading}</h4>
-<p>${attachmentText}</p>
+<p>${attachmentText}</p>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlan/_extendedBaselineMonitoring.gsp b/grails-app/views/project/meriPlan/_extendedBaselineMonitoring.gsp
index ee5a1be1d..c7c04be9c 100644
--- a/grails-app/views/project/meriPlan/_extendedBaselineMonitoring.gsp
+++ b/grails-app/views/project/meriPlan/_extendedBaselineMonitoring.gsp
@@ -9,10 +9,10 @@
     <tbody data-bind="foreach: rows">
     <tr class="header">
         <th class="code"></th>
-        <th class="outcome required">Outcome statement/s</th>
+        <th class="outcome required">${outcomeStatementHeading ?: 'Outcome statement/s'}</th>
         <th class="monitoring-data required">Baseline data <g:if test="${baselineDataHelpText}"><fc:iconHelp>${baselineDataHelpText}</fc:iconHelp></g:if></th>
         <th class="baseline required">Baseline data description <g:if test="${baselineDataDescriptionHelpText}"><fc:iconHelp>${baselineDataDescriptionHelpText}</fc:iconHelp></g:if></th>
-        <th class="service required">Project Service / Target Measure/s <g:if test="${baselineHelpText}"><fc:iconHelp>${baselineServiceHelpText}</fc:iconHelp></g:if></th>
+        <th class="service required">${servicesHeading ?: 'Project service / Target measure/s'}<g:if test="${baselineHelpText}"><fc:iconHelp>${baselineServiceHelpText}</fc:iconHelp></g:if></th>
         <th class="baseline-method required">Select the method used to obtain the baseline, or how the baseline will be established if ‘Other’<fc:iconHelp html="true">${baselineMethodHelpText ?: "Describe the project baseline(s) units of measure or data which will be used to report progress towards this project's outcomes (short-term, medium-term and 5 year program outcome), and the monitoring design."}</fc:iconHelp></th>
         <th class="baseline-evidence required">Evidence to be retained <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
         <th class="remove"></th>
@@ -71,7 +71,7 @@
         </td>
         <td class="remove">
             <span data-bind="if: $index() && !$root.isProjectDetailsLocked()"><i class="fa fa-remove"
-                                                                                 data-bind="click: $parent.removeRow"></i>
+                                                                                 data-bind="click: $root.removeBaseline"></i>
             </span>
         </td>
     </tr>
@@ -82,7 +82,7 @@
 
 
     <g:render template="/project/meriPlan/monitoringIndicators"
-              model="${[monitoringValidation:true, extendedMonitoring:true,indictorSelectorExpression:'$root.monitoringIndicators(code)', addIndictorExpression:'function() {$root.addMonitoringIndicator(this)}', removeIndictorExpression:'$root.removeMonitoringIndicator']}"/>
+              model="${[monitoringValidation:true, extendedMonitoring:true,indictorSelectorExpression:'$root.monitoringIndicators(code)', addIndictorExpression:'function() {$root.addMonitoringIndicator(this)}', removeIndictorExpression:'$root.removeMonitoringIndicator', numberOfMandatoryRows:0]}"/>
 
 </td>
 </tr>
diff --git a/grails-app/views/project/meriPlan/_extendedKeyThreats.gsp b/grails-app/views/project/meriPlan/_extendedKeyThreats.gsp
index 959659e32..f16b99383 100644
--- a/grails-app/views/project/meriPlan/_extendedKeyThreats.gsp
+++ b/grails-app/views/project/meriPlan/_extendedKeyThreats.gsp
@@ -9,10 +9,10 @@
     <thead>
     <tr>
         <th class="index"></th>
-        <th class="related-outcomes required">Outcome Statement/s</th>
+        <th class="related-outcomes required">${outcomeStatementHeading ?: 'Outcome statement/s'}</th>
         <th class="threat-code required">Threats / Threatening processes</th>
         <th class="threat required">Description <fc:iconHelp>${threatHelpText ?: "Describe the key threats (or key threatening processes) to the primary investment priority"}</fc:iconHelp></th>
-        <th class="services required">Project Service / Target Measure/s to address threats<fc:iconHelp>${servicesHelpText ?: "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables"}</fc:iconHelp></th>
+        <th class="services required">${servicesHeading ?: 'Project service / Target measure/s to address threats'}<fc:iconHelp>${servicesHelpText ?: "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables"}</fc:iconHelp></th>
         <th class="intervention required">Methodology <fc:iconHelp>${interventionHelpText ?: "Describe the proposed interventions to address the threat and how this will deliver on the 5 year outcome."}</fc:iconHelp></th>
         <th class="evidence required">Evidence to be retained <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
         <th class="remove"></th>
diff --git a/grails-app/views/project/meriPlan/_monitoringIndicators.gsp b/grails-app/views/project/meriPlan/_monitoringIndicators.gsp
index c0d99723b..49150bc3f 100644
--- a/grails-app/views/project/meriPlan/_monitoringIndicators.gsp
+++ b/grails-app/views/project/meriPlan/_monitoringIndicators.gsp
@@ -10,7 +10,7 @@
                 <g:if test="${monitoringValidation}">
                     <th class="baseline required">${indicatorHeading} <g:if test="${indicatorHelpText}"><fc:iconHelp title="${indicatorHeading}">${indicatorHelpText}</fc:iconHelp></g:if></th>
                     <g:if test="${extendedMonitoring}">
-                        <th class="monitoring-service required">Project Service / Target Measure/s <g:if test="${monitoringServiceHelpText}"><fc:iconHelp html="true">${monitoringServiceHelpText}</fc:iconHelp></g:if></th>
+                        <th class="monitoring-service required">${monitoringServicesHeading ?: 'Project service / Target measure/s'} <g:if test="${monitoringServiceHelpText}"><fc:iconHelp html="true">${monitoringServiceHelpText}</fc:iconHelp></g:if></th>
                     </g:if>
                     <th class="baseline-method required">${approachHeading} <g:if test="${approachHelpText}"><fc:iconHelp html="true" title="${approachHeading}">${approachHelpText}</fc:iconHelp></g:if></th>
                     <g:if test="${extendedMonitoring}">
@@ -83,7 +83,7 @@
                     <td class="baseline-method"> <textarea class="form-control form-control-sm" data-bind="value: data2, disable: $root.isProjectDetailsLocked()" rows="5" placeholder="${approachPlaceHolder}"></textarea> </td>
                 </g:else>
                 <td class="remove">
-                    <span data-bind="if: $index() && !$root.isProjectDetailsLocked()"><i class="fa fa-remove" data-bind="click: ${removeIndictorExpression?:'$root.removeObjectives'}"></i></span>
+                    <span data-bind="if: $index() >= ${numberOfMandatoryRows != null ? numberOfMandatoryRows : 1} && !$root.isProjectDetailsLocked()"><i class="fa fa-remove" data-bind="click: ${removeIndictorExpression?:'$root.removeObjectives'}"></i></span>
                 </td>
             </tr>
             </tbody>
diff --git a/grails-app/views/project/meriPlan/_outcomeStatements.gsp b/grails-app/views/project/meriPlan/_outcomeStatements.gsp
index 02b8fc027..e7e2d88a8 100644
--- a/grails-app/views/project/meriPlan/_outcomeStatements.gsp
+++ b/grails-app/views/project/meriPlan/_outcomeStatements.gsp
@@ -18,7 +18,7 @@
         </g:else>
         <th class="outcome required">${subtitle ?: ""} <g:if test="${helpText}"><fc:iconHelp html="true" container="body">${helpText}</fc:iconHelp></g:if> </th>
         <g:if test="${extendedOutcomes}">
-            <th class="investment-priority required">Investment Priority</th>
+            <th class="investment-priority required">${investmentPriorityHeading ?: 'Investment priority'}</th>
             <th class="program-outcome required">Related program outcome</th>
         </g:if>
         <th class="remove"></th>
diff --git a/grails-app/views/project/meriPlan/_programOutcome.gsp b/grails-app/views/project/meriPlan/_programOutcome.gsp
index be573d776..ffeb47483 100644
--- a/grails-app/views/project/meriPlan/_programOutcome.gsp
+++ b/grails-app/views/project/meriPlan/_programOutcome.gsp
@@ -1,9 +1,9 @@
-<h4>Program Outcome<g:if test="${helpTextHeading}"> <fc:iconHelp html="true" container="body">${helpTextHeading}</fc:iconHelp></g:if></h4>
+<h4>${sectionHeading ?: 'Program outcome'}<g:if test="${helpTextHeading}"> <fc:iconHelp html="true" container="body">${helpTextHeading}</fc:iconHelp></g:if></h4>
 <table class="table">
     <thead>
     <tr class="header">
         <th class="outcome-priority required">${primaryOutcomeHeading?: 'Primary outcome'}<g:if test="${helpTextPrimaryOutcome}"> <fc:iconHelp html="true" container="body">${helpTextPrimaryOutcome}</fc:iconHelp></g:if></th>
-        <th class="primary-outcome priority required">${pestsAndWeedsHeading?: 'Primary Investment'} <span data-bind="if:!isAgricultureProject() && !details.outcomes.primaryOutcomeSupportsMultiplePriorities()">Priority</span><span data-bind="if:isAgricultureProject() || details.outcomes.primaryOutcomeSupportsMultiplePriorities()">Priorities</span>
+        <th class="primary-outcome priority required">${pestsAndWeedsHeading?: 'Primary investment'} <span data-bind="if:!isAgricultureProject() && !details.outcomes.primaryOutcomeSupportsMultiplePriorities()">${pestsAndWeedsHeadingExtNonMulti ?: 'priority'}</span><span data-bind="if:isAgricultureProject() || details.outcomes.primaryOutcomeSupportsMultiplePriorities()">${pestsAndWeedsHeadingExtMulti ?: 'priorities'}</span>
                 <fc:iconHelp html="true" container="body">${priorityHelpText?: 'Enter the primary investment priority/ies for the primary outcome. (drop down list in MERIT) <br/>For outcomes 1-4, only one primary investment priority can be selected.<br/>For outcomes 5-6, select one or a maximum of two primary investment priorities'}</fc:iconHelp>
         </th>
         <th class="remove"></th>
diff --git a/grails-app/views/project/meriPlan/_serviceForecasts.gsp b/grails-app/views/project/meriPlan/_serviceForecasts.gsp
index f7f23abc5..567592504 100644
--- a/grails-app/views/project/meriPlan/_serviceForecasts.gsp
+++ b/grails-app/views/project/meriPlan/_serviceForecasts.gsp
@@ -35,7 +35,7 @@
         <td class="budget-cell">
             <input class="form-control form-control-sm" type="number"
                    data-bind="value: target, disable: $root.isProjectDetailsLocked()"
-                   data-validation-engine="validate[custom[number],min[0]]"/>
+                   data-validation-engine="validate[required,custom[number],min[0]]"/>
         </td>
         <!-- /ko -->
     </tr>
diff --git a/grails-app/views/project/meriPlan/_serviceOutcomeTargets.gsp b/grails-app/views/project/meriPlan/_serviceOutcomeTargets.gsp
index 6b6bf2b2f..49248948b 100644
--- a/grails-app/views/project/meriPlan/_serviceOutcomeTargets.gsp
+++ b/grails-app/views/project/meriPlan/_serviceOutcomeTargets.gsp
@@ -47,7 +47,7 @@
             <select multiple class="form-control form-control-sm" data-bind="options:availableOutcomes, multiSelect2:{value:relatedOutcomes, templateResult:$root.renderOutcome, tags:false}, disable: $root.isProjectDetailsLocked()">
             </select>
         </td>
-        <td class="score"><input type="number" class="form-control form-control-sm" data-bind="value:target, disable: $root.isProjectDetailsLocked()"></td>
+        <td class="score"><input type="number" class="form-control form-control-sm" data-bind="value:target, disable: $root.isProjectDetailsLocked()" data-validation-engine="validate[required,min[validate[min[0.01]]"></td>
         <td>
             <span data-bind="if:!$root.isProjectDetailsLocked()">
             <i class="fa fa-remove" data-bind="click:$parent.removeOutcomeTarget, disable: $root.isProjectDetailsLocked()"></i>
diff --git a/grails-app/views/project/meriPlanChanges/_activities.gsp b/grails-app/views/project/meriPlanChanges/_activities.gsp
new file mode 100644
index 000000000..ad61a5b09
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_activities.gsp
@@ -0,0 +1,14 @@
+<div id="activity-list-view">
+<g:if test="${title}">
+    <h4>${title}</h4>
+</g:if>
+
+    <ul data-bind="visible:details.activities.activities().length > 0 || details.activities.activities.otherChecked()">
+        <!-- ko foreach:details.activities.activities -->
+        <li class="activity" data-bind="text:$data"></li>
+        <!-- /ko -->
+        <li class="activity" data-bind="visible:details.activities.activities.otherChecked(), text:details.activities.activities.otherValue()"></li>
+    </ul>
+
+    <span class="activity" data-bind="visible:details.activities.activities().length == 0 && !details.activities.activities.otherChecked()">${noneSelectedMessage}</span>
+</div>
diff --git a/grails-app/views/project/meriPlanChanges/_adaptiveManagement.gsp b/grails-app/views/project/meriPlanChanges/_adaptiveManagement.gsp
new file mode 100644
index 000000000..72767e08a
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_adaptiveManagement.gsp
@@ -0,0 +1,7 @@
+<div id="adaptive-management-view">
+<g:if test="${title}">
+    <h4>${title}</h4>
+</g:if>
+    <p>Methods and processes that will enable adaptive management during the lifetime of this project</p>
+    <span data-bind="text:details.adaptiveManagement"></span>
+</div>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_additionalOutcomes.gsp b/grails-app/views/project/meriPlanChanges/_additionalOutcomes.gsp
new file mode 100644
index 000000000..3c3e90014
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_additionalOutcomes.gsp
@@ -0,0 +1,29 @@
+<h4>Additional benefits</h4>
+<table class="table secondary-outcome">
+    <thead>
+    <tr>
+        <th class="outcome-priority">${outcomePriority ?:"Secondary outcome(s)"}</th>
+        <th class="priority">${ priority ?:"Secondary Investment Priorities"}</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td class="outcome-priority">
+            <span id="additional-benefits">
+                <g:set var="max" value="${Math.max(project.custom.details.outcomes?.secondaryOutcomes?.size(), changed.custom.details.outcomes?.secondaryOutcomes?.size()?:0)}"/>
+                <g:each in="${(0..<max)}" var="i">
+                    <span><fc:renderComparison changed="${changed.custom.details.outcomes.secondaryOutcomes ?: []}" i="${i}" original="${project.custom.details.outcomes.secondaryOutcomes ?: []}" property="description"/></span>
+                </g:each>
+            </span>
+        </td>
+        <td>
+            <span id="secondary-assets">
+                <g:set var="max" value="${Math.max(project.custom.details.outcomes?.secondaryOutcomes?.assets?.size(), changed.custom.details.outcomes?.secondaryOutcomes?.assets?.size()?:0)}"/>
+                <g:each in="${(0..<max)}" var="i">
+                    <span><fc:renderComparisonList changed="${changed.custom.details.outcomes.secondaryOutcomes ?: []}" i="${i}" original="${project.custom.details.outcomes.secondaryOutcomes ?: []}" property="assets"/></span>
+                </g:each>
+            </span>
+        </td>
+    </tr>
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_assets.gsp b/grails-app/views/project/meriPlanChanges/_assets.gsp
new file mode 100644
index 000000000..24b95e968
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_assets.gsp
@@ -0,0 +1,37 @@
+<h4>Project assets</h4>
+<g:if test="${viewExplanation}">
+    ${viewExplanation ?: "Species, ecological community or environmental asset(s) the project is targeting"}
+</g:if>
+<g:set var="assetClass" value="${useCategorySelection || autoSelectCategory ? 'asset-detail': 'asset'} "/>
+<table class="table assets-view">
+    <thead>
+    <tr>
+        <th class="index"></th>
+        <g:if test="${fromPriorities && useCategorySelection}">
+            <th class="asset-category">Asset Type</th>
+        </g:if>
+            <th class="${assetClass}">${assetHeading ?: "Species, ecological community or environmental asset(s) the project is targeting"}</th>
+        <g:if test="${fromPriorities && autoSelectCategory}">
+            <th class="asset-category">Asset Type</th>
+        </g:if>
+    </tr>
+    </thead>
+    <tbody data-bind="foreach:details.assets">
+    <tr>
+        <td class="index" data-bind="text:$index()+1"></td>
+        <g:if test="${fromPriorities && useCategorySelection}">
+            <td class="asset-category">
+                <span data-bind="text:category"></span>
+            </td>
+        </g:if>
+        <td class="${assetClass}">
+            <span data-bind="text:description"></span>
+        </td>
+        <g:if test="${fromPriorities && autoSelectCategory}">
+            <td class="asset-category">
+                <span data-bind="text:category"></span>
+            </td>
+        </g:if>
+    </tr>
+    </tbody>
+</table>
diff --git a/grails-app/views/project/meriPlanChanges/_attachmentFooter.gsp b/grails-app/views/project/meriPlanChanges/_attachmentFooter.gsp
new file mode 100644
index 000000000..70d5dd085
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_attachmentFooter.gsp
@@ -0,0 +1,2 @@
+<h4>${heading}</h4>
+<p>${attachmentText}</p>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_communityEngagement.gsp b/grails-app/views/project/meriPlanChanges/_communityEngagement.gsp
new file mode 100644
index 000000000..35274ed83
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_communityEngagement.gsp
@@ -0,0 +1,5 @@
+<h4>${title}</h4>
+
+<div class="community-engagement-view row">
+    <span class="col-sm-12" data-bind="text:details.communityEngagement"></span>
+</div>
diff --git a/grails-app/views/project/meriPlanChanges/_consultation.gsp b/grails-app/views/project/meriPlanChanges/_consultation.gsp
new file mode 100644
index 000000000..ba9cae38b
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_consultation.gsp
@@ -0,0 +1,5 @@
+<h4>${title}</h4>
+
+<div class="consultation-view row">
+    <span class="col-sm-12" data-bind="text:details.consultation"></span>
+</div>
diff --git a/grails-app/views/project/meriPlanChanges/_controlApproach.gsp b/grails-app/views/project/meriPlanChanges/_controlApproach.gsp
new file mode 100644
index 000000000..343a2366b
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_controlApproach.gsp
@@ -0,0 +1,17 @@
+<g:if test="${title}">
+    <h4>${title}</h4>
+</g:if>
+<table class="table">
+    <thead>
+    <tr>
+        <th class="approach-current">Could this control approach pose a threat to Native Animals/Plants or Biodiversity?</th>
+        <th class="approach-details">Details</th>
+    </tr>
+    </thead>
+    <tbody data-bind="foreach : details.threatToNativeSpecies.rows">
+    <tr>
+        <td class="approach-current"><span data-bind="text:couldBethreatToSpecies"></span></td>
+        <td class="approach-details"><span data-bind="text:details"></span></td>
+    </tr>
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_controlMethod.gsp b/grails-app/views/project/meriPlanChanges/_controlMethod.gsp
new file mode 100644
index 000000000..3a794d1e9
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_controlMethod.gsp
@@ -0,0 +1,23 @@
+<g:if test="${title}">
+    <h4>${title}</h4>
+</g:if>
+<table class="table">
+    <thead>
+    <tr>
+        <th class="index"></th>
+        <th class="method-current">Are there any current control methods for this pest?</th>
+        <th class="method-success">Has it been successful?</th>
+        <th class="method-type">Type of method</th>
+        <th class="method-details">Details</th>
+    </tr>
+    </thead>
+    <tbody data-bind="foreach : details.threatControlMethod.rows">
+    <tr>
+        <td class="index"><span data-bind="text: $index()+1"></span></td>
+        <td class="method-current"><span data-bind="text:currentControlMethod"></span></td>
+        <td class="method-success"><span data-bind="text:hasBeenSuccessful"></span></td>
+        <td class="method-type"><span data-bind="text:methodType"></span></td>
+        <td class="method-details"><span data-bind="text:details"></span></td>
+    </tr>
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_description.gsp b/grails-app/views/project/meriPlanChanges/_description.gsp
new file mode 100644
index 000000000..d4cd26f3c
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_description.gsp
@@ -0,0 +1,23 @@
+<g:if test="${tableFormatting}">
+    <table class="table">
+        <thead>
+        <tr>
+            <th>Project description</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+            <td style="display:none" class="original" data-bind="text:details.descriptionComparison"></td>
+            <td style="display:none" class="changed" data-bind="text:detailsChanged.descriptionComparison"></td>
+            <td wrap class="diff1"></td>
+        </tr>
+        </tbody>
+    </table>
+</g:if>
+<g:else>
+    <h4>Project description</h4>
+    <td style="display:none" class="original" data-bind="text:details.descriptionComparison"></td>
+    <td style="display:none" class="changed" data-bind="text:detailsChanged.descriptionComparison"></td>
+    <td wrap class="diff1"></td>
+</g:else>
+
diff --git a/grails-app/views/project/meriPlanChanges/_extendedBaselineMonitoring.gsp b/grails-app/views/project/meriPlanChanges/_extendedBaselineMonitoring.gsp
new file mode 100644
index 000000000..470b0e9f8
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_extendedBaselineMonitoring.gsp
@@ -0,0 +1,46 @@
+<h4 class="header-with-help">Monitoring methodology</h4><fc:iconHelp>${titleHelpText ?: "Describe the project baseline(s) units of measure or data which will be used to report progress towards this project's outcomes (short-term, medium-term and 5 year program outcome), and the monitoring design. Refer to the Regional Land Partnerships Evaluation Plan, which provides guidance on baselines and the monitoring indicators for each RLP outcome. Note, other monitoring indicators can also be used."}</fc:iconHelp>
+<br/>
+<strong>Project baseline</strong>
+<g:set var="baselineHeader">
+
+</g:set>
+<table class="table monitoring-baseline extended">
+    <tbody>
+    <g:set var="max" value="${Math.max(project.custom.details.baseline?.rows.size(), changed.custom.details.baseline?.rows?.size()?:0)}"/>
+    <g:each in="${(0..<max)}" var="i">
+    <g:set var="code" value="${project.custom.details.baseline.rows.code.get([i])}"/>
+    <g:set var="monitoringModel" value="${changed.custom.details.monitoring?.rows.find {it.relatedBaseline == code}}"/>
+    <tr class="header">
+        <th class="code"></th>
+        <th class="outcome required">Outcome statement/s</th>
+        <th class="monitoring-data required">Baseline data <g:if test="${baselineDataHelpText}"><fc:iconHelp>${baselineDataHelpText}</fc:iconHelp></g:if></th>
+        <th class="baseline required">Baseline data description <g:if test="${baselineDataDescriptionHelpText}"><fc:iconHelp>${baselineDataDescriptionHelpText}</fc:iconHelp></g:if></th>
+        <th class="service required">Project Service / Target Measure/s <g:if test="${baselineHelpText}"><fc:iconHelp>${baselineServiceHelpText}</fc:iconHelp></g:if></th>
+        <th class="baseline-method required">Select the method used to obtain the baseline, or how the baseline will be established if ‘Other’<fc:iconHelp html="true">${baselineMethodHelpText ?: "Describe the project baseline(s) units of measure or data which will be used to report progress towards this project's outcomes (short-term, medium-term and 5 year program outcome), and the monitoring design."}</fc:iconHelp></th>
+        <th class="baseline-evidence required">Evidence to be retained <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
+    </tr>
+
+    <tr class="baseline-row">
+        <td class="code"><fc:renderComparison changed="${changed.custom.details.baseline.rows ?: []}" i="${i}" original="${project.custom.details.baseline.rows ?: []}" property="code"/> </td>
+        <td class="outcome"><fc:renderComparisonList changed="${changed.custom.details.baseline.rows ?: []}" i="${i}" original="${project.custom.details.baseline.rows ?: []}" property="relatedOutcomes"/> </td>
+        <td class="monitoring-data required"><fc:renderComparison changed="${changed.custom.details.baseline.rows ?: []}" i="${i}" original="${project.custom.details.baseline.rows ?: []}" property="monitoringDataStatus"/> </td>
+        <td class="baseline"><fc:renderComparison changed="${changed.custom.details.baseline.rows ?: []}" i="${i}" original="${project.custom.details.baseline.rows ?: []}" property="baseline"/> </td>
+        <td class="service"><fc:renderComparisonScoreLabel config="${config}" changed="${changed.custom.details.baseline.rows ?: []}" i="${i}" original="${project.custom.details.baseline.rows ?: []}" property="relatedTargetMeasures" includeService="${true}"/> </td>
+        <td class="baseline-method"><fc:renderComparisonList changed="${changed.custom.details.baseline.rows ?: []}" i="${i}" original="${project.custom.details.baseline.rows ?: []}" property="protocols"/> </td>
+        <td class="evidence"><fc:renderComparison changed="${changed.custom.details.baseline.rows ?: []}" i="${i}" original="${project.custom.details.baseline.rows ?: []}" property="evidence"/> </td>
+    </tr>
+    <tr><td class="code"></td><th colspan="7"> Monitoring indicators </th></tr>
+    <tr>
+        <td class="code"><fc:renderComparison changed="${changed.custom.details.baseline.rows ?: []}" i="${i}" original="${project.custom.details.baseline.rows ?: []}" property="code"/> </td>
+        <td colspan="8" class="embedded-monitoring">
+            <g:render template="/project/meriPlanChanges/monitoringIndicators"
+                      model="${[monitoringValidation:true,
+                                indictorSelectorExpression:monitoringModel,
+                                code:code,
+                                extendedMonitoring:true]}"/>
+
+        </td>
+    </tr>
+    </g:each>
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_extendedKeyThreats.gsp b/grails-app/views/project/meriPlanChanges/_extendedKeyThreats.gsp
new file mode 100644
index 000000000..55aa4277f
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_extendedKeyThreats.gsp
@@ -0,0 +1,48 @@
+<g:if test="${title}">
+    <h4>${title}</h4>
+</g:if>
+<g:if test="${explanation}">
+    <p>${explanation}</p>
+</g:if>
+
+<!-- ko with:details.threats -->
+<table class="table threats-view extended-threats">
+    <thead>
+    <tr>
+        <th class="index"></th>
+        <th class="related-outcomes">Outcome Statement/s</th>
+        <th class="threat-code">Threats / Threatening processes</th>
+        <th class="threat required">Description <fc:iconHelp>${threatHelpText ?: "Describe the key threats (or key threatening processes) to the primary investment priority"}</fc:iconHelp></th>
+        <th class="services">Project service / Target measure/s to address threats</th>
+        <th class="intervention required">Methodology <fc:iconHelp>${interventionHelpText ?: "Describe the proposed interventions to address the threat and how this will deliver on the 5 year outcome."}</fc:iconHelp></th>
+        <th class="evidence">Evidence to be retained <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
+    </tr>
+    </thead>
+    <tbody>
+    <g:set var="max" value="${Math.max(project.custom.details.threats.rows.size(), changed.custom.details.threats?.rows?.size()?:0)}"/>
+    <g:each in="${(0..<max)}" var="i">
+        <tr>
+            <td class="index"><span data-bind="text:${i}+1"></span></td>
+            <td class="related-outcomes">
+                <fc:renderComparisonList changed="${changed.custom.details.threats.rows ?: []}" i="${i}" original="${project.custom.details.threats.rows ?: []}" property="relatedOutcomes"/>
+            </td>
+            <td class="threat-code">
+                <fc:renderComparison changed="${changed.custom.details.threats.rows ?: []}" i="${i}" original="${project.custom.details.threats.rows ?: []}" property="threatCode"/>
+            </td>
+            <td class="threat">
+                <fc:renderComparison changed="${changed.custom.details.threats.rows ?: []}" i="${i}" original="${project.custom.details.threats.rows ?: []}" property="threat"/>
+            </td>
+            <td class="services">
+                <fc:renderComparisonScoreLabel config="${config}" changed="${changed.custom.details.threats.rows ?: []}" i="${i}" original="${project.custom.details.threats.rows ?: []}" property="relatedTargetMeasures" includeService="${true}"/>
+            </td>
+            <td class="intervention">
+                <fc:renderComparison changed="${changed.custom.details.threats.rows ?: []}" i="${i}" original="${project.custom.details.threats.rows ?: []}" property="intervention"/>
+            </td>
+            <td class="evidence">
+                <fc:renderComparison changed="${changed.custom.details.threats.rows ?: []}" i="${i}" original="${project.custom.details.threats.rows ?: []}" property="evidence"/>
+            </td>
+        </tr>
+    </g:each>
+    </tbody>
+</table>
+<!-- /ko -->
diff --git a/grails-app/views/project/meriPlanChanges/_indigenousInvolvement.gsp b/grails-app/views/project/meriPlanChanges/_indigenousInvolvement.gsp
new file mode 100644
index 000000000..7a8b15a3d
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_indigenousInvolvement.gsp
@@ -0,0 +1,35 @@
+<h4>First Nations people involvement</h4>
+
+<div class="row">
+    <div class="col-md-8">
+        <label>Are First Nations people (Indigenous) involved in the management and recovery of threatened species, threatened ecological communities and priority places within the project?</label>
+    </div>
+
+    <div class="col-md-4">
+        <span style="display: none" class="original" data-bind="text:details.indigenousInvolved"></span>
+        <span style="display: none" class="changed" data-bind="text:detailsChanged.indigenousInvolved"></span>
+        <span wrap class="diff1"></span>
+    </div>
+</div>
+<div class="row" data-bind="if:detailsChanged.indigenousInvolved() == 'Yes'">
+    <div class="col-md-8">
+        <label>What is the nature of the involvement?</label>
+    </div>
+
+    <div class="col-md-4">
+        <span style="display: none" class="original" data-bind="text:details.indigenousInvolvementType"></span>
+        <span style="display: none" class="changed" data-bind="text:detailsChanged.indigenousInvolvementType"></span>
+        <span wrap class="diff1"></span>
+    </div>
+</div>
+<div class="row" data-bind="if:detailsChanged.indigenousInvolved() == 'No'">
+    <div class="col-md-8">
+        <label>Comments</label>
+    </div>
+
+    <div class="col-md-4">
+        <span style="display: none" class="original" data-bind="text:details.indigenousInvolvementComment"></span>
+        <span style="display: none" class="changed" data-bind="text:detailsChanged.indigenousInvolvementComment"></span>
+        <span wrap class="diff1"></span>
+    </div>
+</div>
diff --git a/grails-app/views/project/meriPlanChanges/_keq.gsp b/grails-app/views/project/meriPlanChanges/_keq.gsp
new file mode 100644
index 000000000..5202880f6
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_keq.gsp
@@ -0,0 +1,19 @@
+<div class="well well-small">
+    <h4>Key evaluation question</h4>
+    <table class="table">
+        <thead>
+        <tr>
+            <th class="index"></th>
+            <th class="baseline">Project Key evaluation question (KEQ)</th>
+            <th class="baseline-method">How will KEQ be monitored</th>
+        </tr>
+        </thead>
+        <tbody data-bind="foreach : details.keq.rows">
+        <tr>
+            <td class="index"><span data-bind="text: $index()+1"></span></td>
+            <td class="baseline"><span data-bind="text:data1"></span></td>
+            <td class="baseline-method"><label data-bind="text:data2"></label></td>
+        </tr>
+        </tbody>
+    </table>
+</div>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_keyThreats.gsp b/grails-app/views/project/meriPlanChanges/_keyThreats.gsp
new file mode 100644
index 000000000..4bbaedcf3
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_keyThreats.gsp
@@ -0,0 +1,67 @@
+<!-- ko with:details.threats -->
+<table class="table threats-view">
+    <thead>
+    <th class="index"></th>
+    <th class="threat required">Key threat(s) and/or key threatening processes</th>
+    <th class="intervention required">Interventions to address threats</th>
+    </thead>
+    <tbody data-bind="foreach: rows">
+    <tr>
+        <td class="index"><span data-bind="text:$index()+1"></span></td>
+        <td class="threat">
+            <span data-bind="text: threat">
+            </span>
+        </td>
+        <td class="intervention">
+            <span data-bind="text: intervention"></span>
+        </td>
+    </tr>
+    </tbody>
+
+</table>
+<!-- /ko -->
+
+<!-- ko with:detailsChanged.threats -->
+<table class="table threats-view">
+    <thead>
+    <th class="index"></th>
+    <th class="threat required">Key threat(s) and/or key threatening processes</th>
+    <th class="intervention required">Interventions to address threats</th>
+    </thead>
+    <tbody data-bind="foreach: rows">
+    <tr>
+        <td class="index"><span data-bind="text:$index()+1"></span></td>
+        <td class="threat">
+            <span data-bind="text: threat">
+            </span>
+        </td>
+        <td class="intervention">
+            <span data-bind="text: intervention"></span>
+        </td>
+    </tr>
+    </tbody>
+
+</table>
+<!-- /ko -->
+
+<table class="table table-striped key-threats">
+    <thead>
+    <tr>
+        <th class="index"></th>
+        <th class="threat required">Key threat(s) and/or key threatening processes</th>
+        <th class="intervention required">Interventions to address threats</th>
+    </tr>
+    </thead>
+    <tbody>
+    <g:set var="max" value="${Math.max(project.custom.details.threats.rows.size(), changed.custom.details.threats?.rows?.size()?:0)}"/>
+    <g:each in="${(0..<max)}" var="i">
+        <tr>
+            <td class="index"><span data-bind="text:${i}+1"></span></td>
+            <td><fc:renderComparison changed="${changed.custom.details.threats.rows ?: []}" i="${i}" original="${project.custom.details.threats.rows ?: []}" property="threat"/> </td>
+            <td><fc:renderComparison changed="${changed.custom.details.threats.rows ?: []}" i="${i}" original="${project.custom.details.threats.rows ?: []}" property="intervention"/> </td>
+        </tr>
+    </g:each>
+
+    </tbody>
+</table>
+
diff --git a/grails-app/views/project/meriPlanChanges/_mediumTermOutcomes.gsp b/grails-app/views/project/meriPlanChanges/_mediumTermOutcomes.gsp
new file mode 100644
index 000000000..86a4e33fc
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_mediumTermOutcomes.gsp
@@ -0,0 +1,14 @@
+<table class="table">
+    <thead>
+    <tr>
+        <th class="index"></th>
+        <th class="outcome">Medium-term outcome statement/s</th>
+    </tr>
+    </thead>
+    <tbody data-bind="foreach:details.outcomes.midTermOutcomes">
+    <tr>
+        <td class="index" data-bind="text:$index()+1"></td>
+        <td class="outcome"><span data-bind="text:description"></span></td>
+    </tr>
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_meriBudget.gsp b/grails-app/views/project/meriPlanChanges/_meriBudget.gsp
new file mode 100644
index 000000000..809a5b5e8
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_meriBudget.gsp
@@ -0,0 +1,67 @@
+<div class="meri-budget-view" class="well well-small">
+    <h4>Project Budget</h4>
+    <table class="table">
+        <thead>
+        <tr>
+            <th class="index"></th>
+            <g:if test="${showThemeColumn}">
+            <th class="budget-category">Investment/Priority Area</th>
+            </g:if>
+            <th class="budget-description">Description</th>
+            <g:if test="${showActivityColumn}">
+                <th class="budget-activities">Project activities relevant to budget item</th>
+            </g:if>
+            <!-- ko foreach: details.budget.headers -->
+            <th class="budget-amount">
+                <div style="text-align: center;" data-bind="text:data"></div>$</th>
+            <!-- /ko -->
+            <!-- ko if: details.budget.headers().length -->
+            <th style="text-align: center;" width="10%">Total</th>
+            <!-- /ko -->
+            <!-- ko if: !details.budget.headers().length -->
+            <th class="budget-amount" width="10%">Amount ($)</th>
+            <!-- /ko -->
+        </tr>
+        </thead>
+        <tbody data-bind="foreach : details.budget.rows">
+        <tr>
+            <td class="index"><span data-bind="text:$index()+1"></span></td>
+            <g:if test="${showThemeColumn}">
+            <td class="budget-category"><span data-bind="text:shortLabel"></span></td>
+            </g:if>
+            <td class="budget-description"><div style="text-align: left;"><span data-bind="text: description"></span></div>
+            </td>
+            <g:if test="${showActivityColumn}">
+                <td class="budget-activities"><span data-bind="text:activities"></span></td>
+            </g:if>
+
+            <!-- ko foreach: costs -->
+            <td class="budget-amount"><span data-bind="text: dollar.formattedCurrency"></span></td>
+            <!-- /ko -->
+
+            <!-- ko if: details.budget.headers().length -->
+            <td class="budget-amount">
+                <span style="width: 90%;" data-bind="text: rowTotal.formattedCurrency"></span>
+            </td>
+            <!-- /ko -->
+        </tr>
+        </tbody>
+        <tfoot>
+        <tr>
+            <td class="footer-index"></td>
+            <g:if test="${showActivityColumn || showThemeColumn}">
+            <td class="budget-footer"></td>
+            </g:if>
+            <td style="text-align: right;" class="budget-footer"><b>Total</b></td>
+            <!-- ko foreach: details.budget.columnTotal -->
+            <td style="text-align: center;" class="budget-amount">
+                <span data-bind="text:data.formattedCurrency"></span>
+            </td>
+            <!-- /ko -->
+            <td style="text-align: center;" class="budget-amount">
+                <b><span data-bind="text:details.budget.overallTotal.formattedCurrency"></span></b>
+            </td>
+        </tr>
+        </tfoot>
+    </table>
+</div>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_monitoringBaseline.gsp b/grails-app/views/project/meriPlanChanges/_monitoringBaseline.gsp
new file mode 100644
index 000000000..8d627183d
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_monitoringBaseline.gsp
@@ -0,0 +1,23 @@
+<h4>Monitoring methodology</h4>
+<!-- ko with:details.baseline -->
+<table class="table baseline-view">
+    <thead>
+    <th class="index"></th>
+    <th class="baseline required">Project baseline</th>
+    <th class="baseline-method required">The method used to obtain the baseline, or how the baseline will be established</th>
+    </thead>
+    <tbody data-bind="foreach: rows">
+    <tr>
+        <td class="index"><span data-bind="text:$index()+1"></span></td>
+        <td class="baseline">
+            <span data-bind="text: baseline"></span>
+        </td>
+        <td class="baseline-method">
+            <span data-bind="text: method"></span>
+        </td>
+
+    </tr>
+    </tbody>
+
+</table>
+<!-- /ko -->
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_monitoringIndicators.gsp b/grails-app/views/project/meriPlanChanges/_monitoringIndicators.gsp
new file mode 100644
index 000000000..5f12bda64
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_monitoringIndicators.gsp
@@ -0,0 +1,30 @@
+<g:if test="${title}">
+    <h4>${title}</h4>
+</g:if>
+<table class="table meri-monitoring-indicators">
+    <thead>
+    <tr>
+        <th class="index"></th>
+        <th class="baseline">${indicatorHeading}</th>
+        <g:if test="${extendedMonitoring}">
+            <th class="monitoring-service">${monitoringServicesHeading ?: 'Project service / Target measure/s'}</th>
+        </g:if>
+        <th class="baseline-method">${approachHeading}</th>
+        <g:if test="${extendedMonitoring}">
+            <th class="monitoring-evidence">Evidence to be retained</th>
+        </g:if>
+    </tr>
+    </thead>
+    <tbody>
+    <g:set var="max" value="${Math.max(project.custom.details.monitoring?.rows.size(), changed.custom.details.monitoring?.rows?.size()?:0)}"/>
+    <g:each in="${(0..<1)}" var="i">
+    <tr>
+        <td class="index"><span data-bind="text: ${i}+1"></span></td>
+        <td class="baseline"><fc:renderComparisonMonitoring config="${config}" changed="${changed.custom.details.monitoring.rows ?: []}" i="${i}" code="${code}" original="${project.custom.details.monitoring.rows ?: []}" property="data1"/></td>
+        <td class="monitoring-service"><fc:renderComparisonMonitoring config="${config}" changed="${changed.custom.details.monitoring.rows ?: []}" i="${i}" code="${code}" original="${project.custom.details.monitoring.rows ?: []}" property="relatedTargetMeasures"/></td>
+        <td class="monitoring-method"><fc:renderComparisonMonitoring config="${config}" changed="${changed.custom.details.monitoring.rows ?: []}" i="${i}" code="${code}" original="${project.custom.details.monitoring.rows ?: []}" property="protocols"/></td>
+        <td class="monitoring-evidence"><fc:renderComparisonMonitoring config="${config}" changed="${changed.custom.details.monitoring.rows ?: []}" i="${i}" code="${code}" original="${project.custom.details.monitoring.rows ?: []}" property="evidence"/></td>
+    </tr>
+    </g:each>
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_name.gsp b/grails-app/views/project/meriPlanChanges/_name.gsp
new file mode 100644
index 000000000..44fa1e7c4
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_name.gsp
@@ -0,0 +1,22 @@
+<g:if test="${tableFormatting}">
+<table class="table">
+    <thead>
+    <tr>
+        <th>Project</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td style="display:none" class="original" data-bind="text:details.nameComparison"></td>
+        <td style="display:none" class="changed" data-bind="text:detailsChanged.nameComparison"></td>
+        <td wrap class="diff1"></td>
+    </tr>
+    </tbody>
+</table>
+</g:if>
+<g:else>
+<h4>Project name</h4>
+    <span style="display:none" class="original" data-bind="text:details.nameComparison"></span>
+    <span style="display:none" class="changed" data-bind="text:detailsChanged.nameComparison"></span>
+    <span wrap class="diff1"></span>
+</g:else>
diff --git a/grails-app/views/project/meriPlanChanges/_nameAndDescription.gsp b/grails-app/views/project/meriPlanChanges/_nameAndDescription.gsp
new file mode 100644
index 000000000..f8d3f138c
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_nameAndDescription.gsp
@@ -0,0 +1,26 @@
+<h4>Project details</h4>
+
+<table class="table">
+    <thead>
+    <tr>
+        <th>Project name</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td><span data-bind="text:details.name"></span></td>
+    </tr>
+    </tbody>
+</table>
+<table class="table">
+    <thead>
+    <tr>
+        <th>Project description</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td><span data-bind="text:details.description"></span></td>
+    </tr>
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_nationalAndRegionalPlans.gsp b/grails-app/views/project/meriPlanChanges/_nationalAndRegionalPlans.gsp
new file mode 100644
index 000000000..02ba4f2b0
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_nationalAndRegionalPlans.gsp
@@ -0,0 +1,34 @@
+<h4>${headingTitle ?: "Relevant national and regional plans"}</h4>
+
+<p>${explanation ?:"Explain how the project aligns with all applicable national and regional priorities, plans and strategies."}</p>
+
+<table id="national-regional-plans" class="table plans-view ${includeUrl ? 'with-url': ''}">
+    <thead>
+    <tr>
+        <th class="index"></th>
+        <th class="document-name required">${documentName ?: "Document name"} <fc:iconHelp
+                title="Document name">${documentNameHelpText ?: "List the name of the National or Regional plan the project is addressing."}</fc:iconHelp></th>
+        <th class="section required">${relevantSectionName ?: "Relevant section"} <fc:iconHelp
+                title="Relevant section">${relevantSectionHelpText ?: "What section (target/outcomes/objective etc) of the plan is being addressed?"}</fc:iconHelp></th>
+        <th class="alignment required">${alignmentName ?: "Explanation of strategic alignment"} <fc:iconHelp
+                title="Explanation of strategic alignment">${alignmentHelpText ?: "Explain how the project design and delivery align with the relevant section of the document"}</fc:iconHelp></th>
+        <g:if test="${includeUrl}">
+            <th class="document-url">${documentUrlTitle ?: "Link to document (where applicable)"}</th>
+        </g:if>
+    </tr>
+    </thead>
+    <tbody>
+    <g:set var="max" value="${Math.max(project.custom.details.priorities.rows.size(), changed.custom.details.priorities?.rows?.size()?:0)}"/>
+    <g:each in="${(0..<max)}" var="i">
+        <tr>
+            <td class="index"><span data-bind="text:${i}+1"></span></td>
+            <td class="document-name"><fc:renderComparison changed="${changed.custom.details.priorities.rows ?: []}" i="${i}" original="${project.custom.details.priorities.rows ?: []}" property="data1"/> </td>
+            <td class="section"><fc:renderComparison changed="${changed.custom.details.priorities.rows ?: []}" i="${i}" original="${project.custom.details.priorities.rows ?: []}" property="data2"/> </td>
+            <td class="alignment"><fc:renderComparison changed="${changed.custom.details.priorities.rows ?: []}" i="${i}" original="${project.custom.details.priorities.rows ?: []}" property="data3"/> </td>
+            <td class="document-url"><fc:renderComparison changed="${changed.custom.details.priorities.rows ?: []}" i="${i}" original="${project.custom.details.priorities.rows ?: []}" property="documentUrl"/> </td>
+        </tr>
+    </g:each>
+
+    </tbody>
+
+</table>
diff --git a/grails-app/views/project/meriPlanChanges/_objectivesList.gsp b/grails-app/views/project/meriPlanChanges/_objectivesList.gsp
new file mode 100644
index 000000000..f62cb092d
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_objectivesList.gsp
@@ -0,0 +1,12 @@
+<div id="objectives-list-view" class="well well-small">
+    <g:if test="${title}">
+    <h4>${title}</h4>
+    </g:if>
+    <ul data-bind="visible:details.objectives.rows1().length > 0">
+        <!-- ko foreach:details.objectives.rows1 -->
+        <li><span data-bind="text:description"></span></li>
+        <!-- /ko -->
+    </ul>
+
+    <span data-bind="visible:details.objectives.rows1().length == 0">No objectives have been nominated for this project</span>
+</div>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_otherOutcomes.gsp b/grails-app/views/project/meriPlanChanges/_otherOutcomes.gsp
new file mode 100644
index 000000000..0e8b83b39
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_otherOutcomes.gsp
@@ -0,0 +1,28 @@
+<h4 style="display: ${displayTitle}">${headingTitle ?: "FDF and NRM Outcomes"}</h4>
+<table class="table">
+    <thead>
+    <tr class="header">
+        <th class="required" <g:if test="${hideTableOne == true}">style="display: none"</g:if> > ${titleTableHeadingOne ?: "FDF Outcome(s)"}</th>
+        <th class="required" <g:if test="${hideTableTwo == true}">style="display: none"</g:if> >${titleTableHeadingTwo ?: "NRM L Outcomes (Select at least 2)"}
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td class="outcome-priority column-1" <g:if test="${hideTableOne == true}">style="display: none"</g:if>>
+            <ul data-bind="foreach:details.outcomes.selectedOtherOutcomesByCategory('${otherOutcomeCategoryTableOne}')">
+                <li>
+                    <span data-bind="text:$data, checked:details.outcomes.otherOutcomes, disable: $parent.isProjectDetailsLocked()"> <!--ko text: $data--><!--/ko--></span>
+                </li>
+            </ul>
+        </td>
+        <td class="outcome-priority column-1" <g:if test="${hideTableTwo == true}">style="display: none"</g:if> >
+            <ul data-bind="foreach:details.outcomes.selectedOtherOutcomesByCategory('${otherOutcomeCategoryTableTwo}')">
+                <li>
+                    <span data-bind="text:$data, checked:details.outcomes.otherOutcomes, disable: $parent.isProjectDetailsLocked()"> <!--ko text: $data--><!--/ko-->
+                    </span>
+                </li>
+            </ul>
+        </td>
+    </tr>
+    </tbody>
+</table>
diff --git a/grails-app/views/project/meriPlanChanges/_outcomeStatements.gsp b/grails-app/views/project/meriPlanChanges/_outcomeStatements.gsp
new file mode 100644
index 000000000..df1a9b3fb
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_outcomeStatements.gsp
@@ -0,0 +1,40 @@
+<g:set var="outcomeType" value="${outcomeType ?: 'short'}"/>
+<g:if test="${title}">
+    <h4>${title}</h4>
+</g:if>
+<table class="table ${extendedOutcomes ? 'extended' :''}" id="outcome-statements">
+    <thead>
+    <tr>
+        <th class="code"></th>
+        <th class="outcome">${subtitle ?: ""} </th>
+        <th class="investment-priority">Investment priority</th>
+        <th class="program-outcome">Related program outcome/s</th>
+    </tr>
+    </thead>
+    <g:if test="${outcomeType == 'mid'}">
+        <tbody>
+        <g:set var="max" value="${Math.max(project.custom.details.outcomes.midTermOutcomes.size(), changed.custom.details.outcomes?.midTermOutcomes?.size()?:0)}"/>
+        <g:each in="${(0..<max)}" var="i">
+            <tr>
+                <td class="code"><fc:renderComparison changed="${changed.custom.details.outcomes.midTermOutcomes ?: []}" i="${i}" original="${project.custom.details.outcomes.midTermOutcomes ?: []}" property="code"/> </td>
+                <td class="outcome"><fc:renderComparison changed="${changed.custom.details.outcomes.midTermOutcomes ?: []}" i="${i}" original="${project.custom.details.outcomes.midTermOutcomes ?: []}" property="description"/> </td>
+                <td class="investment-priority"><fc:renderComparisonList changed="${changed.custom.details.outcomes.midTermOutcomes ?: []}" i="${i}" original="${project.custom.details.outcomes.midTermOutcomes ?: []}" property="assets"/> </td>
+                <td class="medium-term-outcome"><fc:renderComparison changed="${changed.custom.details.outcomes.midTermOutcomes ?: []}" i="${i}" original="${project.custom.details.outcomes.midTermOutcomes ?: []}" property="relatedOutcome"/> </td>
+            </tr>
+        </g:each>
+        </tbody>
+    </g:if>
+    <g:else>
+        <tbody>
+        <g:set var="max" value="${Math.max(project.custom.details.outcomes.shortTermOutcomes.size(), changed.custom.details.outcomes?.shortTermOutcomes?.size()?:0)}"/>
+        <g:each in="${(0..<max)}" var="i">
+            <tr>
+                <td class="code"><fc:renderComparison changed="${changed.custom.details.outcomes.shortTermOutcomes ?: []}" i="${i}" original="${project.custom.details.outcomes.shortTermOutcomes ?: []}" property="code"/> </td>
+                <td class="outcome"><fc:renderComparison changed="${changed.custom.details.outcomes.shortTermOutcomes ?: []}" i="${i}" original="${project.custom.details.outcomes.shortTermOutcomes ?: []}" property="description"/> </td>
+                <td class="investment-priority"><fc:renderComparisonList changed="${changed.custom.details.outcomes.shortTermOutcomes ?: []}" i="${i}" original="${project.custom.details.outcomes.shortTermOutcomes ?: []}" property="assets"/> </td>
+                <td class="medium-term-outcome"><fc:renderComparison changed="${changed.custom.details.outcomes.shortTermOutcomes ?: []}" i="${i}" original="${project.custom.details.outcomes.shortTermOutcomes ?: []}" property="relatedOutcome"/> </td>
+            </tr>
+        </g:each>
+        </tbody>
+    </g:else>
+</table>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_priorityPlace.gsp b/grails-app/views/project/meriPlanChanges/_priorityPlace.gsp
new file mode 100644
index 000000000..81a2db622
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_priorityPlace.gsp
@@ -0,0 +1,27 @@
+<g:if test="${title}">
+    <h4>${title}</h4>
+</g:if>
+<div class="priority-place row">
+    <div class="col-sm-8">
+        ${priorityPlaceLabel ?: 'Does this project directly support a priority place?'}
+        <g:if test="${priorityPlaceHelpText}"><fc:iconHelp>${priorityPlaceHelpText}</fc:iconHelp></g:if>
+    </div>
+    <div class="col-sm-4">
+        <span style="display: none" class="original" data-bind="text:details.supportsPriorityPlace"></span>
+        <span style="display: none" class="changed" data-bind="text:detailsChanged.supportsPriorityPlace"></span>
+        <span wrap class="diff1"></span>
+
+    </div>
+</div>
+
+
+    <!-- ko if:detailsChanged.supportsPriorityPlace() == 'Yes' -->
+<div class="row">
+    <div class="col-sm-8">Please select the supported priority places</div>
+    <div class="col-sm-4">
+        <span style="display: none" class="original" data-bind="text:details.supportedPriorityPlaces"></span>
+        <span style="display: none" class="changed" data-bind="text:detailsChanged.supportedPriorityPlaces"></span>
+        <span wrap class="diff1"></span>
+    </div>
+</div>
+    <!-- /ko -->
diff --git a/grails-app/views/project/meriPlanChanges/_programOutcome.gsp b/grails-app/views/project/meriPlanChanges/_programOutcome.gsp
new file mode 100644
index 000000000..c46ec1995
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_programOutcome.gsp
@@ -0,0 +1,26 @@
+<h4>Program Outcome</h4>
+<table class="table primary-outcome">
+    <thead>
+    <tr>
+        <th class="outcome-priority">Primary outcome</th>
+        <th class="primary-outcome priority required">${pestsAndWeedsHeading?: 'Primary investment'} <span data-bind="if:!isAgricultureProject() && !details.outcomes.primaryOutcomeSupportsMultiplePriorities()">priority</span><span data-bind="if:isAgricultureProject() || details.outcomes.primaryOutcomeSupportsMultiplePriorities()">priorities</span>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td class="outcome-priority" id="primaryOutcome">
+        <span style="display:none" class="original" data-bind="text:details.outcomes.primaryOutcome.description"></span>
+        <span style="display:none" class="changed" data-bind="text:detailsChanged.outcomes.primaryOutcome.description"></span>
+        <span wrap class="diff"></span>
+        </td>
+        <td>
+            <span id="program-outcome-assets">
+            <g:set var="max" value="${Math.max(project.custom.details.outcomes?.primaryOutcome?.assets?.size(), changed.custom.details.outcomes?.primaryOutcome?.assets?.size()?:0)}"/>
+            <g:each in="${(0..<max)}" var="i">
+                <span><fc:renderComparison changed="${changed.custom.details.outcomes?.primaryOutcome.assets ?: []}" i="${i}" original="${project.custom.details.outcomes?.primaryOutcome.assets ?: []}"/> </span>
+            </g:each>
+            </span>
+        </td>
+    </tr>
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_projectImplementation.gsp b/grails-app/views/project/meriPlanChanges/_projectImplementation.gsp
new file mode 100644
index 000000000..b23c03db4
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_projectImplementation.gsp
@@ -0,0 +1,4 @@
+<div id="project-implementation" class="well well-small">
+    <h4>Project implementation / delivery mechanism:</h4>
+    <span style="white-space: pre-wrap;" data-bind="text: details.implementation.description"></span>
+</div>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_projectMethodology.gsp b/grails-app/views/project/meriPlanChanges/_projectMethodology.gsp
new file mode 100644
index 000000000..1eb016c53
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_projectMethodology.gsp
@@ -0,0 +1,17 @@
+<g:if test="${title}">
+    <h4>${title}</h4>
+</g:if>
+<table class="table">
+    <thead>
+    <tr>
+        <th class="required">${tableHeading ?: "Project delivery assumptions"}</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td style="display:none" class="original" data-bind="text:details.implementation.description"></td>
+        <td style="display:none" class="changed" data-bind="text:detailsChanged.implementation.description"></td>
+        <td wrap class="diff1"></td>
+    </tr>
+    </tbody>
+</table>
diff --git a/grails-app/views/project/meriPlanChanges/_projectPartnerships.gsp b/grails-app/views/project/meriPlanChanges/_projectPartnerships.gsp
new file mode 100644
index 000000000..2df412c9a
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_projectPartnerships.gsp
@@ -0,0 +1,24 @@
+<div id="project-partnership-view" class="well well-small">
+    <h4>Project partnerships</h4>
+    <table class="table" id="project-partnerships">
+        <thead>
+        <tr>
+            <th class="index"></th>
+            <th class="partner-name">Partner name</th>
+            <th class="partnership-nature">Nature of partnership</th>
+            <th class="partner-organisation-type">Type of organisation</th>
+        </tr>
+        </thead>
+        <tbody>
+        <g:set var="max" value="${Math.max(project.custom.details.partnership.rows.size(), changed.custom.details.partnership?.rows?.size()?:0)}"/>
+        <g:each in="${(0..<max)}" var="i">
+            <tr>
+                <td class="index"><span data-bind="text:${i}+1"></span></td>
+                <td class="partner-name"><fc:renderComparison changed="${changed.custom.details.partnership.rows ?: []}" i="${i}" original="${project.custom.details.partnership.rows ?: []}" property="data1"/> </td>
+                <td class="partnership-nature"><fc:renderComparison changed="${changed.custom.details.partnership.rows ?: []}" i="${i}" original="${project.custom.details.partnership.rows ?: []}" property="data2"/> </td>
+                <td class="partner-organisation-type"><fc:renderComparison changed="${changed.custom.details.partnership.rows ?: []}" i="${i}" original="${project.custom.details.partnership.rows ?: []}" property="data3"/> </td>
+            </tr>
+        </g:each>
+        </tbody>
+    </table>
+</div>
diff --git a/grails-app/views/project/meriPlanChanges/_projectReview.gsp b/grails-app/views/project/meriPlanChanges/_projectReview.gsp
new file mode 100644
index 000000000..54a3c361e
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_projectReview.gsp
@@ -0,0 +1,14 @@
+<table class="table">
+    <thead>
+    <tr>
+        <th>${title?: "Project Review, Evaluation and Improvement Methodology and Approach"}</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td style="display:none" class="original" data-bind="text:details.projectEvaluationApproach"></td>
+        <td style="display:none" class="changed" data-bind="text:detailsChanged.projectEvaluationApproach"></td>
+        <td wrap class="diff1"></td>
+    </tr>
+    </tbody>
+</table>
diff --git a/grails-app/views/project/meriPlanChanges/_rationale.gsp b/grails-app/views/project/meriPlanChanges/_rationale.gsp
new file mode 100644
index 000000000..49a3630b8
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_rationale.gsp
@@ -0,0 +1,20 @@
+<g:if test="${tableFormatting}">
+    <table class="table">
+        <thead>
+        <tr>
+            <th>${title ?: "Project rationale"}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+            <td><span data-bind="text:details.rationale"></span></td>
+        </tr>
+        </tbody>
+    </table>
+</g:if>
+<g:else>
+    <h4>${title ?: "Project rationale"}</h4>
+    <div class="consultation-view row">
+        <span class="col-sm-12" data-bind="text:details.rationale"></span>
+    </div>
+</g:else>
diff --git a/grails-app/views/project/meriPlanChanges/_relatedProjects.gsp b/grails-app/views/project/meriPlanChanges/_relatedProjects.gsp
new file mode 100644
index 000000000..c61c2fff7
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_relatedProjects.gsp
@@ -0,0 +1,13 @@
+<table class="table">
+    <thead>
+        <tr>
+            <th class="required">${title ?: "Related Projects"}</th>
+        </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td><span class="relatedProjects" data-bind="text:details.relatedProjects"></span></td>
+    </tr>
+    </tbody>
+</table>
+
diff --git a/grails-app/views/project/meriPlanChanges/_risksAndThreats.gsp b/grails-app/views/project/meriPlanChanges/_risksAndThreats.gsp
new file mode 100644
index 000000000..3fd06b7ee
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_risksAndThreats.gsp
@@ -0,0 +1,48 @@
+<div class="space-after">
+    <div class="required">
+        <div id="project-risks-threats" class="well well-small">
+            <h4>Project risks & threats</h4>
+            <div align="right">
+                <b> Overall project risk profile : <span data-bind="text: risks.overallRisk, css: overAllRiskHighlight" ></span></b>
+            </div>
+            <table>
+                <thead>
+                <tr>
+                    <th class="risk-type">Type of threat / risk</th>
+                    <th class="risk-description">Description</th>
+                    <th class="risk-likelihood">Likelihood</th>
+                    <th class="risk-consequence">Consequence</th>
+                    <th class="risk-rating">Risk rating</th>
+                    <th class="risk-control">Current control / Contingency strategy</th>
+                    <th class="residual-risk">Residual risk</th>
+                </tr>
+                </thead>
+                <tbody data-bind="foreach : risks.rows" >
+                <tr>
+                    <td class="risk-type">
+                        <label data-bind="text: threat" ></label>
+                    </td>
+                    <td class="risk-description">
+                        <label data-bind="text: description" ></label>
+                    </td>
+                    <td class="risk-likelihood">
+                        <label data-bind="text: likelihood" ></label>
+                    </td>
+                    <td class="risk-consequence">
+                        <label data-bind="text: consequence" ></label>
+                    </td>
+                    <td class="risk-rating">
+                        <label data-bind="text: riskRating" ></label>
+                    </td>
+                    <td class="risk-control">
+                        <label data-bind="text: currentControl" ></label>
+                    </td>
+                    <td class="residual-risk">
+                        <label data-bind="text: residualRisk" ></label>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
diff --git a/grails-app/views/project/meriPlanChanges/_sectionHeading.gsp b/grails-app/views/project/meriPlanChanges/_sectionHeading.gsp
new file mode 100644
index 000000000..0244ba339
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_sectionHeading.gsp
@@ -0,0 +1 @@
+<h4>${heading}</h4>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_serviceForecasts.gsp b/grails-app/views/project/meriPlanChanges/_serviceForecasts.gsp
new file mode 100644
index 000000000..3f1736ee8
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_serviceForecasts.gsp
@@ -0,0 +1,39 @@
+<!-- ko with:details.serviceOutcomes -->
+<h4>${title ?: "Project services forecasts"}</h4>
+
+<table class="table service-target forecasts">
+    <thead>
+    <tr>
+        <th class="index" rowspan="2"></th>
+        <th class="required" rowspan="2">${serviceName ?: "Service"}</th>
+        <th class="required" rowspan="2" style="min-width: 500px;">Target measure</th>
+        <!-- ko if: forecastPeriods && forecastPeriods.length -->
+        <th data-bind="attr:{colspan:forecastPeriods.length+1}">Annual target forecast (indicative only) <fc:iconHelp>${minHelptext ?:"Specify the minimum total target for each Project Service to be delivered each financial year. Note: the sum of these targets will not necessarily equal the total services to be delivered."}</fc:iconHelp></th>
+        <!-- /ko -->
+    </tr>
+    <tr>
+
+        <!-- ko foreach: forecastPeriods -->
+        <th class="budget-cell"><div data-bind="text:$data"></div></th>
+        <!-- /ko -->
+    </tr>
+    </thead>
+    <tbody data-bind="foreach : outcomeTargets">
+    <tr>
+        <td class="index"><span data-bind="text:$index()+1"></span></td>
+        <td class="service">
+            <span data-bind="text:serviceLabel"></span>
+        </td>
+        <td class="score">
+            <span data-bind="text:scoreLabel"></span>
+        </td>
+        <!-- ko foreach: periodTargets -->
+        <td class="budget-cell">
+            <span data-bind="text:target"></span>
+        </td>
+        <!-- /ko -->
+    </tr>
+    </tbody>
+</table>
+
+<!-- /ko -->
diff --git a/grails-app/views/project/meriPlanChanges/_serviceOutcomeTargets.gsp b/grails-app/views/project/meriPlanChanges/_serviceOutcomeTargets.gsp
new file mode 100644
index 000000000..39dc6ad01
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_serviceOutcomeTargets.gsp
@@ -0,0 +1,41 @@
+<h4>${title ?: "Project services and outcome targets"}</h4>
+
+<table class="table service-outcomes-targets-view service-outcome-changed">
+    <thead>
+    <tr>
+    <tr>
+        <th class="index"></th>
+        <th class="service required">${serviceName ?: "Project Service"}</th>
+        <th class="score required">Target measure</th>
+    </tr>
+    </thead>
+    <tbody>
+    <g:set var="max" value="${Math.max(changed.outputTargets.size(), project.outputTargets.size()?:0)}"/>
+    <g:each in="${(0..<max)}" var="i">
+
+    <tr class="service-target">
+        <td class="index"><span data-bind="text:${i}+1"></span></td>
+        <td class="service">
+            <fc:renderComparisonService programConfig="${config}"  changed="${changed.outputTargets ?: []}" i="${i}" original="${project.outputTargets ?: []}"/>
+        </td>
+        <td class="score">
+            <fc:renderComparisonScoreLabel config="${config}" changed="${changed.outputTargets ?: []}" i="${i}" original="${project.outputTargets ?: []}" property="scoreId"/>
+        </td>
+    </tr>
+    <tr>
+        <td class="index"></td>
+        <th>Project Outcome/s</th>
+        <th>Target</th>
+    </tr>
+    <tr class="outcome-target">
+        <td class="index"></td>
+        <td class="service">
+            <fc:renderComparisonOutputTargets changed="${changed.outputTargets.outcomeTargets ?: []}" i="${i}" original="${project.outputTargets.outcomeTargets ?: []}" property="relatedOutcomes"/>
+        </td>
+        <td class="score">
+            <fc:renderComparisonOutputTargets changed="${changed.outputTargets.outcomeTargets ?: []}" i="${i}" original="${project.outputTargets.outcomeTargets ?: []}" property="target"/>
+        </td>
+    </tr>
+    </g:each>
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChanges/_serviceTargets.gsp b/grails-app/views/project/meriPlanChanges/_serviceTargets.gsp
new file mode 100644
index 000000000..846c4215c
--- /dev/null
+++ b/grails-app/views/project/meriPlanChanges/_serviceTargets.gsp
@@ -0,0 +1,54 @@
+<!-- ko with:details.services -->
+<h4>${title ?: "Project services and minimum targets"}</h4>
+
+<table class="table service-targets-view">
+    <thead>
+    <tr>
+        <th class="index" rowspan="2"></th>
+        <th class="service" rowspan="2">${serviceName ?: "Service"}</th>
+        <th class="score" rowspan="2">Target measure</th>
+        <th class="budget-cell" rowspan="2">Total to be delivered</th>
+        <g:if test="${showTargetDate}">
+            <th class="target-date" rowspan="2">
+                Delivery date
+            </th>
+        </g:if>
+        <!-- ko if: periods && periods.length -->
+        <th data-bind="attr:{colspan:periods.length+1}">Minimum annual targets</th>
+        <!-- /ko  -->
+    </tr>
+    <tr>
+        <!-- ko foreach: periods -->
+        <th class="budget-cell"><div data-bind="text:$data"></div></th>
+        <!-- /ko -->
+    </tr>
+    </thead>
+    <tbody data-bind="foreach : services">
+    <tr>
+        <td class="index"><span data-bind="text:$index()+1"></span></td>
+        <td class="service">
+            <span data-bind="text:service() ? service().name : ''"></span>
+        </td>
+        <td class="score">
+            <span data-bind="text:score() ? score().label : ''  "></span>
+        </td>
+        <td class="budget-cell">
+            <span data-bind="text: target"></span>
+        </td>
+        <g:if test="${showTargetDate}">
+            <td class="target-date">
+                <span data-bind="text: targetDate.formattedDate()"></span>
+            </td>
+        </g:if>
+
+        <!-- ko foreach: periodTargets -->
+        <td class="budget-cell">
+            <span data-bind="text: target"/>
+        </td>
+        <!-- /ko -->
+
+    </tr>
+    </tbody>
+</table>
+
+<!-- /ko -->
\ No newline at end of file
diff --git a/grails-app/views/project/meriPlanChangesReport.gsp b/grails-app/views/project/meriPlanChangesReport.gsp
new file mode 100644
index 000000000..72828d601
--- /dev/null
+++ b/grails-app/views/project/meriPlanChangesReport.gsp
@@ -0,0 +1,103 @@
+<%@ page import="au.org.ala.merit.ReportService" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta name="layout" content="nrmPrint"/>
+    <title>MERI Plan - ${project.name}</title>
+    <script type="text/javascript" src="${grailsApplication.config.getProperty('google.maps.url')}"></script>
+
+    <script>
+    var fcConfig = {
+        serverUrl: "${grailsApplication.config.getProperty('grails.serverURL')}",
+        imageLocation:"${assetPath(src:'/')}",
+        healthCheckUrl:"${createLink(controller:'ajax', action:'keepSessionAlive')}",
+        returnTo: "${createLink(controller: 'project', action: 'index', id: project.projectId)}"
+    },
+        here = window.location.href;
+
+    </script>
+    <style type="text/css">
+    .title { font-weight: bold;}
+    .activity-title {
+        border-top: 4px solid black;
+        background-color: #d9edf7;
+        border-bottom: 1px solid;
+        padding-bottom: 10px;
+        margin-bottom: 10px;
+    }
+    .output-block > h3 {
+        font-size:large;
+    }
+    .output-section.stage-title {
+        padding:10px;
+        border-top: 4px solid black;
+    }
+    tr {
+        page-break-inside: avoid;
+    }
+    </style>
+
+    <asset:stylesheet src="common-bs4.css"/>
+    <asset:stylesheet src="project.css"/>
+</head>
+<body>
+<div class="container">
+    <g:render template="${headerTemplate}" model="${[project: project]}"/>
+    <g:render template="${meriPlanChangesTemplate}" model="${[project: project, mode: au.org.ala.merit.ReportService.ReportMode.PRINT.name(), changed:changed]}"/>
+    <asset:script>
+
+    $(function() {
+
+        var project = <fc:modelAsJavascript model="${project}"/>;
+        var changed = <fc:modelAsJavascript model="${changed}"/>;
+
+        var config = [];
+        var themes = <fc:modelAsJavascript model="${config.themes?:[]}"/>;
+        config.themes = themes;
+        var services = <fc:modelAsJavascript model="${config.services?:[]}"/>;
+        config.services = services;
+        var outcomes = <fc:modelAsJavascript model="${config.outcomes?:[]}"/>;
+        project.outcomes = outcomes;
+        config.useRlpTemplate = ${config.getProjectTemplate() == au.org.ala.merit.config.ProgramConfig.ProjectTemplate.RLP};
+        var programName = '${(config.program?.acronym?: project.associatedSubProgram) ?: project.associatedProgram}';
+
+        config.programName = "programName";
+        config.programObjectives = <fc:modelAsJavascript model="${config.program?.config?.objectives ?: []}"/>;
+        config.programActivities = <fc:modelAsJavascript model="${config.program?.config?.activities?.collect{it.name} ?: []}"/>;
+        config.excludeFinancialYearData = ${config.program?.config?.excludeFinancialYearData ?: false};
+        config.useServiceOutcomesModel = ${config.program?.config?.meriPlanContents?.find{it.template == 'serviceOutcomeTargets'} != null};
+
+        var viewModel = new ReadOnlyMeriPlan(project, new ProjectService(project, config), config, changed);
+        viewModel.name = project.name;
+        viewModel.description = project.description;
+        ko.applyBindings(viewModel, document.getElementById('meriplan-changes'))
+
+        $("#meriplan-changes div").prettyTextDiff({
+                cleanup: true,
+                diffContainer: ".diff1"
+            });
+
+        $(".key-threats td").prettyTextDiff({cleanup: true});
+        $(".extended td").prettyTextDiff({cleanup: true});
+        $(".extended-threats td").prettyTextDiff({cleanup: true});
+        $(".service-outcome-changed td").prettyTextDiff({cleanup: true});
+        $("#national-regional-plans td").prettyTextDiff({cleanup: true});
+        $("#primaryOutcome").prettyTextDiff({cleanup: true});
+        $("#program-outcome-assets").prettyTextDiff({cleanup: true});
+        $("#additional-benefits span").prettyTextDiff({cleanup: true});
+        $("#secondary-assets").prettyTextDiff({cleanup: true});
+        $("#outcome-statements td").prettyTextDiff({cleanup: true});
+        $("#project-partnerships td").prettyTextDiff({cleanup: true});
+
+        });
+
+    </asset:script>
+</div>
+<g:render template="/shared/pdfInstructions"/>
+<asset:javascript src="common-bs4.js"/>
+<asset:javascript src="projects.js"/>
+<asset:deferredScripts/>
+<asset:javascript src="print-instructions.js"/>
+
+</body>
+</html>
diff --git a/grails-app/views/project/meriPlanReadOnly/_additionalOutcomes.gsp b/grails-app/views/project/meriPlanReadOnly/_additionalOutcomes.gsp
index 088c91cd8..87a0f236a 100644
--- a/grails-app/views/project/meriPlanReadOnly/_additionalOutcomes.gsp
+++ b/grails-app/views/project/meriPlanReadOnly/_additionalOutcomes.gsp
@@ -4,7 +4,7 @@
     <thead>
 
     <tr>
-        <th class="outcome-priority">Secondary outcome(s)</th>
+        <th class="outcome-priority">${outcomePriority ?:"Secondary outcome(s)"}</th>
         <th class="priority">${ priority ?:"Secondary Investment Priorities"}</th>
     </tr>
     </thead>
diff --git a/grails-app/views/project/meriPlanReadOnly/_arrayAsList.gsp b/grails-app/views/project/meriPlanReadOnly/_arrayAsList.gsp
new file mode 100644
index 000000000..86e7e7daf
--- /dev/null
+++ b/grails-app/views/project/meriPlanReadOnly/_arrayAsList.gsp
@@ -0,0 +1,16 @@
+<!-- ko if: ${source} && ${source}.length == 1 -->
+<span data-bind="text:${source}"></span>
+<!-- /ko -->
+
+<!-- ko if: ${source} && ${source}.length > 1 -->
+<ul class="meriList" >
+    <!-- ko foreach:${source} -->
+    <!-- ko if:$data != 'Other' -->
+    <li data-bind="text:$data"></li>
+    <!-- /ko -->
+    <!-- /ko -->
+    <!-- ko if:_.contains(${source}, 'Other') -->
+    <li data-bind="text:'Other: ' + ${otherSource?:"''"}"></li>
+    <!-- /ko -->
+</ul>
+<!-- /ko -->
diff --git a/grails-app/views/project/meriPlanReadOnly/_extendedBaselineMonitoring.gsp b/grails-app/views/project/meriPlanReadOnly/_extendedBaselineMonitoring.gsp
index 3f23be83e..e32f954ab 100644
--- a/grails-app/views/project/meriPlanReadOnly/_extendedBaselineMonitoring.gsp
+++ b/grails-app/views/project/meriPlanReadOnly/_extendedBaselineMonitoring.gsp
@@ -9,7 +9,7 @@
     <tbody data-bind="foreach: rows">
     <tr class="header">
         <th class="code"></th>
-        <th class="outcome required">Outcome statement</th>
+        <th class="outcome required">Outcome statement/s</th>
         <th class="monitoring-data required">Baseline data <g:if test="${baselineDataHelpText}"><fc:iconHelp>${baselineDataHelpText}</fc:iconHelp></g:if></th>
         <th class="baseline required">Baseline data description <g:if test="${baselineDataDescriptionHelpText}"><fc:iconHelp>${baselineDataDescriptionHelpText}</fc:iconHelp></g:if></th>
         <th class="service required">Project Service / Target Measure/s <g:if test="${baselineHelpText}"><fc:iconHelp>${baselineServiceHelpText}</fc:iconHelp></g:if></th>
@@ -30,12 +30,10 @@
             </span>
         </td>
         <td class="service">
-            <span data-bind="text:$root.targetMeasureLabels(relatedTargetMeasures)"></span>
+            <g:render template="/project/meriPlanReadOnly/arrayAsList" model="${[source:'$root.targetMeasureLabels(relatedTargetMeasures)']}"/>
         </td>
         <td class="baseline-method">
-            <span data-bind="text:protocols"></span>
-            <br/>
-            <span data-bind="visible:_.contains(protocols(), 'Other'), text: method"></span>
+            <g:render template="/project/meriPlanReadOnly/arrayAsList" model="${[source:'protocols()', otherSource:'method()']}"/>
         </td>
         <td class="evidence">
             <span class="textarea-view" data-bind="text:evidence"></span>
diff --git a/grails-app/views/project/meriPlanReadOnly/_extendedKeyThreats.gsp b/grails-app/views/project/meriPlanReadOnly/_extendedKeyThreats.gsp
index e9f7355ec..55780f5de 100644
--- a/grails-app/views/project/meriPlanReadOnly/_extendedKeyThreats.gsp
+++ b/grails-app/views/project/meriPlanReadOnly/_extendedKeyThreats.gsp
@@ -12,7 +12,7 @@
         <th class="related-outcomes">Outcome Statement/s</th>
         <th class="threat-code">Threats / Threatening processes</th>
         <th class="threat required">Description <fc:iconHelp>${threatHelpText ?: "Describe the key threats (or key threatening processes) to the primary investment priority"}</fc:iconHelp></th>
-        <th class="services">Project service measure/s to address threats</th>
+        <th class="services">Project service / Target measure/s to address threats</th>
         <th class="intervention required">Methodology <fc:iconHelp>${interventionHelpText ?: "Describe the proposed interventions to address the threat and how this will deliver on the 5 year outcome."}</fc:iconHelp></th>
         <th class="evidence">Evidence to be retained <g:if test="${evidenceHelpText}"><fc:iconHelp>${evidenceHelpText}</fc:iconHelp></g:if></th>
     </tr>
@@ -31,7 +31,7 @@
             </span>
         </td>
         <td class="services">
-            <span data-bind="text:$root.targetMeasureLabels(relatedTargetMeasures)"></span>
+            <g:render template="/project/meriPlanReadOnly/arrayAsList" model="${[source:'$root.targetMeasureLabels(relatedTargetMeasures)']}"/>
         </td>
         <td class="intervention">
             <span class="textarea-view" data-bind="text: intervention"></span>
diff --git a/grails-app/views/project/meriPlanReadOnly/_monitoringIndicators.gsp b/grails-app/views/project/meriPlanReadOnly/_monitoringIndicators.gsp
index 9f9499b0d..758beea40 100644
--- a/grails-app/views/project/meriPlanReadOnly/_monitoringIndicators.gsp
+++ b/grails-app/views/project/meriPlanReadOnly/_monitoringIndicators.gsp
@@ -5,13 +5,13 @@
     <thead>
     <tr>
         <th class="index"></th>
-        <th class="baseline">Monitoring indicator</th>
+        <th class="baseline">${indicatorHeading}</th>
         <g:if test="${extendedMonitoring}">
-            <th class="monitoring-service">Service / Target Measure</th>
+            <th class="monitoring-service">${monitoringServicesHeading ?: 'Project service / Target measure/s'}</th>
         </g:if>
-        <th class="baseline-method">Monitoring approach</th>
+        <th class="baseline-method">${approachHeading}</th>
         <g:if test="${extendedMonitoring}">
-            <th class="monitoring-evidence">Evidence</th>
+            <th class="monitoring-evidence">Evidence to be retained</th>
         </g:if>
     </tr>
     </thead>
@@ -21,14 +21,12 @@
         <td class="baseline"><span data-bind="text:data1"></span></td>
         <g:if test="${extendedMonitoring}">
             <td class="monitoring-service">
-                <span data-bind="text:$root.targetMeasureLabels(relatedTargetMeasures)"></span>
+                <g:render template="/project/meriPlanReadOnly/arrayAsList" model="${[source:'$root.targetMeasureLabels(relatedTargetMeasures)']}"/>
             </td>
         </g:if>
         <td class="monitoring-method">
         <g:if test="${extendedMonitoring}">
-            <span data-bind="text:protocols"></span>
-            <br/>
-            <span data-bind="visible:_.contains(protocols(), 'Other'), text: data2"></span>
+            <g:render template="/project/meriPlanReadOnly/arrayAsList" model="${[source:'protocols()', otherSource:'data2()']}"/>
 
         </g:if>
         <g:else>
diff --git a/grails-app/views/project/meriPlanReadOnly/_outcomeStatements.gsp b/grails-app/views/project/meriPlanReadOnly/_outcomeStatements.gsp
index 5e390e5ca..a9ee35d72 100644
--- a/grails-app/views/project/meriPlanReadOnly/_outcomeStatements.gsp
+++ b/grails-app/views/project/meriPlanReadOnly/_outcomeStatements.gsp
@@ -11,9 +11,9 @@
         <g:else>
             <th class="code"></th>
         </g:else>
-        <th class="outcome">Outcome statement/s</th>
+        <th class="outcome">${subtitle ?: ""} </th>
         <g:if test="${extendedOutcomes}">
-            <th class="investment-priority">Investment Priority</th>
+            <th class="investment-priority">Investment priority</th>
             <th class="program-outcome">Related program outcome/s</th>
         </g:if>
     </tr>
diff --git a/grails-app/views/project/meriPlanReadOnly/_programOutcome.gsp b/grails-app/views/project/meriPlanReadOnly/_programOutcome.gsp
index a10b18998..a2f216708 100644
--- a/grails-app/views/project/meriPlanReadOnly/_programOutcome.gsp
+++ b/grails-app/views/project/meriPlanReadOnly/_programOutcome.gsp
@@ -3,7 +3,7 @@
     <thead>
     <tr>
         <th class="outcome-priority">Primary outcome</th>
-        <th class="primary-outcome priority required">${pestsAndWeedsHeading?: 'Primary Investment'} <span data-bind="if:!isAgricultureProject() && !details.outcomes.primaryOutcomeSupportsMultiplePriorities()">Priority</span><span data-bind="if:isAgricultureProject() || details.outcomes.primaryOutcomeSupportsMultiplePriorities()">Priorities</span>
+        <th class="primary-outcome priority required">${pestsAndWeedsHeading?: 'Primary investment'} <span data-bind="if:!isAgricultureProject() && !details.outcomes.primaryOutcomeSupportsMultiplePriorities()">priority</span><span data-bind="if:isAgricultureProject() || details.outcomes.primaryOutcomeSupportsMultiplePriorities()">priorities</span>
     </tr>
     </thead>
     <tbody>
diff --git a/grails-app/views/project/meriPlanReadOnly/_projectMethodology.gsp b/grails-app/views/project/meriPlanReadOnly/_projectMethodology.gsp
index faae028bf..82dd03c6a 100644
--- a/grails-app/views/project/meriPlanReadOnly/_projectMethodology.gsp
+++ b/grails-app/views/project/meriPlanReadOnly/_projectMethodology.gsp
@@ -4,7 +4,7 @@
 <table class="table">
     <thead>
     <tr>
-        <th>Project methodology</th>
+        <th class="required">${tableHeading ?: "Project delivery assumptions"}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/grails-app/views/project/meriPlanReadOnly/_projectReview.gsp b/grails-app/views/project/meriPlanReadOnly/_projectReview.gsp
index 94fde7441..a8309e3a5 100644
--- a/grails-app/views/project/meriPlanReadOnly/_projectReview.gsp
+++ b/grails-app/views/project/meriPlanReadOnly/_projectReview.gsp
@@ -1,7 +1,7 @@
 <table class="table">
     <thead>
     <tr>
-        <th>Project Review, Evaluation and Improvement Methodology and Approach</th>
+        <th>${title?: "Project Review, Evaluation and Improvement Methodology and Approach"}</th>
     </tr>
     </thead>
     <tbody>
diff --git a/grails-app/views/report/_reef2050PlanActionReport.gsp b/grails-app/views/report/_reef2050PlanActionReport.gsp
index f0a6d0d69..d8747ddb7 100644
--- a/grails-app/views/report/_reef2050PlanActionReport.gsp
+++ b/grails-app/views/report/_reef2050PlanActionReport.gsp
@@ -13,7 +13,7 @@
 
 
 <g:if test="${reportText}">
-    <markdown:renderHtml text="${reportText}"/>
+    <fc:markdownToHtml text="${reportText}"/>
 </g:if>
 <g:else>
 
diff --git a/grails-app/views/report/performanceReportView.gsp b/grails-app/views/report/performanceReportView.gsp
index f7e9dcff9..56606396f 100644
--- a/grails-app/views/report/performanceReportView.gsp
+++ b/grails-app/views/report/performanceReportView.gsp
@@ -82,5 +82,12 @@
     </div>
 </div>
 
+<g:if test="${printView}">
+    <asset:javascript src="print-instructions.js"/>
+    <g:render template="/shared/pdfInstructions"/>
+</g:if>
+<asset:javascript src="common-bs4.js"/>
+<asset:deferredScripts/>
+
 </body>
 </html>
diff --git a/grails-app/views/report/reef2050PlanActionReportPrintable.gsp b/grails-app/views/report/reef2050PlanActionReportPrintable.gsp
index f15b1abc1..70def7d25 100644
--- a/grails-app/views/report/reef2050PlanActionReportPrintable.gsp
+++ b/grails-app/views/report/reef2050PlanActionReportPrintable.gsp
@@ -24,7 +24,7 @@
 
     <h3>Reef 2050 Plan Action Reporting</h3>
     <g:if test="${reportText}">
-        <markdown:renderHtml text="${reportText}"/>
+        <fc:markdownToHtml text="${reportText}"/>
     </g:if>
     <g:else>
         <g:if test="${!actions}">
@@ -142,6 +142,11 @@
     </div>
     </g:else>
 </div>
-
+<g:if test="${printView}">
+    <asset:javascript src="print-instructions.js"/>
+    <g:render template="/shared/pdfInstructions"/>
+</g:if>
+<asset:javascript src="common-bs4.js"/>
+<asset:deferredScripts/>
 </body>
 </html>
diff --git a/grails-app/views/shared/_activitiesPlan.gsp b/grails-app/views/shared/_activitiesPlan.gsp
index 0089bf98f..ef8581b18 100644
--- a/grails-app/views/shared/_activitiesPlan.gsp
+++ b/grails-app/views/shared/_activitiesPlan.gsp
@@ -111,21 +111,9 @@
                                         </div>
                                     </div>
                                 <!-- /ko -->
-                                <div class="row">
-                                    <label for="orientation" class="col-sm-4 col-form-label">PDF Orientation: <fc:iconHelp>If your PDF includes activities with wide tables, the Landscape setting may improve the result.  This setting has no effect on the HTML view. </fc:iconHelp></label>
-                                    <div class="col-sm-8">
-                                        <select name="orientation" id="orientation" class="form-control form-control-sm" data-bind="value:orientation">
-                                            <option value="portrait">Portrait</option>
-                                            <option value="landscape">Landscape</option>
-                                        </select>
-                                    </div>
-
-
-                                </div>
                         </div>
                         <div class="modal-footer">
-                            <button type="button" class="btn btn-sm btn-success" data-bind="click:generateProjectReportHTML">Generate Report (HTML)</button>
-                            <button type="button" class="btn btn-sm btn-warning" data-bind="click:generateProjectReportPDF">Generate Report (PDF)</button>
+                            <button type="button" class="btn btn-sm btn-success" data-bind="click:generateProjectReportHTML">Generate Report</button>
                             <button class="btn btn-sm btn-danger" data-dismiss="modal" aria-label="Cancel">Cancel</button>
                         </div>
                     </div>
diff --git a/grails-app/views/shared/_attachDocument.gsp b/grails-app/views/shared/_attachDocument.gsp
index aa1fd2df9..f87d1f1da 100644
--- a/grails-app/views/shared/_attachDocument.gsp
+++ b/grails-app/views/shared/_attachDocument.gsp
@@ -2,8 +2,10 @@
 <div id="attachDocument" class="modal fade" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
-            <div class="modal-header">
+            <div class="modal-header" style="flex-direction:column;">
                 <h4 class="modal-title" id="title">Attach Document</h4>
+                <label class="col-form-label row-cols-sm-1" style="font-size: small"><g:message code="attach.document.subtitle"/><a href="https://www.dcceew.gov.au/environment/environmental-information-data/information-policy/sensitive-ecological-data-access-and-management-policy" target="_blank"> <g:message code="attach.document.subtitle.link"/></a>
+                <fc:iconHelp helpTextCode="attach.document.help"></fc:iconHelp></label>
             </div>
             <div class="modal-body validationContainer" id="documentForm">
                     <div class="form-group row">
diff --git a/grails-app/views/shared/_categorizedReporting.gsp b/grails-app/views/shared/_categorizedReporting.gsp
index 038179d6a..6d3973cb5 100644
--- a/grails-app/views/shared/_categorizedReporting.gsp
+++ b/grails-app/views/shared/_categorizedReporting.gsp
@@ -150,7 +150,7 @@
 
             <a target="print-report" class="btn btn-container btn-sm"
                     data-bind="attr:{href:downloadUrl}, visible:viewable"><i
-                    class="fa fa-download" title="Download a PDF of this report"></i></a>
+                    class="fa fa-download" title="Display a printable version of this report"></i></a>
             <a class="btn btn-container btn-sm disabled-icon" data-bind="visible:!viewable">
                 <i class="fa fa-download" title="Please mark the report as complete before generating a PDF"></i>
             </a>
diff --git a/grails-app/views/shared/_categorizedReportsAndDeclaration.gsp b/grails-app/views/shared/_categorizedReportsAndDeclaration.gsp
new file mode 100644
index 000000000..012e865df
--- /dev/null
+++ b/grails-app/views/shared/_categorizedReportsAndDeclaration.gsp
@@ -0,0 +1,5 @@
+<!-- ko stopBinding:true -->
+<g:render template="/shared/categorizedReporting"/>
+
+<g:render template="/shared/declaration_bs4" model="${[declarationType:declarationType ?: au.org.ala.merit.SettingPageType.RLP_REPORT_DECLARATION]}"/>
+<!-- /ko -->
\ No newline at end of file
diff --git a/grails-app/views/shared/_projectListByProgram.gsp b/grails-app/views/shared/_projectListByProgram.gsp
index df6df8b16..7fc8dd9bb 100644
--- a/grails-app/views/shared/_projectListByProgram.gsp
+++ b/grails-app/views/shared/_projectListByProgram.gsp
@@ -1,4 +1,6 @@
-
+<g:if test="${reportsFirst}">
+    <g:render template="/shared/categorizedReportsAndDeclaration"/>
+</g:if>
 <div class="projects-wrapper d-none d-md-block">
     <g:if test="${displayedPrograms}">
         <g:each var="programDetails" status="i" in="${displayedPrograms}">
@@ -32,8 +34,6 @@
     </g:if>
 </div>
 
-<!-- ko stopBinding:true -->
-<g:render template="/shared/categorizedReporting"/>
-
-<g:render template="/shared/declaration_bs4" model="${[declarationType:au.org.ala.merit.SettingPageType.RLP_REPORT_DECLARATION]}"/>
-<!-- /ko -->
+<g:if test="${!reportsFirst}">
+    <g:render template="/shared/categorizedReportsAndDeclaration"/>
+</g:if>
diff --git a/grails-app/views/site/_map.gsp b/grails-app/views/site/_map.gsp
index 11ea3a936..5a1085d71 100644
--- a/grails-app/views/site/_map.gsp
+++ b/grails-app/views/site/_map.gsp
@@ -1,3 +1,4 @@
+<%@ page import="au.org.ala.merit.SiteService" %>
 <!-- ko stopBinding: true -->
 <div id="sitemap">
             <script type="text/javascript" src="${grailsApplication.config.getProperty('google.drawmaps.url')}"></script>
@@ -30,19 +31,21 @@
                 </div>
                 <div class="col-sm-3">
                     <label for="siteType">Type</label>
-                    %{--<input data-bind="value: type" id="siteType" type="text" class="span12"/>--}%
                     <div>
                         <g:select id="siteType"
+                                  from="${siteTypes}"
+                                  optionKey="value"
+                                  optionValue="label"
                               data-bind="value: type"
                               class="form-control"
                               name='type'
-                              from="['Works Area','Project Extent']"
-                              keys="['worksArea','projectArea']"/>
+
+                              />
                     </div>
                 </div>
                 <div class="col-sm-3">
                     <label for="siteContext">Context</label>
-                    %{--<input data-bind="value: context" id="siteContext" type="text" class="span12"/>--}%
+
                     <div>
                         <g:select id="siteContext"
                               data-bind="value: context"
diff --git a/grails-app/views/site/_sitesList.gsp b/grails-app/views/site/_sitesList.gsp
index 49ec5335d..1ccf7f76d 100644
--- a/grails-app/views/site/_sitesList.gsp
+++ b/grails-app/views/site/_sitesList.gsp
@@ -29,7 +29,7 @@
                 <tr>
                     <th><input type="checkbox" id="select-all-sites"></th>
                     <th></th>
-                    <th>Type <fc:iconHelp html="true">Planning site (P) or Reporting site (R)</fc:iconHelp><br/>
+                    <th>Type <fc:iconHelp html="true">Planning site (P), Reporting site (R) or EMSA site created with the Monitor app (E)</fc:iconHelp><br/>
                         <select data-bind="value:typeFilter, options:typeOptions">
 
                         </select>
@@ -42,17 +42,17 @@
                 </thead>
                 <tbody data-bind="foreach: sites">
                 <tr>
-                    <th><input type="checkbox" name="select-site" data-bind="checked:selected, enable:type != 'compound'"></th>
+                    <th><input type="checkbox" name="select-site" data-bind="checked:selected, enable:!readOnly"></th>
                     <td>
                         <g:if test="${editable}">
                             <span>
-                                <button type="button" data-bind="click:$root.editSite, visible:type != 'compound'" class="btn btn-sm btn-container"><i class="fa fa-edit" title="Edit ${wordForSite.capitalize()}"></i></button>
+                                <button type="button" data-bind="click:$root.editSite, visible:!readOnly" class="btn btn-sm btn-container"><i class="fa fa-edit" title="Edit ${wordForSite.capitalize()}"></i></button>
                                 <button type="button" data-bind="click:$root.viewSite" class="btn btn-sm btn-container"><i class="fa fa-eye" title="View ${wordForSite.capitalize()}"></i></button>
-                                <button type="button" data-bind="click:$root.deleteSite, visible:type != 'compound'" class="btn btn-sm btn-container"><i class="fa fa-remove" title="Delete ${wordForSite.capitalize()}"></i></button>
+                                <button type="button" data-bind="click:$root.deleteSite, visible:!readOnly" class="btn btn-sm btn-container"><i class="fa fa-remove" title="Delete ${wordForSite.capitalize()}"></i></button>
                             </span>
                         </g:if>
                     </td>
-                    <td data-bind="text:type == 'compound' ? 'R' : 'P', title:type == 'compound' ? 'Reporting site' :  'Planning site'">
+                    <td data-bind="text:filterType, title:filterTypeTitle">
                     </td>
 
                     <td>
diff --git a/grails-app/views/site/index.gsp b/grails-app/views/site/index.gsp
index b27c9e4fb..589baf089 100644
--- a/grails-app/views/site/index.gsp
+++ b/grails-app/views/site/index.gsp
@@ -59,7 +59,7 @@
 
                     Site Actions:
                     <div class="btn-group">
-                        <g:if test="${site.type != au.org.ala.merit.SiteService.SITE_TYPE_COMPOUND}">
+                        <g:if test="${!au.org.ala.merit.SiteService.isReadOnly(site)}">
                             <g:link action="edit" id="${site.siteId}"><button type="button" class="btn btn-sm mr-1"><i class="fa fa-edit"></i> Edit Site</button></g:link>
                         </g:if>
 
@@ -86,7 +86,7 @@
             </div>
             <p>
                 <span class="label label-info">External Id:</span> ${site.externalId?:'Not specified'}
-                <span class="label label-info">Type:</span> ${site.type?:'Not specified'}
+                <span class="label label-info">Type:</span> ${g.message(code:'site.type.'+site.type, default:site.type)?:'Not specified'}
                 <span class="label label-info">Area:</span>
                 <g:set var="areaHa" value="${site?.extent?.geometry?.aream2 ? site?.extent?.geometry?.aream2 / 10000 : (site?.extent?.geometry?.area) ? site?.extent?.geometry?.area * 100 : null}"/>
                 <g:if test="${areaHa}">
diff --git a/grails-app/views/site/upload.gsp b/grails-app/views/site/upload.gsp
index e0a8048d8..dd93babec 100644
--- a/grails-app/views/site/upload.gsp
+++ b/grails-app/views/site/upload.gsp
@@ -15,10 +15,10 @@
                 sldPolgonHighlightUrl: "${grailsApplication.config.getProperty('sld.polgon.highlight.url')}",
                 saveSitesUrl: "${createLink(action: 'createSitesFromShapefile')}",
                 siteUploadProgressUrl: "${createLink(action: 'siteUploadProgress')}",
-                cancelSiteUploadUrl: "${createLink(action:'cancelSiteUpload')}"
+                cancelSiteUploadUrl: "${createLink(action:'cancelSiteUpload')}",
+                returnToUrl: "${createLink(controller: 'project', action: 'index', id: projectId)}"
 
-            },
-            returnTo = "${params.returnTo}";
+            };
     </script>
     <asset:stylesheet src="site-bs4.css"/>
 </head>
@@ -50,8 +50,7 @@
             </div>
         </g:if>
 
-        <g:uploadForm class="upload-sites" controller="site" action="siteUpload">
-            <input type="hidden" name="returnTo" value="${returnTo}">
+        <g:uploadForm class="upload-sites" controller="site" action="siteUpload" id="${projectId}">
             <input type="hidden" name="projectId" value="${projectId}">
             <label for="shapefile">Attach shape file (zip format)</label>
             <input id="shapefile" type="file" accept="application/zip, .kml, .kmz" name="shapefile"/>
@@ -186,7 +185,7 @@ $(function() {
         cancelSiteUploadUrl: fcConfig.cancelSiteUploadUrl,
         validationContainerSelector: '#sites-container',
         progressSelector: '#uploadProgress',
-        returnToUrl: '${params.returnTo}'
+        returnToUrl: fcConfig.returnToUrl
         };
 
     $('#uploadProgress').modal({backdrop:'static', show:false});
diff --git a/karma.conf.js b/karma.conf.js
index c9571a3a4..4bd418b8e 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -49,6 +49,8 @@ module.exports = function (config) {
             'grails-app/assets/components/components.js',
             'grails-app/assets/components/compile/*.js',
             'grails-app/assets/components/javascript/*.js',
+            'node_modules/@atlasoflivingaustralia/ecodata-client-plugin/grails-app/assets/javascripts/utils.js',
+            'node_modules/@atlasoflivingaustralia/ecodata-client-plugin/grails-app/assets/javascripts/knockout-dates.js',
             'src/test/js/spec/**/*.js'
         ],
 
diff --git a/package-lock.json b/package-lock.json
index 5048db4aa..44af52801 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,12 +8,13 @@
       "name": "fieldcapture",
       "version": "2.3",
       "dependencies": {
+        "@atlasoflivingaustralia/ecodata-client-plugin": "6.2.0-pre.2023-08-22.f397d6f5",
         "bootstrap": "4.6",
         "slickgrid": "^2.4.34"
       },
       "devDependencies": {
         "@metahub/karma-jasmine-jquery": "^2.0.1",
-        "chromedriver": "117.0.3",
+        "chromedriver": "121.0.0",
         "jasmine-core": "^3.5.0",
         "jasmine-jquery": "^2.0.0",
         "jquery": "3.6.2",
@@ -29,13 +30,26 @@
         "moment-timezone": "^0.5.37"
       }
     },
+    "node_modules/@atlasoflivingaustralia/ecodata-client-plugin": {
+      "version": "6.2.0-pre.2023-08-22.f397d6f5",
+      "resolved": "https://npm.pkg.github.com/download/@atlasoflivingaustralia/ecodata-client-plugin/6.2.0-pre.2023-08-22.f397d6f5/ce82dfec3ec67909df2d565e151929c78fb6e388",
+      "integrity": "sha512-LbjIFcgb07rGWlQIcmrq4h6Tw66N0Gm3ooLCDPMlbncPY15hBlJ6vAVWK2FkdWBZQvA7/pA8+A//2GJdFfn8Cw==",
+      "dependencies": {
+        "bootstrap": "^4.6.0",
+        "browserify": "^16.2.3"
+      }
+    },
     "node_modules/@babel/code-frame": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-      "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.8.3"
+        "@babel/highlight": "^7.22.13",
+        "chalk": "^2.4.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
@@ -107,44 +121,52 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
-      "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.9.5",
-        "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
-        "source-map": "^0.5.0"
+        "@babel/types": "^7.23.0",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jsesc": "^2.5.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/generator/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "dev": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
-      "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-get-function-arity": "^7.8.3",
-        "@babel/template": "^7.8.3",
-        "@babel/types": "^7.9.5"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-      "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.8.3"
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
@@ -212,19 +234,34 @@
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
-      "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.8.3"
+        "@babel/types": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
-      "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
-      "dev": true
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
     },
     "node_modules/@babel/helpers": {
       "version": "7.9.2",
@@ -238,20 +275,23 @@
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-      "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.9.0",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.9.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-      "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -261,31 +301,38 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/parser": "^7.8.6",
-        "@babel/types": "^7.8.6"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
-      "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.9.5",
-        "@babel/helper-function-name": "^7.9.5",
-        "@babel/helper-split-export-declaration": "^7.8.3",
-        "@babel/parser": "^7.9.0",
-        "@babel/types": "^7.9.5",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.0",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
         "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.13"
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse/node_modules/debug": {
@@ -312,14 +359,17 @@
       "dev": true
     },
     "node_modules/@babel/types": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-      "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.9.5",
-        "lodash": "^4.17.13",
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/@colors/colors": {
@@ -340,6 +390,54 @@
         "node": ">=8"
       }
     },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
+      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
     "node_modules/@metahub/karma-jasmine-jquery": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@metahub/karma-jasmine-jquery/-/karma-jasmine-jquery-2.0.1.tgz",
@@ -356,9 +454,9 @@
       "dev": true
     },
     "node_modules/@testim/chrome-version": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.3.tgz",
-      "integrity": "sha512-g697J3WxV/Zytemz8aTuKjTGYtta9+02kva3C1xc7KXB8GdbfE1akGJIsZLyY/FSh2QrnE+fiB7vmWU3XNcb6A==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",
+      "integrity": "sha512-kIhULpw9TrGYnHp/8VfdcneIcxKnLixmADtukQRtJUmsVlMg0niMkwV0xZmi8hqa57xqilIHjWFA0GKvEjVU5g==",
       "dev": true
     },
     "node_modules/@types/cookie": {
@@ -405,6 +503,35 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-node": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
+      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
+      "dependencies": {
+        "acorn": "^7.0.0",
+        "acorn-walk": "^7.0.0",
+        "xtend": "^4.0.2"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/agent-base": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@@ -474,6 +601,44 @@
         "node": ">= 8"
       }
     },
+    "node_modules/asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/asn1.js/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
+    "node_modules/assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      }
+    },
+    "node_modules/assert/node_modules/inherits": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+      "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA=="
+    },
+    "node_modules/assert/node_modules/util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
+      "dependencies": {
+        "inherits": "2.0.1"
+      }
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -481,12 +646,12 @@
       "dev": true
     },
     "node_modules/axios": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
-      "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
+      "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
       "dev": true,
       "dependencies": {
-        "follow-redirects": "^1.15.0",
+        "follow-redirects": "^1.15.4",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -494,8 +659,26 @@
     "node_modules/balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
     "node_modules/base64id": {
       "version": "2.0.0",
@@ -515,6 +698,11 @@
         "node": ">=8"
       }
     },
+    "node_modules/bn.js": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
+    },
     "node_modules/body-parser": {
       "version": "1.20.1",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
@@ -568,7 +756,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -586,6 +773,207 @@
         "node": ">=8"
       }
     },
+    "node_modules/brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="
+    },
+    "node_modules/browser-pack": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz",
+      "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
+      "dependencies": {
+        "combine-source-map": "~0.8.0",
+        "defined": "^1.0.0",
+        "JSONStream": "^1.0.3",
+        "safe-buffer": "^5.1.1",
+        "through2": "^2.0.0",
+        "umd": "^3.0.0"
+      },
+      "bin": {
+        "browser-pack": "bin/cmd.js"
+      }
+    },
+    "node_modules/browser-resolve": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz",
+      "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==",
+      "dependencies": {
+        "resolve": "^1.17.0"
+      }
+    },
+    "node_modules/browserify": {
+      "version": "16.5.2",
+      "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.5.2.tgz",
+      "integrity": "sha512-TkOR1cQGdmXU9zW4YukWzWVSJwrxmNdADFbqbE3HFgQWe5wqZmOawqZ7J/8MPCwk/W8yY7Y0h+7mOtcZxLP23g==",
+      "dependencies": {
+        "assert": "^1.4.0",
+        "browser-pack": "^6.0.1",
+        "browser-resolve": "^2.0.0",
+        "browserify-zlib": "~0.2.0",
+        "buffer": "~5.2.1",
+        "cached-path-relative": "^1.0.0",
+        "concat-stream": "^1.6.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "~1.0.0",
+        "crypto-browserify": "^3.0.0",
+        "defined": "^1.0.0",
+        "deps-sort": "^2.0.0",
+        "domain-browser": "^1.2.0",
+        "duplexer2": "~0.1.2",
+        "events": "^2.0.0",
+        "glob": "^7.1.0",
+        "has": "^1.0.0",
+        "htmlescape": "^1.1.0",
+        "https-browserify": "^1.0.0",
+        "inherits": "~2.0.1",
+        "insert-module-globals": "^7.0.0",
+        "JSONStream": "^1.0.3",
+        "labeled-stream-splicer": "^2.0.0",
+        "mkdirp-classic": "^0.5.2",
+        "module-deps": "^6.2.3",
+        "os-browserify": "~0.3.0",
+        "parents": "^1.0.1",
+        "path-browserify": "~0.0.0",
+        "process": "~0.11.0",
+        "punycode": "^1.3.2",
+        "querystring-es3": "~0.2.0",
+        "read-only-stream": "^2.0.0",
+        "readable-stream": "^2.0.2",
+        "resolve": "^1.1.4",
+        "shasum": "^1.0.0",
+        "shell-quote": "^1.6.1",
+        "stream-browserify": "^2.0.0",
+        "stream-http": "^3.0.0",
+        "string_decoder": "^1.1.1",
+        "subarg": "^1.0.0",
+        "syntax-error": "^1.1.1",
+        "through2": "^2.0.0",
+        "timers-browserify": "^1.0.1",
+        "tty-browserify": "0.0.1",
+        "url": "~0.11.0",
+        "util": "~0.10.1",
+        "vm-browserify": "^1.0.0",
+        "xtend": "^4.0.0"
+      },
+      "bin": {
+        "browserify": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dependencies": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/browserify-rsa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "dependencies": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/browserify-sign": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
+      "dependencies": {
+        "bn.js": "^5.2.1",
+        "browserify-rsa": "^4.1.0",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.4",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.6",
+        "readable-stream": "^3.6.2",
+        "safe-buffer": "^5.2.1"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dependencies": {
+        "pako": "~1.0.5"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+      "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
+      "dependencies": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4"
+      }
+    },
     "node_modules/buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@@ -595,6 +983,21 @@
         "node": "*"
       }
     },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+    },
+    "node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="
+    },
+    "node_modules/builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ=="
+    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -604,11 +1007,15 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/cached-path-relative": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz",
+      "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA=="
+    },
     "node_modules/call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
       "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.0.2"
@@ -653,19 +1060,19 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "117.0.3",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-117.0.3.tgz",
-      "integrity": "sha512-c2rk2eGK5zZFBJMdviUlAJfQEBuPNIKfal4+rTFVYAmrWbMPYAqPozB+rIkc1lDP/Ryw44lPiqKglrI01ILhTQ==",
+      "version": "121.0.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-121.0.0.tgz",
+      "integrity": "sha512-ZIKEdZrQAfuzT/RRofjl8/EZR99ghbdBXNTOcgJMKGP6N/UL6lHUX4n6ONWBV18pDvDFfQJ0x58h5AdOaXIOMw==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@testim/chrome-version": "^1.1.3",
-        "axios": "^1.4.0",
-        "compare-versions": "^6.0.0",
+        "@testim/chrome-version": "^1.1.4",
+        "axios": "^1.6.5",
+        "compare-versions": "^6.1.0",
         "extract-zip": "^2.0.1",
         "https-proxy-agent": "^5.0.1",
         "proxy-from-env": "^1.1.0",
-        "tcp-port-used": "^1.0.1"
+        "tcp-port-used": "^1.0.2"
       },
       "bin": {
         "chromedriver": "bin/chromedriver"
@@ -674,6 +1081,15 @@
         "node": ">=18"
       }
     },
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
@@ -697,9 +1113,33 @@
     "node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
       "dev": true
     },
+    "node_modules/combine-source-map": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz",
+      "integrity": "sha512-UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg==",
+      "dependencies": {
+        "convert-source-map": "~1.1.0",
+        "inline-source-map": "~0.6.0",
+        "lodash.memoize": "~3.0.3",
+        "source-map": "~0.5.3"
+      }
+    },
+    "node_modules/combine-source-map/node_modules/convert-source-map": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
+      "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg=="
+    },
+    "node_modules/combine-source-map/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -721,8 +1161,21 @@
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "node_modules/concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "engines": [
+        "node >= 0.8"
+      ],
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
     },
     "node_modules/connect": {
       "version": "3.7.0",
@@ -739,6 +1192,16 @@
         "node": ">= 0.10.0"
       }
     },
+    "node_modules/console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
+    },
+    "node_modules/constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="
+    },
     "node_modules/content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
@@ -766,6 +1229,11 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+    },
     "node_modules/cors": {
       "version": "2.8.5",
       "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
@@ -779,12 +1247,77 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      }
+    },
+    "node_modules/create-ecdh/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "node_modules/crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dependencies": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
       "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
       "dev": true
     },
+    "node_modules/dash-ast": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz",
+      "integrity": "sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA=="
+    },
     "node_modules/date-format": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz",
@@ -809,6 +1342,14 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
+    "node_modules/defined": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
+      "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -827,6 +1368,29 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/deps-sort": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz",
+      "integrity": "sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==",
+      "dependencies": {
+        "JSONStream": "^1.0.3",
+        "shasum-object": "^1.0.0",
+        "subarg": "^1.0.0",
+        "through2": "^2.0.0"
+      },
+      "bin": {
+        "deps-sort": "bin/cmd.js"
+      }
+    },
+    "node_modules/des.js": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+      "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
     "node_modules/destroy": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
@@ -837,12 +1401,43 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/detective": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz",
+      "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==",
+      "dependencies": {
+        "acorn-node": "^1.8.2",
+        "defined": "^1.0.0",
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "detective": "bin/detective.js"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
       "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
       "dev": true
     },
+    "node_modules/diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "node_modules/diffie-hellman/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
     "node_modules/dom-serialize": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
@@ -855,12 +1450,48 @@
         "void-elements": "^2.0.0"
       }
     },
+    "node_modules/domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "engines": {
+        "node": ">=0.4",
+        "npm": ">=1.2"
+      }
+    },
+    "node_modules/duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      }
+    },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
       "dev": true
     },
+    "node_modules/elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dependencies": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "node_modules/elliptic/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -962,7 +1593,7 @@
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
       "engines": {
         "node": ">=0.8.0"
@@ -974,6 +1605,23 @@
       "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
       "dev": true
     },
+    "node_modules/events": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-2.1.0.tgz",
+      "integrity": "sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg==",
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dependencies": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -1018,6 +1666,11 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
+    "node_modules/fast-safe-stringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
+    },
     "node_modules/fd-slicer": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
@@ -1064,9 +1717,9 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "dev": true,
       "funding": [
         {
@@ -1126,8 +1779,7 @@
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "node_modules/fsevents": {
       "version": "2.3.2",
@@ -1146,8 +1798,7 @@
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "node_modules/gensync": {
       "version": "1.0.0-beta.1",
@@ -1158,6 +1809,11 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/get-assigned-identifiers": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz",
+      "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="
+    },
     "node_modules/get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -1171,7 +1827,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
       "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-      "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
@@ -1197,7 +1852,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
       "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -1244,7 +1898,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1"
       },
@@ -1255,7 +1908,7 @@
     "node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -1265,7 +1918,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -1273,12 +1925,84 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hash-base/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/hash-base/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "node_modules/hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
     "node_modules/html-escaper": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
+    "node_modules/htmlescape": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
+      "integrity": "sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg==",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
@@ -1318,6 +2042,11 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="
+    },
     "node_modules/https-proxy-agent": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
@@ -1366,11 +2095,29 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -1379,8 +2126,43 @@
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/inline-source-map": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz",
+      "integrity": "sha512-0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA==",
+      "dependencies": {
+        "source-map": "~0.5.3"
+      }
+    },
+    "node_modules/inline-source-map/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/insert-module-globals": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz",
+      "integrity": "sha512-ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg==",
+      "dependencies": {
+        "acorn-node": "^1.5.2",
+        "combine-source-map": "^0.8.0",
+        "concat-stream": "^1.6.1",
+        "is-buffer": "^1.1.0",
+        "JSONStream": "^1.0.3",
+        "path-is-absolute": "^1.0.1",
+        "process": "~0.11.0",
+        "through2": "^2.0.0",
+        "undeclared-identifiers": "^1.1.2",
+        "xtend": "^4.0.0"
+      },
+      "bin": {
+        "insert-module-globals": "bin/cmd.js"
+      }
     },
     "node_modules/ip-regex": {
       "version": "4.3.0",
@@ -1403,6 +2185,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "node_modules/is-core-module": {
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -1471,6 +2269,11 @@
         "node": ">=v0.10.0"
       }
     },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+    },
     "node_modules/isbinaryfile": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz",
@@ -1644,6 +2447,14 @@
         "node": ">=4"
       }
     },
+    "node_modules/json-stable-stringify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
+      "integrity": "sha512-nKtD/Qxm7tWdZqJoldEC7fF0S41v0mWbeaXG3637stOWfyGxTgWTYE2wtfKmjzpvxv2MA2xzxsXOIiwUpkX6Qw==",
+      "dependencies": {
+        "jsonify": "~0.0.0"
+      }
+    },
     "node_modules/json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
@@ -1668,6 +2479,37 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/jsonify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+      "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
+      "engines": [
+        "node >= 0.2.0"
+      ]
+    },
+    "node_modules/JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dependencies": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      },
+      "bin": {
+        "JSONStream": "bin.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/karma": {
       "version": "6.3.17",
       "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.17.tgz",
@@ -1763,12 +2605,26 @@
       "integrity": "sha512-wRJ9I4az0QcsH7A4v4l0enUpkS++MBx0BnL/68KaLzJg7x1qmbjSlwEoCNol7KTYZ+pmtI7Eh2J0Nu6/2Z5J/Q==",
       "dev": true
     },
+    "node_modules/labeled-stream-splicer": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz",
+      "integrity": "sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "stream-splicer": "^2.0.0"
+      }
+    },
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
+    "node_modules/lodash.memoize": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
+      "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A=="
+    },
     "node_modules/log4js": {
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz",
@@ -1820,6 +2676,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
     "node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -1829,6 +2695,23 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/miller-rabin/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
     "node_modules/mime": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
@@ -1862,11 +2745,20 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+    },
+    "node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="
+    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -1877,8 +2769,7 @@
     "node_modules/minimist": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "node_modules/mkdirp": {
       "version": "0.5.5",
@@ -1892,6 +2783,39 @@
         "mkdirp": "bin/cmd.js"
       }
     },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+    },
+    "node_modules/module-deps": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz",
+      "integrity": "sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==",
+      "dependencies": {
+        "browser-resolve": "^2.0.0",
+        "cached-path-relative": "^1.0.2",
+        "concat-stream": "~1.6.0",
+        "defined": "^1.0.0",
+        "detective": "^5.2.0",
+        "duplexer2": "^0.1.2",
+        "inherits": "^2.0.1",
+        "JSONStream": "^1.0.3",
+        "parents": "^1.0.0",
+        "readable-stream": "^2.0.2",
+        "resolve": "^1.4.0",
+        "stream-combiner2": "^1.1.1",
+        "subarg": "^1.0.0",
+        "through2": "^2.0.0",
+        "xtend": "^4.0.0"
+      },
+      "bin": {
+        "module-deps": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/moment": {
       "version": "2.29.4",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
@@ -1950,7 +2874,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1959,7 +2882,6 @@
       "version": "1.12.2",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
       "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -1980,11 +2902,40 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "dependencies": {
         "wrappy": "1"
       }
     },
+    "node_modules/os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A=="
+    },
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+    },
+    "node_modules/parents": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+      "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==",
+      "dependencies": {
+        "path-platform": "~0.11.15"
+      }
+    },
+    "node_modules/parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dependencies": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -1994,11 +2945,15 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="
+    },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2006,8 +2961,30 @@
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "node_modules/path-platform": {
+      "version": "0.11.15",
+      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
+      "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
     },
     "node_modules/pend": {
       "version": "1.2.0",
@@ -2038,12 +3015,43 @@
         "url": "https://opencollective.com/popperjs"
       }
     },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
       "dev": true
     },
+    "node_modules/public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/public-encrypt/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
     "node_modules/pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -2054,6 +3062,11 @@
         "once": "^1.3.1"
       }
     },
+    "node_modules/punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
+    },
     "node_modules/qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
@@ -2067,7 +3080,6 @@
       "version": "6.11.0",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
       "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "dev": true,
       "dependencies": {
         "side-channel": "^1.0.4"
       },
@@ -2078,6 +3090,31 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
     "node_modules/range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -2102,6 +3139,36 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/read-only-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
+      "integrity": "sha512-3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w==",
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/readable-stream/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "node_modules/readdirp": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
@@ -2130,12 +3197,19 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.0.tgz",
-      "integrity": "sha512-LarL/PIKJvc09k1jaeT4kQb/8/7P+qV4qSnN2K80AES+OHdfZELAKVOBjxsvtToT/uLOfFbvYvKfZmV8cee7nA==",
-      "dev": true,
+      "version": "1.22.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
       "dependencies": {
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/rfdc": {
@@ -2159,17 +3233,24 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/semver": {
       "version": "6.3.1",
@@ -2186,11 +3267,47 @@
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
+    "node_modules/shasum": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
+      "integrity": "sha512-UTzHm/+AzKfO9RgPgRpDIuMSNie1ubXRaljjlhFMNGYoG7z+rm9AHLPMf70R7887xboDH9Q+5YQbWKObFHEAtw==",
+      "dependencies": {
+        "json-stable-stringify": "~0.0.0",
+        "sha.js": "~2.4.4"
+      }
+    },
+    "node_modules/shasum-object": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz",
+      "integrity": "sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==",
+      "dependencies": {
+        "fast-safe-stringify": "^2.0.7"
+      }
+    },
+    "node_modules/shell-quote": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
+      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
@@ -2200,6 +3317,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/slickgrid": {
       "version": "2.4.34",
       "resolved": "https://registry.npmjs.org/slickgrid/-/slickgrid-2.4.34.tgz",
@@ -2303,13 +3439,64 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
+    "node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-combiner2": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
+      "integrity": "sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==",
+      "dependencies": {
+        "duplexer2": "~0.1.0",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-http": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz",
+      "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==",
+      "dependencies": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "xtend": "^4.0.2"
+      }
+    },
+    "node_modules/stream-http/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/stream-splicer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz",
+      "integrity": "sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.2"
       }
     },
     "node_modules/streamroller": {
@@ -2349,6 +3536,33 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/string-width": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
@@ -2375,6 +3589,14 @@
         "node": ">=8"
       }
     },
+    "node_modules/subarg": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+      "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==",
+      "dependencies": {
+        "minimist": "^1.1.0"
+      }
+    },
     "node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -2387,6 +3609,25 @@
         "node": ">=4"
       }
     },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/syntax-error": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
+      "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
+      "dependencies": {
+        "acorn-node": "^1.2.0"
+      }
+    },
     "node_modules/tcp-port-used": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz",
@@ -2420,6 +3661,31 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
+    },
+    "node_modules/through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dependencies": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "node_modules/timers-browserify": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
+      "integrity": "sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==",
+      "dependencies": {
+        "process": "~0.11.0"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
     "node_modules/tmp": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
@@ -2462,6 +3728,11 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/tty-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
+      "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="
+    },
     "node_modules/type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -2475,6 +3746,11 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
+    },
     "node_modules/ua-parser-js": {
       "version": "0.7.33",
       "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz",
@@ -2494,6 +3770,29 @@
         "node": "*"
       }
     },
+    "node_modules/umd": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz",
+      "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==",
+      "bin": {
+        "umd": "bin/cli.js"
+      }
+    },
+    "node_modules/undeclared-identifiers": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz",
+      "integrity": "sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==",
+      "dependencies": {
+        "acorn-node": "^1.3.0",
+        "dash-ast": "^1.0.0",
+        "get-assigned-identifiers": "^1.2.0",
+        "simple-concat": "^1.0.0",
+        "xtend": "^4.0.1"
+      },
+      "bin": {
+        "undeclared-identifiers": "bin.js"
+      }
+    },
     "node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -2512,6 +3811,33 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/url": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz",
+      "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==",
+      "dependencies": {
+        "punycode": "^1.4.1",
+        "qs": "^6.11.0"
+      }
+    },
+    "node_modules/util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "node_modules/util/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+    },
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -2530,6 +3856,11 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/vm-browserify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
+    },
     "node_modules/void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
@@ -2604,8 +3935,7 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "node_modules/ws": {
       "version": "8.11.0",
@@ -2628,6 +3958,14 @@
         }
       }
     },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
     "node_modules/y18n": {
       "version": "5.0.5",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
@@ -2676,13 +4014,23 @@
     }
   },
   "dependencies": {
+    "@atlasoflivingaustralia/ecodata-client-plugin": {
+      "version": "6.2.0-pre.2023-08-22.f397d6f5",
+      "resolved": "https://npm.pkg.github.com/download/@atlasoflivingaustralia/ecodata-client-plugin/6.2.0-pre.2023-08-22.f397d6f5/ce82dfec3ec67909df2d565e151929c78fb6e388",
+      "integrity": "sha512-LbjIFcgb07rGWlQIcmrq4h6Tw66N0Gm3ooLCDPMlbncPY15hBlJ6vAVWK2FkdWBZQvA7/pA8+A//2GJdFfn8Cw==",
+      "requires": {
+        "bootstrap": "^4.6.0",
+        "browserify": "^16.2.3"
+      }
+    },
     "@babel/code-frame": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-      "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.8.3"
+        "@babel/highlight": "^7.22.13",
+        "chalk": "^2.4.2"
       }
     },
     "@babel/core": {
@@ -2739,43 +4087,40 @@
       }
     },
     "@babel/generator": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
-      "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.9.5",
-        "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
-        "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
+        "@babel/types": "^7.23.0",
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
+        "jsesc": "^2.5.1"
       }
     },
+    "@babel/helper-environment-visitor": {
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+      "dev": true
+    },
     "@babel/helper-function-name": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
-      "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.8.3",
-        "@babel/template": "^7.8.3",
-        "@babel/types": "^7.9.5"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       }
     },
-    "@babel/helper-get-function-arity": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-      "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
+    "@babel/helper-hoist-variables": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.8.3"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-member-expression-to-functions": {
@@ -2843,18 +4188,24 @@
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
-      "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.8.3"
+        "@babel/types": "^7.22.5"
       }
     },
+    "@babel/helper-string-parser": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "dev": true
+    },
     "@babel/helper-validator-identifier": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
-      "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true
     },
     "@babel/helpers": {
@@ -2869,48 +4220,49 @@
       }
     },
     "@babel/highlight": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-      "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.9.0",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.9.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-      "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
       "dev": true
     },
     "@babel/template": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/parser": "^7.8.6",
-        "@babel/types": "^7.8.6"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       }
     },
     "@babel/traverse": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
-      "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.9.5",
-        "@babel/helper-function-name": "^7.9.5",
-        "@babel/helper-split-export-declaration": "^7.8.3",
-        "@babel/parser": "^7.9.0",
-        "@babel/types": "^7.9.5",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.0",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
         "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.13"
+        "globals": "^11.1.0"
       },
       "dependencies": {
         "debug": {
@@ -2931,13 +4283,13 @@
       }
     },
     "@babel/types": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-      "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.9.5",
-        "lodash": "^4.17.13",
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -2953,6 +4305,45 @@
       "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
       "dev": true
     },
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "dev": true
+    },
+    "@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
+      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
     "@metahub/karma-jasmine-jquery": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@metahub/karma-jasmine-jquery/-/karma-jasmine-jquery-2.0.1.tgz",
@@ -2966,9 +4357,9 @@
       "dev": true
     },
     "@testim/chrome-version": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.3.tgz",
-      "integrity": "sha512-g697J3WxV/Zytemz8aTuKjTGYtta9+02kva3C1xc7KXB8GdbfE1akGJIsZLyY/FSh2QrnE+fiB7vmWU3XNcb6A==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@testim/chrome-version/-/chrome-version-1.1.4.tgz",
+      "integrity": "sha512-kIhULpw9TrGYnHp/8VfdcneIcxKnLixmADtukQRtJUmsVlMg0niMkwV0xZmi8hqa57xqilIHjWFA0GKvEjVU5g==",
       "dev": true
     },
     "@types/cookie": {
@@ -3012,6 +4403,26 @@
         "negotiator": "0.6.3"
       }
     },
+    "acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
+    },
+    "acorn-node": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
+      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
+      "requires": {
+        "acorn": "^7.0.0",
+        "acorn-walk": "^7.0.0",
+        "xtend": "^4.0.2"
+      }
+    },
+    "acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
+    },
     "agent-base": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@@ -3063,6 +4474,48 @@
         "picomatch": "^2.0.4"
       }
     },
+    "asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+        }
+      }
+    },
+    "assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "requires": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA=="
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -3070,12 +4523,12 @@
       "dev": true
     },
     "axios": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
-      "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
+      "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
       "dev": true,
       "requires": {
-        "follow-redirects": "^1.15.0",
+        "follow-redirects": "^1.15.4",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -3083,8 +4536,12 @@
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
     "base64id": {
       "version": "2.0.0",
@@ -3098,6 +4555,11 @@
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true
     },
+    "bn.js": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+      "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
+    },
     "body-parser": {
       "version": "1.20.1",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
@@ -3139,7 +4601,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -3154,23 +4615,216 @@
         "fill-range": "^7.0.1"
       }
     },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="
+    },
+    "browser-pack": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz",
+      "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
+      "requires": {
+        "combine-source-map": "~0.8.0",
+        "defined": "^1.0.0",
+        "JSONStream": "^1.0.3",
+        "safe-buffer": "^5.1.1",
+        "through2": "^2.0.0",
+        "umd": "^3.0.0"
+      }
+    },
+    "browser-resolve": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz",
+      "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==",
+      "requires": {
+        "resolve": "^1.17.0"
+      }
+    },
+    "browserify": {
+      "version": "16.5.2",
+      "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.5.2.tgz",
+      "integrity": "sha512-TkOR1cQGdmXU9zW4YukWzWVSJwrxmNdADFbqbE3HFgQWe5wqZmOawqZ7J/8MPCwk/W8yY7Y0h+7mOtcZxLP23g==",
+      "requires": {
+        "assert": "^1.4.0",
+        "browser-pack": "^6.0.1",
+        "browser-resolve": "^2.0.0",
+        "browserify-zlib": "~0.2.0",
+        "buffer": "~5.2.1",
+        "cached-path-relative": "^1.0.0",
+        "concat-stream": "^1.6.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "~1.0.0",
+        "crypto-browserify": "^3.0.0",
+        "defined": "^1.0.0",
+        "deps-sort": "^2.0.0",
+        "domain-browser": "^1.2.0",
+        "duplexer2": "~0.1.2",
+        "events": "^2.0.0",
+        "glob": "^7.1.0",
+        "has": "^1.0.0",
+        "htmlescape": "^1.1.0",
+        "https-browserify": "^1.0.0",
+        "inherits": "~2.0.1",
+        "insert-module-globals": "^7.0.0",
+        "JSONStream": "^1.0.3",
+        "labeled-stream-splicer": "^2.0.0",
+        "mkdirp-classic": "^0.5.2",
+        "module-deps": "^6.2.3",
+        "os-browserify": "~0.3.0",
+        "parents": "^1.0.1",
+        "path-browserify": "~0.0.0",
+        "process": "~0.11.0",
+        "punycode": "^1.3.2",
+        "querystring-es3": "~0.2.0",
+        "read-only-stream": "^2.0.0",
+        "readable-stream": "^2.0.2",
+        "resolve": "^1.1.4",
+        "shasum": "^1.0.0",
+        "shell-quote": "^1.6.1",
+        "stream-browserify": "^2.0.0",
+        "stream-http": "^3.0.0",
+        "string_decoder": "^1.1.1",
+        "subarg": "^1.0.0",
+        "syntax-error": "^1.1.1",
+        "through2": "^2.0.0",
+        "timers-browserify": "^1.0.1",
+        "tty-browserify": "0.0.1",
+        "url": "~0.11.0",
+        "util": "~0.10.1",
+        "vm-browserify": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "requires": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+      "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
+      "requires": {
+        "bn.js": "^5.2.1",
+        "browserify-rsa": "^4.1.0",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.4",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.6",
+        "readable-stream": "^3.6.2",
+        "safe-buffer": "^5.2.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        }
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+      "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4"
+      }
+    },
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
       "dev": true
     },
+    "buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ=="
+    },
     "bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
       "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true
     },
+    "cached-path-relative": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz",
+      "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA=="
+    },
     "call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
       "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
       "requires": {
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.0.2"
@@ -3204,18 +4858,27 @@
       }
     },
     "chromedriver": {
-      "version": "117.0.3",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-117.0.3.tgz",
-      "integrity": "sha512-c2rk2eGK5zZFBJMdviUlAJfQEBuPNIKfal4+rTFVYAmrWbMPYAqPozB+rIkc1lDP/Ryw44lPiqKglrI01ILhTQ==",
+      "version": "121.0.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-121.0.0.tgz",
+      "integrity": "sha512-ZIKEdZrQAfuzT/RRofjl8/EZR99ghbdBXNTOcgJMKGP6N/UL6lHUX4n6ONWBV18pDvDFfQJ0x58h5AdOaXIOMw==",
       "dev": true,
       "requires": {
-        "@testim/chrome-version": "^1.1.3",
-        "axios": "^1.4.0",
-        "compare-versions": "^6.0.0",
+        "@testim/chrome-version": "^1.1.4",
+        "axios": "^1.6.5",
+        "compare-versions": "^6.1.0",
         "extract-zip": "^2.0.1",
         "https-proxy-agent": "^5.0.1",
         "proxy-from-env": "^1.1.0",
-        "tcp-port-used": "^1.0.1"
+        "tcp-port-used": "^1.0.2"
+      }
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "cliui": {
@@ -3241,9 +4904,32 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
       "dev": true
     },
+    "combine-source-map": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz",
+      "integrity": "sha512-UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg==",
+      "requires": {
+        "convert-source-map": "~1.1.0",
+        "inline-source-map": "~0.6.0",
+        "lodash.memoize": "~3.0.3",
+        "source-map": "~0.5.3"
+      },
+      "dependencies": {
+        "convert-source-map": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
+          "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg=="
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
+        }
+      }
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -3262,8 +4948,18 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
     },
     "connect": {
       "version": "3.7.0",
@@ -3277,6 +4973,16 @@
         "utils-merge": "1.0.1"
       }
     },
+    "console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="
+    },
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
@@ -3298,6 +5004,11 @@
       "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
       "dev": true
     },
+    "core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+    },
     "cors": {
       "version": "2.8.5",
       "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
@@ -3308,12 +5019,76 @@
         "vary": "^1"
       }
     },
+    "create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+        }
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
     "custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
       "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
       "dev": true
     },
+    "dash-ast": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz",
+      "integrity": "sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA=="
+    },
     "date-format": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz",
@@ -3335,6 +5110,11 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
+    "defined": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
+      "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q=="
+    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -3347,18 +5127,65 @@
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true
     },
+    "deps-sort": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz",
+      "integrity": "sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==",
+      "requires": {
+        "JSONStream": "^1.0.3",
+        "shasum-object": "^1.0.0",
+        "subarg": "^1.0.0",
+        "through2": "^2.0.0"
+      }
+    },
+    "des.js": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+      "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
     "destroy": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true
     },
+    "detective": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz",
+      "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==",
+      "requires": {
+        "acorn-node": "^1.8.2",
+        "defined": "^1.0.0",
+        "minimist": "^1.2.6"
+      }
+    },
     "di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
       "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
       "dev": true
     },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+        }
+      }
+    },
     "dom-serialize": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
@@ -3371,12 +5198,46 @@
         "void-elements": "^2.0.0"
       }
     },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
+    },
+    "duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+      "requires": {
+        "readable-stream": "^2.0.2"
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
       "dev": true
     },
+    "elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "requires": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+        }
+      }
+    },
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -3460,7 +5321,7 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true
     },
     "eventemitter3": {
@@ -3469,6 +5330,20 @@
       "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
       "dev": true
     },
+    "events": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-2.1.0.tgz",
+      "integrity": "sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg=="
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -3504,6 +5379,11 @@
         }
       }
     },
+    "fast-safe-stringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
+    },
     "fd-slicer": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
@@ -3544,9 +5424,9 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "dev": true
     },
     "form-data": {
@@ -3583,8 +5463,7 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
       "version": "2.3.2",
@@ -3596,8 +5475,7 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "gensync": {
       "version": "1.0.0-beta.1",
@@ -3605,6 +5483,11 @@
       "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
       "dev": true
     },
+    "get-assigned-identifiers": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz",
+      "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="
+    },
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -3615,7 +5498,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
       "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-      "dev": true,
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
@@ -3635,7 +5517,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
       "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -3670,7 +5551,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
       "requires": {
         "function-bind": "^1.1.1"
       }
@@ -3678,14 +5558,59 @@
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true
     },
     "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
+    },
+    "hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "requires": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        }
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
     },
     "html-escaper": {
       "version": "2.0.2",
@@ -3693,6 +5618,11 @@
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
+    "htmlescape": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
+      "integrity": "sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg=="
+    },
     "http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
@@ -3725,6 +5655,11 @@
         "requires-port": "^1.0.0"
       }
     },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="
+    },
     "https-proxy-agent": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
@@ -3761,11 +5696,15 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -3774,8 +5713,39 @@
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "inline-source-map": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz",
+      "integrity": "sha512-0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA==",
+      "requires": {
+        "source-map": "~0.5.3"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
+        }
+      }
+    },
+    "insert-module-globals": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz",
+      "integrity": "sha512-ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg==",
+      "requires": {
+        "acorn-node": "^1.5.2",
+        "combine-source-map": "^0.8.0",
+        "concat-stream": "^1.6.1",
+        "is-buffer": "^1.1.0",
+        "JSONStream": "^1.0.3",
+        "path-is-absolute": "^1.0.1",
+        "process": "~0.11.0",
+        "through2": "^2.0.0",
+        "undeclared-identifiers": "^1.1.2",
+        "xtend": "^4.0.0"
+      }
     },
     "ip-regex": {
       "version": "4.3.0",
@@ -3792,6 +5762,19 @@
         "binary-extensions": "^2.0.0"
       }
     },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "is-core-module": {
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -3842,6 +5825,11 @@
         "is-url": "^1.2.4"
       }
     },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+    },
     "isbinaryfile": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz",
@@ -3978,6 +5966,14 @@
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
+    "json-stable-stringify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
+      "integrity": "sha512-nKtD/Qxm7tWdZqJoldEC7fF0S41v0mWbeaXG3637stOWfyGxTgWTYE2wtfKmjzpvxv2MA2xzxsXOIiwUpkX6Qw==",
+      "requires": {
+        "jsonify": "~0.0.0"
+      }
+    },
     "json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
@@ -3994,6 +5990,25 @@
         "universalify": "^2.0.0"
       }
     },
+    "jsonify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+      "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg=="
+    },
+    "jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg=="
+    },
+    "JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "requires": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      }
+    },
     "karma": {
       "version": "6.3.17",
       "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.17.tgz",
@@ -4077,12 +6092,26 @@
       "integrity": "sha512-wRJ9I4az0QcsH7A4v4l0enUpkS++MBx0BnL/68KaLzJg7x1qmbjSlwEoCNol7KTYZ+pmtI7Eh2J0Nu6/2Z5J/Q==",
       "dev": true
     },
+    "labeled-stream-splicer": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz",
+      "integrity": "sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "stream-splicer": "^2.0.0"
+      }
+    },
     "lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
+    "lodash.memoize": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
+      "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A=="
+    },
     "log4js": {
       "version": "6.4.1",
       "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz",
@@ -4122,12 +6151,38 @@
         "semver": "^6.0.0"
       }
     },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
       "dev": true
     },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+        }
+      }
+    },
     "mime": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
@@ -4149,11 +6204,20 @@
         "mime-db": "1.51.0"
       }
     },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="
+    },
     "minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -4161,8 +6225,7 @@
     "minimist": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "mkdirp": {
       "version": "0.5.5",
@@ -4173,6 +6236,33 @@
         "minimist": "^1.2.5"
       }
     },
+    "mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+    },
+    "module-deps": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz",
+      "integrity": "sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==",
+      "requires": {
+        "browser-resolve": "^2.0.0",
+        "cached-path-relative": "^1.0.2",
+        "concat-stream": "~1.6.0",
+        "defined": "^1.0.0",
+        "detective": "^5.2.0",
+        "duplexer2": "^0.1.2",
+        "inherits": "^2.0.1",
+        "JSONStream": "^1.0.3",
+        "parents": "^1.0.0",
+        "readable-stream": "^2.0.2",
+        "resolve": "^1.4.0",
+        "stream-combiner2": "^1.1.1",
+        "subarg": "^1.0.0",
+        "through2": "^2.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
     "moment": {
       "version": "2.29.4",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
@@ -4215,14 +6305,12 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
     },
     "object-inspect": {
       "version": "1.12.2",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
     },
     "on-finished": {
       "version": "2.3.0",
@@ -4237,28 +6325,77 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "requires": {
         "wrappy": "1"
       }
     },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A=="
+    },
+    "pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+    },
+    "parents": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+      "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==",
+      "requires": {
+        "path-platform": "~0.11.15"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "requires": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "dev": true
     },
+    "path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="
+    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "path-platform": {
+      "version": "0.11.15",
+      "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
+      "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg=="
+    },
+    "pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
     },
     "pend": {
       "version": "1.2.0",
@@ -4278,12 +6415,42 @@
       "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
       "peer": true
     },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
     "proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
       "dev": true
     },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+        }
+      }
+    },
     "pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -4294,6 +6461,11 @@
         "once": "^1.3.1"
       }
     },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
+    },
     "qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
@@ -4304,11 +6476,32 @@
       "version": "6.11.0",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
       "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "dev": true,
       "requires": {
         "side-channel": "^1.0.4"
       }
     },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA=="
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
     "range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -4327,6 +6520,38 @@
         "unpipe": "1.0.0"
       }
     },
+    "read-only-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
+      "integrity": "sha512-3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w==",
+      "requires": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      },
+      "dependencies": {
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
     "readdirp": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
@@ -4349,12 +6574,13 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.0.tgz",
-      "integrity": "sha512-LarL/PIKJvc09k1jaeT4kQb/8/7P+qV4qSnN2K80AES+OHdfZELAKVOBjxsvtToT/uLOfFbvYvKfZmV8cee7nA==",
-      "dev": true,
+      "version": "1.22.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
       "requires": {
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       }
     },
     "rfdc": {
@@ -4372,17 +6598,24 @@
         "glob": "^7.1.3"
       }
     },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "semver": {
       "version": "6.3.1",
@@ -4396,17 +6629,52 @@
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shasum": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
+      "integrity": "sha512-UTzHm/+AzKfO9RgPgRpDIuMSNie1ubXRaljjlhFMNGYoG7z+rm9AHLPMf70R7887xboDH9Q+5YQbWKObFHEAtw==",
+      "requires": {
+        "json-stable-stringify": "~0.0.0",
+        "sha.js": "~2.4.4"
+      }
+    },
+    "shasum-object": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz",
+      "integrity": "sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==",
+      "requires": {
+        "fast-safe-stringify": "^2.0.7"
+      }
+    },
+    "shell-quote": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
+      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA=="
+    },
     "side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
         "object-inspect": "^1.9.0"
       }
     },
+    "simple-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+      "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
+    },
     "slickgrid": {
       "version": "2.4.34",
       "resolved": "https://registry.npmjs.org/slickgrid/-/slickgrid-2.4.34.tgz",
@@ -4495,6 +6763,56 @@
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
       "dev": true
     },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-combiner2": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
+      "integrity": "sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==",
+      "requires": {
+        "duplexer2": "~0.1.0",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-http": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz",
+      "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==",
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "xtend": "^4.0.2"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
+    "stream-splicer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz",
+      "integrity": "sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
     "streamroller": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.2.tgz",
@@ -4523,6 +6841,21 @@
         }
       }
     },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        }
+      }
+    },
     "string-width": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
@@ -4543,6 +6876,14 @@
         "ansi-regex": "^5.0.0"
       }
     },
+    "subarg": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+      "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==",
+      "requires": {
+        "minimist": "^1.1.0"
+      }
+    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -4552,6 +6893,19 @@
         "has-flag": "^3.0.0"
       }
     },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+    },
+    "syntax-error": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
+      "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==",
+      "requires": {
+        "acorn-node": "^1.2.0"
+      }
+    },
     "tcp-port-used": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz",
@@ -4579,6 +6933,28 @@
         }
       }
     },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "timers-browserify": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
+      "integrity": "sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==",
+      "requires": {
+        "process": "~0.11.0"
+      }
+    },
     "tmp": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
@@ -4609,6 +6985,11 @@
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true
     },
+    "tty-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
+      "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="
+    },
     "type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -4619,12 +7000,34 @@
         "mime-types": "~2.1.24"
       }
     },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
+    },
     "ua-parser-js": {
       "version": "0.7.33",
       "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz",
       "integrity": "sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==",
       "dev": true
     },
+    "umd": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz",
+      "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="
+    },
+    "undeclared-identifiers": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz",
+      "integrity": "sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==",
+      "requires": {
+        "acorn-node": "^1.3.0",
+        "dash-ast": "^1.0.0",
+        "get-assigned-identifiers": "^1.2.0",
+        "simple-concat": "^1.0.0",
+        "xtend": "^4.0.1"
+      }
+    },
     "universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -4637,6 +7040,35 @@
       "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
       "dev": true
     },
+    "url": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz",
+      "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==",
+      "requires": {
+        "punycode": "^1.4.1",
+        "qs": "^6.11.0"
+      }
+    },
+    "util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "requires": {
+        "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -4649,6 +7081,11 @@
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true
     },
+    "vm-browserify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
+    },
     "void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
@@ -4704,8 +7141,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
       "version": "8.11.0",
@@ -4714,6 +7150,11 @@
       "dev": true,
       "requires": {}
     },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+    },
     "y18n": {
       "version": "5.0.5",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
diff --git a/package.json b/package.json
index 8730fa501..9bb537fc8 100644
--- a/package.json
+++ b/package.json
@@ -7,11 +7,12 @@
   "private": true,
   "dependencies": {
     "bootstrap": "4.6",
-    "slickgrid": "^2.4.34"
+    "slickgrid": "^2.4.34",
+    "@atlasoflivingaustralia/ecodata-client-plugin": "6.2.0-pre.2023-08-22.f397d6f5"
   },
   "devDependencies": {
     "@metahub/karma-jasmine-jquery": "^2.0.1",
-    "chromedriver": "117.0.3",
+    "chromedriver": "121.0.0",
     "jasmine-core": "^3.5.0",
     "jasmine-jquery": "^2.0.0",
     "jquery": "3.6.2",
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/AdminSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/AdminSpec.groovy
index c1529017f..7329f2aca 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/AdminSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/AdminSpec.groovy
@@ -4,6 +4,7 @@ import au.org.ala.merit.SettingPageType
 import com.icegreen.greenmail.util.GreenMail
 import pages.AdminReportsPage
 import pages.MERITAdministrationPage
+import pages.Reef2050PlanActionDownloadReport
 import spock.lang.Shared
 
 import javax.mail.internet.MimeMessage
@@ -71,7 +72,7 @@ class AdminSpec extends StubbedCasSpec {
     def "Admin Reports"() {
         setup:
         login([userId:'1', role:"ROLE_ADMIN", email:'fc-admin@nowhere.com', firstName: "ALA", lastName:'Admin'], browser)
-        String fromDate = "10/10/2020"
+        String fromDate = "10/01/2020"
         String toDate = "10/10/2021"
 
         when:
@@ -105,8 +106,67 @@ class AdminSpec extends StubbedCasSpec {
         waitFor 20, {
             MimeMessage[] messages = greenMail.getReceivedMessages()
             messages?.length == 2
-            messages[0].getSubject() == "Your download is ready"
+            messages[1].getSubject() == "Your download is ready"
+        }
+
+        when:"I clicked the Organisation Activities Report button"
+        downloadOrgReport(fromDate, toDate)
+        okBootbox()
+
+        then:
+        waitFor 20, {
+            MimeMessage[] messages = greenMail.getReceivedMessages()
+            messages?.length == 3
+            messages[2].getSubject() == "Your download is ready"
+        }
+
+        when:"I clicked the Organisation Report Status button"
+        downloadOrgReportSummary(fromDate, toDate)
+        okBootbox()
+
+        then:
+        waitFor 20, {
+            MimeMessage[] messages = greenMail.getReceivedMessages()
+            messages?.length == 4
+            messages[3].getSubject() == "Your download is ready"
         }
 
     }
+
+
+    def "a PDF can be generated for Reef 2050 Plan Action Report"() {
+        setup:
+        loginAsMeritAdmin(browser)
+        String fromDate = "10/10/2020"
+        String toDate = "10/10/2021"
+
+        when:
+        to MERITAdministrationPage
+
+        then:
+        at MERITAdministrationPage
+
+        when:
+        administration.administratorReport.click()
+
+        then:
+        waitFor {at AdminReportsPage}
+
+        when:"generates PDF"
+        generateReef2050Pdf()
+
+        then:
+        withWindow("reef2050PlanActionReport", {
+            at Reef2050PlanActionDownloadReport
+            waitFor {
+                printInstructions.displayed
+            }
+            closePrintInstructions()
+            waitFor {
+                !printInstructions.displayed
+            }
+        })
+
+    }
+
 }
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/ConfigurableMeriPlanSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/ConfigurableMeriPlanSpec.groovy
index 71e39e0f3..a75e0d2ac 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/ConfigurableMeriPlanSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/ConfigurableMeriPlanSpec.groovy
@@ -45,6 +45,13 @@ class ConfigurableMeriPlanSpec extends StubbedCasSpec {
         when:
         to RlpProjectPage, projectId
         def meriPlan = openMeriPlanEditTab()
+        meriPlan.aquireEditLock()
+        waitFor {
+            hasBeenReloaded()
+        }
+        at RlpProjectPage // reset at check time.
+
+        meriPlan = openMeriPlanEditTab()
 
         meriPlan.projectName = "MERI plan edited name"
         meriPlan.projectDescription = "MERI plan edited description"
@@ -99,12 +106,13 @@ class ConfigurableMeriPlanSpec extends StubbedCasSpec {
         }
 
         when:
+        meriPlan.keyThreats[0].relatedOutcomes = ['ST1']
         meriPlan.keyThreats[0].threatCode = 'Key threat 2'
         meriPlan.keyThreats[0].threat = "Threat 1"
         meriPlan.keyThreats[0].intervention = "Intervention 1"
+
         meriPlan.keyThreats[0].targetMeasures = ['score_42']
         meriPlan.keyThreats[0].evidence = "Evidence 1"
-        meriPlan.keyThreats[0].relatedOutcomes = ['ST1']
         meriPlan.projectMethodology = "Project assumptions 1"
 
         meriPlan.projectPartnerships[0].name = 'partner name'
@@ -114,7 +122,7 @@ class ConfigurableMeriPlanSpec extends StubbedCasSpec {
         then:
         waitFor {
             meriPlan.extendedBaseline.projectBaselines[0].outcome.find('option').collect{it.value()} == ["", "MT1", "MT2", "ST1"]
-            meriPlan.extendedBaseline.projectBaselines[0].methodProtocols.find('option').collect{it.value()} == ["", "Category 1", "Category 2", "Category 3", "Other"]
+            meriPlan.extendedBaseline.projectBaselines[0].methodProtocols.find('option').collect{it.value()} == ["", "Category 1", "Category 3", "Other"]
             meriPlan.extendedBaseline.projectBaselines[0].targetMeasures.module(FormElement).disabled
             meriPlan.extendedBaseline.projectBaselines[0].methodProtocols.module(FormElement).disabled
             meriPlan.extendedBaseline.projectBaselines[0].evidence.module(FormElement).disabled
@@ -450,6 +458,13 @@ class ConfigurableMeriPlanSpec extends StubbedCasSpec {
         meriPlan.availableObjectives() == ['objective 1', 'objective 2', 'objective 3']
 
         when:
+        meriPlan.aquireEditLock()
+        waitFor {
+            hasBeenReloaded()
+        }
+        at RlpProjectPage // reset at check time.
+
+        meriPlan = openMeriPlanEditTab()
         meriPlan.checkObjective("objective 2")
         meriPlan.monitoringIndicators[0].indicator = "indicator 1"
         meriPlan.monitoringIndicators[0].approach = "approach 1"
@@ -538,6 +553,13 @@ class ConfigurableMeriPlanSpec extends StubbedCasSpec {
         meriPlan.availableObjectives() == ['objective 1', 'objective 2', 'objective 3', 'Other']
 
         when:
+        meriPlan.aquireEditLock()
+        waitFor {
+            hasBeenReloaded()
+        }
+        at RlpProjectPage // reset at check time.
+
+        meriPlan = openMeriPlanEditTab()
         meriPlan.assets[0].description = "asset 1"
         meriPlan.checkObjective("objective 2")
         waitFor {
@@ -683,6 +705,13 @@ class ConfigurableMeriPlanSpec extends StubbedCasSpec {
 
 
         when:
+        meriPlan.aquireEditLock()
+        waitFor {
+            hasBeenReloaded()
+        }
+        at RlpProjectPage // reset at check time.
+
+        meriPlan = openMeriPlanEditTab()
         meriPlan.assets[0].description = "asset 1"
         meriPlan.shortTermOutcomes[0].outcome.value("outcome 1")
         waitFor {
@@ -738,6 +767,13 @@ class ConfigurableMeriPlanSpec extends StubbedCasSpec {
 
         when:
         def meriPlan = openMeriPlanEditTab()
+        meriPlan.aquireEditLock()
+        waitFor {
+            hasBeenReloaded()
+        }
+        at RlpProjectPage // reset at check time.
+
+        meriPlan = openMeriPlanEditTab()
 
         meriPlan.primaryOutcome = "By 2023, there is restoration of, and reduction in threats to, the ecological character of Ramsar sites, through the implementation of priority actions"
         waitFor {
@@ -814,6 +850,13 @@ class ConfigurableMeriPlanSpec extends StubbedCasSpec {
 
         when:
         def meriPlan = openMeriPlanEditTab()
+        meriPlan.aquireEditLock()
+        waitFor {
+            hasBeenReloaded()
+        }
+        at RlpProjectPage // reset at check time.
+
+        meriPlan = openMeriPlanEditTab()
 
         meriPlan.primaryOutcome = "By 2023, there is restoration of, and reduction in threats to, the ecological character of Ramsar sites, through the implementation of priority actions"
         waitFor {
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/DatasetSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/DatasetSpec.groovy
index 2d7b496fa..8e53ea1e0 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/DatasetSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/DatasetSpec.groovy
@@ -1,5 +1,6 @@
 package au.org.ala.fieldcapture
 
+import geb.module.FormElement
 import pages.DatasetPage
 import pages.RlpProjectPage
 import spock.lang.Stepwise
@@ -33,10 +34,14 @@ class DatasetSpec extends StubbedCasSpec{
         def dataSet = datasetContent
         dataSet.title = "Title"
         dataSet.programOutcome = "5. By 2023, there is an increase in the awareness and adoption of land management practices that improve and protect the condition of soil, biodiversity and vegetation."
-        dataSet.investmentPriorities = ["Soil acidification", "Other"]
-        dataSet.otherInvestmentPriority = "Other Priority"
-        dataSet.term = "Short-term outcome statement"
+        dataSet.investmentPriorities = ["Soil acidification"]
         dataSet.type = "Baseline dataset associated with a project outcome"
+        dataSet.protocol = "other"
+
+        then:
+        waitFor {dataSet.measurementTypes.module(FormElement).enabled}
+
+        when:
         dataSet.measurementTypes = ["Soil erosion"]
         dataSet.methods = ["Genetic sampling", "Area sampling"]
         dataSet.methodDescription = "Method description"
@@ -46,15 +51,9 @@ class DatasetSpec extends StubbedCasSpec{
         dataSet.endDate ="21-01-2022"
         dataSet.addition = "Yes"
         dataSet.threatenedSpeciesIndex = "Yes"
-        dataSet.collectorType = "University researcher"
-        dataSet.qa = "Yes"
-        dataSet.published = "Yes"
-        dataSet.storageType = "Aurion"
         dataSet.publicationUrl = "url"
         dataSet.format = "JSON"
         dataSet.sensitivities =["Commercially sensitive", "Ecologically sensitive"]
-        dataSet.dataOwner = "data owner"
-        dataSet.custodian = "custodian"
 
         dataSet.createButton.click()
 
@@ -96,12 +95,11 @@ class DatasetSpec extends StubbedCasSpec{
         def set = datasetContent
         set.title == "Title"
         set.programOutcome == "5. By 2023, there is an increase in the awareness and adoption of land management practices that improve and protect the condition of soil, biodiversity and vegetation."
-        set.investmentPriorities == ["Soil acidification", "Other"]
-        set.otherInvestmentPriority == "Other Priority"
-        set.term == "Short-term outcome statement"
+        set.investmentPriorities == ["Soil acidification"]
+        set.protocol == "other"
         set.type == "Baseline dataset associated with a project outcome"
         set.measurementTypes == ["Soil erosion"]
-        set.methods == ["Genetic sampling", "Area sampling"]
+        set.methods == ["Area sampling", "Genetic sampling"]
         set.methodDescription == "Method description"
         set.collectionApp == "Collection App"
         set.location == "Location"
@@ -109,17 +107,10 @@ class DatasetSpec extends StubbedCasSpec{
         set.endDate =="21-01-2022"
         set.addition == "Yes"
         set.threatenedSpeciesIndex == "Yes"
-        set.collectorType == "University researcher"
-        set.qa == "Yes"
-        set.published == "Yes"
-        set.storageType == "Aurion"
-        set.publicationUrl == "url"
         set.format == "JSON"
         set.sensitivities ==["Commercially sensitive", "Ecologically sensitive"]
-        set.dataOwner == "data owner"
-        set.custodian == "custodian"
-        set.dataCollectionOngoing.size() == 1
-        set.dataCollectionOngoingChecked.size() == 0
+        !set.dataCollectionOngoing.checked
+
 
         when:
         cancel()
@@ -136,8 +127,12 @@ class DatasetSpec extends StubbedCasSpec{
         waitFor 10, {
             hasBeenReloaded()
         }
+        when:
+        def dataSetSummary = openDataSetSummaryTab()
+
+        then:
         waitFor 10, {
-           $('#project-data-sets tbody[data-bind*=dataSets] tr').size() == 0
+           dataSetSummary.dataSetSummaryCount() == 0
         }
 
     }
@@ -175,8 +170,7 @@ class DatasetSpec extends StubbedCasSpec{
 
         def set = datasetContent
         set.title == "Title"
-        set.dataCollectionOngoing.size() == 1
-        set.dataCollectionOngoingChecked.size() == 0
+        !set.dataCollectionOngoing.checked
 
         when:
         set.markCompleted.click()
@@ -190,32 +184,32 @@ class DatasetSpec extends StubbedCasSpec{
         when:
         set.title = "Title"
         set.programOutcome = "5. By 2023, there is an increase in the awareness and adoption of land management practices that improve and protect the condition of soil, biodiversity and vegetation."
-        set.investmentPriorities = ["Soil acidification", "Other"]
-        set.otherInvestmentPriority = "Other Priority"
+        set.investmentPriorities = ["Soil acidification"]
         set.type = "Baseline dataset associated with a project outcome"
-        set.measurementTypes = ["Soil erosion"]
-        set.methods = ["Genetic sampling", "Area sampling"]
-        set.methodDescription = "Method description"
+        set.baselines = ['b1']
+        set.protocol = 'guid-1'
         set.collectionApp = "Collection App"
         set.location = "Location"
         set.startDate ="21-01-2021"
         set.endDate ="21-01-2022"
         set.addition = "Yes"
         set.threatenedSpeciesIndex = "Yes"
-        set.collectorType = "University researcher"
-        set.qa = "Yes"
-        set.published = "Yes"
-        set.storageType = "Aurion"
-        set.publicationUrl = "url"
         set.format = "JSON"
         set.sensitivities =["Commercially sensitive", "Ecologically sensitive"]
-        set.dataOwner = "data owner"
-        set.custodian = "custodian"
+        set.threatenedSpeciesDateOfUpload = '21-01-2021'
+        set.dataSetSize = '200'
+        set.publicationUrl = "https://www.ala.org.au"
 
         set.createButton.click()
 
         then:
-        waitFor { at RlpProjectPage }
+        waitFor {
+            // This test is failing sometimes on actions due to what seems to be a validation error - trying to track it down.
+            println js.exec("return \$('div.formError')")
+            println js.exec("return \$('div.formError').next()")?.collect{[it.getAttribute('name'), it.getAttribute('id'), it.getAttribute('data-bind'), it.value()]}
+
+            at RlpProjectPage
+        }
         waitFor {$("#project-data-sets .fa-edit").displayed}
         $('[data-bind*="text: progress"]').displayed
         $('[data-bind*="text: progress"]').text() == "finished"
@@ -238,6 +232,13 @@ class DatasetSpec extends StubbedCasSpec{
         when: "We update and save the MERI plan"
         openMERIPlanTab()
         def meriPlan = openMeriPlanEditTab()
+        meriPlan.aquireEditLock()
+        waitFor {
+            hasBeenReloaded()
+        }
+        at RlpProjectPage // reset at check time.
+
+        meriPlan = openMeriPlanEditTab()
         meriPlan.save()
 
         and: "We reload the page and reopen the data set summary tab"
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/ESPProjectSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/ESPProjectSpec.groovy
index cca1fe559..92e364eef 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/ESPProjectSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/ESPProjectSpec.groovy
@@ -63,7 +63,7 @@ class ESPProjectSpec extends StubbedCasSpec {
             waitFor {
                 !printInstructions.displayed
             }
-            groundCoverPercentage.text() == "60"
+            groundCoverPercentage*.text().contains("60")
         })
     }
 }
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/FutureDroughtFundMERIPlanSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/FutureDroughtFundMERIPlanSpec.groovy
index a37580929..554ba6c0a 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/FutureDroughtFundMERIPlanSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/FutureDroughtFundMERIPlanSpec.groovy
@@ -25,6 +25,13 @@ class FutureDroughtFundMERIPlanSpec extends StubbedCasSpec {
 
         when:
         def meriPlan = openMeriPlanEditTab()
+        meriPlan.aquireEditLock()
+        waitFor {
+            hasBeenReloaded()
+        }
+        at RlpProjectPage // reset at check time.
+
+        meriPlan = openMeriPlanEditTab()
 
         meriPlan.primaryOutcome = "5. By 2023, there is an increase in the awareness and adoption of land management practices that improve and protect the condition of soil, biodiversity and vegetation."
         meriPlan.primaryPriorityUnstyled[0].click()
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/HomeIndexPageSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/HomeIndexPageSpec.groovy
index 7a08b5db1..69a799465 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/HomeIndexPageSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/HomeIndexPageSpec.groovy
@@ -15,18 +15,15 @@ class HomeIndexPageSpec extends StubbedCasSpec {
 
     def "Display total number of projects and scores Ha in the homepage"(){
 
-        setup:
+        setup: "Clear the home page statistics cache to ensure they are calculated using the dataset used by this test"
         loginAsAlaAdmin(browser)
-
-        when:
         to AdminTools
         clearMetadata()
         reindex()
+        // Give the re-index time to finish before proceeding
+        Thread.sleep(30000)
         to AdminClearCachePage
-
-        then:
-        waitFor {$("#homePageStatistics").displayed}
-        $("#homePageStatistics").click()
+        clearHomePageStatistics()
         waitFor{hasBeenReloaded()}
 
         when:
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/MERIPlanForBushfireNRMandStateSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/MERIPlanForBushfireNRMandStateSpec.groovy
index d565d5894..59ae40488 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/MERIPlanForBushfireNRMandStateSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/MERIPlanForBushfireNRMandStateSpec.groovy
@@ -42,6 +42,13 @@ class MERIPlanForBushfireNRMandStateSpec extends StubbedCasSpec {
 
         when:
         def meriPlan = openMeriPlanEditTab()
+        meriPlan.aquireEditLock()
+        waitFor {
+            hasBeenReloaded()
+        }
+        at RlpProjectPage // reset at check time.
+
+        meriPlan = openMeriPlanEditTab()
 
         waitFor {
             meriPlan.asset.find('[value="Euastacus jagara (Freshwater crayfish)"')
@@ -163,6 +170,13 @@ class MERIPlanForBushfireNRMandStateSpec extends StubbedCasSpec {
 
         when:
         def meriPlan = openMeriPlanEditTab()
+        meriPlan.aquireEditLock()
+        waitFor {
+            hasBeenReloaded()
+        }
+        at RlpProjectPage // reset at check time.
+
+        meriPlan = openMeriPlanEditTab()
 
         meriPlan.primaryOutcome = "2. By 2023, the trajectory of species targeted under the Threatened Species Strategy, and other EPBC Act priority species, is stabilised or improved."
         meriPlan.secondaryOutcomes[0].outcome = "2. By 2023, the trajectory of species targeted under the Threatened Species Strategy, and other EPBC Act priority species, is stabilised or improved."
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/ManagementUnitReportingSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/ManagementUnitReportingSpec.groovy
index fbf6c2831..b47134c4e 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/ManagementUnitReportingSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/ManagementUnitReportingSpec.groovy
@@ -2,6 +2,8 @@ package au.org.ala.fieldcapture
 
 import com.icegreen.greenmail.util.GreenMail
 import com.icegreen.greenmail.util.GreenMailUtil
+import pages.DownloadReport
+import pages.ManagementUnitDownloadReport
 import pages.ManagementUnitPage
 import pages.ReportPage
 import pages.ViewReportPage
@@ -223,4 +225,28 @@ class ManagementUnitReportingSpec extends StubbedCasSpec {
         reportsTabPane.reports[1].notRequired()
 
     }
+
+
+    def "A PDF can be generated from report tab"() {
+        setup:
+        String managementUnitId = 'test_mu'
+        loginAsUser('1', browser)
+
+        when: "Display the reporting tab and download the first report"
+        to ManagementUnitPage, managementUnitId
+        displayReportsTab()
+        reportsTabPane.reports[0].downloadReport()
+
+        then:
+        withWindow("print-report", {
+            at ManagementUnitDownloadReport
+            waitFor {
+                printInstructions.displayed
+            }
+            closePrintInstructions()
+            waitFor {
+                !printInstructions.displayed
+            }
+        })
+    }
 }
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/MeriPlanSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/MeriPlanSpec.groovy
index 65d293afc..e86004a90 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/MeriPlanSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/MeriPlanSpec.groovy
@@ -64,6 +64,14 @@ class MeriPlanSpec extends StubbedCasSpec {
         meriPlan != null
 
         when:
+        meriPlan.aquireEditLock()
+        waitFor {
+            hasBeenReloaded()
+        }
+        at RlpProjectPage // reset at check time.
+
+        meriPlan = openMeriPlanEditTab()
+
         meriPlan.primaryOutcome = "By 2023, there is restoration of, and reduction in threats to, the ecological character of Ramsar sites, through the implementation of priority actions"
         waitFor {
             meriPlan.primaryPriority.find('[value="Ginini Flats Wetland Complex"')
@@ -235,6 +243,13 @@ class MeriPlanSpec extends StubbedCasSpec {
 
         when:
         def meriPlan = openMeriPlanEditTab()
+        meriPlan.aquireEditLock()
+        waitFor {
+            hasBeenReloaded()
+        }
+        at RlpProjectPage // reset at check time.
+
+        meriPlan = openMeriPlanEditTab()
 
         then: "The primary outcome will default to the program default"
         waitFor {
@@ -590,12 +605,38 @@ class MeriPlanSpec extends StubbedCasSpec {
 
         then:
         openMeriPlan.meriPlanHistory.size() == 1
-        waitFor { openMeriPlan.meriPlanHistory.open[0].click() }
+        waitFor { $(".fa-external-link").displayed }
+
+        when:"Open a history of the approved meri plan"
+        waitFor { $(".fa-external-link").click() }
+
+        and:"View meri plan comparison"
+        waitFor { $(".fa-code-fork").click() }
 
-        when:
-        overviewTab.click()
 
         then:
+        overviewTab.click()
+
+        and:
         overview.projectStatus[1].text() == 'ACTIVE'
     }
+
+    def "Compare current MERI Plan with the latest approved MERI plan"() {
+        setup:
+        String projectId = 'meri1'
+        loginAsUser('1', browser)
+
+        when:
+        to RlpProjectPage, projectId
+
+        then:
+        waitFor { at RlpProjectPage }
+
+        when:
+        def editableMeriPlan = openMeriPlanEditTab()
+        editableMeriPlan.compareMeriPlanChanges()
+
+        then:
+        overviewTab.click()
+    }
 }
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/OrganisationReportingSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/OrganisationReportingSpec.groovy
index 55823f3d6..e4185fd25 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/OrganisationReportingSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/OrganisationReportingSpec.groovy
@@ -5,6 +5,7 @@ import com.icegreen.greenmail.util.GreenMailUtil
 import geb.module.FormElement
 import pages.AdminTools
 import pages.Organisation
+import pages.OrganisationDownloadReport
 import pages.ReportPage
 import pages.ViewReportPage
 import spock.lang.Shared
@@ -80,6 +81,7 @@ class OrganisationReportingSpec extends StubbedCasSpec {
         waitFor 20,{
             hasBeenReloaded()
         }
+        at Organisation // Need to reset the at check time for subsequent "hasBeenReloaded"
 
         when:
         openAdminTab()
@@ -94,7 +96,7 @@ class OrganisationReportingSpec extends StubbedCasSpec {
         reportingSection.generateReports()
 
         then:
-        waitFor 20,{
+        waitFor 60,{
             hasBeenReloaded()
         }
 
@@ -198,6 +200,36 @@ class OrganisationReportingSpec extends StubbedCasSpec {
 
     }
 
+    def "A PDF can be generated from report tab"() {
+        setup:
+        loginAsReadOnlyUser(browser)
+
+        when:
+        to Organisation, orgId
+
+        waitFor {
+            reportingTab.click()
+        }
+
+        then:
+        waitFor { reportsTabPane.displayed }
+
+        when:
+        reportsTabPane.reports[0].downloadReport()
+
+        then:
+        withWindow("print-report", {
+            at OrganisationDownloadReport
+            waitFor {
+                printInstructions.displayed
+            }
+            closePrintInstructions()
+            waitFor {
+                !printInstructions.displayed
+            }
+        })
+    }
+
     def "A user with the grant manager role can approve and return reports"() {
         setup:
         loginAsGrantManager(browser)
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/OriginalMeriPlanSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/OriginalMeriPlanSpec.groovy
index 4ca5806e1..4b1c17b4c 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/OriginalMeriPlanSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/OriginalMeriPlanSpec.groovy
@@ -26,6 +26,13 @@ class OriginalMeriPlanSpec extends StubbedCasSpec {
 
         when:
         def meriPlan = openMeriPlanEditTab()
+        meriPlan.aquireEditLock()
+        waitFor {
+            hasBeenReloaded()
+        }
+        at RlpProjectPage // reset at check time.
+
+        meriPlan = openMeriPlanEditTab()
 
         then:
         meriPlan != null
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/ParatooIntegrationSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/ParatooIntegrationSpec.groovy
new file mode 100644
index 000000000..df2842430
--- /dev/null
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/ParatooIntegrationSpec.groovy
@@ -0,0 +1,131 @@
+package au.org.ala.fieldcapture
+
+import au.org.ala.ws.service.WebService
+import org.apache.http.entity.ContentType
+import org.grails.testing.GrailsUnitTest
+import org.apache.http.HttpStatus
+import spock.lang.Stepwise
+import pages.RlpProjectPage
+
+@Stepwise
+// We need GrailsUnitTest because the WebService class has a dependency on grailsApplication.config
+// It slows startup down quite a bit though
+class ParatooIntegrationSpec extends StubbedCasSpec implements GrailsUnitTest {
+
+    WebService webService
+
+    def setupSpec() {
+        useDataSet("dataset3")
+    }
+
+    def cleanupSpec() {
+        logout(browser)
+    }
+
+    def setup() {
+        webService = new WebService(grailsApplication: getGrailsApplication())
+    }
+
+
+    def "Add new data set in to project"() {
+
+        setup:
+        String token = tokenForUser('1')
+        Map plotSelectionsPayload = [
+
+                "data": [
+                        "plot_name"                 : [
+                                "state"        : "CT",
+                                "program"      : "NLP",
+                                "bioregion"    : "ARC",
+                                "unique_digits": "6060"
+                        ],
+                        "plot_label"                : "string",
+                        "recommended_location"      : [
+                                "lat": 0,
+                                "lng": 0
+                        ],
+                        "recommended_location_point": "C",
+                        "uuid"                      : "string",
+                        "comment"                   : "string",
+                        "createdBy"                 : 0,
+                        "updatedBy"                 : 0
+                ]
+
+        ]
+        Map mintCollectionIdPayload = [
+
+                surveyId: [
+                        projectId : 'monitorProject',
+                        protocol  : [
+                                id     : "guid-1", // Protocol 23 used to obtain representative data for this functional test
+                                version: 1
+                        ],
+                        surveyType: 'soil-pit-characterisation-full',
+                        time      : '2023-08-28T00:34:13.100Z',
+                        uuid   : "123-123-123-123-123"
+                ]
+        ]
+        Map collectionPayload = [
+                projectId: 'monitorProject',
+                protocol : [
+                        id     : "guid-1",
+                        version: 1
+                ],
+                userId   : '1',
+                eventTime: '2023-08-28T00:28:15.272Z'
+        ]
+
+        when:
+        String url = testConfig.ecodata.baseUrl + 'paratoo/plot-selections'
+        Map headers = ["Authorization": "Bearer ${token}"]
+        Map resp = webService.post(url, plotSelectionsPayload, null, ContentType.APPLICATION_JSON, false, false, headers)
+
+        then:
+        resp.statusCode == HttpStatus.SC_OK
+
+        when:
+        url = testConfig.ecodata.baseUrl + 'paratoo/mintCollectionId'
+        headers = ["Authorization": "Bearer ${token}"]
+        resp = webService.post(url, mintCollectionIdPayload, null, ContentType.APPLICATION_JSON, false, false, headers)
+
+        String orgMintedIdentifier = resp.resp.orgMintedIdentifier
+
+        then:
+        resp.statusCode == HttpStatus.SC_OK
+
+        orgMintedIdentifier != null
+
+        when:
+        url = testConfig.ecodata.baseUrl + 'paratoo/pdp/monitorProject/guid-1/write'
+
+        headers = ["Authorization": "Bearer ${token}"]
+        resp = webService.get(url, null, ContentType.APPLICATION_JSON, false, false, headers)
+
+        then:
+        resp.statusCode == HttpStatus.SC_OK
+        resp.resp.isAuthorised == true
+
+        when:
+        collectionPayload.orgMintedIdentifier = orgMintedIdentifier
+        url = testConfig.ecodata.baseUrl + '/paratoo/collection'
+        resp = webService.post(url, collectionPayload, null, ContentType.APPLICATION_JSON, false, false, headers)
+
+        then:
+        resp.statusCode == HttpStatus.SC_OK
+        resp.resp.success == true
+
+
+    }
+
+
+    def "Data from monitor will be used to create a data set summary in MERIT"() {
+        when: "We view the created data set in the project"
+        loginAsUser('1', browser)
+        to RlpProjectPage, "monitorProject"
+        openDataSetSummaryTab()
+
+        then: "The data set is displayed"
+        datasetDetails.dataSetSummaryCount() == 1
+    }
+}
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectExplorerMapTabSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectExplorerMapTabSpec.groovy
index bc35ecf0c..425067327 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectExplorerMapTabSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectExplorerMapTabSpec.groovy
@@ -2,6 +2,7 @@ package au.org.ala.fieldcapture
 
 import pages.AdminTools
 import pages.ProjectExplorer
+import spock.lang.Ignore
 
 class ProjectExplorerMapTabSpec extends StubbedCasSpec {
 
@@ -9,6 +10,8 @@ class ProjectExplorerMapTabSpec extends StubbedCasSpec {
         useDataSet("dataset_project_sites")
     }
 
+    @Ignore
+    // Temporarily ignoring this test as it seems that google maps is not loading
     void "The project explorer displays a list of projects"() {
 
         setup:"Reindex to ensure the project explorer will have predictable data"
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectExplorerSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectExplorerSpec.groovy
index 13a810d38..6da8fb0c1 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectExplorerSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectExplorerSpec.groovy
@@ -24,14 +24,11 @@ class ProjectExplorerSpec extends StubbedCasSpec {
         expectedProjects.add("Grants project")
         expectedProjects.add("project application")
 
-        when:
-        to AdminTools
-
-        then:
-        at AdminTools
 
         when: "Reindex to ensure the project explorer will have predictable data"
+        to AdminTools
         reindex()
+
         and: "Logout so the rest of the test is run as an unauthenticated user"
         logout(browser)
         to ProjectExplorer
@@ -75,7 +72,7 @@ class ProjectExplorerSpec extends StubbedCasSpec {
 
         then:
         waitFor { hasBeenReloaded() }
-        projects.size() == 1
+        waitFor { projects.size() == 1 }
 
         when: "We expand the project to view the details"
         projects[0].toggle()
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectIndexSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectIndexSpec.groovy
index 47b9d1e3d..13bb608cc 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectIndexSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectIndexSpec.groovy
@@ -62,9 +62,10 @@ class ProjectIndexSpec extends StubbedCasSpec {
         waitFor 10, {hasBeenReloaded()}
         at ProjectIndex // Do another at check or the next call to "hasBeenReloaded" will return regardless of whether the page has been reloaded again.
 
-        waitFor {admin.documents.documentSummaryList().size() == 2}
-        admin.documents.documentSummaryList().size() == 2
-        admin.documents.documentSummaryList()[1].name == 'test 2'
+        waitFor {
+            admin.documents.documentSummaryList().size() == 2
+            admin.documents.documentSummaryList()[1].name == 'test 2'
+        }
 
         when:
         admin.documents.documentSummaryList()[1].deleteButton.click()
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectSiteSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectSiteSpec.groovy
index 45dc4bd97..af0cf0305 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectSiteSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/ProjectSiteSpec.groovy
@@ -3,6 +3,7 @@ package au.org.ala.fieldcapture
 import pages.EditSitePage
 import pages.ProjectIndex
 import pages.SiteIndexPage
+import spock.lang.Ignore
 
 class ProjectSiteSpec extends StubbedCasSpec {
 
@@ -36,6 +37,8 @@ class ProjectSiteSpec extends StubbedCasSpec {
 
     }
 
+    @Ignore
+    // Spatial portal test is timing out site intersection so this test is failing
     def "Edit and Update site name and save successfully" (){
 
         setup:
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/ReportActivityFilteringSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/ReportActivityFilteringSpec.groovy
index 1b0fa2c89..3fba2474d 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/ReportActivityFilteringSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/ReportActivityFilteringSpec.groovy
@@ -114,6 +114,23 @@ class ReportActivityFilteringSpec extends StubbedCasSpec {
 
         waitFor { at RlpProjectPage }
         def meriPlan = openMeriPlanEditTab()
+        meriPlan.aquireEditLock()
+
+        then:
+        waitFor {
+            hasBeenReloaded()
+        }
+
+        when:
+        meriPlan = openMeriPlanEditTab()
+
+        then:
+        // The page will reload and we look for the banner confirming the user holds the lock to proceed
+        waitFor {
+            meriPlan.holdsEditLock()
+        }
+
+        when:
         meriPlan.checkActivity('activity 2')
         meriPlan.save()
 
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/ReportServiceFilteringSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/ReportServiceFilteringSpec.groovy
index 64af03367..a5a7fbc49 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/ReportServiceFilteringSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/ReportServiceFilteringSpec.groovy
@@ -27,15 +27,12 @@ class ReportServiceFilteringSpec extends StubbedCasSpec {
 
         when:
         to AdminTools
-
-        then:
-        at AdminTools
-
-        when:
         clearCache()
+        to AdminClearCachePage
+        clearServiceListCache()
 
         then:
-        waitFor 5, { to AdminClearCachePage }
+        waitFor { at AdminClearCachePage }
     }
 
     def "the reports can be regenerated by an FC_ADMIN"() {
@@ -122,6 +119,13 @@ class ReportServiceFilteringSpec extends StubbedCasSpec {
 
         waitFor { at RlpProjectPage }
         def meriPlan = openMeriPlanEditTab()
+        meriPlan.aquireEditLock()
+        waitFor {
+            hasBeenReloaded()
+        }
+        at RlpProjectPage // reset at check time.
+
+        meriPlan = openMeriPlanEditTab()
         meriPlan.projectServices[0].selectService("Communication materials")
         meriPlan.projectServices[0].selectScore("Number of communication materials published")
         meriPlan.projectServices[0].targets = "5"
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/RlpReportingSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/RlpReportingSpec.groovy
index 8e6a9c094..ba4b178a8 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/RlpReportingSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/RlpReportingSpec.groovy
@@ -2,6 +2,7 @@ package au.org.ala.fieldcapture
 
 import com.icegreen.greenmail.util.GreenMail
 import com.icegreen.greenmail.util.GreenMailUtil
+import pages.ProjectDownloadReport
 import pages.ProjectIndex
 import pages.RlpProjectPage
 import pages.ReportPage
@@ -236,6 +237,40 @@ class RlpReportingSpec extends StubbedCasSpec {
         !projectReports.reports[0].notRequired()
     }
 
+    def "A PDF can be genreated from report tab"() {
+        setup:
+        String projectId = '1'
+        loginAsUser('1', browser)
+
+        when:
+        to RlpProjectPage, projectId
+
+        then:
+        waitFor { at RlpProjectPage }
+
+        when:
+        reportingTab.click()
+
+        then:
+        waitFor { projectReports.displayed }
+
+        when:
+        projectReports.reports[0].downloadReport()
+
+        then:
+        withWindow("print-report", {
+            at ProjectDownloadReport
+            waitFor {
+                printInstructions.displayed
+            }
+            closePrintInstructions()
+            waitFor {
+                !printInstructions.displayed
+            }
+        })
+
+    }
+
     def "A project admin can submit the report"() {
         setup:
         String projectId = '1'
@@ -570,6 +605,7 @@ class RlpReportingSpec extends StubbedCasSpec {
 
         then:
         waitFor 30, { hasBeenReloaded() }
+        at ProjectIndex // Reset at check time and check correct page has been reloaded.
 
         and: "List of reports will be displayed"
         waitFor {
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/SiteUploadSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/SiteUploadSpec.groovy
index e41024ed4..28b7683e6 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/SiteUploadSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/SiteUploadSpec.groovy
@@ -3,6 +3,7 @@ package au.org.ala.fieldcapture
 
 import pages.RlpProjectPage
 import pages.SiteUpload
+import spock.lang.Ignore
 
 class SiteUploadSpec extends StubbedCasSpec {
 
@@ -10,6 +11,8 @@ class SiteUploadSpec extends StubbedCasSpec {
         useDataSet('dataset2')
     }
 
+    @Ignore
+    // Temporarily ignore this test as spatial-test is having issues causing these tests to fail.
     def "I can upload a file"() {
         setup:
         String projectId = '1'
diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy
index 427955a2a..8192a9b76 100644
--- a/src/integration-test/groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy
+++ b/src/integration-test/groovy/au/org/ala/fieldcapture/StubbedCasSpec.groovy
@@ -2,20 +2,23 @@ package au.org.ala.fieldcapture
 
 import com.github.tomakehurst.wiremock.WireMockServer
 import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer
+import com.nimbusds.jose.jwk.RSAKey
+import com.nimbusds.jwt.util.DateUtils
 import geb.Browser
 import grails.converters.JSON
 import org.grails.web.converters.marshaller.json.MapMarshaller
 import org.openqa.selenium.StaleElementReferenceException
 import org.openqa.selenium.WebDriverException
-import org.pac4j.jwt.config.signature.SignatureConfiguration
+import org.pac4j.jwt.config.signature.RSASignatureConfiguration
 import org.pac4j.jwt.profile.JwtGenerator
-import spock.lang.Shared
 import wiremock.com.github.jknack.handlebars.EscapingStrategy
 import wiremock.com.github.jknack.handlebars.Handlebars
 import wiremock.com.github.jknack.handlebars.Helper
 import wiremock.com.github.jknack.handlebars.Options
 import wiremock.com.google.common.collect.ImmutableMap
 
+import java.security.KeyPair
+
 import static com.github.tomakehurst.wiremock.client.WireMock.*
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options
 
@@ -30,35 +33,70 @@ class StubbedCasSpec extends FieldcaptureFunctionalTest {
     static String MERIT_ADMIN_USER_ID = '1002'
     static String ALA_ADMIN_USER_ID = '2000'
 
+    static KeyPair pair
+    static RSAKey signingKey
+    static {
+        //  KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA")
+        //  generator.initialize(2048)
+        //  pair = generator.generateKeyPair()
+        //
+        //  signingKey = new RSAKey.Builder(pair.getPublic()).privateKey(pair.getPrivate()).build()
+        //  RSAKey publicKey =  new RSAKey.Builder(pair.getPublic()).build()
+        //  println signingKey.toJSONObject() - this is hardcoded below and is used to sign tokens
+        //  println publicKey.toJSONObject() - this goes into wiremock as the response to the jwks request
+
+        // It would be better to generate this at runtime, but the stub needs to be in wirework during bean initialisation of MERIT
+        // So we've generated a random key as above and coded it here and into the wiremock stub
+        Map key = ["p":"ybsLU3Xf05Nkmfthec3Gf5SCR1cMG4gHYTJh9dP575RavQO63oxS9G-srVmNTmCYsoi-KJs9RODO8Ive701DrpSBkeM7cYZ5_7J3Zt7kTtIPCavwJsb0yhyJQGcm6v7iuF8GIRukeKLT57LwjhSPPqZgdOu9elsc3T7-D9jPPBE",
+        "kty":"RSA",
+        "q":"rA9mDEolsAG9br7CJlgPIaNsAdpPmqwGTnaHZgJCeN3XwKLlTkLiBlH66OdvakvoFHuvoiaUXFx2xd0G-WrBdePnqZcAb0SdLMp0RxDCRyC4HwJSE9YwieOpIO8EvgzYZKL7liUKR0fz3HAciV9oW3lA6bnh1doSVadw18LMKZk",
+        "d":"GDawqqYZsTqZpR3WRyK1YoSI0qO4RS61jvW-l72SbpILYHl9M0cZewef95OrT9yl4-7SurBV15j7wkqLvLxmQNxpIs-yXRK5hpmvxa07SiXZOtwW7EvG_PMx9tyQ8LiyM8MnTr-qknh_Rtbjr9bH0mrMeUCQfVj5VSSF8SNHEVPGy_QxQoswIhRgzcq9tOaGP1W-FoVCaQjAxJG4boAselX_bvYe3IVuDwE_ZV8KPCQcZISEqrY8B8-b8AdTgecORODQB5lChElqRBeKUeoOtVMvD8rlwUgjV9ir_QK25Vq8rLcEkdPrRhV0EKKnr1eBir1WSpdLjzIUhAsF5HPUAQ",
+        "e":"AQAB", "qi":"kuYhMgrJR1fTuX0IJar-SjWhrn3EV96bfaObAkxMZDHes-tthLxcZ58PpKKbsMSK8kncT41JMb0Irb9HC12B6aSDy3Kzsns-gzcD38m9YcdOk80kyjCqLIceU2tmMIeIxSF54wGwVO_p4p94xeANf4si450ssqdPM_q1n1SRu88",
+        "dp":"Gx8Nj8P6OqzHSrh0S3bx5_ckaMj4NL9eFqA6cV11bdNpO55DwmXlRT26Xnf6un3cKayevEDaxObgi5CSgWPG5LLMlLuTI1ksD8eDrA3tbfdp1CgMmnoHMSETBtiXb-Kiwpzr6wmXXCywBqeVFdUHySl_MFj9WXTkdY5hg-nnOrE",
+        "dq":"DwhxZBV-YXhlcq2cDPmYqNm8cBUA64SoMGbOwazk3eaUGTKiUkopsV-sSnkeFO1444FDASnZwJAbmIINP_GB4aj97qVQ1mfqS6WMr0DZmJlVPPBY9365UvLfLg90HJ7GsVREIwQtd7jjp5jsBVyeo49eio1BHAwnmfA9Pby5VdE",
+        "n":"h5XN-_LL1yXb8oPWHOTNMby0Y6olpByVCNJGo1mjhk9PUoX8bfu6wNr4G7oR7O0NfIQVNLykqE7Q04RrP7JfexI97UuH5B0xBjHVo-S5SxeyUrVSQBpRu6EisQzxxF3a038a0GHYJpA5YUAZWD7Pux0yqJ5ly1y2Sn7uGb_JJ_bJ86EVWs3AxE1RZHmeY975A1kk470ylDAyfQuW_GU-gUzG5vdE1wAEIKe6GFtg5ulA_n_XVsrz9qio7ZtEyWZDAOCtk0jfg8iTJf5eLP2Q3D8ePy_6IvYvFDuQLmvKHn1jg5MnnDWZHV3GBRnfU8CtPu2ChFKhXedcrhQhhAWfKQ"
+        ]
+
+        signingKey = RSAKey.parse(key)
+        pair = signingKey.toKeyPair()
+
+    }
+
    // @Shared WireMockServer wireMockServer
     def setupSpec() {
         JSON.registerObjectMarshaller(new MapMarshaller())
         if (testConfig.wiremock.embedded) {
 
-            Handlebars handlebars = new Handlebars()
-            handlebars.escapingStrategy = EscapingStrategy.NOOP
-
-            // This is done so we can use a custom handlebars with a NOOP escaping strategy - the default escapes HTML
-            // which breaks the redirect URL returned by the PDF generation stub.
-            Helper noop = new Helper() {
-                Object apply(Object context, Options options) throws IOException {
-                    return context[0]
-                }
-            }
-            wireMockServer = new WireMockServer(options()
-                    .port(testConfig.wiremock.port)
-                    .usingFilesUnderDirectory(getMappingsPath())
-                    .extensions(new ResponseTemplateTransformer(false, handlebars, ImmutableMap.of("noop", noop), null, null)))
-
-            wireMockServer.start()
+            startWireMock()
         }
 
         // Configure the client
         configureFor("localhost", testConfig.wiremock.port)
     }
 
+    private void startWireMock() {
+        Handlebars handlebars = new Handlebars()
+        handlebars.escapingStrategy = EscapingStrategy.NOOP
+
+        // This is done so we can use a custom handlebars with a NOOP escaping strategy - the default escapes HTML
+        // which breaks the redirect URL returned by the PDF generation stub.
+        Helper noop = new Helper() {
+            Object apply(Object context, Options options) throws IOException {
+                return context[0]
+            }
+        }
+        wireMockServer = new WireMockServer(options()
+                .port(testConfig.wiremock.port)
+                .usingFilesUnderDirectory(getMappingsPath())
+                .extensions(new ResponseTemplateTransformer(false, handlebars, ImmutableMap.of("noop", noop), null, null)))
+
+        wireMockServer.start()
+    }
+
     def cleanupSpec() {
-        //wireMockServer.stop()
+        if (testConfig.wiremock.embedded) {
+            wireMockServer.stop()
+        }
     }
 
     /**
@@ -112,6 +150,9 @@ class StubbedCasSpec extends FieldcaptureFunctionalTest {
         }
         catch (StaleElementReferenceException e) { // Do nothing, backdrop was already detached
         }
+        catch (NullPointerException e) {
+            // Do nothing, backdrop was already detached and destroyed before we selected it
+        }
         catch (WebDriverException e) {
             // We are now seeing WebDriverException instead of StateElementReferenceException in some cases
         }
@@ -135,7 +176,7 @@ class StubbedCasSpec extends FieldcaptureFunctionalTest {
     }
     /** Convenience method to stub the login of a user with the CAS ROLE_ALA_ADMIN role */
     def loginAsAlaAdmin(Browser browser) {
-        login([userId:ALA_ADMIN_USER_ID, role:"ROLE_ADMIN", email: 'ala_admin@nowhere.com', firstName:"ALA", lastName:"Administrator"], browser)
+        login([userId:ALA_ADMIN_USER_ID, role:"ROLE_ADMIN", userName: 'ala_admin@nowhere.com', email: 'ala_admin@nowhere.com', firstName:"ALA", lastName:"Administrator"], browser)
     }
     /** Convenience method to stub the login of a user no special roles */
     def loginAsUser(String userId, Browser browser) {
@@ -145,6 +186,11 @@ class StubbedCasSpec extends FieldcaptureFunctionalTest {
         login([userId:userId, email: "user${userId}@nowhere.com", firstName:"MERIT", lastName:"User ${userId}"], browser)
     }
 
+    String tokenForUser(String userId) {
+        Map userDetails = [userId:userId, email: "user${userId}@nowhere.com", firstName:"MERIT", lastName:"User ${userId}"]
+        setupOidcAuthForUser(userDetails)
+    }
+
     private String loggedInUser = null
 
     def login(Map userDetails, Browser browser) {
@@ -156,7 +202,17 @@ class StubbedCasSpec extends FieldcaptureFunctionalTest {
     }
 
     def oidcLogin(Map userDetails, Browser browser) {
+        setupOidcAuthForUser(userDetails)
+        browser.go "${browser.getConfig().baseUrl}login"
+    }
 
+    /**
+     * Sets up stubs with wiremock to authenticate a user via OIDC.  Also returns an idToken which can be used
+     * if an interactive login is not required.
+     * @param userDetails the details of the user to setup
+     * @return an idToken for the user.
+     */
+    String setupOidcAuthForUser(Map userDetails) {
         // The test config isn't a normal grails config object (probably need to to into why) so getProperty doesn't work.
         String clientId = getTestConfig().security.oidc.clientId
         List roles = ["ROLE_USER"]
@@ -165,35 +221,37 @@ class StubbedCasSpec extends FieldcaptureFunctionalTest {
         }
 
         Map idTokenClaims = [
-                at_hash:"KX-L2Fj6Z9ow-gOpYfehRA",
-                sub:userDetails.userId,
-                email_verified:true,
-                role:roles,
-                amr:"DelegatedClientAuthenticationHandler",
-                iss:"http://localhost:8018/cas/oidc",
-                preferred_username:userDetails.email,
-                given_name:userDetails.firstName,
-                family_name:userDetails.lastName,
-                client_id:clientId,
-                sid:"test_sid",
-                aud:clientId,
-                name:userDetails.firstName+" "+userDetails.lastName,
-                state:"maybe_this_matters",
-                auth_time:-1,
-                nbf:com.nimbusds.jwt.util.DateUtils.toSecondsSinceEpoch(new Date().minus(365)),
-                exp:com.nimbusds.jwt.util.DateUtils.toSecondsSinceEpoch(new Date().plus(365)),
-                iat:com.nimbusds.jwt.util.DateUtils.toSecondsSinceEpoch(new Date()),
-                jti:"id",
-                email:userDetails.email
+                at_hash           : "KX-L2Fj6Z9ow-gOpYfehRA",
+                sub               : userDetails.userId,
+                email_verified    : true,
+                role              : roles,
+                amr               : "DelegatedClientAuthenticationHandler",
+                iss               : "http://localhost:8018/cas/oidc",
+                preferred_username: userDetails.email,
+                given_name        : userDetails.firstName,
+                family_name       : userDetails.lastName,
+                client_id         : clientId,
+                sid               : "test_sid",
+                aud               : clientId,
+                userid            : userDetails.userId,
+                name              : userDetails.firstName + " " + userDetails.lastName,
+                state             : "maybe_this_matters",
+                auth_time         : -1,
+                nbf               : DateUtils.toSecondsSinceEpoch(new Date().minus(365)),
+                exp               : DateUtils.toSecondsSinceEpoch(new Date().plus(365)),
+                iat               : DateUtils.toSecondsSinceEpoch(new Date()),
+                jti               : "id",
+                email             : userDetails.email,
+                scope             : "openid profile ala roles email"
         ]
-        String idToken = new JwtGenerator(null).generate(idTokenClaims)
+        String idToken = new JwtGenerator(new RSASignatureConfiguration(pair)).generate(idTokenClaims)
         Map token = [:]
         token.access_token = idToken
         token.id_token = idToken
         token.refresh_token = null
         token.token_type = "bearer"
         token.expires_in = 86400
-        token.scope = "user_defined email openid profile roles"
+        token.scope = "openid profile ala roles email"
 
         stubFor(post(urlPathEqualTo("/cas/oidc/oidcAccessToken"))
                 .willReturn(aResponse()
@@ -203,11 +261,12 @@ class StubbedCasSpec extends FieldcaptureFunctionalTest {
                         .withTransformers("response-template")))
 
         Map profile = [
-                sub:userDetails.userId,
-                name:userDetails.firstName+" "+userDetails.lastName,
-                given_name:userDetails.firstName,
-                family_name:userDetails.lastName,
-                email:userDetails.email
+                userid     : userDetails.userId,
+                sub        : userDetails.userId,
+                name       : userDetails.firstName + " " + userDetails.lastName,
+                given_name : userDetails.firstName,
+                family_name: userDetails.lastName,
+                email      : userDetails.email
         ]
         stubFor(get(urlPathEqualTo("/cas/oidc/oidcProfile"))
                 .willReturn(aResponse()
@@ -215,8 +274,7 @@ class StubbedCasSpec extends FieldcaptureFunctionalTest {
                         .withHeader("Content-Type", "application/json")
                         .withBody((profile as JSON).toString())
                 ))
-
-        browser.go "${getConfig().baseUrl}login"
+        idToken
     }
 
     /** Creates a wiremock configuration to stub a user login request and return the supplied user and role information */
diff --git a/src/integration-test/groovy/pages/AdminClearCachePage.groovy b/src/integration-test/groovy/pages/AdminClearCachePage.groovy
index db80e943b..fb6e66c2a 100644
--- a/src/integration-test/groovy/pages/AdminClearCachePage.groovy
+++ b/src/integration-test/groovy/pages/AdminClearCachePage.groovy
@@ -25,6 +25,8 @@ class AdminClearCachePage extends ReloadablePage {
     void clearHomePageStatistics(){
         waitFor {homePageStatistics.displayed}
         homePageStatistics.click()
+
+        waitFor{hasBeenReloaded()}
     }
 
     void clearProgramListCache() {
diff --git a/src/integration-test/groovy/pages/AdminReportsPage.groovy b/src/integration-test/groovy/pages/AdminReportsPage.groovy
index dfad80592..82e4e05b1 100644
--- a/src/integration-test/groovy/pages/AdminReportsPage.groovy
+++ b/src/integration-test/groovy/pages/AdminReportsPage.groovy
@@ -12,10 +12,16 @@ class AdminReportsPage extends Page {
         period {$('select#reportPeriodOfManagementUnit',0)}
         downloadReportBtn(required:false) {$('a#muReportDownload')}
         downloadReportSummaryBtn(required:false) {$('a#muReportDownloadSummary')}
+        orgDownloadReportBtn(required:false) {$('a#orgReportDownload')}
+        orgDownloadReportSummaryBtn(required:false) {$('a#orgReportDownloadSummary')}
         showDownloadDetailsIcon(required:false) { $('i.showDownloadDetailsIcon')}
-        muReportDownloadLink(required:false) {$('a#muReportDownloadLink')}
-        startDate{$("#fromDate")}
-        endDate{$("#toDate")}
+        muReportDownloadLink(required:false) {$('a#entityReportDownloadLink')}
+        startDate{$("#muFromDate")}
+        endDate{$("#muToDate")}
+        orgStartDate{$("#orgFromDate")}
+        orgEndDate{$("#orgToDate")}
+        reportFormats { $('#reportFormats')}
+        viewReportBtn(required:false) {$('#viewReportBtn')}
 
     }
 
@@ -35,4 +41,21 @@ class AdminReportsPage extends Page {
         downloadReportSummaryBtn.click()
     }
 
+    def downloadOrgReport(String fromDate, String toDate) {
+        orgStartDate = fromDate
+        orgEndDate = toDate
+        orgDownloadReportBtn.click()
+    }
+
+    def downloadOrgReportSummary(String fromDate, String toDate) {
+        orgStartDate = fromDate
+        orgEndDate = toDate
+        orgDownloadReportSummaryBtn.click()
+    }
+
+    def generateReef2050Pdf() {
+        reportFormats = "pdf"
+        viewReportBtn.click()
+    }
+
 }
diff --git a/src/integration-test/groovy/pages/DataSetSummary.groovy b/src/integration-test/groovy/pages/DataSetSummary.groovy
index ada8c6577..444a1d235 100644
--- a/src/integration-test/groovy/pages/DataSetSummary.groovy
+++ b/src/integration-test/groovy/pages/DataSetSummary.groovy
@@ -13,6 +13,8 @@ class DataSetSummary extends Module {
         statusColumn(required: false) { $('#project-data-sets .dataset-progress') }
         status(required: false) {$('[data-bind*="text: progress"]')}
 
+        summaryTable(required: false) {$('#project-data-sets')}
+        tableEmptyMessage(required:false) {$('#project-data-sets td.dataTables_empty')}
     }
 
     void cancel() {
@@ -20,7 +22,7 @@ class DataSetSummary extends Module {
     }
 
     int dataSetSummaryCount() {
-        $('#project-data-sets tbody tr').size()
+        tableEmptyMessage.displayed ? 0 : summaryTable.find('tbody tr').size()
     }
 
 }
diff --git a/src/integration-test/groovy/pages/ManagementUnitDownloadReport.groovy b/src/integration-test/groovy/pages/ManagementUnitDownloadReport.groovy
new file mode 100644
index 000000000..4e05d6c27
--- /dev/null
+++ b/src/integration-test/groovy/pages/ManagementUnitDownloadReport.groovy
@@ -0,0 +1,18 @@
+package pages
+
+
+import geb.Page
+
+class ManagementUnitDownloadReport extends Page {
+    static at = { title.startsWith("Core services report 1") }
+    static url = "managementUnit/printableReport"
+
+    static content = {
+        groundCoverPercentage { $("span[data-bind*=groundCoverPercent]") }
+        printInstructions { $("#print-instructions") }
+    }
+
+    def closePrintInstructions() {
+        $("#print-instructions .btn-secondary").click()
+    }
+}
diff --git a/src/integration-test/groovy/pages/OrganisationDownloadReport.groovy b/src/integration-test/groovy/pages/OrganisationDownloadReport.groovy
new file mode 100644
index 000000000..e04ea982d
--- /dev/null
+++ b/src/integration-test/groovy/pages/OrganisationDownloadReport.groovy
@@ -0,0 +1,18 @@
+package pages
+
+
+import geb.Page
+
+class OrganisationDownloadReport extends Page {
+    static at = { title.startsWith("Regional capacity report 1") }
+    static url = "organisation/printableReport"
+
+    static content = {
+        groundCoverPercentage { $("span[data-bind*=groundCoverPercent]") }
+        printInstructions { $("#print-instructions") }
+    }
+
+    def closePrintInstructions() {
+        $("#print-instructions .btn-secondary").click()
+    }
+}
diff --git a/src/integration-test/groovy/pages/ProjectDownloadReport.groovy b/src/integration-test/groovy/pages/ProjectDownloadReport.groovy
new file mode 100644
index 000000000..a3b84575d
--- /dev/null
+++ b/src/integration-test/groovy/pages/ProjectDownloadReport.groovy
@@ -0,0 +1,18 @@
+package pages
+
+
+import geb.Page
+
+class ProjectDownloadReport extends Page {
+    static at = { title.startsWith("Year 2018/2019 - Quarter 1 Outputs Report") }
+    static url = "project/printableReport"
+
+    static content = {
+        groundCoverPercentage { $("span[data-bind*=groundCoverPercent]") }
+        printInstructions { $("#print-instructions") }
+    }
+
+    def closePrintInstructions() {
+        $("#print-instructions .btn-secondary").click()
+    }
+}
diff --git a/src/integration-test/groovy/pages/Reef2050PlanActionDownloadReport.groovy b/src/integration-test/groovy/pages/Reef2050PlanActionDownloadReport.groovy
new file mode 100644
index 000000000..0c315b301
--- /dev/null
+++ b/src/integration-test/groovy/pages/Reef2050PlanActionDownloadReport.groovy
@@ -0,0 +1,18 @@
+package pages
+
+
+import geb.Page
+
+class Reef2050PlanActionDownloadReport extends Page {
+    static at = { title.startsWith("Reef 2050 Plan Action Reporting") }
+    static url = "report/reef2050PlanActionReport"
+
+    static content = {
+        groundCoverPercentage { $("span[data-bind*=groundCoverPercent]") }
+        printInstructions { $("#print-instructions") }
+    }
+
+    def closePrintInstructions() {
+        $("#print-instructions .btn-secondary").click()
+    }
+}
diff --git a/src/integration-test/groovy/pages/ReloadablePage.groovy b/src/integration-test/groovy/pages/ReloadablePage.groovy
index 41c5a4918..2c218ad21 100644
--- a/src/integration-test/groovy/pages/ReloadablePage.groovy
+++ b/src/integration-test/groovy/pages/ReloadablePage.groovy
@@ -32,7 +32,7 @@ class ReloadablePage extends Page {
 
     /** Returns true if the page has been reloaded since the most recent "at" check */
     def hasBeenReloaded() {
-        Thread.sleep(10000)
+        //Thread.sleep(10000)
         !getAtCheckTime()
     }
 
diff --git a/src/integration-test/groovy/pages/modules/DatasetPageModule.groovy b/src/integration-test/groovy/pages/modules/DatasetPageModule.groovy
index 2e80d1da8..6bd3df10f 100644
--- a/src/integration-test/groovy/pages/modules/DatasetPageModule.groovy
+++ b/src/integration-test/groovy/pages/modules/DatasetPageModule.groovy
@@ -1,36 +1,34 @@
 package pages.modules
 
 import geb.Module
+import geb.module.Checkbox
 
 class DatasetPageModule extends Module{
 
     static content = {
-        title(required: false) {$('#title')}
-        programOutcome(required: false) {$('#programOutcome')}
-        investmentPriorities(required: false) {$('#investmentPriority')}
-        otherInvestmentPriority(required: false) {$(".otherPriorityTextArea")}
-        term(required: false){$("#term")}
-        type(required: false){$("#type")}
-        measurementTypes(required: false) {$("#measurementTypes")}
-        methods (required: false){$("#methods")}
-        methodDescription (required: false) {$("#methodDescription")}
-        collectionApp(required: false){$("#collectionApp")}
-        location(required: false) {$('#location')}
-        startDate(required: false) {$("#startDate")}
-        endDate(required: false) {$("#endDate")}
-        addition(required: false) {$("#addition")}
-        collectorType(required: false){$('#collectorType')}
-        threatenedSpeciesIndex(required: false){$('#threatenedSpeciesIndex')}
-        qa(required: false) {$("#qa")}
-        published(required: false) {$("#published")}
-        storageType(required: false) {$("#storageType")}
-        publicationUrl(required: false) {$("#publicationUrl")}
-        format(required: false) {$("#format")}
-        sensitivities(required: false) {$("#sensitivities")}
-        dataOwner(required: false) {$("#owner")}
-        custodian(required: false) {$("#custodian")}
-        dataCollectionOngoing(required: false) {$("#dataCollectionOngoing")}
-        dataCollectionOngoingChecked(required: false) {$("#dataCollectionOngoing:checked")}
+        title {$('#title')}
+        programOutcome {$('#programOutcome')}
+        investmentPriorities {$('#investmentPriority')}
+        serviceAndOutcomes {$('#projectOutcomes')}
+        type{$("#type")}
+        baselines{ $('#projectBaseline')}
+        protocol{$('#protocol')}
+        measurementTypes {$("#measurementTypes")}
+        methods {$("#methods")}
+        methodDescription  {$("#methodDescription")}
+        collectionApp {$("#collectionApp")}
+        location {$('#location')}
+        startDate {$("#startDate")}
+        endDate {$("#endDate")}
+        addition {$("#addition")}
+        threatenedSpeciesIndex{$('#threatenedSpeciesIndex')}
+        threatenedSpeciesDateOfUpload {$('#threatenedSpeciesIndexUploadDate')}
+
+        publicationUrl {$("#publicationUrl")}
+        format {$("#format")}
+        dataSetSize {$('#sizeinkb')}
+        sensitivities {$("#sensitivities")}
+        dataCollectionOngoing{$("#dataCollectionOngoing").module(Checkbox)}
 
         markCompleted(required: false) {$('[data-bind*="checked:markedAsFinished"]')}
 
diff --git a/src/integration-test/groovy/pages/modules/EditableMeriPlan.groovy b/src/integration-test/groovy/pages/modules/EditableMeriPlan.groovy
index 7f7465165..6ebbc537c 100644
--- a/src/integration-test/groovy/pages/modules/EditableMeriPlan.groovy
+++ b/src/integration-test/groovy/pages/modules/EditableMeriPlan.groovy
@@ -305,6 +305,7 @@ class EditableMeriPlan extends Module {
         floatingSaveButton { $('#floating-save [data-bind*="saveProjectDetails"]') }
         saveButton { $('.form-actions [data-bind*="saveProjectDetails"]').first() }
         pdfButton { $('.btn[data-bind*="meriPlanPDF"]').first() }
+        meriPlanChanges { $('.btn[data-bind*="meriPlanChanges"]').first() }
         saveAndSubmitChanges { $('button.saveAndSubmitChanges').first() }
         approveButton(required:false){ $('[data-bind*="approvePlan"]') }
         rejectButton(required:false) { $('[data-bind*="rejectPlan"]') }
@@ -318,6 +319,7 @@ class EditableMeriPlan extends Module {
 
         toggleMeriPlanHistory(required:false){ $('[data-bind*="toggleMeriPlanHistory"]') }
         meriPlanHistory {module HistoryApprovedMeriPlansModule}
+        lockMeriPlanButton (required:false) { $('#lockMeriPlan') }
 
     }
 
@@ -405,6 +407,10 @@ class EditableMeriPlan extends Module {
         pdfButton.click()
     }
 
+    void compareMeriPlanChanges() {
+        meriPlanChanges.click()
+    }
+
     List checkedObjectives() {
         objectivesList.find('input:checked').collect{it.attr("value")}
     }
@@ -458,4 +464,13 @@ class EditableMeriPlan extends Module {
         }
     }
 
+    /** Users of this method should waitFor hasBeenReloaded as this triggers a page reload */
+    void aquireEditLock() {
+        lockMeriPlanButton.click()
+    }
+
+    boolean holdsEditLock() {
+        $('div.meri-lock-held').each {it.displayed}
+    }
+
 }
diff --git a/src/integration-test/groovy/pages/modules/ReportSummaryLine.groovy b/src/integration-test/groovy/pages/modules/ReportSummaryLine.groovy
index 4bd063365..3e0b190bc 100644
--- a/src/integration-test/groovy/pages/modules/ReportSummaryLine.groovy
+++ b/src/integration-test/groovy/pages/modules/ReportSummaryLine.groovy
@@ -10,6 +10,7 @@ class ReportSummaryLine extends Module {
         toDate { $('.report-end').text() }
         editLink { $('td.report-actions [data-bind*=editUrl]')}
         viewLink { $('td.report-actions [data-bind*=viewUrl]')}
+        downloadLink { $('td.report-actions [data-bind*=downloadUrl]')}
         submitButton(required:false) { $('button[data-bind*="submitReport"]') }
         approveButton(required:false) { $('button[data-bind*=approveReport]') }
         returnButton(required:false) { $('button[data-bind*=rejectReport]') }
@@ -24,6 +25,10 @@ class ReportSummaryLine extends Module {
         viewLink.click()
     }
 
+    def downloadReport() {
+        downloadLink.click()
+    }
+
     def markedAsComplete() {
         $('.badge[data-bind*="finished"]').displayed
     }
diff --git a/src/integration-test/resources/data_common/insertData.js b/src/integration-test/resources/data_common/insertData.js
index dceac4e03..f2a6cc1e3 100644
--- a/src/integration-test/resources/data_common/insertData.js
+++ b/src/integration-test/resources/data_common/insertData.js
@@ -202,24 +202,30 @@ function loadActivityForms() {
         "name": "Protocol 1",
         "type":"EMSA",
         "category":"Category 1",
-        "externalId": NumberInt(1),
+        "externalIds": [{ externalId: "1", idType:"MONITOR_PROTOCOL_INTERNAL_ID" }, { externalId: "guid-1", idType:"MONITOR_PROTOCOL_GUID" }],
+        "external":true,
         "formVersion": NumberInt(1),
-        "publicationStatus":"published"
+        "publicationStatus":"published",
+        "tags":["survey"]
     }, {
         "name": "Protocol 2",
         "type":"EMSA",
         "category":"Category 2",
-        "externalId": NumberInt(2),
-
+        "externalIds": [{ externalId: "2", idType:"MONITOR_PROTOCOL_INTERNAL_ID" }, { externalId: "guid-2", idType:"MONITOR_PROTOCOL_GUID" }],
+        "external":true,
         "formVersion": NumberInt(1),
-        "publicationStatus":"published"
+        "publicationStatus":"published",
+        "tags": ["intervention"]
     }, {
         "name": "Protocol 3",
         "type":"EMSA",
         "category":"Category 3",
-        "externalId": NumberInt(3),
+        "externalIds": [{ externalId: "3", idType:"MONITOR_PROTOCOL_INTERNAL_ID" }, { externalId: "guid-3", idType:"MONITOR_PROTOCOL_GUID" }],
+
+        "external":true,
         "formVersion": NumberInt(1),
-        "publicationStatus":"published"
+        "publicationStatus":"published",
+        "tags": ["survey"]
 
     }];
     for (let i= 0; i < forms.length; i++) {
diff --git a/src/integration-test/resources/dataset2/loadDataSet.js b/src/integration-test/resources/dataset2/loadDataSet.js
index 0909891a7..e68e9d63e 100644
--- a/src/integration-test/resources/dataset2/loadDataSet.js
+++ b/src/integration-test/resources/dataset2/loadDataSet.js
@@ -8,6 +8,7 @@ createProgram({});
 var config = {
     projectTemplate: "rlp",
     meriPlanTemplate: "configurableMeriPlan",
+    supportsMeriPlanComparison: true,
     meriPlanContents: [
         {
             "template": "objectivesList"
diff --git a/src/integration-test/resources/dataset3/loadDataSet.js b/src/integration-test/resources/dataset3/loadDataSet.js
index 3c1b61865..566aa3db1 100644
--- a/src/integration-test/resources/dataset3/loadDataSet.js
+++ b/src/integration-test/resources/dataset3/loadDataSet.js
@@ -1050,13 +1050,44 @@ createProject({
     managementUnitId: "bushfireManagement1",
     custom: {
         details: {
+            programServiceConfig: {
+                serviceFormName: "Outputs Report",
+                programServices: [
+                    {
+                        "serviceTargets": [
+                            "score_42"
+                        ],
+                        "serviceId": NumberInt(1)
+                    }
+                ]
+            },
             outcomes: {
+                shortTermOutcomes: [{
+                    "code":"ST1",
+                    "description": "Short term outcome 1",
+                    "assets": [],
+                    "relatedOutcome":"Program short term outcome 1"}
+                ],
                 otherOutcomes: ["Partnerships and engagement is built between stakeholders responsible for managing natural resources",
                     "More primary producers adopt risk management practices to improve their sustainability and resilience",
                     "More primary producers and agricultural communities are experimenting with adaptive or transformative NRM practices, systems and approaches that link and contribute to building drought resilience"]
+            },
+            baseline: {
+                rows: [
+                    {
+                        code:'b1', baseline:'baseline 1', protocols:['Category 1', 'Category 2']
+                    }
+                ]
             }
         }
-    }
+    },
+    outputTargets: [
+        {
+            scoreId:'score_42',
+            target:'10',
+            outcomeTargets:[{relatedOutcomes:['ST1'], target:'10'}]
+        }
+    ]
 })
 
 db.userPermission.insert({
@@ -1475,13 +1506,56 @@ config.priorityPlaces = [
     "Priority place 3"
 ];
 config.excludeFinancialYearData = false;
-
+config.supportsParatoo = true;
 createProgram({programId: "outcomeMeriPlan", name: "Outcome MERI Plan", description: "", config: config});
 createProject({projectId: "outcomeMeriPlanProject", name: "Outcome MERI Plan project", programId: "outcomeMeriPlan"});
-
 db.userPermission.insert({
     entityType: 'au.org.ala.ecodata.Project',
     entityId: "outcomeMeriPlanProject",
     userId: '1',
     accessLevel: 'admin'
-});
\ No newline at end of file
+});
+const monitorProject = {
+    projectId: "monitorProject",
+    name: "Testing monitor integration",
+    programId: "outcomeMeriPlan",
+    custom: {
+        details: {
+            baseline: {
+                    rows: [
+                        {
+                            code:'b1', baseline:'baseline 1', protocols:['Category 1', 'Category 2']
+                        }
+                    ]
+                }
+            }
+        }
+    };
+
+createProject(monitorProject);
+db.userPermission.insert({
+    entityType: 'au.org.ala.ecodata.Project',
+    entityId: "monitorProject",
+    userId: '1',
+    accessLevel: 'admin'
+});
+
+createOrganisation({
+    name:'THE TRUSTEE FOR PSS FUND Test',
+    organisationId:'test_organisation',
+    status:'active', abn:'',
+    url:'http://www.ala.org.au',
+    acronym:'TSTORG', description:'THE TRUSTEE FOR PSS FUND Test'
+});
+delete report1.projectId
+var activityId = "activity2"
+report1.organisationId = 'test_organisation';
+report1.activityId = activityId;
+activity.activityId = activityId;
+output.activityId = activityId;
+outputSwan.activityId = activityId;
+
+db.report.insert(report1)
+db.activity.insert(activity)
+db.output.insert(output);
+db.output.insert(outputSwan)
\ No newline at end of file
diff --git a/src/integration-test/resources/dataset_mu/loadDataSet.js b/src/integration-test/resources/dataset_mu/loadDataSet.js
index 869777cce..9633bc028 100644
--- a/src/integration-test/resources/dataset_mu/loadDataSet.js
+++ b/src/integration-test/resources/dataset_mu/loadDataSet.js
@@ -249,6 +249,23 @@ var orgReport1 = {
     "progress" : "started"
 }
 
+var orgPerfReport = {
+    "reportId" : "a02a527a-4377-40f0-86de-8eabe6weeknd",
+    "dateCreated" : ISODate("2016-06-22T01:13:26.944Z"),
+    "lastUpdated" : ISODate("2017-07-16T05:38:41.463Z"),
+    "type" : "Performance Management Framework - Self Assessment",
+    "organisationId" : "test_organisation",
+    "name" : "2015 / 2016 Performance Management Framework - Self Assessment",
+    "publicationStatus" : "unpublished",
+    "status" : "active",
+    "progress" : "finished",
+    "fromDate" : ISODate("2015-07-01T14:00:00.000Z"),
+    "toDate" : ISODate("2016-07-01T14:00:00.000Z"),
+    "dueDate" : ISODate("2016-08-15T14:00:00.000Z"),
+    "submissionDate" : ISODate("2016-07-01T14:00:00.000Z"),
+    "category": "Performance Management Framework"
+}
+
 var activity2 = {
     "activityId" : "xyz254bf-b4fe-481c-9324-6d65d9c7c0d8",
     "assessment" : false,
@@ -271,6 +288,7 @@ var activity2 = {
 
 
 db.report.insert(orgReport1);
+db.report.insert(orgPerfReport);
 db.activity.insert(activity2);
 
 addSetting('meritfielddata.rlp.cs_report.submitted.emailSubject', 'Report submitted subject');
diff --git a/src/integration-test/resources/wiremock/mappings/jwkSource.json b/src/integration-test/resources/wiremock/mappings/jwkSource.json
new file mode 100644
index 000000000..77c820a5a
--- /dev/null
+++ b/src/integration-test/resources/wiremock/mappings/jwkSource.json
@@ -0,0 +1,25 @@
+{
+  "request": {
+    "urlPath": "/cas/oidc/jwks",
+    "method": "GET"
+  },
+  "response" : {
+    "status": 200,
+    "headers": {
+      "content-Type": "application/json"
+    },
+    "jsonBody": {
+      "keys": [
+        {
+          "kty":"RSA",
+          "e":"AQAB",
+          "use":"sig",
+          "alg": "RS256",
+          "kid":"localhost:8018",
+          "n": "h5XN-_LL1yXb8oPWHOTNMby0Y6olpByVCNJGo1mjhk9PUoX8bfu6wNr4G7oR7O0NfIQVNLykqE7Q04RrP7JfexI97UuH5B0xBjHVo-S5SxeyUrVSQBpRu6EisQzxxF3a038a0GHYJpA5YUAZWD7Pux0yqJ5ly1y2Sn7uGb_JJ_bJ86EVWs3AxE1RZHmeY975A1kk470ylDAyfQuW_GU-gUzG5vdE1wAEIKe6GFtg5ulA_n_XVsrz9qio7ZtEyWZDAOCtk0jfg8iTJf5eLP2Q3D8ePy_6IvYvFDuQLmvKHn1jg5MnnDWZHV3GBRnfU8CtPu2ChFKhXedcrhQhhAWfKQ"
+        }
+      ]
+    }
+
+  }
+}
\ No newline at end of file
diff --git a/src/integration-test/resources/wiremock/mappings/monitorProtocol2.json b/src/integration-test/resources/wiremock/mappings/monitorProtocol2.json
new file mode 100644
index 000000000..52bc3796f
--- /dev/null
+++ b/src/integration-test/resources/wiremock/mappings/monitorProtocol2.json
@@ -0,0 +1,108 @@
+{
+  "request": {
+    "urlPath": "/monitor/protocols/2",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "headers": {
+      "content-Type": "application/json"
+    },
+    "jsonBody": {
+      "data": {
+        "id": 2,
+        "attributes": {
+          "identifier": "068d17e8-e042-ae42-1e42-d004fa2ef759",
+          "name": "Soil Site Observation and Pit Characterisation",
+          "module": "Soils",
+          "endpointPrefix": "/soil-pit-characterisation-fulls",
+          "version": 1,
+          "description": "",
+          "isWritable": true,
+          "workflow": [
+            {
+              "modelName": "plot-layout"
+            },
+            {
+              "modelName": "plot-visit"
+            },
+            {
+              "modelName": "soil-pit-characterisation-full",
+              "overrideDisplayName": "Soil Pit Location",
+              "usesCustomComponent": true
+            },
+            {
+              "modelName": "soil-landform-element",
+              "overrideDisplayName": "Land Form Element",
+              "usesCustomComponent": true
+            },
+            {
+              "modelName": "soil-land-surface-phenomena",
+              "overrideDisplayName": "Land Surface Phenomena & Soil Development",
+              "usesCustomComponent": true
+            },
+            {
+              "multiple": true,
+              "required": false,
+              "modelName": "microrelief-observation",
+              "defaultHidden": true,
+              "usesCustomComponent": true
+            },
+            {
+              "multiple": true,
+              "required": false,
+              "modelName": "erosion-observation",
+              "defaultHidden": true,
+              "usesCustomComponent": true
+            },
+            {
+              "multiple": true,
+              "required": false,
+              "modelName": "surface-coarse-fragments-observation",
+              "defaultHidden": true
+            },
+            {
+              "required": false,
+              "modelName": "rock-outcrop-observation",
+              "defaultHidden": true
+            },
+            {
+              "modelName": "soil-pit-observation"
+            },
+            {
+              "multiple": true,
+              "modelName": "soil-horizon-observation",
+              "usesCustomComponent": true,
+              "newInstanceForRelationOnAttributes": [
+                "mottles",
+                "coarse_fragments",
+                "structure",
+                "segregation",
+                "voids",
+                "pans",
+                "cutans",
+                "roots"
+              ]
+            },
+            {
+              "modelName": "soil-classification",
+              "newInstanceForRelationOnAttributes": [
+                "asc"
+              ]
+            },
+            {
+              "multiple": true,
+              "modelName": "soil-horizon-sample",
+              "usesCustomComponent": true
+            }
+          ],
+          "isHidden": false,
+          "next_prot_suggestion": "068d17e8-e042-ae42-1e42-d0065d7ec2e4",
+          "createdAt": "2023-08-16T02:59:43.946Z",
+          "updatedAt": "2023-08-16T02:59:43.946Z"
+        }
+      },
+      "meta": {}
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/integration-test/resources/wiremock/mappings/oidcDiscovery.json b/src/integration-test/resources/wiremock/mappings/oidcDiscovery.json
index b5f27fb99..5b27ec350 100644
--- a/src/integration-test/resources/wiremock/mappings/oidcDiscovery.json
+++ b/src/integration-test/resources/wiremock/mappings/oidcDiscovery.json
@@ -64,7 +64,7 @@
         "refresh_token"
       ],
       "id_token_signing_alg_values_supported": [
-        "none"
+        "RS256", "none"
       ],
       "id_token_encryption_alg_values_supported": [
         "none"
@@ -73,7 +73,7 @@
         "none"
       ],
       "userinfo_signing_alg_values_supported": [
-        "none"
+        "RS256", "none"
       ],
       "userinfo_encryption_alg_values_supported": [
         "none"
@@ -82,7 +82,7 @@
         "none"
       ],
       "request_object_signing_alg_values_supported": [
-        "none"
+        "RS256", "none"
       ],
       "request_object_encryption_alg_values_supported": [
         "none"
diff --git a/src/integration-test/resources/wiremock/mappings/soilPitCharacterisationFulls.json b/src/integration-test/resources/wiremock/mappings/soilPitCharacterisationFulls.json
new file mode 100644
index 000000000..cf19673c9
--- /dev/null
+++ b/src/integration-test/resources/wiremock/mappings/soilPitCharacterisationFulls.json
@@ -0,0 +1,1418 @@
+{
+  "request": {
+    "urlPath": "/monitor/soil-pit-characterisation-fulls",
+    "method": "GET"
+  },
+  "response": {
+    "status": 200,
+    "headers": {
+      "content-Type": "application/json"
+    },
+    "jsonBody": {
+      "data": [
+        {
+          "id": 1,
+          "attributes": {
+            "surveyId": {
+              "time": "2023-08-25T03:45:09.509Z",
+              "randNum": 40204923,
+              "surveyType": "soil-pit-characterisation-full"
+            },
+            "start_date_time": "2023-08-25T03:45:01.861Z",
+            "end_date_time": "2023-08-25T03:45:01.861Z",
+            "soil_pit_id": "SATFLB0001-3",
+            "location_description": "This is a location descriptions first line\nThis is the second",
+            "createdAt": "2023-08-25T03:51:03.732Z",
+            "updatedAt": "2023-08-25T03:51:03.732Z",
+            "plot_visit": {
+              "data": {
+                "id": 6,
+                "attributes": {
+                  "start_date": "2020-03-29T17:05:06.421Z",
+                  "end_date": null,
+                  "visit_field_name": "SA autumn survey",
+                  "createdAt": "2023-08-16T03:00:22.841Z",
+                  "updatedAt": "2023-08-24T04:30:11.525Z",
+                  "plot_layout": {
+                    "data": {
+                      "id": 4,
+                      "attributes": {
+                        "replicate": 1,
+                        "is_the_plot_permanently_marked": true,
+                        "orientation": 1,
+                        "createdAt": "2023-08-16T03:00:22.706Z",
+                        "updatedAt": "2023-08-16T03:00:22.706Z",
+                        "plot_selection": {
+                          "data": {
+                            "id": 4,
+                            "attributes": {
+                              "plot_label": "SATFLB0001",
+                              "uuid": "a6f84a0e-2239-4bfa-aac6-6d2c99e252f4",
+                              "comment": "some comment",
+                              "createdAt": "2023-08-16T02:59:46.026Z",
+                              "updatedAt": "2023-08-24T04:28:38.085Z",
+                              "plot_name": {
+                                "id": 46,
+                                "unique_digits": "0001",
+                                "state": {
+                                  "data": {
+                                    "id": 5,
+                                    "attributes": {
+                                      "symbol": "SA",
+                                      "label": "South Australia",
+                                      "description": "",
+                                      "uri": "https://linked.data.gov.au/def/nrm/5648c02d-6120-5cb1-858a-d92e970c1da0",
+                                      "createdAt": "2023-08-16T02:59:44.583Z",
+                                      "updatedAt": "2023-08-16T02:59:44.583Z"
+                                    }
+                                  }
+                                },
+                                "program": {
+                                  "data": {
+                                    "id": 7,
+                                    "attributes": {
+                                      "symbol": "S",
+                                      "label": "Super Sites",
+                                      "description": "",
+                                      "uri": "",
+                                      "createdAt": "2023-08-16T02:59:44.675Z",
+                                      "updatedAt": "2023-08-16T02:59:44.675Z"
+                                    }
+                                  }
+                                },
+                                "bioregion": {
+                                  "data": {
+                                    "id": 27,
+                                    "attributes": {
+                                      "symbol": "FLB",
+                                      "label": "Flinders Lofty Block",
+                                      "description": "",
+                                      "uri": "",
+                                      "createdAt": "2023-08-16T02:59:45.032Z",
+                                      "updatedAt": "2023-08-24T04:28:43.491Z",
+                                      "states": {
+                                        "data": [
+                                          {
+                                            "id": 5,
+                                            "attributes": {
+                                              "symbol": "SA",
+                                              "label": "South Australia",
+                                              "description": "",
+                                              "uri": "https://linked.data.gov.au/def/nrm/5648c02d-6120-5cb1-858a-d92e970c1da0",
+                                              "createdAt": "2023-08-16T02:59:44.583Z",
+                                              "updatedAt": "2023-08-16T02:59:44.583Z"
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  }
+                                }
+                              },
+                              "recommended_location": {
+                                "id": 139,
+                                "lat": -35.0004723472134,
+                                "lng": 138.66067886352542
+                              },
+                              "recommended_location_point": {
+                                "data": {
+                                  "id": 1,
+                                  "attributes": {
+                                    "symbol": "C",
+                                    "description": "Centre",
+                                    "label": "Centre",
+                                    "uri": "",
+                                    "createdAt": "2023-08-16T02:59:45.714Z",
+                                    "updatedAt": "2023-08-16T02:59:45.714Z"
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "plot_type": {
+                          "data": {
+                            "id": 1,
+                            "attributes": {
+                              "symbol": "C",
+                              "label": "Control",
+                              "description": "",
+                              "uri": "",
+                              "createdAt": "2023-08-16T03:00:06.446Z",
+                              "updatedAt": "2023-08-16T03:00:06.446Z"
+                            }
+                          }
+                        },
+                        "permanently_marked": {
+                          "id": 3,
+                          "marker": {
+                            "data": {
+                              "id": 2,
+                              "attributes": {
+                                "symbol": "SSS",
+                                "label": "Survey stake - steel",
+                                "description": "",
+                                "uri": "",
+                                "createdAt": "2023-08-16T03:00:06.210Z",
+                                "updatedAt": "2023-08-16T03:00:06.210Z"
+                              }
+                            }
+                          },
+                          "marked": {
+                            "data": {
+                              "id": 2,
+                              "attributes": {
+                                "symbol": "SE",
+                                "label": "South East",
+                                "description": "",
+                                "uri": "",
+                                "createdAt": "2023-08-16T03:00:06.170Z",
+                                "updatedAt": "2023-08-16T03:00:06.170Z"
+                              }
+                            }
+                          }
+                        },
+                        "plot_dimension": {
+                          "data": {
+                            "id": 1,
+                            "attributes": {
+                              "symbol": "100m",
+                              "label": "100 x 100",
+                              "description": "100 m by 100m (1 hectare)",
+                              "uri": "",
+                              "createdAt": "2023-08-16T03:00:06.146Z",
+                              "updatedAt": "2023-08-16T03:00:06.146Z"
+                            }
+                          }
+                        },
+                        "plot_points": [
+                          {
+                            "id": 76,
+                            "lat": -34.97222197296049,
+                            "lng": 138.63720760798054,
+                            "name": {
+                              "data": {
+                                "id": 12,
+                                "attributes": {
+                                  "symbol": "W1",
+                                  "description": "West 1",
+                                  "label": "West 1",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.806Z",
+                                  "updatedAt": "2023-08-16T02:59:45.806Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 77,
+                            "lat": -34.97204230990367,
+                            "lng": 138.63720760798054,
+                            "name": {
+                              "data": {
+                                "id": 13,
+                                "attributes": {
+                                  "symbol": "W2",
+                                  "description": "West 2",
+                                  "label": "West 2",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.813Z",
+                                  "updatedAt": "2023-08-16T02:59:45.813Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 78,
+                            "lat": -34.971862646846844,
+                            "lng": 138.63720760798054,
+                            "name": {
+                              "data": {
+                                "id": 14,
+                                "attributes": {
+                                  "symbol": "W3",
+                                  "description": "West 3",
+                                  "label": "West 3",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.819Z",
+                                  "updatedAt": "2023-08-16T02:59:45.819Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 79,
+                            "lat": -34.97168298379002,
+                            "lng": 138.63720760798054,
+                            "name": {
+                              "data": {
+                                "id": 15,
+                                "attributes": {
+                                  "symbol": "W4",
+                                  "description": "West 4",
+                                  "label": "West 4",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.828Z",
+                                  "updatedAt": "2023-08-16T02:59:45.828Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 80,
+                            "lat": -34.9715033207332,
+                            "lng": 138.63720760798054,
+                            "name": {
+                              "data": {
+                                "id": 16,
+                                "attributes": {
+                                  "symbol": "W5",
+                                  "description": "West 5",
+                                  "label": "West 5",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.834Z",
+                                  "updatedAt": "2023-08-16T02:59:45.834Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 81,
+                            "lat": -34.971413489204785,
+                            "lng": 138.63720760798054,
+                            "name": {
+                              "data": {
+                                "id": 24,
+                                "attributes": {
+                                  "symbol": "NW",
+                                  "description": "North West",
+                                  "label": "North West",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.893Z",
+                                  "updatedAt": "2023-08-16T02:59:45.893Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 82,
+                            "lat": -34.971413489204785,
+                            "lng": 138.63731723494544,
+                            "name": {
+                              "data": {
+                                "id": 17,
+                                "attributes": {
+                                  "symbol": "N1",
+                                  "description": "North 1",
+                                  "label": "North 1",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.839Z",
+                                  "updatedAt": "2023-08-16T02:59:45.839Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 83,
+                            "lat": -34.971413489204785,
+                            "lng": 138.6375364888752,
+                            "name": {
+                              "data": {
+                                "id": 18,
+                                "attributes": {
+                                  "symbol": "N2",
+                                  "description": "North 2",
+                                  "label": "North 2",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.845Z",
+                                  "updatedAt": "2023-08-16T02:59:45.845Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 84,
+                            "lat": -34.971413489204785,
+                            "lng": 138.63775574280498,
+                            "name": {
+                              "data": {
+                                "id": 19,
+                                "attributes": {
+                                  "symbol": "N3",
+                                  "description": "North 3",
+                                  "label": "North 3",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.851Z",
+                                  "updatedAt": "2023-08-16T02:59:45.851Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 85,
+                            "lat": -34.971413489204785,
+                            "lng": 138.63797499673475,
+                            "name": {
+                              "data": {
+                                "id": 20,
+                                "attributes": {
+                                  "symbol": "N4",
+                                  "description": "North 4",
+                                  "label": "North 4",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.857Z",
+                                  "updatedAt": "2023-08-16T02:59:45.857Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 86,
+                            "lat": -34.971413489204785,
+                            "lng": 138.63819425066453,
+                            "name": {
+                              "data": {
+                                "id": 21,
+                                "attributes": {
+                                  "symbol": "N5",
+                                  "description": "North 5",
+                                  "label": "North 5",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.865Z",
+                                  "updatedAt": "2023-08-16T02:59:45.865Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 87,
+                            "lat": -34.971413489204785,
+                            "lng": 138.63830387762943,
+                            "name": {
+                              "data": {
+                                "id": 25,
+                                "attributes": {
+                                  "symbol": "NE",
+                                  "description": "North East",
+                                  "label": "North East",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.900Z",
+                                  "updatedAt": "2023-08-16T02:59:45.900Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 88,
+                            "lat": -34.9715033207332,
+                            "lng": 138.63830387762943,
+                            "name": {
+                              "data": {
+                                "id": 6,
+                                "attributes": {
+                                  "symbol": "E5",
+                                  "description": "East 5",
+                                  "label": "East 5",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.766Z",
+                                  "updatedAt": "2023-08-16T02:59:45.766Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 89,
+                            "lat": -34.97168298379002,
+                            "lng": 138.63830387762943,
+                            "name": {
+                              "data": {
+                                "id": 5,
+                                "attributes": {
+                                  "symbol": "E4",
+                                  "description": "East 4",
+                                  "label": "East 4",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.759Z",
+                                  "updatedAt": "2023-08-16T02:59:45.759Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 90,
+                            "lat": -34.971862646846844,
+                            "lng": 138.63830387762943,
+                            "name": {
+                              "data": {
+                                "id": 4,
+                                "attributes": {
+                                  "symbol": "E3",
+                                  "description": "East 3",
+                                  "label": "East 3",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.751Z",
+                                  "updatedAt": "2023-08-16T02:59:45.751Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 91,
+                            "lat": -34.97204230990367,
+                            "lng": 138.63830387762943,
+                            "name": {
+                              "data": {
+                                "id": 3,
+                                "attributes": {
+                                  "symbol": "E2",
+                                  "description": "East 2",
+                                  "label": "East 2",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.742Z",
+                                  "updatedAt": "2023-08-16T02:59:45.742Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 92,
+                            "lat": -34.97222197296049,
+                            "lng": 138.63830387762943,
+                            "name": {
+                              "data": {
+                                "id": 2,
+                                "attributes": {
+                                  "symbol": "E1",
+                                  "description": "East 1",
+                                  "label": "East 1",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.731Z",
+                                  "updatedAt": "2023-08-16T02:59:45.731Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 93,
+                            "lat": -34.9723118044889,
+                            "lng": 138.63830387762943,
+                            "name": {
+                              "data": {
+                                "id": 23,
+                                "attributes": {
+                                  "symbol": "SE",
+                                  "description": "South East",
+                                  "label": "South East",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.884Z",
+                                  "updatedAt": "2023-08-16T02:59:45.884Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 94,
+                            "lat": -34.9723118044889,
+                            "lng": 138.63819425066453,
+                            "name": {
+                              "data": {
+                                "id": 11,
+                                "attributes": {
+                                  "symbol": "S5",
+                                  "description": "South 5",
+                                  "label": "South 5",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.798Z",
+                                  "updatedAt": "2023-08-16T02:59:45.798Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 95,
+                            "lat": -34.9723118044889,
+                            "lng": 138.63797499673475,
+                            "name": {
+                              "data": {
+                                "id": 10,
+                                "attributes": {
+                                  "symbol": "S4",
+                                  "description": "South 4",
+                                  "label": "South 4",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.792Z",
+                                  "updatedAt": "2023-08-16T02:59:45.792Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 96,
+                            "lat": -34.9723118044889,
+                            "lng": 138.63775574280498,
+                            "name": {
+                              "data": {
+                                "id": 9,
+                                "attributes": {
+                                  "symbol": "S3",
+                                  "description": "South 3",
+                                  "label": "South 3",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.785Z",
+                                  "updatedAt": "2023-08-16T02:59:45.785Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 97,
+                            "lat": -34.9723118044889,
+                            "lng": 138.6375364888752,
+                            "name": {
+                              "data": {
+                                "id": 8,
+                                "attributes": {
+                                  "symbol": "S2",
+                                  "description": "South 2",
+                                  "label": "South 2",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.778Z",
+                                  "updatedAt": "2023-08-16T02:59:45.778Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 98,
+                            "lat": -34.9723118044889,
+                            "lng": 138.63731723494544,
+                            "name": {
+                              "data": {
+                                "id": 7,
+                                "attributes": {
+                                  "symbol": "S1",
+                                  "description": "South 1",
+                                  "label": "South 1",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.772Z",
+                                  "updatedAt": "2023-08-16T02:59:45.772Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 99,
+                            "lat": -34.97186264684684,
+                            "lng": 138.63775574280498,
+                            "name": {
+                              "data": {
+                                "id": 1,
+                                "attributes": {
+                                  "symbol": "C",
+                                  "description": "Centre",
+                                  "label": "Centre",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.714Z",
+                                  "updatedAt": "2023-08-16T02:59:45.714Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 100,
+                            "lat": -34.9723118044889,
+                            "lng": 138.63720760798054,
+                            "name": {
+                              "data": {
+                                "id": 22,
+                                "attributes": {
+                                  "symbol": "SW",
+                                  "description": "South West",
+                                  "label": "South West",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.873Z",
+                                  "updatedAt": "2023-08-16T02:59:45.873Z"
+                                }
+                              }
+                            }
+                          }
+                        ],
+                        "fauna_plot_point": [
+                          {
+                            "id": 6,
+                            "lat": -34.971864821496084,
+                            "lng": 138.63764986019743,
+                            "name": {
+                              "data": {
+                                "id": 1,
+                                "attributes": {
+                                  "symbol": "C",
+                                  "description": "Centre",
+                                  "label": "Centre",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:55.359Z",
+                                  "updatedAt": "2023-08-16T02:59:55.359Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 7,
+                            "lat": -34.971403261821905,
+                            "lng": 138.6371026907952,
+                            "name": {
+                              "data": {
+                                "id": 2,
+                                "attributes": {
+                                  "symbol": "NW",
+                                  "description": "North-West",
+                                  "label": "North-West",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:55.366Z",
+                                  "updatedAt": "2023-08-16T02:59:55.366Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 9,
+                            "lat": -34.972304399720215,
+                            "lng": 138.63709732396242,
+                            "name": {
+                              "data": {
+                                "id": 3,
+                                "attributes": {
+                                  "symbol": "SW",
+                                  "description": "South-West",
+                                  "label": "South-West",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:55.371Z",
+                                  "updatedAt": "2023-08-16T02:59:55.371Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 10,
+                            "lat": -34.972304399720215,
+                            "lng": 138.6381916652405,
+                            "name": {
+                              "data": {
+                                "id": 4,
+                                "attributes": {
+                                  "symbol": "SE",
+                                  "description": "South-East",
+                                  "label": "South-East",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:55.376Z",
+                                  "updatedAt": "2023-08-16T02:59:55.376Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 8,
+                            "lat": -34.9714076576406,
+                            "lng": 138.63819166764344,
+                            "name": {
+                              "data": {
+                                "id": 5,
+                                "attributes": {
+                                  "symbol": "NE",
+                                  "description": "North-East",
+                                  "label": "North-East",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:55.381Z",
+                                  "updatedAt": "2023-08-16T02:59:55.381Z"
+                                }
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "observers": [
+              {
+                "id": 16,
+                "observer": "Tom92m53"
+              }
+            ],
+            "collection_method": {
+              "data": {
+                "id": 3,
+                "attributes": {
+                  "symbol": "T",
+                  "label": "Tablet",
+                  "description": "",
+                  "uri": "",
+                  "createdAt": "2023-08-16T03:00:07.667Z",
+                  "updatedAt": "2023-08-16T03:00:07.667Z"
+                }
+              }
+            },
+            "location": {
+              "id": 186,
+              "lat": -23.7,
+              "lng": 132.8
+            }
+          }
+        },
+        {
+          "id": 2,
+          "attributes": {
+            "surveyId": {
+              "time": "2023-08-28T00:34:13.100Z",
+              "randNum": 46390249,
+              "surveyType": "soil-pit-characterisation-full"
+            },
+            "start_date_time": "2023-08-28T00:33:35.912Z",
+            "end_date_time": "2023-08-28T00:33:35.912Z",
+            "soil_pit_id": "QDASEQ0001-1",
+            "location_description": "Test",
+            "createdAt": "2023-08-28T00:36:37.859Z",
+            "updatedAt": "2023-08-28T00:36:37.859Z",
+            "plot_visit": {
+              "data": {
+                "id": 1,
+                "attributes": {
+                  "start_date": "2021-08-26T12:26:54.317Z",
+                  "end_date": null,
+                  "visit_field_name": "QLD winter survey",
+                  "createdAt": "2023-08-16T03:00:22.806Z",
+                  "updatedAt": "2023-08-24T04:30:11.464Z",
+                  "plot_layout": {
+                    "data": {
+                      "id": 1,
+                      "attributes": {
+                        "replicate": 1,
+                        "is_the_plot_permanently_marked": false,
+                        "orientation": 1,
+                        "createdAt": "2023-08-16T03:00:22.273Z",
+                        "updatedAt": "2023-08-16T03:00:22.273Z",
+                        "plot_selection": {
+                          "data": {
+                            "id": 1,
+                            "attributes": {
+                              "plot_label": "QDASEQ0001",
+                              "uuid": "a6f84a0e-2239-4bfa-aac6-6d2c99e252f1",
+                              "comment": "some comment",
+                              "createdAt": "2023-08-16T02:59:45.942Z",
+                              "updatedAt": "2023-08-24T04:28:35.761Z",
+                              "plot_name": {
+                                "id": 43,
+                                "unique_digits": "0001",
+                                "state": {
+                                  "data": {
+                                    "id": 4,
+                                    "attributes": {
+                                      "symbol": "QD",
+                                      "label": "Queensland",
+                                      "description": "",
+                                      "uri": "https://linked.data.gov.au/def/nrm/d9d48a48-f74e-55b7-a360-82975c6be412",
+                                      "createdAt": "2023-08-16T02:59:44.574Z",
+                                      "updatedAt": "2023-08-16T02:59:44.574Z"
+                                    }
+                                  }
+                                },
+                                "program": {
+                                  "data": {
+                                    "id": 1,
+                                    "attributes": {
+                                      "symbol": "NLP",
+                                      "label": "National Landcare Program",
+                                      "description": "",
+                                      "uri": "",
+                                      "createdAt": "2023-08-16T02:59:44.628Z",
+                                      "updatedAt": "2023-08-16T02:59:44.628Z"
+                                    }
+                                  }
+                                },
+                                "bioregion": {
+                                  "data": {
+                                    "id": 84,
+                                    "attributes": {
+                                      "symbol": "SEQ",
+                                      "label": "South Eastern Queensland",
+                                      "description": "",
+                                      "uri": "",
+                                      "createdAt": "2023-08-16T02:59:45.671Z",
+                                      "updatedAt": "2023-08-24T04:28:48.443Z",
+                                      "states": {
+                                        "data": [
+                                          {
+                                            "id": 2,
+                                            "attributes": {
+                                              "symbol": "NS",
+                                              "label": "New South Wales",
+                                              "description": "",
+                                              "uri": "https://linked.data.gov.au/def/nrm/14b8c3fe-3a60-5f3a-bb7a-b9cf5df49b4e",
+                                              "createdAt": "2023-08-16T02:59:44.559Z",
+                                              "updatedAt": "2023-08-16T02:59:44.559Z"
+                                            }
+                                          },
+                                          {
+                                            "id": 4,
+                                            "attributes": {
+                                              "symbol": "QD",
+                                              "label": "Queensland",
+                                              "description": "",
+                                              "uri": "https://linked.data.gov.au/def/nrm/d9d48a48-f74e-55b7-a360-82975c6be412",
+                                              "createdAt": "2023-08-16T02:59:44.574Z",
+                                              "updatedAt": "2023-08-16T02:59:44.574Z"
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  }
+                                }
+                              },
+                              "recommended_location": {
+                                "id": 136,
+                                "lat": -35.0004723472134,
+                                "lng": 138.66067886352542
+                              },
+                              "recommended_location_point": {
+                                "data": {
+                                  "id": 1,
+                                  "attributes": {
+                                    "symbol": "C",
+                                    "description": "Centre",
+                                    "label": "Centre",
+                                    "uri": "",
+                                    "createdAt": "2023-08-16T02:59:45.714Z",
+                                    "updatedAt": "2023-08-16T02:59:45.714Z"
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "plot_type": {
+                          "data": {
+                            "id": 1,
+                            "attributes": {
+                              "symbol": "C",
+                              "label": "Control",
+                              "description": "",
+                              "uri": "",
+                              "createdAt": "2023-08-16T03:00:06.446Z",
+                              "updatedAt": "2023-08-16T03:00:06.446Z"
+                            }
+                          }
+                        },
+                        "permanently_marked": null,
+                        "plot_dimension": {
+                          "data": {
+                            "id": 1,
+                            "attributes": {
+                              "symbol": "100m",
+                              "label": "100 x 100",
+                              "description": "100 m by 100m (1 hectare)",
+                              "uri": "",
+                              "createdAt": "2023-08-16T03:00:06.146Z",
+                              "updatedAt": "2023-08-16T03:00:06.146Z"
+                            }
+                          }
+                        },
+                        "plot_points": [
+                          {
+                            "id": 1,
+                            "lat": -27.388252,
+                            "lng": 152.880694,
+                            "name": {
+                              "data": {
+                                "id": 16,
+                                "attributes": {
+                                  "symbol": "W5",
+                                  "description": "West 5",
+                                  "label": "West 5",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.834Z",
+                                  "updatedAt": "2023-08-16T02:59:45.834Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 2,
+                            "lat": -27.388336,
+                            "lng": 152.880651,
+                            "name": {
+                              "data": {
+                                "id": 15,
+                                "attributes": {
+                                  "symbol": "W4",
+                                  "description": "West 4",
+                                  "label": "West 4",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.828Z",
+                                  "updatedAt": "2023-08-16T02:59:45.828Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 3,
+                            "lat": -27.388483,
+                            "lng": 152.880518,
+                            "name": {
+                              "data": {
+                                "id": 14,
+                                "attributes": {
+                                  "symbol": "W3",
+                                  "description": "West 3",
+                                  "label": "West 3",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.819Z",
+                                  "updatedAt": "2023-08-16T02:59:45.819Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 4,
+                            "lat": -27.388611,
+                            "lng": 152.880389,
+                            "name": {
+                              "data": {
+                                "id": 13,
+                                "attributes": {
+                                  "symbol": "W2",
+                                  "description": "West 2",
+                                  "label": "West 2",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.813Z",
+                                  "updatedAt": "2023-08-16T02:59:45.813Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 5,
+                            "lat": -27.388749,
+                            "lng": 152.88028,
+                            "name": {
+                              "data": {
+                                "id": 12,
+                                "attributes": {
+                                  "symbol": "W1",
+                                  "description": "West 1",
+                                  "label": "West 1",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.806Z",
+                                  "updatedAt": "2023-08-16T02:59:45.806Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 6,
+                            "lat": -27.388903,
+                            "lng": 152.880154,
+                            "name": {
+                              "data": {
+                                "id": 22,
+                                "attributes": {
+                                  "symbol": "SW",
+                                  "description": "South West",
+                                  "label": "South West",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.873Z",
+                                  "updatedAt": "2023-08-16T02:59:45.873Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 7,
+                            "lat": -27.389463,
+                            "lng": 152.880835,
+                            "name": {
+                              "data": {
+                                "id": 23,
+                                "attributes": {
+                                  "symbol": "SE",
+                                  "description": "South East",
+                                  "label": "South East",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.884Z",
+                                  "updatedAt": "2023-08-16T02:59:45.884Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 8,
+                            "lat": -27.389366,
+                            "lng": 152.880644,
+                            "name": {
+                              "data": {
+                                "id": 11,
+                                "attributes": {
+                                  "symbol": "S5",
+                                  "description": "South 5",
+                                  "label": "South 5",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.798Z",
+                                  "updatedAt": "2023-08-16T02:59:45.798Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 9,
+                            "lat": -27.389248,
+                            "lng": 152.880525,
+                            "name": {
+                              "data": {
+                                "id": 10,
+                                "attributes": {
+                                  "symbol": "S4",
+                                  "description": "South 4",
+                                  "label": "South 4",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.792Z",
+                                  "updatedAt": "2023-08-16T02:59:45.792Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 10,
+                            "lat": -27.389158,
+                            "lng": 152.88035,
+                            "name": {
+                              "data": {
+                                "id": 9,
+                                "attributes": {
+                                  "symbol": "S3",
+                                  "description": "South 3",
+                                  "label": "South 3",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.785Z",
+                                  "updatedAt": "2023-08-16T02:59:45.785Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 11,
+                            "lat": -27.389021,
+                            "lng": 152.880195,
+                            "name": {
+                              "data": {
+                                "id": 8,
+                                "attributes": {
+                                  "symbol": "S2",
+                                  "description": "South 2",
+                                  "label": "South 2",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.778Z",
+                                  "updatedAt": "2023-08-16T02:59:45.778Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 12,
+                            "lat": -27.389373,
+                            "lng": 152.880195,
+                            "name": {
+                              "data": {
+                                "id": 7,
+                                "attributes": {
+                                  "symbol": "S1",
+                                  "description": "South 1",
+                                  "label": "South 1",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.772Z",
+                                  "updatedAt": "2023-08-16T02:59:45.772Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 13,
+                            "lat": -27.388316,
+                            "lng": 152.880797,
+                            "name": {
+                              "data": {
+                                "id": 24,
+                                "attributes": {
+                                  "symbol": "NW",
+                                  "description": "North West",
+                                  "label": "North West",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.893Z",
+                                  "updatedAt": "2023-08-16T02:59:45.893Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 14,
+                            "lat": -27.388909,
+                            "lng": 152.881448,
+                            "name": {
+                              "data": {
+                                "id": 25,
+                                "attributes": {
+                                  "symbol": "NE",
+                                  "description": "North East",
+                                  "label": "North East",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.900Z",
+                                  "updatedAt": "2023-08-16T02:59:45.900Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 15,
+                            "lat": -27.388821,
+                            "lng": 152.881503,
+                            "name": {
+                              "data": {
+                                "id": 21,
+                                "attributes": {
+                                  "symbol": "N5",
+                                  "description": "North 5",
+                                  "label": "North 5",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.865Z",
+                                  "updatedAt": "2023-08-16T02:59:45.865Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 16,
+                            "lat": -27.388766,
+                            "lng": 152.881422,
+                            "name": {
+                              "data": {
+                                "id": 20,
+                                "attributes": {
+                                  "symbol": "N4",
+                                  "description": "North 4",
+                                  "label": "North 4",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.857Z",
+                                  "updatedAt": "2023-08-16T02:59:45.857Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 17,
+                            "lat": -27.388644,
+                            "lng": 152.881263,
+                            "name": {
+                              "data": {
+                                "id": 19,
+                                "attributes": {
+                                  "symbol": "N3",
+                                  "description": "North 3",
+                                  "label": "North 3",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.851Z",
+                                  "updatedAt": "2023-08-16T02:59:45.851Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 18,
+                            "lat": -27.388549,
+                            "lng": 152.881107,
+                            "name": {
+                              "data": {
+                                "id": 18,
+                                "attributes": {
+                                  "symbol": "N2",
+                                  "description": "North 2",
+                                  "label": "North 2",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.845Z",
+                                  "updatedAt": "2023-08-16T02:59:45.845Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 19,
+                            "lat": -27.388445,
+                            "lng": 152.880939,
+                            "name": {
+                              "data": {
+                                "id": 17,
+                                "attributes": {
+                                  "symbol": "N1",
+                                  "description": "North 1",
+                                  "label": "North 1",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.839Z",
+                                  "updatedAt": "2023-08-16T02:59:45.839Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 20,
+                            "lat": -27.389035,
+                            "lng": 152.881314,
+                            "name": {
+                              "data": {
+                                "id": 6,
+                                "attributes": {
+                                  "symbol": "E5",
+                                  "description": "East 5",
+                                  "label": "East 5",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.766Z",
+                                  "updatedAt": "2023-08-16T02:59:45.766Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 21,
+                            "lat": -27.389208,
+                            "lng": 152.88122,
+                            "name": {
+                              "data": {
+                                "id": 5,
+                                "attributes": {
+                                  "symbol": "E4",
+                                  "description": "East 4",
+                                  "label": "East 4",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.759Z",
+                                  "updatedAt": "2023-08-16T02:59:45.759Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 22,
+                            "lat": -27.388974,
+                            "lng": 152.880106,
+                            "name": {
+                              "data": {
+                                "id": 1,
+                                "attributes": {
+                                  "symbol": "C",
+                                  "description": "Centre",
+                                  "label": "Centre",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.714Z",
+                                  "updatedAt": "2023-08-16T02:59:45.714Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 23,
+                            "lat": -27.389343,
+                            "lng": 152.881089,
+                            "name": {
+                              "data": {
+                                "id": 4,
+                                "attributes": {
+                                  "symbol": "E3",
+                                  "description": "East 3",
+                                  "label": "East 3",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.751Z",
+                                  "updatedAt": "2023-08-16T02:59:45.751Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 24,
+                            "lat": -27.389472,
+                            "lng": 152.880973,
+                            "name": {
+                              "data": {
+                                "id": 3,
+                                "attributes": {
+                                  "symbol": "E2",
+                                  "description": "East 2",
+                                  "label": "East 2",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.742Z",
+                                  "updatedAt": "2023-08-16T02:59:45.742Z"
+                                }
+                              }
+                            }
+                          },
+                          {
+                            "id": 25,
+                            "lat": -27.389553,
+                            "lng": 152.880916,
+                            "name": {
+                              "data": {
+                                "id": 2,
+                                "attributes": {
+                                  "symbol": "E1",
+                                  "description": "East 1",
+                                  "label": "East 1",
+                                  "uri": "",
+                                  "createdAt": "2023-08-16T02:59:45.731Z",
+                                  "updatedAt": "2023-08-16T02:59:45.731Z"
+                                }
+                              }
+                            }
+                          }
+                        ],
+                        "fauna_plot_point": []
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "observers": [
+              {
+                "id": 28,
+                "observer": "3"
+              }
+            ],
+            "collection_method": {
+              "data": {
+                "id": 1,
+                "attributes": {
+                  "symbol": "DG",
+                  "label": "Differential GNSS",
+                  "description": "",
+                  "uri": "",
+                  "createdAt": "2023-08-16T03:00:07.655Z",
+                  "updatedAt": "2023-08-16T03:00:07.655Z"
+                }
+              }
+            },
+            "location": {
+              "id": 219,
+              "lat": -35.2592451,
+              "lng": 149.0651511
+            }
+          }
+        }
+      ],
+      "meta": {
+        "pagination": {
+          "page": 1,
+          "pageSize": 1000,
+          "pageCount": 1,
+          "total": 2
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/groovy/au/org/ala/merit/DateUtils.groovy b/src/main/groovy/au/org/ala/merit/DateUtils.groovy
index c5ab5dc33..56aa88882 100644
--- a/src/main/groovy/au/org/ala/merit/DateUtils.groovy
+++ b/src/main/groovy/au/org/ala/merit/DateUtils.groovy
@@ -7,6 +7,8 @@ import org.joda.time.format.ISODateTimeFormat
 
 import java.text.SimpleDateFormat
 import java.time.Month
+import java.time.ZoneOffset
+import java.time.ZonedDateTime
 
 /**
  * Utilities for working with fieldcapture / ecodata ISO8601 dates.
@@ -21,7 +23,7 @@ class DateUtils {
     private static DateTimeFormatter DISPLAY_DATE_FORMATTER_WITH_TIME_NOSPACE = DateTimeFormat.forPattern("yyyyMMddHHmmss").withZone(DateTimeZone.default)
     private static DateTimeFormatter MONTH_ONLY_FORMATTER = DateTimeFormat.forPattern('MMMMM yyyy')
     private static DateTimeFormatter LOCAL_DATE_ISO_FORMAT = ISODateTimeFormat.date().withZone(DateTimeZone.default)
-
+    private static java.time.format.DateTimeFormatter ISO_DATE_FORMATTER = java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")
 
 
     /**
@@ -128,6 +130,11 @@ class DateUtils {
         return DATE_FORMATTER.print(date)
     }
 
+    static String formatAsISOStringNoMillis(Date date) {
+        ZonedDateTime dateTime = ZonedDateTime.ofInstant(date.toInstant(), ZoneOffset.UTC)
+        dateTime.format(ISO_DATE_FORMATTER)
+    }
+
     static String format(DateTime date, String formatString) {
         DateTimeFormatter formatter = DateTimeFormat.forPattern(formatString).withZone(date.getZone())
         return formatter.print(date)
diff --git a/src/main/groovy/au/org/ala/merit/GmsMapper.groovy b/src/main/groovy/au/org/ala/merit/GmsMapper.groovy
index 4fe2e8937..8feac3ef6 100644
--- a/src/main/groovy/au/org/ala/merit/GmsMapper.groovy
+++ b/src/main/groovy/au/org/ala/merit/GmsMapper.groovy
@@ -61,7 +61,7 @@ class GmsMapper {
             APP_DESC:[name:'description', type:'string', description:'The project description as it will appear in MERIT'],
             PROGRAM_NM:[name:'associatedProgram', type:'string',mandatory:true,description:'Must match the name of an existing MERIT program or sub-program'],
             ROUND_NM:[name:'associatedSubProgram', type:'string'],
-            MANAGEMENT_UNIT:[name:'managementUnitName', type:'string'],
+            MANAGEMENT_UNIT:[name:'managementUnitName', type:'string', mandatory: false, description: 'The management unit the project is being conducted in'],
             ABN:[name: 'abn', type: 'string', description:'The ABN of the organisation receiving the funding'],
             ORG_TRADING_NAME:[name:'organisationName', type:'string',description:'The trading name of the organisation receiving the funding (only used if the ABN is not supplied)'],
             START_DT:[name:'plannedStartDate', type:'date', mandatory:true, description:'The planned start date of the project'],
@@ -70,6 +70,7 @@ class GmsMapper {
             CONTRACT_END_DT:[name:'contractEndDate', type:'date'],
             ORDER_NO: [name: 'externalIds', type:'externalId',description:'The SAP Internal Order Number for this project', multipleColumnsSupported: true, idType:'INTERNAL_ORDER_NUMBER'],
             TECH_ONE_ID: [name: 'externalIds', type:'externalId', 'description':'The Tech One system ID for this project', multipleColumnsSupported: true, idType:'TECH_ONE_CODE'],
+            TECH_ONE_CONTRACT_NUMBER: [name: 'externalIds', type:'externalId', 'description':'The Tech One contract number for this project', multipleColumnsSupported: true, idType:'TECH_ONE_CONTRACT_NUMBER'],
             WORK_ORDER_ID:[name:'externalIds', type:'externalId', multipleColumnsSupported: true, idType:'WORK_ORDER'],
             FUNDING:[name:'funding', type:'decimal',description:'Total funding for this project (displayed on project overview)'],
             AUTHORISEDP_EMAIL:[name:'adminEmail', type:'email', description:'This user will be added as an admin to the project'],
diff --git a/src/main/groovy/au/org/ala/merit/PublicationStatus.groovy b/src/main/groovy/au/org/ala/merit/PublicationStatus.groovy
new file mode 100644
index 000000000..e5782ab4b
--- /dev/null
+++ b/src/main/groovy/au/org/ala/merit/PublicationStatus.groovy
@@ -0,0 +1,22 @@
+package au.org.ala.merit
+
+class PublicationStatus {
+    public static final String APPROVED = 'published'
+    public static final String SUBMITTED = 'pendingApproval'
+    public static final String NOT_APPROVED = 'unpublished'
+    public static final String CANCELLED = 'cancelled'
+
+    static boolean isReadOnly(publicationStatus) {
+        // A null/blank publication status is treated the same as a NOT_APPROVED status
+        publicationStatus == APPROVED || publicationStatus == SUBMITTED || publicationStatus == CANCELLED
+    }
+
+    static boolean isApproved(publicationStatus) {
+        publicationStatus == APPROVED
+    }
+
+    /** A status indicates the item requires further action when it is not yet approved or cancelled */
+    static boolean requiresAction(publicationStatus) {
+        publicationStatus != APPROVED && publicationStatus != CANCELLED
+    }
+}
diff --git a/src/main/groovy/au/org/ala/merit/SettingPageType.groovy b/src/main/groovy/au/org/ala/merit/SettingPageType.groovy
index a9115ed85..e7d28c9b5 100644
--- a/src/main/groovy/au/org/ala/merit/SettingPageType.groovy
+++ b/src/main/groovy/au/org/ala/merit/SettingPageType.groovy
@@ -60,9 +60,12 @@ enum SettingPageType {
     SERVICES('services', 'Configuration for project services', 'services.config'),
     DASHBOARD_EXPLANATION('dashboardExplanation', 'Header text under the dashboard report', 'fielddata.dashboardExplanation'),
     UNLOCK_PLAN_DECLARATION('unlockPlanDeclaration', 'Declaration', 'fielddata.unlockPlanDeclaration.text'),
-    LOCK_STOLEN_EMAIL_SUBJECT('lockStolenSubject', 'Subject line when someone overrides a lock', 'fielddata.lock.subject'),
-    LOCK_STOLEN_EMAIL('lockStolenEmail', 'Email content when someone overrides a lock', 'fielddata.lock.body'),
+    ACTIVITY_LOCK_STOLEN_EMAIL_SUBJECT('lockStolenSubject', 'Subject line when someone overrides a lock', 'fielddata.lock.subject'),
+    ACTIVITY_LOCK_STOLEN_EMAIL('lockStolenEmail', 'Email content when someone overrides a lock', 'fielddata.lock.body'),
+    PROJECT_LOCK_STOLEN_EMAIL_SUBJECT('projectLockStolenSubject', 'Subject line when someone overrides a project MERI Plan lock', 'fielddata.project_lock.subject'),
+    PROJECT_LOCK_STOLEN_EMAIL('projectLockStolenEmail', 'Email content when someone overrides a project MERI Plan lock', 'fielddata.project_lock.body'),
     RLP_MERI_DECLARATION('rlpMeriDeclaration', 'Declaration when submitting RLP reports or MERI Plan', 'fielddata.rlp.meri.declaration'),
+    RDP_MERI_DECLARATION('rdpMeriDeclaration', 'Declaration when submitting RDP reports or MERI Plan', 'fielddata.rdp.meri.declaration'),
     RLP_PLAN_SUBMITTED_EMAIL('rlpMeriPlanSubmitted', 'Project plan has been submitted email body text', 'fielddata.rlp.meriPlanSubmitted.emailText'),
     RLP_PLAN_APPROVED_EMAIL('rlpMeriPlanApproved', 'Project plan has been approved email body text', 'fielddata.rlp.meriPlanApproved.emailText'),
     RLP_PLAN_REJECTED_EMAIL('rlpMeriPlanRejected', 'Project plan has been rejected email body text', 'fielddata.rlp.meriPlanRejected.emailText'),
@@ -70,6 +73,7 @@ enum SettingPageType {
     RLP_PLAN_APPROVED_EMAIL_SUBJECT_LINE('rlpMeriPlanApprovedSubject', 'Subject line for the \'Project plan has been approved\' email', 'fielddata.rlp.meriPlanApproved.emailSubject'),
     RLP_PLAN_REJECTED_EMAIL_SUBJECT_LINE('rlpMeriPlanRejectedSubject', 'Subject line for the \'Project plan has been rejected\' email', 'fielddata.rlp.meriPlanRejected.emailSubject'),
     RLP_REPORT_DECLARATION('rlpReportDeclaration', 'Declaration when submitting RLP reports or MERI Plan', 'fielddata.rlp.report.declaration'),
+    RDP_REPORT_DECLARATION('rdpReportDeclaration', 'Declaration when submitting RDP reports or MERI Plan', 'fielddata.rdp.report.declaration'),
     RLP_REPORT_SUBMITTED_EMAIL_SUBJECT('rlpReportSubmittedEmailSubject', 'RLP Report submitted email subject line text', 'fielddata.rlp.report.submitted.emailSubject'),
     RLP_REPORT_SUBMITTED_EMAIL_BODY('rlpReportSubmittedEmailBody', 'RLP Report submitted email subject body text', 'fielddata.rlp.report.submitted.emailBody'),
     RLP_REPORT_APPROVED_EMAIL_SUBJECT('rlpReportApprovedEmailSubject', 'RLP Report approved email subject line text', 'fielddata.rlp.report.approved.emailSubject'),
diff --git a/src/main/groovy/au/org/ala/merit/command/MeriPlanChangesReportCommand.groovy b/src/main/groovy/au/org/ala/merit/command/MeriPlanChangesReportCommand.groovy
new file mode 100644
index 000000000..bdf3ebe4f
--- /dev/null
+++ b/src/main/groovy/au/org/ala/merit/command/MeriPlanChangesReportCommand.groovy
@@ -0,0 +1,87 @@
+package au.org.ala.merit.command
+
+import au.org.ala.merit.DocumentService
+import au.org.ala.merit.MetadataService
+import au.org.ala.merit.ProjectService
+import grails.validation.Validateable
+import org.apache.http.HttpStatus
+
+import javax.persistence.Transient
+
+/**
+ * The MeriPlanReportCommand assembles the necessary data to display the MERI plan for a project.
+ * It can use the current project information or retrieve project data from an audit message if the audit
+ * message id is supplied.
+ */
+class MeriPlanChangesReportCommand implements Validateable{
+
+    static String RLP_MERI_PLAN_TEMPLATE = "rlpMeriPlan"
+
+    @Transient
+    ProjectService projectService
+
+    @Transient
+    MetadataService metadataService
+
+    @Transient
+    DocumentService documentService
+
+    /** The project id to display the MERI Plan report for */
+    String id
+
+    /** The document id if a previous MERI plan is requested */
+    String documentId
+
+
+    static constraints = {
+        projectService nullable: true
+        metadataService nullabe: true
+        documentId nullable: true
+    }
+
+    /**
+     * Returns a model suitable for rendering a MERI plan from either a project id or audit message id (for a
+     * historical MERI plan).
+     * If validation fails or the project is not found a map with keys statusCode:<int>, error:<errors object>
+     * will be returned.
+     */
+    Map meriPlanChangesReportModel() {
+
+        if (!validate()) {
+            return [statusCode:HttpStatus.SC_UNPROCESSABLE_ENTITY, error:getErrors()]
+        }
+
+        Map project, content, changed, model
+        if (documentId) {
+            content = projectService.getApprovedMeriPlanProject(documentId)
+            project = content?.project
+        } else {
+            Map result = documentService.search(projectId:id, role:'approval', labels:'MERI')
+            List documents = result?.documents ?: []
+            def res = documents.get(documents.size()-1)
+            content = projectService.getApprovedMeriPlanProject(res.documentId)
+            project = content?.project
+        }
+
+        if (!project) {
+            errors.reject("Project not found")
+            model = [statusCode: HttpStatus.SC_NOT_FOUND, error:getErrors()]
+        } else {
+            Map config = projectService.getProgramConfiguration(project)
+            changed = projectService.get(id, 'all')
+
+            project?.referenceDocument = content?.referenceDocument
+            project?.dateApproved = content?.dateApproved
+
+            [project:content?.project,
+                     config:config,
+                     headerTemplate:'/project/configurableMeriPlanHeader',
+                     meriPlanChangesTemplate:'/project/configurableMeriPlanChangesView',
+                     changed:changed,
+                     user:[isAdmin:true]]
+
+        }
+
+    }
+
+}
diff --git a/src/main/groovy/au/org/ala/merit/command/PrintOrganisationReportCommand.groovy b/src/main/groovy/au/org/ala/merit/command/PrintOrganisationReportCommand.groovy
new file mode 100644
index 000000000..2cead979a
--- /dev/null
+++ b/src/main/groovy/au/org/ala/merit/command/PrintOrganisationReportCommand.groovy
@@ -0,0 +1,11 @@
+package au.org.ala.merit.command
+
+import au.org.ala.merit.ReportService
+
+class PrintOrganisationReportCommand extends OrganisationReportCommand {
+
+    @Override
+    ReportService.ReportMode getMode() {
+        return ReportService.ReportMode.PRINT
+    }
+}
diff --git a/src/main/groovy/au/org/ala/merit/command/PrintProgramReportCommand.groovy b/src/main/groovy/au/org/ala/merit/command/PrintProgramReportCommand.groovy
new file mode 100644
index 000000000..7201d5514
--- /dev/null
+++ b/src/main/groovy/au/org/ala/merit/command/PrintProgramReportCommand.groovy
@@ -0,0 +1,11 @@
+package au.org.ala.merit.command
+
+import au.org.ala.merit.ReportService
+
+class PrintProgramReportCommand extends OrganisationReportCommand {
+
+    @Override
+    ReportService.ReportMode getMode() {
+        return ReportService.ReportMode.PRINT
+    }
+}
diff --git a/src/main/groovy/au/org/ala/merit/command/Reef2050PlanActionReportCommand.groovy b/src/main/groovy/au/org/ala/merit/command/Reef2050PlanActionReportCommand.groovy
index cc6eb7260..297c25e1f 100644
--- a/src/main/groovy/au/org/ala/merit/command/Reef2050PlanActionReportCommand.groovy
+++ b/src/main/groovy/au/org/ala/merit/command/Reef2050PlanActionReportCommand.groovy
@@ -3,6 +3,7 @@ package au.org.ala.merit.command
 import au.org.ala.merit.ActivityService
 import au.org.ala.merit.DateUtils
 import au.org.ala.merit.ProjectService
+import au.org.ala.merit.PublicationStatus
 import au.org.ala.merit.ReportService
 import au.org.ala.merit.SettingPageType
 import au.org.ala.merit.SettingService
@@ -109,7 +110,7 @@ class Reef2050PlanActionReportCommand extends Reef2050PlanActionReportConfig imp
                 progress:ActivityService.PROGRESS_FINISHED]
 
         if (approvedActivitiesOnly) {
-            searchCriteria.publicationStatus = ReportService.REPORT_APPROVED
+            searchCriteria.publicationStatus = PublicationStatus.APPROVED
         }
 
         Map resp
diff --git a/src/main/groovy/au/org/ala/merit/command/Reef2050PlanActionReportSummaryCommand.groovy b/src/main/groovy/au/org/ala/merit/command/Reef2050PlanActionReportSummaryCommand.groovy
index 16fef5e68..ddb403597 100644
--- a/src/main/groovy/au/org/ala/merit/command/Reef2050PlanActionReportSummaryCommand.groovy
+++ b/src/main/groovy/au/org/ala/merit/command/Reef2050PlanActionReportSummaryCommand.groovy
@@ -1,8 +1,7 @@
 package au.org.ala.merit.command
 
 import au.org.ala.merit.ActivityService
-import au.org.ala.merit.DateUtils
-import au.org.ala.merit.ReportService
+import au.org.ala.merit.PublicationStatus
 import au.org.ala.merit.reports.Reef2050PlanActionReportConfig
 import grails.converters.JSON
 import grails.validation.Validateable
@@ -41,7 +40,7 @@ class Reef2050PlanActionReportSummaryCommand implements Validateable{
                 [type    : Reef2050PlanActionReportConfig.REEF_2050_PLAN_ACTION_REPORTING_2018_ACTIVITY_TYPE,
                  progress: ActivityService.PROGRESS_FINISHED]
         if (approvedActivitiesOnly) {
-            searchCriteria.publicationStatus = ReportService.REPORT_APPROVED
+            searchCriteria.publicationStatus = PublicationStatus.APPROVED
         }
 
         List availableReports = []
diff --git a/src/main/groovy/au/org/ala/merit/command/SaveReportDataCommand.groovy b/src/main/groovy/au/org/ala/merit/command/SaveReportDataCommand.groovy
index 037508edc..a24162d36 100644
--- a/src/main/groovy/au/org/ala/merit/command/SaveReportDataCommand.groovy
+++ b/src/main/groovy/au/org/ala/merit/command/SaveReportDataCommand.groovy
@@ -3,13 +3,14 @@ package au.org.ala.merit.command
 import au.org.ala.merit.ActivityService
 import au.org.ala.merit.ReportService
 import au.org.ala.merit.SiteService
+import au.org.ala.merit.reports.ReportLifecycleListener
 import grails.validation.Validateable
 import org.apache.http.HttpStatus
 
 /**
  * Handles the process of updating the activity and site data for a Report.
  */
-class SaveReportDataCommand implements Validateable{
+class SaveReportDataCommand implements Validateable {
 
     SiteService siteService
     ActivityService activityService
@@ -119,7 +120,17 @@ class SaveReportDataCommand implements Validateable{
             }
             // Setting the activityId in the payload is necessary for ecodata to update the activity as well as outputs.
             activity.activityId = activityId
+
             result = activityService.update(activityId, activity)
+
+            if (!result.error) {
+                Map callbackResult = saveCallback(savedActivity.type, activity, report)
+                if (callbackResult.error) {
+                    result.error = callbackResult.error
+                }
+                result.error = callbackResult.error
+            }
+
         }
 
         result
@@ -156,5 +167,8 @@ class SaveReportDataCommand implements Validateable{
         siteId
     }
 
-
+    private Map saveCallback(String activityType, Map activity, Map report) {
+        ReportLifecycleListener reportData = reportService.reportLifeCycleListener(activityType)
+        reportData.reportSaved(report, activity)
+    }
 }
\ No newline at end of file
diff --git a/src/main/groovy/au/org/ala/merit/config/ProgramConfig.groovy b/src/main/groovy/au/org/ala/merit/config/ProgramConfig.groovy
index a130f6887..6730d792d 100644
--- a/src/main/groovy/au/org/ala/merit/config/ProgramConfig.groovy
+++ b/src/main/groovy/au/org/ala/merit/config/ProgramConfig.groovy
@@ -1,6 +1,6 @@
 package au.org.ala.merit.config
 
-
+import au.org.ala.merit.SettingPageType
 import groovy.util.logging.Slf4j
 
 /**
@@ -96,6 +96,10 @@ class ProgramConfig implements Map {
         emailTemplate
     }
 
+    SettingPageType getDeclarationTemplate() {
+        return SettingPageType.getForName(config.declarationPageType ?: 'rlpReportDeclaration')
+    }
+
 
 
     boolean projectsMustStartAndEndOnContractDates
@@ -138,6 +142,15 @@ class ProgramConfig implements Map {
 
     /** This flag controls whether a user with the MERIT read only role can view projects when the visibility is set to "private" */
     boolean readOnlyUsersCanViewWhenPrivate = false
+
+    /** This flag controls whether the project is using the new meri plan template(2023) */
+    boolean supportsMeriPlanComparison = false
+
+    boolean supportsOutcomeTargets() {
+        Map template = config.meriPlanContents?.find{ it.template == "serviceOutcomeTargets"}
+        template != null
+    }
+
 }
 
 
diff --git a/src/main/groovy/au/org/ala/merit/reports/NHTOutputReportLifecycleListener.groovy b/src/main/groovy/au/org/ala/merit/reports/NHTOutputReportLifecycleListener.groovy
new file mode 100644
index 000000000..198037720
--- /dev/null
+++ b/src/main/groovy/au/org/ala/merit/reports/NHTOutputReportLifecycleListener.groovy
@@ -0,0 +1,109 @@
+package au.org.ala.merit.reports
+
+import au.org.ala.merit.ActivityService
+import au.org.ala.merit.ProjectService
+import au.org.ala.merit.PublicationStatus
+import groovy.util.logging.Slf4j
+import org.grails.web.json.JSONArray
+import org.grails.web.json.JSONObject
+import org.springframework.beans.factory.annotation.Autowired
+
+/**
+ * Custom data for the NHT Output Report.
+ */
+@Slf4j
+class NHTOutputReportLifecycleListener extends ReportLifecycleListener {
+
+    @Autowired
+    ProjectService projectService
+    @Autowired
+    ActivityService activityService
+
+    boolean containsEntityReferences() {
+        true
+    }
+    Map getContextData(Map project, Map report) {
+        // Side effect - filter data sets.
+        List eligibleDataSets = project.custom?.dataSets?.findAll {
+            // This is a side effect and a workaround for the problem that selected outcomes
+            // are an array and the knockout binding doesn't support arrays as a value.
+            if (it.projectOutcomes) {
+                it.outcomesLabel = new ArrayList(it.projectOutcomes).join(',')
+            }
+            it.progress == ActivityService.PROGRESS_FINISHED
+        }
+        eligibleDataSets.each {
+            it.alreadyReported = (it.reportId && it.reportId != report.reportId)
+        }
+        if (project.custom) {
+            project.custom.dataSets = new JSONArray(eligibleDataSets ?: [])
+        }
+
+        List investmentPriorities = projectService.listProjectInvestmentPriorities(project.projectId)
+
+        List protocols = projectService.listProjectProtocols(project).collect {
+            [label: it.name, value: it.externalId]
+        }
+        protocols << [label:'Other', value:'other']
+        return [
+            protocols:protocols,
+            investmentPriorities:investmentPriorities
+        ]
+    }
+
+
+    Map getOutputData(Map project, Map outputConfig, Map report) {
+        List scores = outputConfig.outputContext.scores
+        JSONObject extraData = new JSONObject()
+        if (scores) {
+            List result = projectService.outcomesByScores(project, scores)
+            extraData.outcomes = result?.collect {
+                String label = new ArrayList(it).join(',')
+                // Knockout doesn't support binding arrays to select options so we need to
+                // convert it to a String.
+                new JSONObject([label:label, value:label])
+            }
+        }
+        extraData
+    }
+
+    Map reportSaved(Map report, Map activityData) {
+        updateDataSetSummaries(report, activityData, [reportId: report.reportId])
+    }
+
+
+    private Map updateDataSetSummaries(Map report, Map activityData, Map properties) {
+        List entities = findReferencedEntities(activityData)
+        List dataSetIds = entities.findAll{
+            it.entityType == 'au.org.ala.ecodata.DataSetSummary'}.collect {
+            it.entityIds }.flatten().unique()
+        projectService.bulkUpdateDataSetSummaries(report.projectId, report.reportId, dataSetIds, properties)
+    }
+
+    Map reportSubmitted(Map report, List reportActivityIds, Map reportOwner) {
+        updateDataSetPublicationStatus(report, reportActivityIds, PublicationStatus.SUBMITTED)
+    }
+    Map reportApproved(Map report, List reportActivityIds, Map reportOwner) {
+        updateDataSetPublicationStatus(report, reportActivityIds, PublicationStatus.APPROVED)
+    }
+    Map reportRejected(Map report, List reportActivityIds, Map reportOwner) {
+        updateDataSetPublicationStatus(report, reportActivityIds, PublicationStatus.NOT_APPROVED)
+    }
+    Map reportCancelled(Map report, List reportActivityIds, Map reportOwner) {
+        updateDataSetPublicationStatus(report, reportActivityIds, PublicationStatus.CANCELLED)
+    }
+    Map reportReset(Map report) {
+        // This is dissociate all data set summaries from the report because of the empty array of data set ids.
+        projectService.bulkUpdateDataSetSummaries(report.projectId, report.reportId, [], [:])
+    }
+
+    private Map updateDataSetPublicationStatus(Map report, List reportActivityIds, String newStatus) {
+        Map result = [:]
+        if (report.activityId) {
+            Map activity = activityService.get(report.activityId)
+            result = updateDataSetSummaries(report, activity, [publicationStatus: newStatus])
+        }
+        result
+    }
+
+}
diff --git a/src/main/groovy/au/org/ala/merit/reports/OutputMetadata.groovy b/src/main/groovy/au/org/ala/merit/reports/OutputMetadata.groovy
new file mode 100644
index 000000000..62d9812f6
--- /dev/null
+++ b/src/main/groovy/au/org/ala/merit/reports/OutputMetadata.groovy
@@ -0,0 +1,360 @@
+package au.org.ala.merit.reports
+
+import org.apache.commons.logging.Log
+import org.apache.commons.logging.LogFactory
+
+/**
+ * Works with the Output metadata.
+ */
+class OutputMetadata {
+
+    static Log log = LogFactory.getLog(OutputMetadata.class)
+
+    /** Used to construct property names to nested model items */
+    String pathSeparator = '.'
+
+    /** The metadata template associated with this output type */
+    private Map metadata
+
+    OutputMetadata(Map metadata) {
+        this.metadata = metadata
+    }
+
+    def getDarwinCoreMapping() {
+        metadata.darwinCoreMapping
+    }
+
+    def annotateDataModel() {
+        annotateNodes(metadata.dataModel)
+    }
+
+    def annotateNodes(nodes) {
+        def annotatedNodes = []
+        nodes.each { node->
+            def annotatedNode = [:]
+            annotatedNode.putAll(node)
+            if (isNestedDataModelType(node)) {
+
+                annotatedNode.columns = annotateNodes(getNestedDataModelNodes(node))
+
+            }
+            else {
+
+                def result = findViewByName(node.name)
+                if (result) {
+                    def label = result.preLabel?:(result.title?:result.postLabel)
+                    annotatedNode.label = label
+                    annotatedNode.putAll(result)
+                }
+                if (!annotatedNode.label) {
+                    annotatedNode.label = annotatedNode.name
+                }
+
+
+            }
+            annotatedNodes << annotatedNode
+        }
+
+        // Sort the nodes based on the order they appear in the view model for consistency.
+        if (metadata.viewModel) {
+            annotatedNodes.sort { node ->
+                metadata.viewModel.findIndexOf{it.source == node.name}
+            }
+        }
+        annotatedNodes
+    }
+
+
+    def findViewByName(name, context = null) {
+
+        if (!context) {
+            context = metadata.viewModel
+        }
+        return context.findResult { node ->
+            if (isNestedViewModelType(node)) {
+                def nested = getNestedViewNodes(node)
+
+                return findViewByName(name, nested)
+            }
+            else {
+                return (node.source == name)?node:null
+            }
+        }
+    }
+
+    Map findDataModelItemByName(String name, List context = null) {
+        if (!context) {
+            context = metadata.dataModel
+        }
+        return context.findResult { Map node ->
+            if (node.name == name) {
+                return node
+            }
+            else if (isNestedDataModelType(node)) {
+                List nested = getNestedDataModelNodes(node)
+                return findDataModelItemByName(name, nested)
+            }
+            else {
+                return null
+            }
+        }
+    }
+
+    def getNestedPropertyNames() {
+        List propertyNames = []
+        dataModelIterator { String path, Map node ->
+            if (isNestedDataModelType(node)) {
+                propertyNames << path
+            }
+        }
+        propertyNames
+    }
+
+
+    List propertyNamesAsList() {
+        List propertyNames = []
+        dataModelIterator{ String path, Map node ->
+            propertyNames << path
+        }
+        propertyNames
+    }
+
+    /** Builds a property name from the current path and node name.  e.g. list.value.nestedList */
+    private String fullPathToNode(String currentPath, Object node) {
+        String name = node.name
+        currentPath ? currentPath + pathSeparator + name : name
+    }
+
+
+    void dataModelIterator(Closure callback) {
+        dataModelIterator('', metadata.dataModel, callback)
+    }
+
+
+    /**
+     * Iterates over the dataModel in this model, invoking the callback for each node.
+     * Handles nested properties by building a '.' separated path.
+     * @param path the starting path.
+     * @param nodes the nodes to iterate over
+     * @param callback a closure accepting a String (the path to the data model item relative to the original path) and the current data model item
+     */
+    void dataModelIterator(String path, List nodes, Closure callback) {
+        nodes.each { Map node ->
+            String nodePath = fullPathToNode(path, node)
+            callback(nodePath, node)
+            if (isNestedDataModelType(node)) {
+                dataModelIterator(nodePath, getNestedDataModelNodes(node), callback)
+            }
+        }
+    }
+
+    String getLabel(Map viewNode, Map dataNode) {
+        String label = null
+        if (viewNode) {
+            label = viewNode.preLabel?:(viewNode.title?:viewNode.postLabel)
+        }
+        label ?: (dataNode.description ?: dataNode.name)
+    }
+
+    void modelIterator(Closure callback) {
+        Set visitedDataNodes = new HashSet()
+        visitedDataNodes = modelIteratorInternal('', metadata.viewModel, metadata.dataModel, visitedDataNodes, callback)
+
+        // The iteration is done via matching view nodes to data nodes, so after it's complete ensure any
+        // data nodes not associated with a view node are visited as well.
+        dataModelIterator { path, node ->
+            if (!visitedDataNodes.contains(node)) {
+                println "Warning: node ${path} is not refernced by the view model"
+                callback(path, null, node)
+            }
+        }
+    }
+
+    /**
+     * Returns true if the supplied view node is referencing a node from the dataModel.
+     * Not all view model nodes need to do this (e.g. rows, columns etc)
+     */
+    private boolean referencesDataModel(Map viewNode) {
+        viewNode.source && viewNode.type != 'literal'
+    }
+
+    private Set modelIteratorInternal(String path, List viewNodes, List dataModelNodes, Set visitedDataNodes, Closure callback) {
+        viewNodes.each { Map node ->
+            String nestedPath = path
+            List dataModelContext = dataModelNodes
+            if (referencesDataModel(node)) {
+                Map dataNode = findDataModelItemByName(node.source, dataModelContext)
+
+                if (dataNode) {
+                    visitedDataNodes.add(dataNode)
+                    String dataNodePath = fullPathToNode(path, dataNode)
+                    callback(dataNodePath, node, dataNode)
+
+                    if (isNestedDataModelType(dataNode)) {
+                        dataModelContext = getNestedDataModelNodes(dataNode)
+                        nestedPath = dataNodePath
+                    }
+                }
+                else {
+                    log.warn("View node: "+node+" references missing dataModel node")
+                }
+            }
+
+            if (isNestedViewModelType(node)) {
+                modelIteratorInternal(nestedPath, getNestedViewNodes(node), dataModelContext, visitedDataNodes, callback)
+            }
+        }
+
+        visitedDataNodes
+    }
+
+
+
+
+    List<String> getMemberOnlyPropertyNames() {
+        List memberOnlyNames = []
+        modelIterator { String path, Map viewNode, Map dataNode ->
+            if (viewNode?.memberOnlyView) {
+                memberOnlyNames << path
+            }
+        }
+        memberOnlyNames
+    }
+
+
+    List<String> getPropertyNamesByDwcAttribute(String dwcAttribute) {
+        List matchingNames = []
+        dataModelIterator {String path, Map node ->
+            if (node.dwcAttribute == dwcAttribute) {
+                matchingNames << path
+            }
+        }
+        matchingNames
+    }
+
+
+    def getNestedViewNodes(node) {
+        return (node.type in ['table', 'photoPoints', 'grid'] ) ? node.columns: node.items
+    }
+    def getNestedDataModelNodes(node) {
+        return node.columns
+    }
+
+    def isNestedDataModelType(node) {
+        return (node.columns != null && node.dataType != "geoMap")
+    }
+    def isNestedViewModelType(node) {
+        return (node.items != null || node.columns != null)
+    }
+
+    /**
+     * lists all names of type passed to function
+     * @param type
+     * @return
+     * [ 'imageList':true,
+     *   'multiSightingTable':['imageTable':true]
+     * ]
+     *
+     */
+    Map getNamesForDataType(String type, context){
+        Map names = [:], childrenNames
+
+        if(!context && metadata){
+            context = metadata.dataModel;
+        }
+
+        context?.each { data ->
+            if(isNestedDataModelType(data)){
+                // recursive call for nested data model
+                childrenNames = getNamesForDataType(type, getNestedDataModelNodes(data));
+                if(childrenNames?.size()){
+                    names[data.name] = childrenNames
+                }
+            }
+
+            if(data.dataType == type){
+                names[data.name] = true
+            }
+        }
+
+        return names;
+    }
+
+    static class ValidationRules {
+
+        def validationRules = []
+        public ValidationRules(property) {
+            if (property.validate) {
+                parseValidationRules(property.validate)
+            }
+
+        }
+
+        private parseValidationRules(String rules) {
+            def criteria = rules.tokenize(',')
+            validationRules = criteria.collect { it.trim() }
+        }
+
+        private parseValidationRules(List rules) {
+            validationRules = rules.collect{
+                String rule = it.rule
+                if (it.param && it.param.expression) {
+                    rule += "[${it.param.expression}]"
+                }
+                rule
+            }
+        }
+
+        public boolean isMandatory() {
+            return validationRules.contains('required')
+        }
+
+        def min() {
+            def min = validationProperties().minimum?:new BigDecimal(0)
+            return min
+        }
+
+        def max() {
+            return validationProperties().maximum
+        }
+
+        def validationProperties() {
+            def props = [:]
+            validationRules.each {
+                if (it.startsWith('min')) {
+                    props << minProperty(it)
+                }
+                else if (it.startsWith('max')) {
+                    props << maxProperty(it)
+                }
+            }
+            return props
+        }
+
+        def valueInBrackets(rule) {
+            def matcher = rule =~ /.*\[(.*)\]/
+            if (matcher.matches()) {
+                return matcher[0][1]
+            }
+            return null
+        }
+
+        def minProperty(rule) {
+            def min = valueInBrackets(rule)
+            if (min) {
+                return [minimum: min]
+            }
+            throw new IllegalArgumentException("Invalid validation rule: "+rule)
+        }
+
+        def maxProperty(rule) {
+            def max = valueInBrackets(rule)
+            if (max) {
+                return [maximum: max]
+            }
+            throw new IllegalArgumentException("Invalid validation rule: "+rule)
+        }
+
+    }
+
+}
diff --git a/src/main/groovy/au/org/ala/merit/reports/ReportGenerator.groovy b/src/main/groovy/au/org/ala/merit/reports/ReportGenerator.groovy
index 50e86c1eb..41140affd 100644
--- a/src/main/groovy/au/org/ala/merit/reports/ReportGenerator.groovy
+++ b/src/main/groovy/au/org/ala/merit/reports/ReportGenerator.groovy
@@ -2,10 +2,10 @@ package au.org.ala.merit.reports
 
 import au.org.ala.merit.DateUtils
 import au.org.ala.merit.config.ReportConfig
+import au.org.ala.merit.PublicationStatus
 import org.apache.commons.logging.LogFactory
 import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
-import org.joda.time.Duration
 import org.joda.time.Interval
 import org.joda.time.Period
 import org.joda.time.PeriodType
@@ -28,8 +28,6 @@ class ReportGenerator {
      */
     private int DATE_FUDGE_FACTOR = 1
 
-    private static final String REPORT_NOT_APPROVED = 'unpublished'
-
     /**
      * Generates a list of reports according to the supplied configuration.
      * @param reportConfig Describes the frequency and properties of generated reports.
@@ -122,7 +120,7 @@ class ReportGenerator {
 
         if (end >= start) {
             //validates the latest approved report to avoid creation of duplicate report
-            if (existingReports && existingReports[0].publicationStatus != REPORT_NOT_APPROVED) {
+            if (existingReports && existingReports[0].publicationStatus != PublicationStatus.NOT_APPROVED) {
                 log.info("Not regenerating report " + reportConfig.category + " to avoid creating duplicate reports")
             } else {
                 Interval reportInterval = new Interval(start, end)
diff --git a/src/main/groovy/au/org/ala/merit/reports/ReportLifecycleListener.groovy b/src/main/groovy/au/org/ala/merit/reports/ReportLifecycleListener.groovy
new file mode 100644
index 000000000..f686c0fb9
--- /dev/null
+++ b/src/main/groovy/au/org/ala/merit/reports/ReportLifecycleListener.groovy
@@ -0,0 +1,95 @@
+package au.org.ala.merit.reports
+
+import au.org.ala.ecodata.forms.ActivityFormService
+import groovy.util.logging.Slf4j
+import org.springframework.beans.factory.annotation.Autowired
+
+/**
+ * Responsible for obtaining report specific data to render into a report template.
+ * Report config beans are looked up in the applicationContext by name based on the report type and the
+ * program configuration.
+ */
+@Slf4j
+class ReportLifecycleListener {
+
+    @Autowired
+    ActivityFormService activityFormService
+
+    Map getContextData(Map context, Map report) { [:] }
+    Map getOutputData(Map context, Map outputConfig, Map report) { [:] }
+    Map reportSaved(Map report, Map activityData) { [:] }
+    Map reportSubmitted(Map report, List reportActivityIds, Map reportOwner) { [:] }
+    Map reportApproved(Map report, List reportActivityIds, Map reportOwner) { [:] }
+    Map reportRejected(Map report, List reportActivityIds, Map reportOwner) { [:] }
+    Map reportCancelled(Map report, List reportActivityIds, Map reportOwner) { [:] }
+    Map reportReset(Map report) { [:] }
+
+    private List<Map> findReferencedEntityTypes(String activityFormType) {
+        List<Map> referencedEntities = []
+        Map activityForm = activityFormService.findActivityForm(activityFormType)
+        activityForm.sections.each { Map formSection ->
+            OutputMetadata outputMetadata = new OutputMetadata(formSection.template)
+
+            outputMetadata.dataModelIterator { String path, Map node ->
+                if (node.dataType == 'text' && node.entityType) {
+                    referencedEntities << [outputName: formSection.name, path: path, node: node]
+                }
+            }
+        }
+        referencedEntities
+    }
+
+    List<Map> findReferencedEntities(Map activityData) {
+        List<Map> typesInForm = findReferencedEntityTypes(activityData.type)
+        List<Map> entityIds = []
+        activityData.outputs?.each { Map output ->
+            List<Map> typesInOutput = typesInForm.findAll{it.outputName == output.name}
+            typesInOutput.each { Map entityType ->
+                List value = getValueFromPath(entityType.path, output.data)?.findAll()
+                if (value) {
+                    entityIds << [entityType: entityType.node.entityType, entityIds: value]
+                }
+            }
+        }
+        entityIds
+
+    }
+
+    /**
+     * Traverses the '.' separated path through the supplied Map and returns the value at the end of the path.
+     * If the path contains a list, the value of the path is returned for each item in the list.
+     * If the path contains a list of lists, the value of the path is returned for each item in each list.
+     * @param path the path to traverse
+     * @param data the data to traverse
+     * @return the value at the end of the path, or null if the path doesn't exist.
+     */
+    static List getValueFromPath(String path, Map data) {
+        if (!path) {
+            return null
+        }
+        List result = []
+        String[] pathElements = path.split('\\.')
+        int i = 0
+        Object current = data
+        while (i < pathElements.length - 1) {
+            current = current[pathElements[i]]
+            if (!current) {
+                return result
+            }
+            else if (current instanceof List) {
+                current.each {
+                    result.addAll(getValueFromPath(pathElements[i+1..-1].join('.'), it))
+                }
+                return result
+            }
+            else if (!(current instanceof Map)) {
+                return result
+            }
+            i++
+        }
+        result << current[pathElements[i]]
+        result
+    }
+
+
+}
diff --git a/src/main/scripts/releases/2.11/adhoc/createEmergencyActionsGrantsSubProgram.js b/src/main/scripts/releases/2.11/adhoc/createEmergencyActionsGrantsSubProgram.js
index d22422a45..5a252056b 100644
--- a/src/main/scripts/releases/2.11/adhoc/createEmergencyActionsGrantsSubProgram.js
+++ b/src/main/scripts/releases/2.11/adhoc/createEmergencyActionsGrantsSubProgram.js
@@ -7,26 +7,9 @@ var userId = '129333';
 let programName = "Saving Native Species";
 var parentProgram = createOrFindProgram(programName);
 
-let refProgram = "Threatened Species Strategy Action Plan Priority Species";
 var subprograms = ["Emergency Actions for Threatened Species"]
-
-subprograms.forEach(function (subProgram) {
-    var now = ISODate();
-    var newProgram = db.program.find({name: refProgram}).next();
-    delete newProgram._id
-    delete newProgram.programId
-    newProgram.name = subProgram
-    newProgram.programId = UUID.generate()
-    newProgram.dateCreated = now
-    newProgram.lastUpdated = now
-    newProgram.status = "active"
-    newProgram.parent = parentProgram._id
-    var program = db.program.find({name: subProgram})
-    if (!program.hasNext()) {
-        db.program.insert(newProgram);
-    } else {
-        print("Program Already Exist: " + subProgram)
-    }
+subprograms.forEach(function (subProgram){
+    createOrFindProgram(subProgram, parentProgram._id);
 });
 
 var projectConfig = {
@@ -35,121 +18,113 @@ var projectConfig = {
             {
                 "template": "name",
                 "model": {
-                    "helpTextHeading": "A succinct overview of the project: (i) what will be done and (ii) why it will be done",
-                    "maxSize": "1000",
-                    "placeholder": "[Free text; limit response to 150 characters)]",
-                    "explanation": ""
+                    "tableFormatting": true
                 }
             },
             {
-                "template": "description",
+                "template": "priorityPlace",
                 "model": {
-                    "helpTextHeading": "",
-                    "maxSize": "1000",
-                    "placeholder": "[Free text; limit response to 1000 characters (approx. 150 words)]",
-                    "explanation": " Please provide a short succinct description of this project. The description should state what will be done and why it will be done. This project description will be publicly visible on the project overview page in MERIT"
+                    "priorityPlaceHelpText": "Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species.",
+                    "priorityPlaceLabel": "Does this project directly support a priority place?"
                 }
             },
             {
-                "template": "programOutcome"
+                "template": "indigenousInvolvement"
             },
             {
-                "template": "activities",
+                "template": "description",
                 "model": {
-                    "includeOther": true,
-                    "noneSelectedMessage": "No priority actions have been nominated for this project",
-                    "singleSelection": false,
-                    "title": "Project Actions",
-                    "explanation": "Please select from the lists of priority action applicable to this project. If the priority action is not listed and ‘other’ is selected, please provide details of the ‘other’ priority within the space provided"
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
                 }
             },
             {
-                "template": "outcomeStatements",
+                "template": "programOutcome",
                 "model": {
-                    "subtitle": "Please provide outcome statements",
-                    "placeholder": "By 30 June 2021, [Free text]",
-                    "title": "Project Outcome"
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
                 }
             },
             {
-                "template": "keyThreats",
+                "template": "outcomeStatements",
                 "model": {
-                    "threatHelpText": "The key threats (or key threatening processes) that your project will be addressing",
-                    "interventionHelpText": "Describe the proposed interventions to address the threat and how this will deliver on the project outcome",
-                    "title": "Key Threats",
-                    "explanation": "Describe the key threat(s) and/or key threatening processes impacting project assets that the project will be addressing."
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
                 }
             },
             {
-                "template": "projectMethodology",
+                "template": "extendedKeyThreats",
                 "model": {
-                    "maxSize": "4000",
-                    "title": "Project Methodology",
-                    "explanation": "The methodology should describe how each project service (i.e., action) will be implemented to achieve outcomes and why that specific approach or technique was chosen. The methodology could include the location, partner/s involvement and outputs. The methodology should clearly link to the outcome statement. At least one method for each project outcome should be identified.",
-                    "tableHeading": "Describe how each project activity will be implemented.",
-                    "placeHolder": "[Free text; limit response to 4000 characters (approx. 650 words)]"
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "threatHelpText": "Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText": "Describe the proposed method to address the threat or threatening process",
+                    "title": "Key threat(s) and/or key threatening processes"
                 }
             },
             {
-                "template": "monitoringBaseline",
+                "template": "projectMethodology",
                 "model": {
-                    "baselineMethodHelpText": "Describe the project baseline (s) units of measure or data which will be used to report progress towards this project’s outcome and the monitoring design",
-                    "titleHelpText": "Describe the project baseline(s) units of measure or data which will be used to report progress towards this project’s outcomes and the monitoring design. Refer to the Regional Land Partnerships Evaluation Plan which provides guidance on baselines and the monitoring indicators for each outcome. Note, other monitoring indicators can also be used."
+                    "helpText": "Include all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic.",
+                    "maxSize": "4000",
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])"
                 }
             },
             {
-                "template": "monitoringIndicators",
+                "template": "projectPartnerships",
                 "model": {
-                    "approachHeading": "Describe the project monitoring indicator(s) approach",
-                    "indicatorHeading": "Identify the project monitoring indicator(s)",
-                    "indicatorHelpText": "List the indicators of project success that will be monitored. Indicators should link back to the outcome statements and, in most cases, will be quantitative and expressed as a numerical measurable. Where relevant, qualitative indicators can be used. Indicators should measure both project outputs (e.g., area (ha) of rabbit control, length (km) of predator proof fencing) and change the project is aiming to achieve (e.g., change in abundance of X threatened species at Y location, change in vegetation cover (%) etc.)",
-                    "approachHelpText": "Briefly describe the method that will be used to monitor the indicator (including timing of monitoring, who will collect/collate/analyse, data, etc)",
-                    "indicatorPlaceHolder": "[Free text]",
-                    "approachPlaceHolder": "[Free text]",
-                    "title": "Project Monitoring Indicators"
+                    "helpTextHeading": "Note: Not limited to key subcontractors.",
+                    "helpTextPartnerName": "Insert name of project partner. To be a project partner, they need to be actively involved in the planning or delivery of the project"
                 }
             },
             {
-                "template": "adaptiveManagement",
+                "template": "extendedBaselineMonitoring",
                 "model": {
-                    "title": "Project Review, Evaluation and Improvement Methodology and Approach",
-                    "explanation": "Outline the methods and processes that will enable adaptive management during the lifetime of this project"
+                    "approachHeading": "Monitoring method",
+                    "indicatorHeading": "Monitoring methodology",
+                    "monitoringServiceHelpText": "Select the relevant Project Services(s)/Target measure(s) that will be used to support ongoing monitoring",
+                    "baselineDataDescriptionHelpText": "Describe the project baseline to be established, or the baseline data that currently exists",
+                    "baselineMethodHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "baselineDataHelpText": "Existing baseline data needs to be based on best practice methods and be compatible with the EMSA protocols.",
+                    "approachHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "titleHelpText": "Describe the Project Baseline(s) and ongoing monitoring which will be used to report progress towards this projects outcome(s).  Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "baselineServiceHelpText": "Select the relevant Project Service(s)/Target measure(s) that will be used to support the development of the baseline",
+                    "newIndicatorText": "New monitoring indicator"
                 }
             },
             {
-                "template": "nationalAndRegionalPlans",
+                "template": "projectReview",
                 "model": {
-                    "documentNameHelpText": "List the name of the Recovery Plan or Conservation Advice for species listed under the Environment Protection and Biodiversity Conservation Act 1999 (if applicable), or state recovery plan.",
-                    "explanation": "Explain how the project aligns with national and/or state species recovery plans and strategies."
+                    "title": "Project review, improvement and evaluation methodology and approach (3000 character limit [approximately 500 words])"
                 }
             },
             {
-                "template": "serviceTargets",
+                "template": "nationalAndRegionalPlans",
                 "model": {
-                    "showTargetDate": true,
-                    "totalHelpText": "The overall total of Project Activities to be delivered during the project delivery period. This total is not necessarily the sum of the minimum annual targets set out for the activities.",
-                    "title": "Activities and Targets Table",
-                    "serviceName": "Activities"
+                    "includeUrl": true,
+                    "headingTitle": "Conservation and management plans"
                 }
             },
             {
-                "template": "projectPartnerships",
+                "template": "serviceOutcomeTargets",
                 "model": {
-                    "namePlaceHolder": "[Free text]",
-                    "helpTextPartnerNature": "If partnership with an organisation: provide the name of the organisation and the role they will play/how you will support them. If partnering with community groups or members of the public: indicate each group or individual you will engage with",
-                    "partnershipPlaceHolder": "[Free text]"
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections",
+                    "title": "Project services and targets",
+                    "serviceName": "Service"
                 }
             },
             {
-                "template": "meriBudget",
+                "template": "serviceForecasts",
                 "model": {
-                    "itemName": "Budget item",
-                    "showThemeColumn": false,
-                    "showActivityColumn": false,
-                    "explanation": "Please detail how project funding will be allocated to project services (action) by species, if more than one species is benefitting from the project. Expenditure should align with the approved project grant application (including the amount identified for project reporting and administration). Each action should be identified as a different line item",
-                    "projectHeadingHelpText": "Planned budget expenditure for each service (action) by species",
-                    "hideHelpText": true
-                }
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                },
+                "excludedModes": [
+                    "PRINT"
+                ]
             }
         ],
         "excludes": [],
@@ -403,12 +378,18 @@ var projectConfig = {
                 }
             ]
         },
-        "visibility": "public",
-        "organisationRelationship": "Grantee",
-        "excludeFinancialYearData": true,
         "requiresActivityLocking": true,
         "projectTemplate": "rlp",
         "activityPeriodDescriptor": "Outputs report #",
+        "requireMeritAdminToReturnMeriPlan": true,
+        "emailTemplates": {
+            "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
+            "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
+            "planApprovedEmailTemplate": "RLP_PLAN_APPROVED_EMAIL_TEMPLATE",
+            "planReturnedEmailTemplate": "RLP_PLAN_RETURNED_EMAIL_TEMPLATE",
+            "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
+            "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
+        },
         "meriPlanTemplate": "configurableMeriPlan",
         "riskAndThreatTypes": [
             "Performance",
@@ -425,7 +406,7 @@ var projectConfig = {
                 "reportDescriptionFormat": "Progress Report %1d",
                 "reportNameFormat": "Progress Report %1d",
                 "reportingPeriodInMonths": 6,
-                "description": "",
+                "description": "_Please note that the reporting fields for these reports are currently being developed_",
                 "minimumReportDurationInDays": 3,
                 "label": "Semester",
                 "category": "Progress Reports",
@@ -439,7 +420,7 @@ var projectConfig = {
                 "reportNameFormat": "Final Report",
                 "reportingPeriodInMonths": 0,
                 "multiple": false,
-                "description": "",
+                "description": "_Please note that the reporting fields for these reports are currently being developed_",
                 "alignToOwnerEnd": true,
                 "label": "Final Report",
                 "category": "Final Report",
@@ -448,933 +429,89 @@ var projectConfig = {
                 "alignToOwnerStart": true
             }
         ],
-        "activities": [
-            {
-                "name": "Herbivore and/or predator control"
-            },
-            {
-                "name": "Weed control and/or revegetation"
-            },
-            {
-                "name": "Fire management and planning"
-            },
-            {
-                "name": "Species and ecological community specific interventions"
-            },
-            {
-                "name": "Traditional Owner led healing of country"
-            },
-            {
-                "name": "Erosion control"
-            },
-            {
-                "name": "Refugia management"
-            }
+        "keyThreatCodes": [
+            "Climate Change - Changed flooding regime",
+            "Climate Change - Changed rainfall patterns",
+            "Climate Change - Sea level rises",
+            "Climate Change - Unexpected seasonal/temperature extremes",
+            "Disease/pathogens - Areas that are infected",
+            "Disease/pathogens - Possible infection of disease free areas",
+            "Fire - Inappropriate fire regime",
+            "Fire - Lack of protection for ecological assets during fire control activities",
+            "Genetics - Bottleneck/inbreeding",
+            "Habitat loss - Breeding place disturbance",
+            "Habitat loss - Dieback/senescence",
+            "Habitat loss - Feeding habitat loss/interference",
+            "Habitat loss - Habitat fragmentation",
+            "Habitat loss - Land clearing",
+            "Habitat loss - Loss of critical ecosystem service supporting habitat",
+            "Human interference - Fish and harvesting aquatic resources (commercial)",
+            "Human interference - Flow-on effects of housing development",
+            "Human interference - Illegal activities",
+            "Human interference - Industrial development",
+            "Human interference - Land use intensification",
+            "Human interference - Recreational fishing",
+            "Human interference - Recreational pressures",
+            "Human interference - Road/vehicle strike",
+            "Land management practices - Changes to hydrology and aquatic systems",
+            "Land management practices - Domestic grazing/stock impacts",
+            "Land management practices - Excess recharge of groundwater",
+            "Land management practices - Excess use (or over-use) of surface water or groundwater resources",
+            "Land management practices - Excessive fertiliser use",
+            "Land management practices - Inappropriate ground cover management",
+            "Land management practices - Runoff",
+            "Native fauna - Competition",
+            "Native fauna - Predation",
+            "Pest - Competition/exclusion",
+            "Pest - Disease transmission",
+            "Pest - Habitat degradation",
+            "Pest - Introduction of new pest animals",
+            "Pest - Predation",
+            "Pollution - Chemical",
+            "Pollution - Eutrophication/algal blooms",
+            "Pollution - Inappropriate waste disposal",
+            "Pollution - Sediment ",
+            "Population size/range - Low habitat area",
+            "Population size/range - Low population numbers",
+            "Weeds - Competition",
+            "Weeds - Introduction of new weed",
+            "Weeds - Spread of weeds from surrounding areas"
         ],
         "navigationMode": "returnToProject",
-        "objectives": [
-            "Prevent extinction and limit decline of native species",
-            "Reduce immediate suffering of native animals directly impacted by the fires",
-            "Maximise chances of long-term recovery of native species and communities",
-            "Ensure learning and continual improvement is core of the response"
+        "priorityPlaces": [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
         ],
-        "supportedServiceIds": [
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            10,
-            11,
-            12,
-            13,
-            14,
-            15,
-            16,
-            17,
-            18,
-            19,
-            20,
-            21,
-            22,
-            23,
-            24,
-            25,
-            26,
-            27,
-            28,
-            29,
-            30,
-            31,
-            32,
-            33,
-            34,
-            35,
-            36,
-            37,
-            38,
-            39,
-            40,
-            41
-        ]
+        "supportsParatoo": true,
+        "supportsMeriPlanHistory": true
     },
 
     priorities: [
-        {
-            "category": "Birds",
-            "priority": "Australasian Bittern Botaurus poiciloptilus"
-        },
-        {
-            "category": "Birds",
-            "priority": "Black-eared Miner Manorina melanotis"
-        },
-        {
-            "category": "Birds",
-            "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
-        },
-        {
-            "category": "Birds",
-            "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
-        },
-        {
-            "category": "Birds",
-            "priority": "Eastern Curlew Numenius madagascariensis"
-        },
-        {
-            "category": "Birds",
-            "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
-        },
-        {
-            "category": "Birds",
-            "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
-        },
-        {
-            "category": "Birds",
-            "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
-        },
-        {
-            "category": "Birds",
-            "priority": "Malleefowl Leipoa ocellata"
-        },
-        {
-            "category": "Birds",
-            "priority": "Night Parrot Pezoporus occidentalis"
-        },
-        {
-            "category": "Birds",
-            "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
-        },
-        {
-            "category": "Birds",
-            "priority": "Orange-bellied Parrot Neophema chrysogaster"
-        },
-        {
-            "category": "Birds",
-            "priority": "Plains-wanderer Pedionomus torquatus"
-        },
-        {
-            "category": "Birds",
-            "priority": "Princess Parrot Polytelis alexandrae"
-        },
-        {
-            "category": "Birds",
-            "priority": "Red Goshawk Erythrotriorchis radiatus"
-        },
-        {
-            "category": "Birds",
-            "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
-        },
-        {
-            "category": "Birds",
-            "priority": "Regent Honeyeater Anthochaera phrygia"
-        },
-        {
-            "category": "Birds",
-            "priority": "Swift Parrot Lathamus discolor"
-        },
-        {
-            "category": "Birds",
-            "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
-        },
-        {
-            "category": "Birds",
-            "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Australian Sea-lion Neophoca cinerea"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Eastern Quoll Dasyurus viverrinus"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Greater Bilby Macrotis lagotis"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Koala (Qld, NSW, ACT) Phascolarctos cinereus"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Mountain Pygmy-possum Burramys parvus"
-        },
-        {
-            "category": "Mammals",
-            "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Northern Quoll Dasyurus hallucatus"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Numbat Myrmecobius fasciatus"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Quokka Setonix brachyurus"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Spectacled Flying-fox Pteropus conspicillatus"
-        },
-        {
-            "category": "Mammals",
-            "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
-        },
-        {
-            "category": "Fish",
-            "priority": "Freshwater Sawfish Pristis pristis"
-        },
-        {
-            "category": "Fish",
-            "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
-        },
-        {
-            "category": "Fish",
-            "priority": "Maugean Skate Zearaja maugeana"
-        },
-        {
-            "category": "Fish",
-            "priority": "Murray Hardyhead Craterocephalus fluviatilis"
-        },
-        {
-            "category": "Fish",
-            "priority": "Red Handfish Thymichthys politus"
-        },
-        {
-            "category": "Fish",
-            "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
-        },
-        {
-            "category": "Fish",
-            "priority": "Stocky Galaxias Galaxias tantangara"
-        },
-        {
-            "category": "Fish",
-            "priority": "Swan Galaxias Galaxias fontanus"
-        },
-        {
-            "category": "Fish",
-            "priority": "White's Seahorse Hippocampus whitei"
-        },
-        {
-            "category": "Frogs",
-            "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
-        },
-        {
-            "category": "Frogs",
-            "priority": "Kroombit Tinker Frog Taudactylus pleione"
-        },
-        {
-            "category": "Frogs",
-            "priority": "Southern Corroboree Frog Pseudophryne corroboree"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Eucalyptus langleyi (Albatross Mallee)"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Collared Delma, Adorned Delma Delma torquata"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Green Turtle Chelonia mydas"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Olive Ridley Turtle Lepidochelys olivacea"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
-        },
-        {
-            "category": "Invertebrates",
-            "priority": "Ammonite Snail Ammoniropa vigens"
-        },
-        {
-            "category": "Invertebrates",
-            "priority": "Cauliflower Soft Coral Dendronephthya australis"
-        },
-        {
-            "category": "Invertebrates",
-            "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
-        },
-        {
-            "category": "Invertebrates",
-            "priority": "Giant Gippsland Earthworm Megascolides australis"
-        },
-        {
-            "category": "Invertebrates",
-            "priority": "Lord Howe Island Phasmid Dryococelus australis"
-        },
-        {
-            "category": "Invertebrates",
-            "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
-        },
-        {
-            "category": "Invertebrates",
-            "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
-        },
-        {
-            "category": "Invertebrates",
-            "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
-        },
-        {
-            "category": "Invertebrates",
-            "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
-        },
-        {
-            "category": "Plants",
-            "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
-        },
-        {
-            "category": "Plants",
-            "priority": "Angle-stemmed Myrtle Gossia gonoclada"
-        },
-        {
-            "category": "Plants",
-            "priority": "Arckaringa Daisy Olearia arckaringensis"
-        },
-        {
-            "category": "Plants",
-            "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
-        },
-        {
-            "category": "Plants",
-            "priority": "Bulberin Nut Macadamia jansenii "
-        },
-        {
-            "category": "Plants",
-            "priority": "Carrington Falls Pomaderris Pomaderris walshii"
-        },
-        {
-            "category": "Plants",
-            "priority": "Davies' Waxflower Phebalium daviesii"
-        },
-        {
-            "category": "Plants",
-            "priority": "Eremophila subangustifolia"
-        },
-        {
-            "category": "Plants",
-            "priority": "Foote's Grevillea Grevillea calliantha"
-        },
-        {
-            "category": "Plants",
-            "priority": "Forked Spyridium Spyridium furculentum"
-        },
-        {
-            "category": "Plants",
-            "priority": "Giant Andersonia Andersonia axilliflora"
-        },
-        {
-            "category": "Plants",
-            "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
-        },
-        {
-            "category": "Plants",
-            "priority": "Imlay Mallee Eucalyptus imlayensis"
-        },
-        {
-            "category": "Plants",
-            "priority": "King Blue-grass Dichanthium queenslandicum"
-        },
-        {
-            "category": "Plants",
-            "priority": "Lax Leek Orchid Prasophyllum laxum"
-        },
-        {
-            "category": "Plants",
-            "priority": "Little Mountain Palm Lepidorrhachis mooreana"
-        },
-        {
-            "category": "Plants",
-            "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
-        },
-        {
-            "category": "Plants",
-            "priority": "Native Guava Rhodomyrtus psidioides"
-        },
-        {
-            "category": "Plants",
-            "priority": "Pimelea cremnophila"
-        },
-        {
-            "category": "Plants",
-            "priority": "Pimelea venosa"
-        },
-        {
-            "category": "Plants",
-            "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
-        },
-        {
-            "category": "Plants",
-            "priority": "Small-flowered Snottygobble Persoonia micranthera"
-        },
-        {
-            "category": "Plants",
-            "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
-        },
-        {
-            "category": "Plants",
-            "priority": "Stiff Groundsel Senecio behrianus"
-        },
-        {
-            "category": "Plants",
-            "priority": "Stirling Range Dryandra Banksia montana"
-        },
-        {
-            "category": "Plants",
-            "priority": "Tangled Wattle Acacia volubilis"
-        },
-        {
-            "category": "Plants",
-            "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
-        },
-        {
-            "category": "Plants",
-            "priority": "Wollemi Pine Wollemia nobilis"
-        },
-        {
-            "category": "Plants",
-            "priority": "Wongan Eriostemon Philotheca wonganensis"
-        },
-        {
-            "category": "Plants",
-            "priority": "Wood Well Spyridium Spyridium fontis-woodii "
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Australasian Bittern Botaurus poiciloptilus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Black-eared Miner Manorina melanotis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
-        },
         {
             "category": "Plants and animals extinction prevention",
-            "priority": "Eastern Curlew Numenius madagascariensis"
+            "priority": "Pugh's Mountain Frog (Philoria pughi)"
         },
         {
             "category": "Plants and animals extinction prevention",
-            "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Malleefowl Leipoa ocellata"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Night Parrot Pezoporus occidentalis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Orange-bellied Parrot Neophema chrysogaster"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Plains-wanderer Pedionomus torquatus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Princess Parrot Polytelis alexandrae"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Red Goshawk Erythrotriorchis radiatus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Regent Honeyeater Anthochaera phrygia"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Swift Parrot Lathamus discolor"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "King Island Scrubtit Acanthornis magna greeniana"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Noisy Scrub-bird Atrichornis clamosus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Australian Sea-lion Neophoca cinerea"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Eastern Quoll Dasyurus viverrinus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Greater Bilby Macrotis lagotis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Koala Phascolarctos cinereus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Mountain Pygmy-possum Burramys parvus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Northern Quoll Dasyurus hallucatus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Numbat Myrmecobius fasciatus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Quokka Setonix brachyurus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Spectacled Flying-fox Pteropus conspicillatus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Freshwater Sawfish Pristis pristis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Maugean Skate Zearaja maugeana"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Murray Hardyhead Craterocephalus fluviatilis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Red Handfish Thymichthys politus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Stocky Galaxias Galaxias tantangara"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Swan Galaxias Galaxias fontanus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "White's Seahorse Hippocampus whitei"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Kroombit Tinker Frog Taudactylus pleione"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Southern Corroboree Frog Pseudophryne corroboree"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Mountain Frog Philoria kundagungan"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Mountain-top Nursery-frog Cophixalus monticola"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "White-bellied Frog Anstisia alba"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Collared Delma, Adorned Delma Delma torquata"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Green Turtle Chelonia mydas"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Olive Ridley Turtle Lepidochelys olivacea"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Western Swamp Tortoise Pseudemydura umbrina"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Ammonite Snail Ammoniropa vigens"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Cauliflower Soft Coral Dendronephthya australis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Giant Gippsland Earthworm Megascolides australis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Lord Howe Island Phasmid Dryococelus australis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Angle-stemmed Myrtle Gossia gonoclada"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Arckaringa Daisy Olearia arckaringensis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Bulberin Nut Macadamia jansenii "
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Carrington Falls Pomaderris Pomaderris walshii"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Davies' Waxflower Phebalium daviesii"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Eremophila subangustifolia"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Foote's Grevillea Grevillea calliantha"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Forked Spyridium Spyridium furculentum"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Giant Andersonia Andersonia axilliflora"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Imlay Mallee Eucalyptus imlayensis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "King Blue-grass Dichanthium queenslandicum"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Lax Leek Orchid Prasophyllum laxum"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Little Mountain Palm Lepidorrhachis mooreana"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Native Guava Rhodomyrtus psidioides"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Pimelea cremnophila"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Pimelea venosa"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Small-flowered Snottygobble Persoonia micranthera"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Stiff Groundsel Senecio behrianus"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Stirling Range Dryandra Banksia montana"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Tangled Wattle Acacia volubilis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Wollemi Pine Wollemia nobilis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Wongan Eriostemon Philotheca wonganensis"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Wood Well Spyridium Spyridium fontis-woodii"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Gorge Rice-flower, Pimelelea cremnophila"
-        },
-        {
-            "category": "Plants and animals extinction prevention",
-            "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+            "priority": "Victorian Grassland Earless Dragon (Tympanocryptis pinguicolla)"
         }
     ]
 };
@@ -1391,7 +528,27 @@ var outcomes = [
         "type": "primary",
         "category": "environment",
         "supportsMultiplePrioritiesAsSecondary": false,
-        "outcome": "Prevent new extinctions of plants and animals"
+        "outcome": "1. Species and Landscapes (Long term): Threatened Species (TS) - New extinctions of plants and animals are prevented"
+    },
+    {
+        "type": "short",
+        "category": "Emergency actions related outcome",
+        "outcome": "All priority species are on track for improved trajectory"
+    },
+    {
+        "type": "short",
+        "category": "Emergency actions related outcome",
+        "outcome": "Implementation of priority actions for priority species is tracked and published"
+    },
+    {
+        "type": "short",
+        "category": "Emergency actions related outcome",
+        "outcome": "Species at high risk of imminent extinction are identified and supported to persist"
+    },
+    {
+        "type": "short",
+        "category": "Emergency actions related outcome",
+        "outcome": "National conservation planning for threatened species and ecological communities is contemporary, effective and fit-for-purpose"
     }
 ]
 
@@ -1400,10 +557,8 @@ subprograms.forEach(function (subprogram){
     var program = db.program.find({name: subprogram});
     while(program.hasNext()){
         var p = program.next();
-        if (p.name === "Emergency Actions for Threatened Species"){
-            p.config = projectConfig.config
-            p.priorities = projectConfig.priorities
-        }
-        db.program.save(p);
+        print("sub program ID: " + p.programId)
+        db.program.updateOne({programId:p.programId}, {$set:{config:projectConfig.config, outcomes:outcomes, priorities:projectConfig.priorities}});
+        useNhtServiceLabels(p.name);
     }
 });
diff --git a/src/main/scripts/releases/2.11/adhoc/createPracticalActionGrantsSubProgram.js b/src/main/scripts/releases/2.11/adhoc/createPrioritySpeciesSubProgram.js
similarity index 76%
rename from src/main/scripts/releases/2.11/adhoc/createPracticalActionGrantsSubProgram.js
rename to src/main/scripts/releases/2.11/adhoc/createPrioritySpeciesSubProgram.js
index 6df23e4dc..645b9ac35 100644
--- a/src/main/scripts/releases/2.11/adhoc/createPracticalActionGrantsSubProgram.js
+++ b/src/main/scripts/releases/2.11/adhoc/createPrioritySpeciesSubProgram.js
@@ -3,30 +3,38 @@ load('../../../utils/audit.js');
 load('../../../utils/program.js');
 var userId = '129333';
 
+//Create the parent program
+// let programName = "Saving Native Species";
+// var parentProgram = createOrFindProgram(programName);
+//
+// let refProgram = "Habitat Restoration Projects - Grants";
+// var subprograms = ["Priority Species"]
+//
+// subprograms.forEach(function (subProgram) {
+//     var now = ISODate();
+//     var newProgram = db.program.find({name: refProgram}).next();
+//     delete newProgram._id
+//     delete newProgram.programId
+//     newProgram.name = subProgram
+//     newProgram.programId = UUID.generate()
+//     newProgram.dateCreated = now
+//     newProgram.lastUpdated = now
+//     newProgram.status = "active"
+//     newProgram.parent = parentProgram._id
+//     var program = db.program.find({name: subProgram})
+//     if (!program.hasNext()) {
+//         db.program.insert(newProgram);
+//     } else {
+//         print("Program Already Exist: " + subProgram)
+//     }
+// });
 //Create the parent program
 let programName = "Saving Native Species";
 var parentProgram = createOrFindProgram(programName);
 
-let refProgram = "Habitat Restoration Projects - Grants";
-var subprograms = ["Practical Action for Priority Threatened Species"]
-
-subprograms.forEach(function (subProgram) {
-    var now = ISODate();
-    var newProgram = db.program.find({name: refProgram}).next();
-    delete newProgram._id
-    delete newProgram.programId
-    newProgram.name = subProgram
-    newProgram.programId = UUID.generate()
-    newProgram.dateCreated = now
-    newProgram.lastUpdated = now
-    newProgram.status = "active"
-    newProgram.parent = parentProgram._id
-    var program = db.program.find({name: subProgram})
-    if (!program.hasNext()) {
-        db.program.insert(newProgram);
-    } else {
-        print("Program Already Exist: " + subProgram)
-    }
+var subprograms = ["Priority Species"]
+subprograms.forEach(function (subProgram){
+    createOrFindProgram(subProgram, parentProgram._id);
 });
 
 var projectConfig = {
@@ -35,129 +43,113 @@ var projectConfig = {
             {
                 "template": "name",
                 "model": {
-                    "helpTextHeading": "A succinct overview of the project: (i) what will be done and (ii) why it will be done",
-                    "maxSize": "150",
-                    "placeholder": "[Free text; limit response to 150 characters)]",
-                    "explanation": ""
+                    "tableFormatting": true
                 }
             },
             {
-                "template": "description",
+                "template": "priorityPlace",
                 "model": {
-                    "helpTextHeading": "A succinct overview of the project: (i) what will be done and (ii) why it will be done",
-                    "maxSize": "1000",
-                    "placeholder": "[Free text; limit response to 1000 characters (approx. 150 words)]",
-                    "explanation": " Please provide a short succinct description of this project. The description should state what will be done and why it will be done. This project description will be publicly visible on the project overview page in MERIT"
+                    "priorityPlaceHelpText": "Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species.",
+                    "priorityPlaceLabel": "Does this project directly support a priority place?"
                 }
             },
             {
-                "template": "programOutcome",
-                "model": {
-                    "helpTextPrimaryOutcome": ""
-                }
+                "template": "indigenousInvolvement"
             },
             {
-                "template": "additionalOutcomes"
+                "template": "description",
+                "model": {
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
+                }
             },
             {
-                "template": "activities",
+                "template": "programOutcome",
                 "model": {
-                    "includeOther": true,
-                    "noneSelectedMessage": "No priority actions have been nominated for this project",
-                    "singleSelection": false,
-                    "title": "Project Actions",
-                    "explanation": "Please select from the lists of priority action applicable to this project. If the priority action is not listed and ‘other’ is selected, please provide details of the ‘other’ priority within the space provided"
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
                 }
             },
             {
                 "template": "outcomeStatements",
                 "model": {
-                    "helpText": "Outcomes statements should: (i) clearly describe the intent of the project, specifically the benefit or change that the project is expected to deliver by June 2026; (ii) be expressed as a SMART statement (Specific, Measurable, Attainable, Realistic and Time-bound); and (iii) ensure that the outcomes are measurable with consideration to the monitoring methodology provided below.",
-                    "subtitle": "Please provide outcome statements.",
-                    "placeholder": "[Free text; limit response to 500 characters]",
-                    "title": "Project Outcome"
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
                 }
             },
             {
-                "template": "keyThreats",
+                "template": "extendedKeyThreats",
                 "model": {
-                    "threatHelpText": "The key threats (or key threatening processes) that your project will be addressing",
-                    "interventionHelpText": "Describe the proposed interventions to address the threat and how this will deliver on the project outcome",
-                    "placeholder": "[Free text; limit response to 500 characters]",
-                    "title": "Key Threats",
-                    "explanation": "Describe the key threat(s) and/or key threatening processes impacting project assets that the project will be addressing."
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "threatHelpText": "Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText": "Describe the proposed method to address the threat or threatening process",
+                    "title": "Key threat(s) and/or key threatening processes"
                 }
             },
             {
                 "template": "projectMethodology",
                 "model": {
+                    "helpText": "Include all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic.",
                     "maxSize": "4000",
-                    "title": "Project Methodology",
-                    "explanation": "The methodology should describe how each project service (i.e., action) will be implemented to achieve outcomes and why that specific approach or technique was chosen. The methodology could include the location, partner/s involvement and outputs. The methodology should clearly link to the outcome statement. At least one method for each project outcome should be identified.",
-                    "tableHeading": "Describe how each project activity will be implemented.",
-                    "placeHolder": "[Free text; limit response to 4000 characters (approx. 650 words)]"
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])"
                 }
             },
             {
-                "template": "monitoringBaseline",
+                "template": "projectPartnerships",
                 "model": {
-                    "baselineMethodHelpText": "Describe the project baseline (s) units of measure or data which will be used to report progress towards this project’s outcome and the monitoring design",
-                    "titleHelpText": "Describe the project baseline(s) units of measure or data which will be used to report progress towards this project’s outcomes and the monitoring design. Refer to the Regional Land Partnerships Evaluation Plan which provides guidance on baselines and the monitoring indicators for each outcome. Note, other monitoring indicators can also be used."
+                    "helpTextHeading": "Note: Not limited to key subcontractors.",
+                    "helpTextPartnerName": "Insert name of project partner. To be a project partner, they need to be actively involved in the planning or delivery of the project"
                 }
             },
             {
-                "template": "monitoringIndicators",
+                "template": "extendedBaselineMonitoring",
                 "model": {
-                    "approachHeading": "Describe the project monitoring indicator(s) approach",
-                    "indicatorHeading": "Identify the project monitoring indicator(s)",
-                    "indicatorHelpText": "List the indicators of project success that will be monitored. Indicators should link back to the outcome statements and, in most cases, will be quantitative and expressed as a numerical measurable. Where relevant, qualitative indicators can be used. Indicators should measure both project outputs (e.g., area (ha) of rabbit control, length (km) of predator proof fencing) and change the project is aiming to achieve (e.g., change in abundance of X threatened species at Y location, change in vegetation cover (%) etc.)",
-                    "approachHelpText": "Briefly describe the method that will be used to monitor the indicator (including timing of monitoring, who will collect/collate/analyse, data, etc)",
-                    "indicatorPlaceHolder": "[Free text]",
-                    "approachPlaceHolder": "[Free text]",
-                    "title": "Project Monitoring Indicators"
+                    "approachHeading": "Monitoring method",
+                    "indicatorHeading": "Monitoring methodology",
+                    "monitoringServiceHelpText": "Select the relevant Project Services(s)/Target measure(s) that will be used to support ongoing monitoring",
+                    "baselineDataDescriptionHelpText": "Describe the project baseline to be established, or the baseline data that currently exists",
+                    "baselineMethodHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "baselineDataHelpText": "Existing baseline data needs to be based on best practice methods and be compatible with the EMSA protocols.",
+                    "approachHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "titleHelpText": "Describe the Project Baseline(s) and ongoing monitoring which will be used to report progress towards this projects outcome(s).  Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "baselineServiceHelpText": "Select the relevant Project Service(s)/Target measure(s) that will be used to support the development of the baseline",
+                    "newIndicatorText": "New monitoring indicator"
                 }
             },
             {
-                "template": "adaptiveManagement",
+                "template": "projectReview",
                 "model": {
-                    "title": "Project Review, Evaluation and Improvement Methodology and Approach",
-                    "explanation": "Outline the methods and processes that will enable adaptive management during the lifetime of this project"
+                    "title": "Project review, improvement and evaluation methodology and approach (3000 character limit [approximately 500 words])"
                 }
             },
             {
                 "template": "nationalAndRegionalPlans",
                 "model": {
-                    "documentNameHelpText": "List the name of the Recovery Plan or Conservation Advice for species listed under the Environment Protection and Biodiversity Conservation Act 1999 (if applicable), or state recovery plan.",
-                    "explanation": "Explain how the project aligns with national and/or state species recovery plans and strategies."
-                }
-            },
-            {
-                "template": "serviceTargets",
-                "model": {
-                    "showTargetDate": true,
-                    "totalHelpText": "The overall total of Project Activities to be delivered during the project delivery period. This total is not necessarily the sum of the minimum annual targets set out for the activities.",
-                    "title": "Activities and Targets Table",
-                    "serviceName": "Activities"
+                    "includeUrl": true,
+                    "headingTitle": "Conservation and management plans"
                 }
             },
             {
-                "template": "projectPartnerships",
+                "template": "serviceOutcomeTargets",
                 "model": {
-                    "namePlaceHolder": "[Free text]",
-                    "helpTextPartnerNature": "If partnership with an organisation: provide the name of the organisation and the role they will play/how you will support them. If partnering with community groups or members of the public: indicate each group or individual you will engage with",
-                    "partnershipPlaceHolder": "[Free text]"
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections",
+                    "title": "Project services and targets",
+                    "serviceName": "Service"
                 }
             },
             {
-                "template": "meriBudget",
+                "template": "serviceForecasts",
                 "model": {
-                    "itemName": "Budget item",
-                    "showThemeColumn": false,
-                    "showActivityColumn": false,
-                    "explanation": "Please detail how project funding will be allocated to project services (action) by species, if more than one species is benefitting from the project. Expenditure should align with the approved project grant application (including the amount identified for project reporting and administration). Each action should be identified as a different line item",
-                    "projectHeadingHelpText": "Planned budget expenditure for each service (action) by species",
-                    "hideHelpText": true
-                }
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                },
+                "excludedModes": [
+                    "PRINT"
+                ]
             }
         ],
         "excludes": [],
@@ -411,12 +403,18 @@ var projectConfig = {
                 }
             ]
         },
-        "visibility": "public",
-        "organisationRelationship": "Service Provider",
-        "excludeFinancialYearData": true,
         "requiresActivityLocking": true,
         "projectTemplate": "rlp",
         "activityPeriodDescriptor": "Outputs report #",
+        "requireMeritAdminToReturnMeriPlan": true,
+        "emailTemplates": {
+            "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
+            "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
+            "planApprovedEmailTemplate": "RLP_PLAN_APPROVED_EMAIL_TEMPLATE",
+            "planReturnedEmailTemplate": "RLP_PLAN_RETURNED_EMAIL_TEMPLATE",
+            "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
+            "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
+        },
         "meriPlanTemplate": "configurableMeriPlan",
         "riskAndThreatTypes": [
             "Performance",
@@ -437,7 +435,7 @@ var projectConfig = {
                 "minimumReportDurationInDays": 3,
                 "label": "Semester",
                 "category": "Progress Reports",
-                "activityType": "Priority Threatened Species Progress Report",
+                "activityType": "Priority Threatened Species Progress Reportx",
                 "reportsAlignedToCalendar": true,
                 "canSubmitDuringReportingPeriod": true
             },
@@ -452,1423 +450,1392 @@ var projectConfig = {
                 "label": "Final Report",
                 "category": "Final Report",
                 "reportsAlignedToCalendar": false,
-                "activityType": "Priority Threatened Species Final Report",
+                "activityType": "Priority Threatened Species Final Reportx",
                 "alignToOwnerStart": true
             }
         ],
-        "activities": [
-            {
-                "name": "Herbivore and/or predator control"
-            },
-            {
-                "name": "Weed control and/or revegetation"
-            },
-            {
-                "name": "Fire management and planning"
-            },
-            {
-                "name": "Species and ecological community specific interventions"
-            },
-            {
-                "name": "Traditional Owner led healing of country"
-            },
-            {
-                "name": "Erosion control"
-            },
-            {
-                "name": "Refugia management"
-            }
+        "keyThreatCodes": [
+            "Climate Change - Changed flooding regime",
+            "Climate Change - Changed rainfall patterns",
+            "Climate Change - Sea level rises",
+            "Climate Change - Unexpected seasonal/temperature extremes",
+            "Disease/pathogens - Areas that are infected",
+            "Disease/pathogens - Possible infection of disease free areas",
+            "Fire - Inappropriate fire regime",
+            "Fire - Lack of protection for ecological assets during fire control activities",
+            "Genetics - Bottleneck/inbreeding",
+            "Habitat loss - Breeding place disturbance",
+            "Habitat loss - Dieback/senescence",
+            "Habitat loss - Feeding habitat loss/interference",
+            "Habitat loss - Habitat fragmentation",
+            "Habitat loss - Land clearing",
+            "Habitat loss - Loss of critical ecosystem service supporting habitat",
+            "Human interference - Fish and harvesting aquatic resources (commercial)",
+            "Human interference - Flow-on effects of housing development",
+            "Human interference - Illegal activities",
+            "Human interference - Industrial development",
+            "Human interference - Land use intensification",
+            "Human interference - Recreational fishing",
+            "Human interference - Recreational pressures",
+            "Human interference - Road/vehicle strike",
+            "Land management practices - Changes to hydrology and aquatic systems",
+            "Land management practices - Domestic grazing/stock impacts",
+            "Land management practices - Excess recharge of groundwater",
+            "Land management practices - Excess use (or over-use) of surface water or groundwater resources",
+            "Land management practices - Excessive fertiliser use",
+            "Land management practices - Inappropriate ground cover management",
+            "Land management practices - Runoff",
+            "Native fauna - Competition",
+            "Native fauna - Predation",
+            "Pest - Competition/exclusion",
+            "Pest - Disease transmission",
+            "Pest - Habitat degradation",
+            "Pest - Introduction of new pest animals",
+            "Pest - Predation",
+            "Pollution - Chemical",
+            "Pollution - Eutrophication/algal blooms",
+            "Pollution - Inappropriate waste disposal",
+            "Pollution - Sediment ",
+            "Population size/range - Low habitat area",
+            "Population size/range - Low population numbers",
+            "Weeds - Competition",
+            "Weeds - Introduction of new weed",
+            "Weeds - Spread of weeds from surrounding areas"
         ],
         "navigationMode": "returnToProject",
-        "objectives": [
-            "Prevent extinction and limit decline of native species",
-            "Reduce immediate suffering of native animals directly impacted by the fires",
-            "Maximise chances of long-term recovery of native species and communities",
-            "Ensure learning and continual improvement is core of the response"
+        "priorityPlaces": [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
         ],
-        "supportedServiceIds": [
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            10,
-            11,
-            12,
-            13,
-            14,
-            15,
-            16,
-            17,
-            18,
-            19,
-            20,
-            21,
-            22,
-            23,
-            24,
-            25,
-            26,
-            27,
-            28,
-            29,
-            30,
-            31,
-            32,
-            33,
-            34,
-            35,
-            36
-        ]
+        "supportsParatoo": true,
+        "supportsMeriPlanHistory": true
     },
     priorities: [
         {
-            "category": "Birds",
-            "priority": "Australasian Bittern Botaurus poiciloptilus"
+            "category": "Plants",
+            "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
         },
         {
-            "category": "Birds",
-            "priority": "Black-eared Miner Manorina melanotis"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
         },
         {
-            "category": "Birds",
-            "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+            "category": "High Risk Species",
+            "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
         },
         {
-            "category": "Birds",
-            "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Ammonite Snail Ammoniropa vigens"
         },
         {
-            "category": "Birds",
-            "priority": "Eastern Curlew Numenius madagascariensis"
+            "category": "Invertebrates",
+            "priority": "Ammonite Snail Ammoniropa vigens"
         },
         {
-            "category": "Birds",
-            "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+            "category": "High Risk Species",
+            "priority": "Ammonite Snail Ammoniropa vigens"
         },
         {
-            "category": "Birds",
-            "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+            "category": "Plants",
+            "priority": "Angle-stemmed Myrtle Gossia gonoclada"
         },
         {
-            "category": "Birds",
-            "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Angle-stemmed Myrtle Gossia gonoclada"
         },
         {
-            "category": "Birds",
-            "priority": "Malleefowl Leipoa ocellata"
+            "category": "High Risk Species",
+            "priority": "Angle-stemmed Myrtle Gossia gonoclada"
         },
         {
-            "category": "Birds",
-            "priority": "Night Parrot Pezoporus occidentalis"
+            "category": "Plants",
+            "priority": "Arckaringa Daisy Olearia arckaringensis"
         },
         {
-            "category": "Birds",
-            "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Arckaringa Daisy Olearia arckaringensis"
         },
         {
-            "category": "Birds",
-            "priority": "Orange-bellied Parrot Neophema chrysogaster"
+            "category": "High Risk Species",
+            "priority": "Arckaringa Daisy Olearia arckaringensis"
         },
         {
-            "category": "Birds",
-            "priority": "Plains-wanderer Pedionomus torquatus"
+            "category": "Reptiles",
+            "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
         },
         {
-            "category": "Birds",
-            "priority": "Princess Parrot Polytelis alexandrae"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
         },
         {
-            "category": "Birds",
-            "priority": "Red Goshawk Erythrotriorchis radiatus"
+            "category": "High Risk Species",
+            "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
         },
         {
             "category": "Birds",
-            "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+            "priority": "Australasian Bittern Botaurus poiciloptilus"
         },
         {
-            "category": "Birds",
-            "priority": "Regent Honeyeater Anthochaera phrygia"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Australasian Bittern Botaurus poiciloptilus"
         },
         {
-            "category": "Birds",
-            "priority": "Swift Parrot Lathamus discolor"
+            "category": "High Risk Species",
+            "priority": "Australasian Bittern Botaurus poiciloptilus"
         },
         {
-            "category": "Birds",
-            "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+            "category": "Mammals",
+            "priority": "Australian Sea-lion Neophoca cinerea"
         },
         {
-            "category": "Birds",
-            "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Australian Sea-lion Neophoca cinerea"
         },
         {
-            "category": "Birds",
-            "priority": "King Island Scrubtit Acanthornis magna greeniana"
+            "category": "High Risk Species",
+            "priority": "Australian Sea-lion Neophoca cinerea"
         },
         {
-            "category": "Birds",
-            "priority": "Noisy Scrub-bird Atrichornis clamosus"
+            "category": "Reptiles",
+            "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
         },
         {
-            "category": "Mammals",
-            "priority": "Australian Sea-lion Neophoca cinerea"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
         },
         {
-            "category": "Mammals",
-            "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+            "category": "High Risk Species",
+            "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
         },
         {
-            "category": "Mammals",
-            "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+            "category": "Birds",
+            "priority": "Black-eared Miner Manorina melanotis"
         },
         {
-            "category": "Mammals",
-            "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Black-eared Miner Manorina melanotis"
         },
         {
-            "category": "Mammals",
-            "priority": "Eastern Quoll Dasyurus viverrinus"
+            "category": "High Risk Species",
+            "priority": "Black-eared Miner Manorina melanotis"
         },
         {
-            "category": "Mammals",
-            "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+            "category": "Plants",
+            "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
         },
         {
-            "category": "Mammals",
-            "priority": "Greater Bilby Macrotis lagotis"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
         },
         {
-            "category": "Mammals",
-            "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+            "category": "High Risk Species",
+            "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
         },
         {
-            "category": "Mammals",
-            "priority": "Koala Phascolarctos cinereus"
+            "category": "Plants",
+            "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
         },
         {
-            "category": "Mammals",
-            "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
         },
         {
-            "category": "Mammals",
-            "priority": "Mountain Pygmy-possum Burramys parvus"
+            "category": "High Risk Species",
+            "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
         },
         {
             "category": "Mammals",
-            "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+            "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
         },
         {
-            "category": "Mammals",
-            "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
         },
         {
-            "category": "Mammals",
-            "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+            "category": "High Risk Species",
+            "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
         },
         {
-            "category": "Mammals",
-            "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+            "category": "Plants",
+            "priority": "Bulberin Nut Macadamia jansenii "
         },
         {
-            "category": "Mammals",
-            "priority": "Northern Quoll Dasyurus hallucatus"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Bulberin Nut Macadamia jansenii "
         },
         {
-            "category": "Mammals",
-            "priority": "Numbat Myrmecobius fasciatus"
+            "category": "High Risk Species",
+            "priority": "Bulberin Nut Macadamia jansenii "
         },
         {
-            "category": "Mammals",
-            "priority": "Quokka Setonix brachyurus"
+            "category": "Reptiles",
+            "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
         },
         {
-            "category": "Mammals",
-            "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
         },
         {
-            "category": "Mammals",
-            "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+            "category": "High Risk Species",
+            "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
         },
         {
-            "category": "Fish",
-            "priority": "Freshwater Sawfish Pristis pristis"
+            "category": "Birds",
+            "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
         },
         {
-            "category": "Fish",
-            "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
         },
         {
-            "category": "Fish",
-            "priority": "Maugean Skate Zearaja maugeana"
+            "category": "High Risk Species",
+            "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
         },
         {
-            "category": "Fish",
-            "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+            "category": "Plants",
+            "priority": "Carrington Falls Pomaderris Pomaderris walshii"
         },
         {
-            "category": "Fish",
-            "priority": "Red Handfish Thymichthys politus"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Carrington Falls Pomaderris Pomaderris walshii"
         },
         {
-            "category": "Fish",
-            "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+            "category": "High Risk Species",
+            "priority": "Carrington Falls Pomaderris Pomaderris walshii"
         },
         {
-            "category": "Fish",
-            "priority": "Stocky Galaxias Galaxias tantangara"
+            "category": "Invertebrates",
+            "priority": "Cauliflower Soft Coral Dendronephthya australis"
         },
         {
-            "category": "Fish",
-            "priority": "Swan Galaxias Galaxias fontanus"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Cauliflower Soft Coral Dendronephthya australis"
         },
         {
-            "category": "Fish",
-            "priority": "White's Seahorse Hippocampus whitei"
+            "category": "High Risk Species",
+            "priority": "Cauliflower Soft Coral Dendronephthya australis"
         },
         {
-            "category": "Frogs",
-            "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+            "category": "Mammals",
+            "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
         },
         {
-            "category": "Frogs",
-            "priority": "Kroombit Tinker Frog Taudactylus pleione"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
         },
         {
-            "category": "Frogs",
-            "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+            "category": "High Risk Species",
+            "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
         },
         {
-            "category": "Frogs",
-            "priority": "Mountain Frog Philoria kundagungan"
+            "category": "Birds",
+            "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
         },
         {
-            "category": "Frogs",
-            "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
         },
         {
-            "category": "Frogs",
-            "priority": "White-bellied Frog Anstisia alba"
+            "category": "High Risk Species",
+            "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
         },
         {
-            "category": "Reptiles",
-            "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+            "category": "Mammals",
+            "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
         },
         {
-            "category": "Reptiles",
-            "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
         },
         {
             "category": "Reptiles",
             "priority": "Collared Delma, Adorned Delma Delma torquata"
         },
         {
-            "category": "Reptiles",
-            "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Collared Delma, Adorned Delma Delma torquata"
         },
         {
-            "category": "Reptiles",
-            "priority": "Green Turtle Chelonia mydas"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Olive Ridley Turtle Lepidochelys olivacea"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
-        },
-        {
-            "category": "Reptiles",
-            "priority": "Western Swamp Tortoise Pseudemydura umbrina"
-        },
-        {
-            "category": "Invertebrates",
-            "priority": "Ammonite Snail Ammoniropa vigens"
+            "category": "High Risk Species",
+            "priority": "Collared Delma, Adorned Delma Delma torquata"
         },
         {
-            "category": "Invertebrates",
-            "priority": "Cauliflower Soft Coral Dendronephthya australis"
+            "category": "Plants",
+            "priority": "Davies' Waxflower Phebalium daviesii"
         },
         {
-            "category": "Invertebrates",
-            "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Davies' Waxflower Phebalium daviesii"
         },
         {
-            "category": "Invertebrates",
-            "priority": "Giant Gippsland Earthworm Megascolides australis"
+            "category": "High Risk Species",
+            "priority": "Davies' Waxflower Phebalium daviesii"
         },
         {
-            "category": "Invertebrates",
-            "priority": "Lord Howe Island Phasmid Dryococelus australis"
+            "category": "Birds",
+            "priority": "Eastern Curlew Numenius madagascariensis"
         },
         {
-            "category": "Invertebrates",
-            "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Eastern Curlew Numenius madagascariensis"
         },
         {
-            "category": "Invertebrates",
-            "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+            "category": "High Risk Species",
+            "priority": "Eastern Curlew Numenius madagascariensis"
         },
         {
-            "category": "Invertebrates",
-            "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+            "category": "Mammals",
+            "priority": "Eastern Quoll Dasyurus viverrinus"
         },
         {
-            "category": "Invertebrates",
-            "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Eastern Quoll Dasyurus viverrinus"
         },
         {
-            "category": "Invertebrates",
-            "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+            "category": "High Risk Species",
+            "priority": "Eastern Quoll Dasyurus viverrinus"
         },
         {
             "category": "Invertebrates",
-            "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
-        },
-        {
-            "category": "Plants",
-            "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
-        },
-        {
-            "category": "Plants",
-            "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+            "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
         },
         {
-            "category": "Plants",
-            "priority": "Arckaringa Daisy Olearia arckaringensis"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
         },
         {
-            "category": "Plants",
-            "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+            "category": "High Risk Species",
+            "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
         },
         {
             "category": "Plants",
-            "priority": "Bulberin Nut Macadamia jansenii "
+            "priority": "Foote's Grevillea Grevillea calliantha"
         },
         {
-            "category": "Plants",
-            "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Foote's Grevillea Grevillea calliantha"
         },
         {
-            "category": "Plants",
-            "priority": "Davies' Waxflower Phebalium daviesii"
+            "category": "High Risk Species",
+            "priority": "Foote's Grevillea Grevillea calliantha"
         },
         {
             "category": "Plants",
-            "priority": "Eremophila subangustifolia"
+            "priority": "Forked Spyridium Spyridium furculentum"
         },
         {
-            "category": "Plants",
-            "priority": "Foote's Grevillea Grevillea calliantha"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Forked Spyridium Spyridium furculentum"
         },
         {
-            "category": "Plants",
+            "category": "High Risk Species",
             "priority": "Forked Spyridium Spyridium furculentum"
         },
         {
-            "category": "Plants",
-            "priority": "Giant Andersonia Andersonia axilliflora"
+            "category": "Fish",
+            "priority": "Freshwater Sawfish Pristis pristis"
         },
         {
-            "category": "Plants",
-            "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Freshwater Sawfish Pristis pristis"
         },
         {
-            "category": "Plants",
-            "priority": "Imlay Mallee Eucalyptus imlayensis"
+            "category": "High Risk Species",
+            "priority": "Freshwater Sawfish Pristis pristis"
         },
         {
             "category": "Plants",
-            "priority": "King Blue-grass Dichanthium queenslandicum"
+            "priority": "Giant Andersonia Andersonia axilliflora"
         },
         {
-            "category": "Plants",
-            "priority": "Lax Leek Orchid Prasophyllum laxum"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Giant Andersonia Andersonia axilliflora"
         },
         {
-            "category": "Plants",
-            "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+            "category": "High Risk Species",
+            "priority": "Giant Andersonia Andersonia axilliflora"
         },
         {
-            "category": "Plants",
-            "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+            "category": "Invertebrates",
+            "priority": "Giant Gippsland Earthworm Megascolides australis"
         },
         {
-            "category": "Plants",
-            "priority": "Native Guava Rhodomyrtus psidioides"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Giant Gippsland Earthworm Megascolides australis"
         },
         {
-            "category": "Plants",
-            "priority": "Pimelea cremnophila"
+            "category": "High Risk Species",
+            "priority": "Giant Gippsland Earthworm Megascolides australis"
         },
         {
-            "category": "Plants",
-            "priority": "Pimelea venosa"
+            "category": "Mammals",
+            "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
         },
         {
-            "category": "Plants",
-            "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
         },
         {
-            "category": "Plants",
-            "priority": "Small-flowered Snottygobble Persoonia micranthera"
+            "category": "High Risk Species",
+            "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
         },
         {
-            "category": "Plants",
-            "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+            "category": "Invertebrates",
+            "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
         },
         {
-            "category": "Plants",
-            "priority": "Stiff Groundsel Senecio behrianus"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
         },
         {
-            "category": "Plants",
-            "priority": "Stirling Range Dryandra Banksia montana"
+            "category": "High Risk Species",
+            "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
         },
         {
-            "category": "Plants",
-            "priority": "Tangled Wattle Acacia volubilis"
+            "category": "Birds",
+            "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
         },
         {
-            "category": "Plants",
-            "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
         },
         {
-            "category": "Plants",
-            "priority": "Wollemi Pine Wollemia nobilis"
+            "category": "High Risk Species",
+            "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
         },
         {
             "category": "Plants",
-            "priority": "Wongan Eriostemon Philotheca wonganensis"
+            "priority": "Gorge Rice-flower, Pimelelea cremnophila"
         },
         {
-            "category": "Plants",
-            "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+            "category": "High Risk Species",
+            "priority": "Gorge Rice-flower, Pimelelea cremnophila"
         },
         {
-            "category": "Plants",
-            "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Gorge Rice-flower, Pimelea cremnophila"
         },
         {
             "category": "Plants",
-            "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+            "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
         },
         {
-            "category": "Plants",
-            "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Australasian Bittern Botaurus poiciloptilus"
+            "category": "High Risk Species",
+            "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Black-eared Miner Manorina melanotis"
+            "category": "Reptiles",
+            "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+            "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+            "category": "High Risk Species",
+            "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Eastern Curlew Numenius madagascariensis"
+            "category": "Mammals",
+            "priority": "Greater Bilby Macrotis lagotis"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+            "priority": "Greater Bilby Macrotis lagotis"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+            "category": "High Risk Species",
+            "priority": "Greater Bilby Macrotis lagotis"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+            "category": "Reptiles",
+            "priority": "Green Turtle Chelonia mydas"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Malleefowl Leipoa ocellata"
+            "priority": "Green Turtle Chelonia mydas"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Night Parrot Pezoporus occidentalis"
+            "category": "High Risk Species",
+            "priority": "Green Turtle Chelonia mydas"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+            "category": "Fish",
+            "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Orange-bellied Parrot Neophema chrysogaster"
+            "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Plains-wanderer Pedionomus torquatus"
+            "category": "High Risk Species",
+            "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Princess Parrot Polytelis alexandrae"
+            "category": "Frogs",
+            "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Red Goshawk Erythrotriorchis radiatus"
+            "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+            "category": "High Risk Species",
+            "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Regent Honeyeater Anthochaera phrygia"
+            "category": "High Risk Species",
+            "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Swift Parrot Lathamus discolor"
+            "category": "Birds",
+            "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+            "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+            "category": "Plants",
+            "priority": "Imlay Mallee Eucalyptus imlayensis"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "King Island Scrubtit Acanthornis magna greeniana"
+            "priority": "Imlay Mallee Eucalyptus imlayensis"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Noisy Scrub-bird Atrichornis clamosus"
+            "category": "High Risk Species",
+            "priority": "Imlay Mallee Eucalyptus imlayensis"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Australian Sea-lion Neophoca cinerea"
+            "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+            "category": "High Risk Species",
+            "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+            "category": "Mammals",
+            "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+            "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Eastern Quoll Dasyurus viverrinus"
+            "category": "High Risk Species",
+            "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+            "category": "Plants",
+            "priority": "King Blue-grass Dichanthium queenslandicum"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Greater Bilby Macrotis lagotis"
+            "priority": "King Blue-grass Dichanthium queenslandicum"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+            "category": "High Risk Species",
+            "priority": "King Blue-grass Dichanthium queenslandicum"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Koala Phascolarctos cinereus"
+            "category": "Birds",
+            "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+            "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Mountain Pygmy-possum Burramys parvus"
+            "category": "High Risk Species",
+            "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+            "category": "Birds",
+            "priority": "King Island Scrubtit Acanthornis magna greeniana"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+            "priority": "King Island Scrubtit Acanthornis magna greeniana"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+            "category": "High Risk Species",
+            "priority": "King Island Scrubtit Acanthornis magna greeniana"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+            "category": "Mammals",
+            "priority": "Koala Phascolarctos cinereus"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Northern Quoll Dasyurus hallucatus"
+            "priority": "Koala Phascolarctos cinereus"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Numbat Myrmecobius fasciatus"
+            "category": "High Risk Species",
+            "priority": "Koala Phascolarctos cinereus"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Quokka Setonix brachyurus"
+            "category": "Frogs",
+            "priority": "Kroombit Tinker Frog Taudactylus pleione"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+            "priority": "Kroombit Tinker Frog Taudactylus pleione"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+            "category": "High Risk Species",
+            "priority": "Kroombit Tinker Frog Taudactylus pleione"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Freshwater Sawfish Pristis pristis"
+            "category": "Plants",
+            "priority": "Lax Leek Orchid Prasophyllum laxum"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+            "priority": "Lax Leek Orchid Prasophyllum laxum"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Maugean Skate Zearaja maugeana"
+            "category": "High Risk Species",
+            "priority": "Lax Leek Orchid Prasophyllum laxum"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+            "category": "Mammals",
+            "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Red Handfish Thymichthys politus"
+            "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+            "category": "High Risk Species",
+            "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Stocky Galaxias Galaxias tantangara"
+            "category": "Reptiles",
+            "priority": "Leaf-Scaled Seasnake – Aipysurus foliosquama"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Swan Galaxias Galaxias fontanus"
+            "category": "Plants",
+            "priority": "Little Mountain Palm Lepidorrhachis mooreana"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "White's Seahorse Hippocampus whitei"
+            "priority": "Little Mountain Palm Lepidorrhachis mooreana"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+            "category": "High Risk Species",
+            "priority": "Little Mountain Palm Lepidorrhachis mooreana"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Kroombit Tinker Frog Taudactylus pleione"
+            "category": "Invertebrates",
+            "priority": "Lord Howe Island Phasmid Dryococelus australis"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+            "priority": "Lord Howe Island Phasmid Dryococelus australis"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Mountain Frog Philoria kundagungan"
+            "category": "High Risk Species",
+            "priority": "Lord Howe Island Phasmid Dryococelus australis"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+            "category": "Plants",
+            "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "White-bellied Frog Anstisia alba"
+            "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+            "category": "High Risk Species",
+            "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+            "category": "Birds",
+            "priority": "Malleefowl Leipoa ocellata"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Collared Delma, Adorned Delma Delma torquata"
+            "priority": "Malleefowl Leipoa ocellata"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+            "category": "High Risk Species",
+            "priority": "Malleefowl Leipoa ocellata"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Green Turtle Chelonia mydas"
+            "category": "Invertebrates",
+            "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+            "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+            "category": "High Risk Species",
+            "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+            "category": "Fish",
+            "priority": "Maugean Skate Zearaja maugeana"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+            "priority": "Maugean Skate Zearaja maugeana"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+            "category": "High Risk Species",
+            "priority": "Maugean Skate Zearaja maugeana"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+            "category": "Invertebrates",
+            "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Ammonite Snail Ammoniropa vigens"
+            "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Cauliflower Soft Coral Dendronephthya australis"
+            "category": "High Risk Species",
+            "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+            "category": "Frogs",
+            "priority": "Mountain Frog Philoria kundagungan"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Giant Gippsland Earthworm Megascolides australis"
+            "priority": "Mountain Frog Philoria kundagungan"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Lord Howe Island Phasmid Dryococelus australis"
+            "category": "High Risk Species",
+            "priority": "Mountain Frog Philoria kundagungan"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+            "category": "Mammals",
+            "priority": "Mountain Pygmy-possum Burramys parvus"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+            "priority": "Mountain Pygmy-possum Burramys parvus"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+            "category": "High Risk Species",
+            "priority": "Mountain Pygmy-possum Burramys parvus"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+            "category": "Frogs",
+            "priority": "Mountain-top Nursery-frog Cophixalus monticola"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+            "priority": "Mountain-top Nursery-frog Cophixalus monticola"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+            "category": "High Risk Species",
+            "priority": "Mountain-top Nursery-frog Cophixalus monticola"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+            "category": "Fish",
+            "priority": "Murray Hardyhead Craterocephalus fluviatilis"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+            "priority": "Murray Hardyhead Craterocephalus fluviatilis"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Arckaringa Daisy Olearia arckaringensis"
+            "category": "High Risk Species",
+            "priority": "Murray Hardyhead Craterocephalus fluviatilis"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+            "category": "Plants",
+            "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Bulberin Nut Macadamia jansenii "
+            "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+            "category": "High Risk Species",
+            "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Davies' Waxflower Phebalium daviesii"
+            "category": "Plants",
+            "priority": "Native Guava Rhodomyrtus psidioides"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Eremophila subangustifolia"
+            "priority": "Native Guava Rhodomyrtus psidioides"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Foote's Grevillea Grevillea calliantha"
+            "category": "High Risk Species",
+            "priority": "Native Guava Rhodomyrtus psidioides"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Forked Spyridium Spyridium furculentum"
+            "category": "Mammals",
+            "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Giant Andersonia Andersonia axilliflora"
+            "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+            "category": "High Risk Species",
+            "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Imlay Mallee Eucalyptus imlayensis"
+            "category": "Birds",
+            "priority": "Night Parrot Pezoporus occidentalis"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "King Blue-grass Dichanthium queenslandicum"
+            "priority": "Night Parrot Pezoporus occidentalis"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Lax Leek Orchid Prasophyllum laxum"
+            "category": "High Risk Species",
+            "priority": "Night Parrot Pezoporus occidentalis"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+            "category": "Birds",
+            "priority": "Noisy Scrub-bird Atrichornis clamosus"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+            "priority": "Noisy Scrub-bird Atrichornis clamosus"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Native Guava Rhodomyrtus psidioides"
+            "category": "High Risk Species",
+            "priority": "Noisy Scrub-bird Atrichornis clamosus"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Pimelea cremnophila"
+            "category": "Birds",
+            "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Pimelea venosa"
+            "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+            "category": "High Risk Species",
+            "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Small-flowered Snottygobble Persoonia micranthera"
+            "category": "Mammals",
+            "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+            "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Stiff Groundsel Senecio behrianus"
+            "category": "High Risk Species",
+            "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Stirling Range Dryandra Banksia montana"
+            "category": "Mammals",
+            "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Tangled Wattle Acacia volubilis"
+            "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+            "category": "High Risk Species",
+            "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Wollemi Pine Wollemia nobilis"
+            "category": "Mammals",
+            "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Wongan Eriostemon Philotheca wonganensis"
+            "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+            "category": "High Risk Species",
+            "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+            "category": "Mammals",
+            "priority": "Northern Quoll Dasyurus hallucatus"
         },
         {
             "category": "Priority Threatened Species Primary",
-            "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+            "priority": "Northern Quoll Dasyurus hallucatus"
         },
         {
-            "category": "Priority Threatened Species Primary",
-            "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+            "category": "High Risk Species",
+            "priority": "Northern Quoll Dasyurus hallucatus"
         },
         {
-            "category": "Target 3",
-            "priority": "Australasian Bittern Botaurus poiciloptilus"
+            "category": "Mammals",
+            "priority": "Numbat Myrmecobius fasciatus"
         },
         {
-            "category": "Target 3",
-            "priority": "Black-eared Miner Manorina melanotis"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Numbat Myrmecobius fasciatus"
         },
         {
-            "category": "Target 3",
-            "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+            "category": "High Risk Species",
+            "priority": "Numbat Myrmecobius fasciatus"
         },
         {
-            "category": "Target 3",
-            "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+            "category": "Reptiles",
+            "priority": "Olive Ridley Turtle Lepidochelys olivacea"
         },
         {
-            "category": "Target 3",
-            "priority": "Eastern Curlew Numenius madagascariensis"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Olive Ridley Turtle Lepidochelys olivacea"
         },
         {
-            "category": "Target 3",
-            "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+            "category": "High Risk Species",
+            "priority": "Olive Ridley Turtle Lepidochelys olivacea"
         },
         {
-            "category": "Target 3",
-            "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+            "category": "Birds",
+            "priority": "Orange-bellied Parrot Neophema chrysogaster"
         },
         {
-            "category": "Target 3",
-            "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Orange-bellied Parrot Neophema chrysogaster"
         },
         {
-            "category": "Target 3",
-            "priority": "Malleefowl Leipoa ocellata"
+            "category": "High Risk Species",
+            "priority": "Orange-bellied Parrot Neophema chrysogaster"
         },
         {
-            "category": "Target 3",
-            "priority": "Night Parrot Pezoporus occidentalis"
+            "category": "Invertebrates",
+            "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
         },
         {
-            "category": "Target 3",
-            "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
         },
         {
-            "category": "Target 3",
-            "priority": "Orange-bellied Parrot Neophema chrysogaster"
+            "category": "High Risk Species",
+            "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
         },
         {
-            "category": "Target 3",
+            "category": "Birds",
             "priority": "Plains-wanderer Pedionomus torquatus"
         },
         {
-            "category": "Target 3",
-            "priority": "Princess Parrot Polytelis alexandrae"
-        },
-        {
-            "category": "Target 3",
-            "priority": "Red Goshawk Erythrotriorchis radiatus"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Plains-wanderer Pedionomus torquatus"
         },
         {
-            "category": "Target 3",
-            "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+            "category": "High Risk Species",
+            "priority": "Plains-wanderer Pedionomus torquatus"
         },
         {
-            "category": "Target 3",
-            "priority": "Regent Honeyeater Anthochaera phrygia"
+            "category": "Birds",
+            "priority": "Princess Parrot Polytelis alexandrae"
         },
         {
-            "category": "Target 3",
-            "priority": "Swift Parrot Lathamus discolor"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Princess Parrot Polytelis alexandrae"
         },
         {
-            "category": "Target 3",
-            "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+            "category": "High Risk Species",
+            "priority": "Princess Parrot Polytelis alexandrae"
         },
         {
-            "category": "Target 3",
-            "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+            "category": "Reptiles",
+            "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
         },
         {
-            "category": "Target 3",
-            "priority": "King Island Scrubtit Acanthornis magna greeniana"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
         },
         {
-            "category": "Target 3",
-            "priority": "Noisy Scrub-bird Atrichornis clamosus"
+            "category": "High Risk Species",
+            "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
         },
         {
-            "category": "Target 3",
-            "priority": "Australian Sea-lion Neophoca cinerea"
+            "category": "Mammals",
+            "priority": "Quokka Setonix brachyurus"
         },
         {
-            "category": "Target 3",
-            "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Quokka Setonix brachyurus"
         },
         {
-            "category": "Target 3",
-            "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+            "category": "High Risk Species",
+            "priority": "Quokka Setonix brachyurus"
         },
         {
-            "category": "Target 3",
-            "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+            "category": "Birds",
+            "priority": "Red Goshawk Erythrotriorchis radiatus"
         },
         {
-            "category": "Target 3",
-            "priority": "Eastern Quoll Dasyurus viverrinus"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Red Goshawk Erythrotriorchis radiatus"
         },
         {
-            "category": "Target 3",
-            "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+            "category": "High Risk Species",
+            "priority": "Red Goshawk Erythrotriorchis radiatus"
         },
         {
-            "category": "Target 3",
-            "priority": "Greater Bilby Macrotis lagotis"
+            "category": "Fish",
+            "priority": "Red Handfish Thymichthys politus"
         },
         {
-            "category": "Target 3",
-            "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Red Handfish Thymichthys politus"
         },
         {
-            "category": "Target 3",
-            "priority": "Koala Phascolarctos cinereus"
+            "category": "High Risk Species",
+            "priority": "Red Handfish Thymichthys politus"
         },
         {
-            "category": "Target 3",
-            "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+            "category": "Birds",
+            "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
         },
         {
-            "category": "Target 3",
-            "priority": "Mountain Pygmy-possum Burramys parvus"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
         },
         {
-            "category": "Target 3",
-            "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+            "category": "High Risk Species",
+            "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
         },
         {
-            "category": "Target 3",
-            "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+            "category": "Fish",
+            "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
         },
         {
-            "category": "Target 3",
-            "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
         },
         {
-            "category": "Target 3",
-            "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+            "category": "High Risk Species",
+            "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
         },
         {
-            "category": "Target 3",
-            "priority": "Northern Quoll Dasyurus hallucatus"
+            "category": "Birds",
+            "priority": "Regent Honeyeater Anthochaera phrygia"
         },
         {
-            "category": "Target 3",
-            "priority": "Numbat Myrmecobius fasciatus"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Regent Honeyeater Anthochaera phrygia"
         },
         {
-            "category": "Target 3",
-            "priority": "Quokka Setonix brachyurus"
+            "category": "High Risk Species",
+            "priority": "Regent Honeyeater Anthochaera phrygia"
         },
         {
-            "category": "Target 3",
-            "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+            "category": "Plants",
+            "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
         },
         {
-            "category": "Target 3",
-            "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
         },
         {
-            "category": "Target 3",
-            "priority": "Freshwater Sawfish Pristis pristis"
+            "category": "High Risk Species",
+            "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
         },
         {
-            "category": "Target 3",
-            "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+            "category": "Reptiles",
+            "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
         },
         {
-            "category": "Target 3",
-            "priority": "Maugean Skate Zearaja maugeana"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
         },
         {
-            "category": "Target 3",
-            "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+            "category": "High Risk Species",
+            "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
         },
         {
-            "category": "Target 3",
-            "priority": "Red Handfish Thymichthys politus"
+            "category": "Plants",
+            "priority": "Small-flowered Snottygobble Persoonia micranthera"
         },
         {
-            "category": "Target 3",
-            "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Small-flowered Snottygobble Persoonia micranthera"
         },
         {
-            "category": "Target 3",
-            "priority": "Stocky Galaxias Galaxias tantangara"
+            "category": "High Risk Species",
+            "priority": "Small-flowered Snottygobble Persoonia micranthera"
         },
         {
-            "category": "Target 3",
-            "priority": "Swan Galaxias Galaxias fontanus"
+            "category": "Plants",
+            "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
         },
         {
-            "category": "Target 3",
-            "priority": "White's Seahorse Hippocampus whitei"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
         },
         {
-            "category": "Target 3",
-            "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+            "category": "High Risk Species",
+            "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
         },
         {
-            "category": "Target 3",
-            "priority": "Kroombit Tinker Frog Taudactylus pleione"
+            "category": "Frogs",
+            "priority": "Southern Corroboree Frog Pseudophryne corroboree"
         },
         {
-            "category": "Target 3",
+            "category": "Priority Threatened Species Primary",
             "priority": "Southern Corroboree Frog Pseudophryne corroboree"
         },
         {
-            "category": "Target 3",
-            "priority": "Mountain Frog Philoria kundagungan"
+            "category": "High Risk Species",
+            "priority": "Southern Corroboree Frog Pseudophryne corroboree"
         },
         {
-            "category": "Target 3",
-            "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+            "category": "Mammals",
+            "priority": "Spectacled Flying-fox Pteropus conspicillatus"
         },
         {
-            "category": "Target 3",
-            "priority": "White-bellied Frog Anstisia alba"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Spectacled Flying-fox Pteropus conspicillatus"
         },
         {
-            "category": "Target 3",
-            "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+            "category": "High Risk Species",
+            "priority": "Spectacled Flying-fox Pteropus conspicillatus"
         },
         {
-            "category": "Target 3",
-            "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+            "category": "Plants",
+            "priority": "Stiff Groundsel Senecio behrianus"
         },
         {
-            "category": "Target 3",
-            "priority": "Collared Delma, Adorned Delma Delma torquata"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Stiff Groundsel Senecio behrianus"
         },
         {
-            "category": "Target 3",
-            "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+            "category": "High Risk Species",
+            "priority": "Stiff Groundsel Senecio behrianus"
         },
         {
-            "category": "Target 3",
-            "priority": "Green Turtle Chelonia mydas"
+            "category": "Plants",
+            "priority": "Stirling Range Dryandra Banksia montana"
         },
         {
-            "category": "Target 3",
-            "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Stirling Range Dryandra Banksia montana"
         },
         {
-            "category": "Target 3",
-            "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+            "category": "High Risk Species",
+            "priority": "Stirling Range Dryandra Banksia montana"
         },
         {
-            "category": "Target 3",
-            "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+            "category": "Fish",
+            "priority": "Stocky Galaxias Galaxias tantangara"
         },
         {
-            "category": "Target 3",
-            "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Stocky Galaxias Galaxias tantangara"
         },
         {
-            "category": "Target 3",
-            "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+            "category": "High Risk Species",
+            "priority": "Stocky Galaxias Galaxias tantangara"
         },
         {
-            "category": "Target 3",
-            "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+            "category": "Fish",
+            "priority": "Swan Galaxias Galaxias fontanus"
         },
         {
-            "category": "Target 3",
-            "priority": "Ammonite Snail Ammoniropa vigens"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Swan Galaxias Galaxias fontanus"
         },
         {
-            "category": "Target 3",
-            "priority": "Cauliflower Soft Coral Dendronephthya australis"
+            "category": "High Risk Species",
+            "priority": "Swan Galaxias Galaxias fontanus"
         },
         {
-            "category": "Target 3",
-            "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+            "category": "Birds",
+            "priority": "Swift Parrot Lathamus discolor"
         },
         {
-            "category": "Target 3",
-            "priority": "Giant Gippsland Earthworm Megascolides australis"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Swift Parrot Lathamus discolor"
         },
         {
-            "category": "Target 3",
-            "priority": "Lord Howe Island Phasmid Dryococelus australis"
+            "category": "High Risk Species",
+            "priority": "Swift Parrot Lathamus discolor"
         },
         {
-            "category": "Target 3",
-            "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+            "category": "Plants",
+            "priority": "Tangled Wattle Acacia volubilis"
         },
         {
-            "category": "Target 3",
-            "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Tangled Wattle Acacia volubilis"
         },
         {
-            "category": "Target 3",
-            "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+            "category": "High Risk Species",
+            "priority": "Tangled Wattle Acacia volubilis"
         },
         {
-            "category": "Target 3",
+            "category": "Invertebrates",
             "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
         },
         {
-            "category": "Target 3",
-            "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
         },
         {
-            "category": "Target 3",
-            "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+            "category": "High Risk Species",
+            "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
         },
         {
-            "category": "Target 3",
-            "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+            "category": "Plants",
+            "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
         },
         {
-            "category": "Target 3",
-            "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
         },
         {
-            "category": "Target 3",
-            "priority": "Arckaringa Daisy Olearia arckaringensis"
+            "category": "High Risk Species",
+            "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
         },
         {
-            "category": "Target 3",
-            "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+            "category": "Birds",
+            "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
         },
         {
-            "category": "Target 3",
-            "priority": "Bulberin Nut Macadamia jansenii "
+            "category": "Priority Threatened Species Primary",
+            "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
         },
         {
-            "category": "Target 3",
-            "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+            "category": "High Risk Species",
+            "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
         },
         {
-            "category": "Target 3",
-            "priority": "Davies' Waxflower Phebalium daviesii"
+            "category": "Mammals",
+            "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
         },
         {
-            "category": "Target 3",
-            "priority": "Eremophila subangustifolia"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
         },
         {
-            "category": "Target 3",
-            "priority": "Foote's Grevillea Grevillea calliantha"
+            "category": "High Risk Species",
+            "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
         },
         {
-            "category": "Target 3",
-            "priority": "Forked Spyridium Spyridium furculentum"
+            "category": "Reptiles",
+            "priority": "Western Swamp Tortoise Pseudemydura umbrina"
         },
         {
-            "category": "Target 3",
-            "priority": "Giant Andersonia Andersonia axilliflora"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Western Swamp Tortoise Pseudemydura umbrina"
         },
         {
-            "category": "Target 3",
-            "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+            "category": "High Risk Species",
+            "priority": "Western Swamp Tortoise Pseudemydura umbrina"
         },
         {
-            "category": "Target 3",
-            "priority": "Imlay Mallee Eucalyptus imlayensis"
+            "category": "Frogs",
+            "priority": "White-bellied Frog Anstisia alba"
         },
         {
-            "category": "Target 3",
-            "priority": "King Blue-grass Dichanthium queenslandicum"
+            "category": "Priority Threatened Species Primary",
+            "priority": "White-bellied Frog Anstisia alba"
         },
         {
-            "category": "Target 3",
-            "priority": "Lax Leek Orchid Prasophyllum laxum"
+            "category": "High Risk Species",
+            "priority": "White-bellied Frog Anstisia alba"
         },
         {
-            "category": "Target 3",
-            "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+            "category": "Birds",
+            "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
         },
         {
-            "category": "Target 3",
-            "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+            "category": "Priority Threatened Species Primary",
+            "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
         },
         {
-            "category": "Target 3",
-            "priority": "Native Guava Rhodomyrtus psidioides"
+            "category": "High Risk Species",
+            "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
         },
         {
-            "category": "Target 3",
-            "priority": "Pimelea cremnophila"
+            "category": "Fish",
+            "priority": "White's Seahorse Hippocampus whitei"
         },
         {
-            "category": "Target 3",
-            "priority": "Pimelea venosa"
+            "category": "Priority Threatened Species Primary",
+            "priority": "White's Seahorse Hippocampus whitei"
         },
         {
-            "category": "Target 3",
-            "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+            "category": "High Risk Species",
+            "priority": "White's Seahorse Hippocampus whitei"
         },
         {
-            "category": "Target 3",
-            "priority": "Small-flowered Snottygobble Persoonia micranthera"
+            "category": "Plants",
+            "priority": "Wollemi Pine Wollemia nobilis"
         },
         {
-            "category": "Target 3",
-            "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Wollemi Pine Wollemia nobilis"
         },
         {
-            "category": "Target 3",
-            "priority": "Stiff Groundsel Senecio behrianus"
+            "category": "High Risk Species",
+            "priority": "Wollemi Pine Wollemia nobilis"
         },
         {
-            "category": "Target 3",
-            "priority": "Stirling Range Dryandra Banksia montana"
+            "category": "Plants",
+            "priority": "Wongan Eriostemon Philotheca wonganensis"
         },
         {
-            "category": "Target 3",
-            "priority": "Tangled Wattle Acacia volubilis"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Wongan Eriostemon Philotheca wonganensis"
         },
         {
-            "category": "Target 3",
-            "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+            "category": "High Risk Species",
+            "priority": "Wongan Eriostemon Philotheca wonganensis"
         },
         {
-            "category": "Target 3",
-            "priority": "Wollemi Pine Wollemia nobilis"
+            "category": "Plants",
+            "priority": "Wood Well Spyridium Spyridium fontis-woodii"
         },
         {
-            "category": "Target 3",
-            "priority": "Wongan Eriostemon Philotheca wonganensis"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Wood Well Spyridium Spyridium fontis-woodii"
         },
         {
-            "category": "Target 3",
+            "category": "High Risk Species",
             "priority": "Wood Well Spyridium Spyridium fontis-woodii"
         },
         {
-            "category": "Target 3",
-            "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+            "category": "Reptiles",
+            "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
         },
         {
-            "category": "Target 3",
-            "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
         },
         {
-            "category": "Target 3",
-            "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+            "category": "High Risk Species",
+            "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
         }
     ]
 };
@@ -1886,12 +1853,12 @@ var outcomes = [
         "type": "primary",
         "category": "environment",
         "supportsMultiplePrioritiesAsSecondary": true,
-        "outcome": "All priority species are on track for improved trajectory"
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - The trajectory of species targeted under the Threatened Species Action Plan 2022-2032 and other EPBC Act listed Species is improved"
     },
     {
         "priorities": [
             {
-                "category": "Target 3"
+                "category": ""
             }
         ],
         "targeted": true,
@@ -2017,6 +1984,41 @@ var outcomes = [
         "category": "environment",
         "supportsMultiplePrioritiesAsSecondary": false,
         "outcome": "Target 22: Community groups lead or participate in recovery activities for all accessible priority species and places, including through citizen science"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "All priority species are on track for improved trajectory"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "Implementation of priority actions for priority species is tracked and published"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "Impacts of climate change on priority species and places are identified and actions are underway to strengthen resilience and adaptive capacity"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "First Nations’ knowledges are integrated in conservation assessments, processes and planning for threatened species and ecological communities"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "First Nations-led recovery activities for threatened species and ecological communities are increased"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "National conservation planning for threatened species and ecological communities is contemporary, effective and fit-for-purpose"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "Community groups lead or participate in recovery activities for all accessible priority species and places, including through citizen science"
     }
 ]
 
@@ -2025,10 +2027,8 @@ subprograms.forEach(function (subprogram){
     var program = db.program.find({name: subprogram});
     while(program.hasNext()){
         var p = program.next();
-        if (p.name === "Practical Action for Priority Threatened Species"){
-            p.config = projectConfig.config
-            p.priorities = projectConfig.priorities
-        }
-        db.program.save(p);
+        print("sub program ID: " + p.programId)
+        db.program.updateOne({programId:p.programId}, {$set:{config:projectConfig.config, outcomes:outcomes, priorities:projectConfig.priorities}});
+        useNhtServiceLabels(p.name);
     }
 });
diff --git a/src/main/scripts/releases/2.12/adhoc/createTrackingSpeciesTrajectoriesProgram.js b/src/main/scripts/releases/2.12/adhoc/createTrackingSpeciesTrajectoriesProgram.js
index bc6fd5e41..93e80a0d2 100644
--- a/src/main/scripts/releases/2.12/adhoc/createTrackingSpeciesTrajectoriesProgram.js
+++ b/src/main/scripts/releases/2.12/adhoc/createTrackingSpeciesTrajectoriesProgram.js
@@ -7,18 +7,381 @@ let programName = "Saving Native Species";
 var parentProgram = createOrFindProgram(programName);
 
 var subprograms = ["Tracking Species Trajectories"]
-createNewProgram(programName, subprograms);
+subprograms.forEach(function (subProgram){
+    createOrFindProgram(subProgram, parentProgram._id);
+});
 
 
 var programConfig = {
     config: {
+        "meriPlanContents": [
+            {
+                "template": "name",
+                "model": {
+                    "tableFormatting": true
+                }
+            },
+            {
+                "template": "priorityPlace",
+                "model": {
+                    "priorityPlaceHelpText": "Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species.",
+                    "priorityPlaceLabel": "Does this project directly support a priority place?"
+                }
+            },
+            {
+                "template": "indigenousInvolvement"
+            },
+            {
+                "template": "description",
+                "model": {
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
+                }
+            },
+            {
+                "template": "programOutcome",
+                "model": {
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "extendedKeyThreats",
+                "model": {
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "threatHelpText": "Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText": "Describe the proposed method to address the threat or threatening process",
+                    "title": "Key threat(s) and/or key threatening processes"
+                }
+            },
+            {
+                "template": "projectMethodology",
+                "model": {
+                    "helpText": "Include all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic.",
+                    "maxSize": "4000",
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])"
+                }
+            },
+            {
+                "template": "projectPartnerships",
+                "model": {
+                    "helpTextHeading": "Note: Not limited to key subcontractors.",
+                    "helpTextPartnerName": "Insert name of project partner. To be a project partner, they need to be actively involved in the planning or delivery of the project"
+                }
+            },
+            {
+                "template": "extendedBaselineMonitoring",
+                "model": {
+                    "approachHeading": "Monitoring method",
+                    "indicatorHeading": "Monitoring methodology",
+                    "monitoringServiceHelpText": "Select the relevant Project Services(s)/Target measure(s) that will be used to support ongoing monitoring",
+                    "baselineDataDescriptionHelpText": "Describe the project baseline to be established, or the baseline data that currently exists",
+                    "baselineMethodHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "baselineDataHelpText": "Existing baseline data needs to be based on best practice methods and be compatible with the EMSA protocols.",
+                    "approachHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "titleHelpText": "Describe the Project Baseline(s) and ongoing monitoring which will be used to report progress towards this projects outcome(s).  Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "baselineServiceHelpText": "Select the relevant Project Service(s)/Target measure(s) that will be used to support the development of the baseline",
+                    "newIndicatorText": "New monitoring indicator"
+                }
+            },
+            {
+                "template": "projectReview",
+                "model": {
+                    "title": "Project review, improvement and evaluation methodology and approach (3000 character limit [approximately 500 words])"
+                }
+            },
+            {
+                "template": "nationalAndRegionalPlans",
+                "model": {
+                    "includeUrl": true,
+                    "headingTitle": "Conservation and management plans"
+                }
+            },
+            {
+                "template": "serviceOutcomeTargets",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections",
+                    "title": "Project services and targets",
+                    "serviceName": "Service"
+                }
+            },
+            {
+                "template": "serviceForecasts",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                },
+                "excludedModes": [
+                    "PRINT"
+                ]
+            }
+        ],
         "excludes": [],
-        "visibility": "public",
+        "programServiceConfig": {
+            "serviceFormName": "Priority Threatened Species Progress Report",
+            "programServices": [
+                {
+                    "serviceTargets": [
+                        "0df7c177-2864-4a25-b420-2cf3c45ce749"
+                    ],
+                    "serviceId": 1
+                },
+                {
+                    "serviceTargets": [
+                        "69deaaf9-cdc2-439a-b684-4cffdc7f224e"
+                    ],
+                    "serviceId": 2
+                },
+                {
+                    "serviceTargets": [
+                        "1f8161bc-908b-4ec8-ab7f-edac973a657d",
+                        "88908921-1248-4a7c-b185-51c625c737e3",
+                        "26a8213e-1770-4dc4-8f99-7e6302197504",
+                        "15a49c6f-2177-4183-9955-c7e487970171",
+                        "fe9f1a6c-e614-489a-80fa-4d6d76f1cf95",
+                        "f7089b5b-333f-4f33-b0df-f7ef88e9f683"
+                    ],
+                    "serviceId": 3
+                },
+                {
+                    "serviceTargets": [
+                        "aa0c6b29-285e-4344-987e-dfeaf1d95648",
+                        "c464b652-be5e-4658-b62f-02bf1a80bcf8",
+                        "a901232d-8244-40dd-9bb7-ff9e4e9dbeac"
+                    ],
+                    "serviceId": 4
+                },
+                {
+                    "serviceTargets": [
+                        "55d76c03-c89d-40fe-867b-93f7a48ff9c1",
+                        "3cbf653f-f74c-4066-81d2-e3f78268185c",
+                        "3855d565-3b77-497b-90af-addb271aa598",
+                        "5dbfb32a-5933-4d8a-9937-41f350fb5f75"
+                    ],
+                    "serviceId": 5
+                },
+                {
+                    "serviceTargets": [
+                        "d97037d2-7ee4-429b-bd26-cdcc5a269d9d",
+                        "e48faf01-72eb-479c-be9b-d2d71d254fa4"
+                    ],
+                    "serviceId": 6
+                },
+                {
+                    "serviceTargets": [
+                        "482bdf4e-6f7a-4bdf-80d5-d619ac7cdf50",
+                        "2ef32f94-14f1-4878-9eb7-c115fa18ce25"
+                    ],
+                    "serviceId": 7
+                },
+                {
+                    "serviceTargets": [
+                        "7709de92-0f85-490b-bc5f-2748b3db42c2",
+                        "8025b157-44d7-4283-bc1c-f40fb9b99501",
+                        "0ec5fd50-13e2-4bde-8e01-5955e7145cae"
+                    ],
+                    "serviceId": 8
+                },
+                {
+                    "serviceTargets": [
+                        "46925c6c-e222-4f6a-8553-c69929929d10",
+                        "757d6c9e-ec24-486f-a128-acc9bfb87830",
+                        "ffa44bad-209d-414a-bc96-e8ca3c96092f"
+                    ],
+                    "serviceId": 9
+                },
+                {
+                    "serviceTargets": [
+                        "edb6e94a-d781-447c-8792-5e06e5c912a8",
+                        "a3afea6e-711c-4ef2-bb20-6d2630b7ee93"
+                    ],
+                    "serviceId": 10
+                },
+                {
+                    "serviceTargets": [
+                        "607e2cd4-d7c5-4d5b-867f-c2c8e7b62948",
+                        "b7c067e3-6ae7-4e76-809a-312165b75f94"
+                    ],
+                    "serviceId": 11
+                },
+                {
+                    "serviceTargets": [
+                        "d1c10295-05e5-4265-a5f1-8a5683af2efe"
+                    ],
+                    "serviceId": 12
+                },
+                {
+                    "serviceTargets": [
+                        "011a161f-7275-4b5e-986e-3fe4640d0265",
+                        "3e402423-3e0b-4549-9e09-2b71329ea069"
+                    ],
+                    "serviceId": 13
+                },
+                {
+                    "serviceTargets": [
+                        "c2dc6f91-ccb1-412e-99d0-a842a4ac4b03"
+                    ],
+                    "serviceId": 14
+                },
+                {
+                    "serviceTargets": [
+                        "def4e2af-dcad-4a15-8336-3765e6671f08",
+                        "cf3ccbf5-d031-4a22-a746-961cdefa7318"
+                    ],
+                    "serviceId": 15
+                },
+                {
+                    "serviceTargets": [
+                        "c46842b6-d7b6-4917-b56f-f1b0594663fa",
+                        "ab822db5-ed79-47af-badc-5a3772dab87d"
+                    ],
+                    "serviceId": 16
+                },
+                {
+                    "serviceTargets": [
+                        "2d877a91-6312-4c44-9ae1-2494ea3e43db"
+                    ],
+                    "serviceId": 17
+                },
+                {
+                    "serviceTargets": [
+                        "d4ba13a1-00c8-4e7f-8463-36b6ea37eee6",
+                        "01ee5719-e814-43ce-a1b1-4e26063b5a6c"
+                    ],
+                    "serviceId": 18
+                },
+                {
+                    "serviceTargets": [
+                        "4bcab901-879a-402d-83f3-01528c6c86a5"
+                    ],
+                    "serviceId": 19
+                },
+                {
+                    "serviceTargets": [
+                        "45994b98-21f1-4927-a03e-3d940ac75116"
+                    ],
+                    "serviceId": 20
+                },
+                {
+                    "serviceTargets": [
+                        "6eaa061c-b77b-4440-8e8f-7ebaa2ff6207"
+                    ],
+                    "serviceId": 21
+                },
+                {
+                    "serviceTargets": [
+                        "0e887410-a3c5-49ca-a6f5-0f2f6fae30db"
+                    ],
+                    "serviceId": 22
+                },
+                {
+                    "serviceTargets": [
+                        "725d9365-0889-4355-8a7f-a21ef260c468",
+                        "996e3dc7-1376-47ad-a941-648cbae246b4"
+                    ],
+                    "serviceId": 23
+                },
+                {
+                    "serviceTargets": [
+                        "0f11a699-6063-4e91-96ca-53e45cf26b80",
+                        "1144fc3d-4d31-42bd-b9fb-ab5f91db37ca"
+                    ],
+                    "serviceId": 24
+                },
+                {
+                    "serviceTargets": [
+                        "8a5dac4a-0bef-431c-b857-2085eca9ae7c",
+                        "3c2c4aaa-fd5f-43d8-a72f-3567e6dea6f4"
+                    ],
+                    "serviceId": 25
+                },
+                {
+                    "serviceTargets": [
+                        "ed30b80b-7bb9-4c04-9949-093df64d124c",
+                        "3d4f1932-7a5b-45d6-ae68-d0571860ea94"
+                    ],
+                    "serviceId": 26
+                },
+                {
+                    "serviceTargets": [
+                        "a516c78d-740f-463b-a1ce-5b02b8c82dd3",
+                        "4cbcb2b5-45cd-42dc-96bf-a9a181a4865b",
+                        "fbc45154-1d60-4f5e-a484-fdff514f9d51",
+                        "85191c99-f56d-46e6-9311-a58c1f37965d"
+                    ],
+                    "serviceId": 27
+                },
+                {
+                    "serviceTargets": [
+                        "6ab3298e-c24b-49d8-9f86-441e71858b6a",
+                        "f23f9fb0-99ec-4fbf-ade3-b6581fe25dcf",
+                        "fd77b1b1-8234-4d06-8a02-aea6f4abb01d",
+                        "f38fbd9e-d208-4750-96ce-3c032ad37684"
+                    ],
+                    "serviceId": 28
+                },
+                {
+                    "serviceTargets": [
+                        "4f747371-fa5f-4200-ae37-6cd59d268fe8"
+                    ],
+                    "serviceId": 29
+                },
+                {
+                    "serviceTargets": [
+                        "685d61e9-2ebd-4198-a83a-ac7a2fc1477a"
+                    ],
+                    "serviceId": 30
+                },
+                {
+                    "serviceTargets": [
+                        "91387f2b-258d-4325-aa60-828d1acf6ac6"
+                    ],
+                    "serviceId": 31
+                },
+                {
+                    "serviceTargets": [
+                        "ba3d0a20-1e4d-404a-9907-b95239499c2f",
+                        "aa92f559-6260-4947-a714-ae6b80776b47"
+                    ],
+                    "serviceId": 32
+                },
+                {
+                    "serviceTargets": [
+                        "28dd9736-b66a-4ab4-9111-504d5cffba88",
+                        "4670a4ba-62bb-401c-a7ed-4fbd8dc5999c"
+                    ],
+                    "serviceId": 33
+                },
+                {
+                    "serviceTargets": [
+                        "0f9ef068-b2f9-4e6f-9ab5-521857b036f4"
+                    ],
+                    "serviceId": 34
+                },
+                {
+                    "serviceTargets": [
+                        "dea1ff8b-f4eb-4987-8073-500bbbf97fcd",
+                        "d48e05f4-a1cb-40e6-a4a3-bafa86b137f0"
+                    ],
+                    "serviceId": 35
+                }
+            ]
+        },
         "requiresActivityLocking": true,
-        "navigationMode": "returnToProject",
         "projectTemplate": "rlp",
         "activityPeriodDescriptor": "Outputs report #",
-        "supportsMeriPlanHistory": true,
+        "requireMeritAdminToReturnMeriPlan": true,
         "emailTemplates": {
             "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
             "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
@@ -27,7 +390,7 @@ var programConfig = {
             "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
             "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
         },
-        "meriPlanTemplate": "rlpMeriPlan",
+        "meriPlanTemplate": "configurableMeriPlan",
         "riskAndThreatTypes": [
             "Performance",
             "Work Health and Safety",
@@ -43,7 +406,7 @@ var programConfig = {
                 "reportDescriptionFormat": "Year %5$s - %6$s %7$d Outputs Report",
                 "reportNameFormat": "Year %5$s - %6$s %7$d Outputs Report",
                 "reportingPeriodInMonths": 3,
-                "description": "",
+                "description": "_Please note that the reporting fields for these reports are currently being developed_",
                 "label": "Quarter",
                 "category": "Outputs Reporting",
                 "activityType": "RLP Output Report",
@@ -55,7 +418,7 @@ var programConfig = {
                 "reportDescriptionFormat": "Annual Progress Report %2$tY - %3$tY for %4$s",
                 "reportNameFormat": "Annual Progress Report %2$tY - %3$tY",
                 "reportingPeriodInMonths": 12,
-                "description": "",
+                "description": "_Please note that the reporting fields for these reports are currently being developed_",
                 "label": "Annual",
                 "category": "Annual Progress Reporting",
                 "activityType": "RLP Annual Report"
@@ -74,138 +437,1514 @@ var programConfig = {
                 "alignToOwnerStart": true
             }
         ],
-        "supportedServiceIds": [
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            10,
-            11,
-            12,
-            13,
-            14,
-            15,
-            16,
-            17,
-            18,
-            19,
-            20,
-            21,
-            22,
-            23,
-            24,
-            25,
-            26,
-            27,
-            28,
-            29,
-            30,
-            31,
-            32,
-            33,
-            34,
-            35,
-            36
-        ]
+        "keyThreatCodes": [
+            "Climate Change - Changed flooding regime",
+            "Climate Change - Changed rainfall patterns",
+            "Climate Change - Sea level rises",
+            "Climate Change - Unexpected seasonal/temperature extremes",
+            "Disease/pathogens - Areas that are infected",
+            "Disease/pathogens - Possible infection of disease free areas",
+            "Fire - Inappropriate fire regime",
+            "Fire - Lack of protection for ecological assets during fire control activities",
+            "Genetics - Bottleneck/inbreeding",
+            "Habitat loss - Breeding place disturbance",
+            "Habitat loss - Dieback/senescence",
+            "Habitat loss - Feeding habitat loss/interference",
+            "Habitat loss - Habitat fragmentation",
+            "Habitat loss - Land clearing",
+            "Habitat loss - Loss of critical ecosystem service supporting habitat",
+            "Human interference - Fish and harvesting aquatic resources (commercial)",
+            "Human interference - Flow-on effects of housing development",
+            "Human interference - Illegal activities",
+            "Human interference - Industrial development",
+            "Human interference - Land use intensification",
+            "Human interference - Recreational fishing",
+            "Human interference - Recreational pressures",
+            "Human interference - Road/vehicle strike",
+            "Land management practices - Changes to hydrology and aquatic systems",
+            "Land management practices - Domestic grazing/stock impacts",
+            "Land management practices - Excess recharge of groundwater",
+            "Land management practices - Excess use (or over-use) of surface water or groundwater resources",
+            "Land management practices - Excessive fertiliser use",
+            "Land management practices - Inappropriate ground cover management",
+            "Land management practices - Runoff",
+            "Native fauna - Competition",
+            "Native fauna - Predation",
+            "Pest - Competition/exclusion",
+            "Pest - Disease transmission",
+            "Pest - Habitat degradation",
+            "Pest - Introduction of new pest animals",
+            "Pest - Predation",
+            "Pollution - Chemical",
+            "Pollution - Eutrophication/algal blooms",
+            "Pollution - Inappropriate waste disposal",
+            "Pollution - Sediment ",
+            "Population size/range - Low habitat area",
+            "Population size/range - Low population numbers",
+            "Weeds - Competition",
+            "Weeds - Introduction of new weed",
+            "Weeds - Spread of weeds from surrounding areas"
+        ],
+        "navigationMode": "returnToProject",
+        "priorityPlaces": [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
+        ],
+        "supportsParatoo": true,
+        "supportsMeriPlanHistory": true
     },
     priorities: [
         {
-            "category": "Soil Quality",
-            "priority": "Soil acidification"
+            "category": "Plants",
+            "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
         },
         {
-            "category": "Soil Quality",
-            "priority": "Soil Carbon priority"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
         },
         {
-            "category": "Soil Quality",
-            "priority": "Hillslope erosion priority"
+            "category": "High Risk Species",
+            "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
         },
         {
-            "category": "Soil Quality",
-            "priority": "Wind erosion priority"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Ammonite Snail Ammoniropa vigens"
         },
         {
-            "category": "Land Management",
-            "priority": "Soil acidification"
+            "category": "Invertebrates",
+            "priority": "Ammonite Snail Ammoniropa vigens"
         },
         {
-            "category": "Land Management",
-            "priority": "Soil carbon"
+            "category": "High Risk Species",
+            "priority": "Ammonite Snail Ammoniropa vigens"
         },
         {
-            "category": "Land Management",
-            "priority": "Hillslope erosion"
+            "category": "Plants",
+            "priority": "Angle-stemmed Myrtle Gossia gonoclada"
         },
         {
-            "category": "Land Management",
-            "priority": "Wind erosion"
+            "category": "Priority Threatened Species Primary",
+            "priority": "Angle-stemmed Myrtle Gossia gonoclada"
         },
         {
-            "category": "Land Management",
-            "priority": "Native vegetation and biodiversity on-farm"
+            "category": "High Risk Species",
+            "priority": "Angle-stemmed Myrtle Gossia gonoclada"
         },
         {
-            "category": "Sustainable Agriculture",
-            "priority": "Climate change adaptation"
+            "category": "Plants",
+            "priority": "Arckaringa Daisy Olearia arckaringensis"
         },
         {
-            "category": "Sustainable Agriculture",
-            "priority": "Market traceability"
-        }
-    ]
-};
-var outcomes = [
-    {
-        "priorities": [
-            {
-                "category": "Ramsar"
-            }
-        ],
-        "targeted": true,
-        "shortDescription": "Ramsar Sites",
-        "category": "environment",
-        "outcome": "1. By 2023, there is restoration of, and reduction in threats to, the ecological character of Ramsar sites, through the implementation of priority actions"
-    },
-    {
-        "priorities": [
-            {
-                "category": "Threatened Species"
-            }
-        ],
-        "targeted": true,
-        "shortDescription": "Threatened Species Strategy",
-        "category": "environment",
-        "outcome": "2. By 2023, the trajectory of species targeted under the Threatened Species Strategy, and other EPBC Act priority species, is stabilised or improved."
-    },
-    {
-        "priorities": [
-            {
-                "category": "Threatened Ecological Communities"
-            }
-        ],
-        "targeted": true,
-        "shortDescription": "Threatened Ecological Communities",
-        "category": "environment",
-        "outcome": "4. By 2023, the implementation of priority actions is leading to an improvement in the condition of EPBC Act listed Threatened Ecological Communities."
-    }
-]
-
-
-subprograms.forEach(function (subprogram){
-    var program = db.program.find({name: subprogram});
-    while(program.hasNext()){
-        var p = program.next();
-        if (p.name === subprogram){
-            p.config = programConfig.config
-            p.priorities = programConfig.priorities
-            p.outcomes = outcomes;
-        }
-        db.program.save(p);
+            "category": "Priority Threatened Species Primary",
+            "priority": "Arckaringa Daisy Olearia arckaringensis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Arckaringa Daisy Olearia arckaringensis"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+        },
+        {
+            "category": "Birds",
+            "priority": "Australasian Bittern Botaurus poiciloptilus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Australasian Bittern Botaurus poiciloptilus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Australasian Bittern Botaurus poiciloptilus"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Australian Sea-lion Neophoca cinerea"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Australian Sea-lion Neophoca cinerea"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Australian Sea-lion Neophoca cinerea"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+        },
+        {
+            "category": "Birds",
+            "priority": "Black-eared Miner Manorina melanotis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Black-eared Miner Manorina melanotis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Black-eared Miner Manorina melanotis"
+        },
+        {
+            "category": "Plants",
+            "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+        },
+        {
+            "category": "Plants",
+            "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+        },
+        {
+            "category": "Plants",
+            "priority": "Bulberin Nut Macadamia jansenii "
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Bulberin Nut Macadamia jansenii "
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Bulberin Nut Macadamia jansenii "
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+        },
+        {
+            "category": "Birds",
+            "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+        },
+        {
+            "category": "Plants",
+            "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Cauliflower Soft Coral Dendronephthya australis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Cauliflower Soft Coral Dendronephthya australis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Cauliflower Soft Coral Dendronephthya australis"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+        },
+        {
+            "category": "Birds",
+            "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Collared Delma, Adorned Delma Delma torquata"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Collared Delma, Adorned Delma Delma torquata"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Collared Delma, Adorned Delma Delma torquata"
+        },
+        {
+            "category": "Plants",
+            "priority": "Davies' Waxflower Phebalium daviesii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Davies' Waxflower Phebalium daviesii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Davies' Waxflower Phebalium daviesii"
+        },
+        {
+            "category": "Birds",
+            "priority": "Eastern Curlew Numenius madagascariensis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Eastern Curlew Numenius madagascariensis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Eastern Curlew Numenius madagascariensis"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Eastern Quoll Dasyurus viverrinus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Eastern Quoll Dasyurus viverrinus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Eastern Quoll Dasyurus viverrinus"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+        },
+        {
+            "category": "Plants",
+            "priority": "Foote's Grevillea Grevillea calliantha"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Foote's Grevillea Grevillea calliantha"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Foote's Grevillea Grevillea calliantha"
+        },
+        {
+            "category": "Plants",
+            "priority": "Forked Spyridium Spyridium furculentum"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Forked Spyridium Spyridium furculentum"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Forked Spyridium Spyridium furculentum"
+        },
+        {
+            "category": "Fish",
+            "priority": "Freshwater Sawfish Pristis pristis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Freshwater Sawfish Pristis pristis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Freshwater Sawfish Pristis pristis"
+        },
+        {
+            "category": "Plants",
+            "priority": "Giant Andersonia Andersonia axilliflora"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Giant Andersonia Andersonia axilliflora"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Giant Andersonia Andersonia axilliflora"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Giant Gippsland Earthworm Megascolides australis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Giant Gippsland Earthworm Megascolides australis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Giant Gippsland Earthworm Megascolides australis"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+        },
+        {
+            "category": "Birds",
+            "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+        },
+        {
+            "category": "Plants",
+            "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Gorge Rice-flower, Pimelea cremnophila"
+        },
+        {
+            "category": "Plants",
+            "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Greater Bilby Macrotis lagotis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Greater Bilby Macrotis lagotis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Greater Bilby Macrotis lagotis"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Green Turtle Chelonia mydas"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Green Turtle Chelonia mydas"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Green Turtle Chelonia mydas"
+        },
+        {
+            "category": "Fish",
+            "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+        },
+        {
+            "category": "Frogs",
+            "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+        },
+        {
+            "category": "Birds",
+            "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+        },
+        {
+            "category": "Plants",
+            "priority": "Imlay Mallee Eucalyptus imlayensis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Imlay Mallee Eucalyptus imlayensis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Imlay Mallee Eucalyptus imlayensis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+        },
+        {
+            "category": "Plants",
+            "priority": "King Blue-grass Dichanthium queenslandicum"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "King Blue-grass Dichanthium queenslandicum"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "King Blue-grass Dichanthium queenslandicum"
+        },
+        {
+            "category": "Birds",
+            "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+        },
+        {
+            "category": "Birds",
+            "priority": "King Island Scrubtit Acanthornis magna greeniana"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "King Island Scrubtit Acanthornis magna greeniana"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "King Island Scrubtit Acanthornis magna greeniana"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Koala Phascolarctos cinereus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Koala Phascolarctos cinereus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Koala Phascolarctos cinereus"
+        },
+        {
+            "category": "Frogs",
+            "priority": "Kroombit Tinker Frog Taudactylus pleione"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Kroombit Tinker Frog Taudactylus pleione"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Kroombit Tinker Frog Taudactylus pleione"
+        },
+        {
+            "category": "Plants",
+            "priority": "Lax Leek Orchid Prasophyllum laxum"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Lax Leek Orchid Prasophyllum laxum"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Lax Leek Orchid Prasophyllum laxum"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Leaf-scaled Seasnake - Aipysurus foliosquama"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Leaf-Scaled Seasnake – Aipysurus foliosquama"
+        },
+        {
+            "category": "Plants",
+            "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Lord Howe Island Phasmid Dryococelus australis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Lord Howe Island Phasmid Dryococelus australis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Lord Howe Island Phasmid Dryococelus australis"
+        },
+        {
+            "category": "Plants",
+            "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+        },
+        {
+            "category": "Birds",
+            "priority": "Malleefowl Leipoa ocellata"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Malleefowl Leipoa ocellata"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Malleefowl Leipoa ocellata"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+        },
+        {
+            "category": "Fish",
+            "priority": "Maugean Skate Zearaja maugeana"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Maugean Skate Zearaja maugeana"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Maugean Skate Zearaja maugeana"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+        },
+        {
+            "category": "Frogs",
+            "priority": "Mountain Frog Philoria kundagungan"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Mountain Frog Philoria kundagungan"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Mountain Frog Philoria kundagungan"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Mountain Pygmy-possum Burramys parvus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Mountain Pygmy-possum Burramys parvus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Mountain Pygmy-possum Burramys parvus"
+        },
+        {
+            "category": "Frogs",
+            "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+        },
+        {
+            "category": "Fish",
+            "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+        },
+        {
+            "category": "Plants",
+            "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+        },
+        {
+            "category": "Plants",
+            "priority": "Native Guava Rhodomyrtus psidioides"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Native Guava Rhodomyrtus psidioides"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Native Guava Rhodomyrtus psidioides"
+        },
+        {
+            "category": "Mammals",
+            "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+        },
+        {
+            "category": "Birds",
+            "priority": "Night Parrot Pezoporus occidentalis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Night Parrot Pezoporus occidentalis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Night Parrot Pezoporus occidentalis"
+        },
+        {
+            "category": "Birds",
+            "priority": "Noisy Scrub-bird Atrichornis clamosus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Noisy Scrub-bird Atrichornis clamosus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Noisy Scrub-bird Atrichornis clamosus"
+        },
+        {
+            "category": "Birds",
+            "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Northern Quoll Dasyurus hallucatus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Northern Quoll Dasyurus hallucatus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Northern Quoll Dasyurus hallucatus"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Numbat Myrmecobius fasciatus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Numbat Myrmecobius fasciatus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Numbat Myrmecobius fasciatus"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+        },
+        {
+            "category": "Birds",
+            "priority": "Orange-bellied Parrot Neophema chrysogaster"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Orange-bellied Parrot Neophema chrysogaster"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Orange-bellied Parrot Neophema chrysogaster"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+        },
+        {
+            "category": "Birds",
+            "priority": "Plains-wanderer Pedionomus torquatus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Plains-wanderer Pedionomus torquatus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Plains-wanderer Pedionomus torquatus"
+        },
+        {
+            "category": "Birds",
+            "priority": "Princess Parrot Polytelis alexandrae"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Princess Parrot Polytelis alexandrae"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Princess Parrot Polytelis alexandrae"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Quokka Setonix brachyurus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Quokka Setonix brachyurus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Quokka Setonix brachyurus"
+        },
+        {
+            "category": "Birds",
+            "priority": "Red Goshawk Erythrotriorchis radiatus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Red Goshawk Erythrotriorchis radiatus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Red Goshawk Erythrotriorchis radiatus"
+        },
+        {
+            "category": "Fish",
+            "priority": "Red Handfish Thymichthys politus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Red Handfish Thymichthys politus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Red Handfish Thymichthys politus"
+        },
+        {
+            "category": "Birds",
+            "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+        },
+        {
+            "category": "Fish",
+            "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+        },
+        {
+            "category": "Birds",
+            "priority": "Regent Honeyeater Anthochaera phrygia"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Regent Honeyeater Anthochaera phrygia"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Regent Honeyeater Anthochaera phrygia"
+        },
+        {
+            "category": "Plants",
+            "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+        },
+        {
+            "category": "Plants",
+            "priority": "Small-flowered Snottygobble Persoonia micranthera"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Small-flowered Snottygobble Persoonia micranthera"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Small-flowered Snottygobble Persoonia micranthera"
+        },
+        {
+            "category": "Plants",
+            "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Southern Bent Wing Bat (Miniopterus orianae bassanii)\n"
+        },
+        {
+            "category": "Frogs",
+            "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+        },
+        {
+            "category": "Plants",
+            "priority": "Stiff Groundsel Senecio behrianus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Stiff Groundsel Senecio behrianus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Stiff Groundsel Senecio behrianus"
+        },
+        {
+            "category": "Plants",
+            "priority": "Stirling Range Dryandra Banksia montana"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Stirling Range Dryandra Banksia montana"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Stirling Range Dryandra Banksia montana"
+        },
+        {
+            "category": "Fish",
+            "priority": "Stocky Galaxias Galaxias tantangara"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Stocky Galaxias Galaxias tantangara"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Stocky Galaxias Galaxias tantangara"
+        },
+        {
+            "category": "Fish",
+            "priority": "Swan Galaxias Galaxias fontanus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Swan Galaxias Galaxias fontanus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Swan Galaxias Galaxias fontanus"
+        },
+        {
+            "category": "Birds",
+            "priority": "Swift Parrot Lathamus discolor"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Swift Parrot Lathamus discolor"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Swift Parrot Lathamus discolor"
+        },
+        {
+            "category": "Plants",
+            "priority": "Tangled Wattle Acacia volubilis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Tangled Wattle Acacia volubilis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Tangled Wattle Acacia volubilis"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+        },
+        {
+            "category": "Plants",
+            "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+        },
+        {
+            "category": "Birds",
+            "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+        },
+        {
+            "category": "Frogs",
+            "priority": "White-bellied Frog Anstisia alba"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "White-bellied Frog Anstisia alba"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "White-bellied Frog Anstisia alba"
+        },
+        {
+            "category": "Birds",
+            "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+        },
+        {
+            "category": "Fish",
+            "priority": "White's Seahorse Hippocampus whitei"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "White's Seahorse Hippocampus whitei"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "White's Seahorse Hippocampus whitei"
+        },
+        {
+            "category": "Plants",
+            "priority": "Wollemi Pine Wollemia nobilis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Wollemi Pine Wollemia nobilis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Wollemi Pine Wollemia nobilis"
+        },
+        {
+            "category": "Plants",
+            "priority": "Wongan Eriostemon Philotheca wonganensis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Wongan Eriostemon Philotheca wonganensis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Wongan Eriostemon Philotheca wonganensis"
+        },
+        {
+            "category": "Plants",
+            "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+        }
+    ]
+};
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Priority Threatened Species Primary"
+            }
+        ],
+        "targeted": true,
+        "supportsMultiplePrioritiesAsPrimary": false,
+        "shortDescription": "Threatened Species Strategy",
+        "type": "primary",
+        "category": "environment",
+        "supportsMultiplePrioritiesAsSecondary": true,
+        "outcome": "1. Species and Landscapes (Long term): Threatened Species (TS) - The trajectory of species targeted under the Threatened Species Action Plan 2022-2032 and other EPBC Act listed Species is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Priority Threatened Species Primary"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "EPBC Species",
+        "category": "Threatened Species",
+        "type": "secondary",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - The trajectory of species targeted under the Threatened Species Action Plan 2022-2032 and other EPBC Act listed Species is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Priority Threatened Species Primary"
+            }
+        ],
+        "shortDescription": "New extinctions",
+        "category": "Threatened Species",
+        "type": "secondary",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - New extinctions of plants and animals are prevented"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Threatened Ecological Communities"
+            }
+        ],
+        "shortDescription": "Threatened Ecological Communities",
+        "category": "Threatened Ecological Communities",
+        "type": "secondary",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Ecological Communities (TECs) and priority places - The condition of targeted EPBC Act listed Threatened Ecological Communities and identified priority places under the Threatened Species Action Plan 2022-2032 is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "World Heritage Sites"
+            }
+        ],
+        "shortDescription": "World Heritage",
+        "category": "World Heritage Sites",
+        "type": "secondary",
+        "outcome": "2: World Heritage Protection (Long term): The outstanding universal value of world heritage properties listed for their natural heritage value is maintained and improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Ramsar"
+            }
+        ],
+        "shortDescription": "Ramsar Sites",
+        "category": "Ramsar",
+        "type": "secondary",
+        "outcome": "3: Ramsar Wetland Protection (Long term): The ecological character of targeted Ramsar sites is maintained and/or improved, building resilience to climate change"
+    },
+    {
+        "type": "short",
+        "category": "Tracking species trajectories related outcome",
+        "outcome": "All priority species are on track for improved trajectory"
+    },
+    {
+        "type": "short",
+        "category": "Tracking species trajectories related outcome",
+        "outcome": "Implementation of priority actions for priority species is tracked and published"
+    },
+    {
+        "type": "short",
+        "category": "Tracking species trajectories related outcome",
+        "outcome": "First Nations’ knowledges are integrated in conservation assessments, processes and planning for threatened species and ecological communities"
+    },
+    {
+        "type": "short",
+        "category": "Tracking species trajectories related outcome",
+        "outcome": "First Nations-led recovery activities for threatened species and ecological communities are increased"
+    },
+    {
+        "type": "short",
+        "category": "Tracking species trajectories related outcome",
+        "outcome": "National conservation planning for threatened species and ecological communities is contemporary, effective and fit-for-purpose"
+    },
+    {
+        "type": "short",
+        "category": "Tracking species trajectories related outcome",
+        "outcome": "At least 5 new tools are developed to mitigate the impact of broad-scale threats on threatened species"
+    },
+    {
+        "type": "short",
+        "category": "Tracking species trajectories related outcome",
+        "outcome": "Monitoring standards for all priority species are published and monitoring tools and protocols are created for at least 50 per cent of priority species"
+    }
+]
+
+
+subprograms.forEach(function (subprogram){
+    var program = db.program.find({name: subprogram});
+    while(program.hasNext()){
+        var p = program.next();
+        print("sub program ID: " + p.programId)
+        db.program.updateOne({programId:p.programId}, {$set:{config:programConfig.config, outcomes:outcomes, priorities:programConfig.priorities}});
+        useNhtServiceLabels(p.name);
     }
 });
diff --git a/src/main/scripts/releases/3.0/adhoc/createPriorityPlacesSubProgram.js b/src/main/scripts/releases/3.0/adhoc/createPriorityPlacesSubProgram.js
new file mode 100644
index 000000000..3e2298d71
--- /dev/null
+++ b/src/main/scripts/releases/3.0/adhoc/createPriorityPlacesSubProgram.js
@@ -0,0 +1,617 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/program.js');
+var userId = '129333';
+
+//Create the parent program
+let programName = "Saving Native Species";
+var parentProgram = createOrFindProgram(programName);
+
+let refProgram = "Priority Species";
+var subprograms = ["Priority Places"]
+
+subprograms.forEach(function (subProgram) {
+    var now = ISODate();
+    var newProgram = db.program.find({name: refProgram}).next();
+    delete newProgram._id
+    delete newProgram.programId
+    newProgram.name = subProgram
+    newProgram.programId = UUID.generate()
+    newProgram.dateCreated = now
+    newProgram.lastUpdated = now
+    newProgram.status = "active"
+    newProgram.parent = parentProgram._id
+    var program = db.program.find({name: subProgram})
+    if (!program.hasNext()) {
+        db.program.insert(newProgram);
+    } else {
+        print("Program Already Exist: " + subProgram)
+    }
+});
+
+var projectConfig = {
+    config: {
+        "meriPlanContents": [
+            {
+                "template": "name",
+                "model": {
+                    "helpTextHeading": "A succinct overview of the project: (i) what will be done and (ii) why it will be done",
+                    "maxSize": "150",
+                    "placeholder": "[Free text; limit response to 150 characters)]",
+                    "explanation": ""
+                }
+            },
+            {
+                "template": "description",
+                "model": {
+                    "helpTextHeading": "A succinct overview of the project: (i) what will be done and (ii) why it will be done",
+                    "maxSize": "1000",
+                    "placeholder": "[Free text; limit response to 1000 characters (approx. 150 words)]",
+                    "explanation": " Please provide a short succinct description of this project. The description should state what will be done and why it will be done. This project description will be publicly visible on the project overview page in MERIT"
+                }
+            },
+            {
+                "template": "programOutcome",
+                "model": {
+                    "helpTextPrimaryOutcome": "testing"
+                }
+            },
+            {
+                "template": "additionalOutcomes"
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "helpText": "Outcomes statements should: (i) clearly describe the intent of the project, specifically the benefit or change that the project is expected to deliver by June 2026; (ii) be expressed as a SMART statement (Specific, Measurable, Attainable, Realistic and Time-bound); and (iii) ensure that the outcomes are measurable with consideration to the monitoring methodology provided below.",
+                    "subtitle": "Please provide outcome statements.",
+                    "placeholder": "[Free text; limit response to 500 characters]",
+                    "title": "Project Outcome"
+                }
+            },
+            {
+                "template": "keyThreats",
+                "model": {
+                    "threatHelpText": "The key threats (or key threatening processes) that your project will be addressing",
+                    "interventionHelpText": "Describe the proposed interventions to address the threat and how this will deliver on the project outcome",
+                    "placeholder": "[Free text; limit response to 500 characters]",
+                    "title": "Key Threats",
+                    "explanation": "Describe the key threat(s) and/or key threatening processes impacting project assets that the project will be addressing."
+                }
+            },
+            {
+                "template": "projectMethodology",
+                "model": {
+                    "maxSize": "4000",
+                    "title": "Project Methodology",
+                    "explanation": "The methodology should describe how each project service (i.e., action) will be implemented to achieve outcomes and why that specific approach or technique was chosen. The methodology could include the location, partner/s involvement and outputs. The methodology should clearly link to the outcome statement. At least one method for each project outcome should be identified.",
+                    "tableHeading": "Describe how each project activity will be implemented.",
+                    "placeHolder": "[Free text; limit response to 4000 characters (approx. 650 words)]"
+                }
+            },
+            {
+                "template": "monitoringBaseline",
+                "model": {
+                    "baselineMethodHelpText": "Describe the project baseline (s) units of measure or data which will be used to report progress towards this project’s outcome and the monitoring design",
+                    "titleHelpText": "Describe the project baseline(s) units of measure or data which will be used to report progress towards this project’s outcomes and the monitoring design. Refer to the Regional Land Partnerships Evaluation Plan which provides guidance on baselines and the monitoring indicators for each outcome. Note, other monitoring indicators can also be used."
+                }
+            },
+            {
+                "template": "monitoringIndicators",
+                "model": {
+                    "approachHeading": "Describe the project monitoring indicator(s) approach",
+                    "indicatorHeading": "Identify the project monitoring indicator(s)",
+                    "indicatorHelpText": "List the indicators of project success that will be monitored. Indicators should link back to the outcome statements and, in most cases, will be quantitative and expressed as a numerical measurable. Where relevant, qualitative indicators can be used. Indicators should measure both project outputs (e.g., area (ha) of rabbit control, length (km) of predator proof fencing) and change the project is aiming to achieve (e.g., change in abundance of X threatened species at Y location, change in vegetation cover (%) etc.)",
+                    "approachHelpText": "Briefly describe the method that will be used to monitor the indicator (including timing of monitoring, who will collect/collate/analyse, data, etc)",
+                    "indicatorPlaceHolder": "[Free text]",
+                    "approachPlaceHolder": "[Free text]",
+                    "title": "Project Monitoring Indicators"
+                }
+            },
+            {
+                "template": "adaptiveManagement",
+                "model": {
+                    "title": "Project Review, Evaluation and Improvement Methodology and Approach",
+                    "explanation": "Outline the methods and processes that will enable adaptive management during the lifetime of this project"
+                }
+            },
+            {
+                "template": "nationalAndRegionalPlans",
+                "model": {
+                    "documentNameHelpText": "List the name of the Recovery Plan or Conservation Advice for species listed under the Environment Protection and Biodiversity Conservation Act 1999 (if applicable), or state recovery plan.",
+                    "explanation": "Explain how the project aligns with national and/or state species recovery plans and strategies."
+                }
+            },
+            {
+                "template": "serviceTargets",
+                "model": {
+                    "showTargetDate": true,
+                    "totalHelpText": "The overall total of Project Activities to be delivered during the project delivery period. This total is not necessarily the sum of the minimum annual targets set out for the activities.",
+                    "title": "Activities and Targets Table",
+                    "serviceName": "Activities"
+                }
+            },
+            {
+                "template": "projectPartnerships",
+                "model": {
+                    "namePlaceHolder": "[Free text]",
+                    "helpTextPartnerNature": "If partnership with an organisation: provide the name of the organisation and the role they will play/how you will support them. If partnering with community groups or members of the public: indicate each group or individual you will engage with",
+                    "partnershipPlaceHolder": "[Free text]"
+                }
+            },
+            {
+                "template": "meriBudget",
+                "model": {
+                    "itemName": "Budget item",
+                    "showThemeColumn": false,
+                    "showActivityColumn": false,
+                    "explanation": "Please detail how project funding will be allocated to project services (action) by species, if more than one species is benefitting from the project. Expenditure should align with the approved project grant application (including the amount identified for project reporting and administration). Each action should be identified as a different line item",
+                    "projectHeadingHelpText": "Planned budget expenditure for each service (action) by species",
+                    "hideHelpText": true
+                }
+            },
+            {
+                "template": "attachmentFooter",
+                "model": {
+                    "heading": "MERI Attachments",
+                    "attachmentText": "Please attach Project logic to your MERI plan using the documents function on the Admin tab.  A \"Document type\" of \"Project Logic\" should be selected when uploading the document."
+                }
+            }
+        ],
+        "excludes": [],
+        "programServiceConfig": {
+            "serviceFormName": "Priority Threatened Species Progress Report",
+            "programServices": [
+                {
+                    "serviceTargets": [
+                        "0df7c177-2864-4a25-b420-2cf3c45ce749"
+                    ],
+                    "serviceId": 1
+                },
+                {
+                    "serviceTargets": [
+                        "69deaaf9-cdc2-439a-b684-4cffdc7f224e"
+                    ],
+                    "serviceId": 2
+                },
+                {
+                    "serviceTargets": [
+                        "1f8161bc-908b-4ec8-ab7f-edac973a657d",
+                        "88908921-1248-4a7c-b185-51c625c737e3",
+                        "26a8213e-1770-4dc4-8f99-7e6302197504",
+                        "15a49c6f-2177-4183-9955-c7e487970171",
+                        "fe9f1a6c-e614-489a-80fa-4d6d76f1cf95",
+                        "f7089b5b-333f-4f33-b0df-f7ef88e9f683"
+                    ],
+                    "serviceId": 3
+                },
+                {
+                    "serviceTargets": [
+                        "aa0c6b29-285e-4344-987e-dfeaf1d95648",
+                        "c464b652-be5e-4658-b62f-02bf1a80bcf8",
+                        "a901232d-8244-40dd-9bb7-ff9e4e9dbeac"
+                    ],
+                    "serviceId": 4
+                },
+                {
+                    "serviceTargets": [
+                        "55d76c03-c89d-40fe-867b-93f7a48ff9c1",
+                        "3cbf653f-f74c-4066-81d2-e3f78268185c",
+                        "3855d565-3b77-497b-90af-addb271aa598",
+                        "5dbfb32a-5933-4d8a-9937-41f350fb5f75"
+                    ],
+                    "serviceId": 5
+                },
+                {
+                    "serviceTargets": [
+                        "d97037d2-7ee4-429b-bd26-cdcc5a269d9d",
+                        "e48faf01-72eb-479c-be9b-d2d71d254fa4"
+                    ],
+                    "serviceId": 6
+                },
+                {
+                    "serviceTargets": [
+                        "482bdf4e-6f7a-4bdf-80d5-d619ac7cdf50",
+                        "2ef32f94-14f1-4878-9eb7-c115fa18ce25"
+                    ],
+                    "serviceId": 7
+                },
+                {
+                    "serviceTargets": [
+                        "7709de92-0f85-490b-bc5f-2748b3db42c2",
+                        "8025b157-44d7-4283-bc1c-f40fb9b99501",
+                        "0ec5fd50-13e2-4bde-8e01-5955e7145cae"
+                    ],
+                    "serviceId": 8
+                },
+                {
+                    "serviceTargets": [
+                        "46925c6c-e222-4f6a-8553-c69929929d10",
+                        "757d6c9e-ec24-486f-a128-acc9bfb87830",
+                        "ffa44bad-209d-414a-bc96-e8ca3c96092f"
+                    ],
+                    "serviceId": 9
+                },
+                {
+                    "serviceTargets": [
+                        "edb6e94a-d781-447c-8792-5e06e5c912a8",
+                        "a3afea6e-711c-4ef2-bb20-6d2630b7ee93"
+                    ],
+                    "serviceId": 10
+                },
+                {
+                    "serviceTargets": [
+                        "607e2cd4-d7c5-4d5b-867f-c2c8e7b62948",
+                        "b7c067e3-6ae7-4e76-809a-312165b75f94"
+                    ],
+                    "serviceId": 11
+                },
+                {
+                    "serviceTargets": [
+                        "d1c10295-05e5-4265-a5f1-8a5683af2efe"
+                    ],
+                    "serviceId": 12
+                },
+                {
+                    "serviceTargets": [
+                        "011a161f-7275-4b5e-986e-3fe4640d0265",
+                        "3e402423-3e0b-4549-9e09-2b71329ea069"
+                    ],
+                    "serviceId": 13
+                },
+                {
+                    "serviceTargets": [
+                        "c2dc6f91-ccb1-412e-99d0-a842a4ac4b03"
+                    ],
+                    "serviceId": 14
+                },
+                {
+                    "serviceTargets": [
+                        "def4e2af-dcad-4a15-8336-3765e6671f08",
+                        "cf3ccbf5-d031-4a22-a746-961cdefa7318"
+                    ],
+                    "serviceId": 15
+                },
+                {
+                    "serviceTargets": [
+                        "c46842b6-d7b6-4917-b56f-f1b0594663fa",
+                        "ab822db5-ed79-47af-badc-5a3772dab87d"
+                    ],
+                    "serviceId": 16
+                },
+                {
+                    "serviceTargets": [
+                        "2d877a91-6312-4c44-9ae1-2494ea3e43db"
+                    ],
+                    "serviceId": 17
+                },
+                {
+                    "serviceTargets": [
+                        "d4ba13a1-00c8-4e7f-8463-36b6ea37eee6",
+                        "01ee5719-e814-43ce-a1b1-4e26063b5a6c"
+                    ],
+                    "serviceId": 18
+                },
+                {
+                    "serviceTargets": [
+                        "4bcab901-879a-402d-83f3-01528c6c86a5"
+                    ],
+                    "serviceId": 19
+                },
+                {
+                    "serviceTargets": [
+                        "45994b98-21f1-4927-a03e-3d940ac75116"
+                    ],
+                    "serviceId": 20
+                },
+                {
+                    "serviceTargets": [
+                        "6eaa061c-b77b-4440-8e8f-7ebaa2ff6207"
+                    ],
+                    "serviceId": 21
+                },
+                {
+                    "serviceTargets": [
+                        "0e887410-a3c5-49ca-a6f5-0f2f6fae30db"
+                    ],
+                    "serviceId": 22
+                },
+                {
+                    "serviceTargets": [
+                        "725d9365-0889-4355-8a7f-a21ef260c468",
+                        "996e3dc7-1376-47ad-a941-648cbae246b4"
+                    ],
+                    "serviceId": 23
+                },
+                {
+                    "serviceTargets": [
+                        "0f11a699-6063-4e91-96ca-53e45cf26b80",
+                        "1144fc3d-4d31-42bd-b9fb-ab5f91db37ca"
+                    ],
+                    "serviceId": 24
+                },
+                {
+                    "serviceTargets": [
+                        "8a5dac4a-0bef-431c-b857-2085eca9ae7c",
+                        "3c2c4aaa-fd5f-43d8-a72f-3567e6dea6f4"
+                    ],
+                    "serviceId": 25
+                },
+                {
+                    "serviceTargets": [
+                        "ed30b80b-7bb9-4c04-9949-093df64d124c",
+                        "3d4f1932-7a5b-45d6-ae68-d0571860ea94"
+                    ],
+                    "serviceId": 26
+                },
+                {
+                    "serviceTargets": [
+                        "a516c78d-740f-463b-a1ce-5b02b8c82dd3",
+                        "4cbcb2b5-45cd-42dc-96bf-a9a181a4865b",
+                        "fbc45154-1d60-4f5e-a484-fdff514f9d51",
+                        "85191c99-f56d-46e6-9311-a58c1f37965d"
+                    ],
+                    "serviceId": 27
+                },
+                {
+                    "serviceTargets": [
+                        "6ab3298e-c24b-49d8-9f86-441e71858b6a",
+                        "f23f9fb0-99ec-4fbf-ade3-b6581fe25dcf",
+                        "fd77b1b1-8234-4d06-8a02-aea6f4abb01d",
+                        "f38fbd9e-d208-4750-96ce-3c032ad37684"
+                    ],
+                    "serviceId": 28
+                },
+                {
+                    "serviceTargets": [
+                        "4f747371-fa5f-4200-ae37-6cd59d268fe8"
+                    ],
+                    "serviceId": 29
+                },
+                {
+                    "serviceTargets": [
+                        "685d61e9-2ebd-4198-a83a-ac7a2fc1477a"
+                    ],
+                    "serviceId": 30
+                },
+                {
+                    "serviceTargets": [
+                        "91387f2b-258d-4325-aa60-828d1acf6ac6"
+                    ],
+                    "serviceId": 31
+                },
+                {
+                    "serviceTargets": [
+                        "ba3d0a20-1e4d-404a-9907-b95239499c2f",
+                        "aa92f559-6260-4947-a714-ae6b80776b47"
+                    ],
+                    "serviceId": 32
+                },
+                {
+                    "serviceTargets": [
+                        "28dd9736-b66a-4ab4-9111-504d5cffba88",
+                        "4670a4ba-62bb-401c-a7ed-4fbd8dc5999c"
+                    ],
+                    "serviceId": 33
+                },
+                {
+                    "serviceTargets": [
+                        "0f9ef068-b2f9-4e6f-9ab5-521857b036f4"
+                    ],
+                    "serviceId": 34
+                },
+                {
+                    "serviceTargets": [
+                        "dea1ff8b-f4eb-4987-8073-500bbbf97fcd",
+                        "d48e05f4-a1cb-40e6-a4a3-bafa86b137f0"
+                    ],
+                    "serviceId": 35
+                }
+            ]
+        },
+        "visibility": "public",
+        "organisationRelationship": "Service Provider",
+        "excludeFinancialYearData": false,
+        "requiresActivityLocking": true,
+        "projectTemplate": "rlp",
+        "activityPeriodDescriptor": "Outputs report #",
+        "meriPlanTemplate": "configurableMeriPlan",
+        "riskAndThreatTypes": [
+            "Performance",
+            "Work Health and Safety",
+            "People resources",
+            "Financial",
+            "External stakeholders",
+            "Natural Environment"
+        ],
+        "projectReports": [
+            {
+                "reportType": "Activity",
+                "firstReportingPeriodEnd": "2023-09-30T14:00:00Z",
+                "reportDescriptionFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportNameFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportingPeriodInMonths": 3,
+                "description": "",
+                "label": "Quarter",
+                "category": "Outputs Reporting",
+                "activityType": "RLP Output Report",
+                "canSubmitDuringReportingPeriod": true
+            },
+            {
+                "firstReportingPeriodEnd": "2024-06-30T14:00:00Z",
+                "reportType": "Administrative",
+                "reportDescriptionFormat": "Annual Progress Report %2$tY - %3$tY for %4$s",
+                "reportNameFormat": "Annual Progress Report %2$tY - %3$tY",
+                "reportingPeriodInMonths": 12,
+                "description": "",
+                "label": "Annual",
+                "category": "Annual Progress Reporting",
+                "activityType": "RLP Annual Report"
+            },
+            {
+                "reportType": "Single",
+                "firstReportingPeriodEnd": "2024-06-30T14:00:00Z",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 36,
+                "multiple": false,
+                "description": "Before beginning Outcomes Report 1, please go to the Data set summary tab and complete a form for each data set collected for this project. Help with completing this form can be found in Section 10 of the [RLP MERIT User Guide](http://www.nrm.gov.au/my-project/monitoring-and-reporting-plan/merit)",
+                "category": "Outcomes Report 1",
+                "reportsAlignedToCalendar": false,
+                "activityType": "RLP Short term project outcomes"
+            }
+        ],
+        "navigationMode": "returnToProject",
+        "objectives": [
+            "Prevent extinction and limit decline of native species",
+            "Reduce immediate suffering of native animals directly impacted by the fires",
+            "Maximise chances of long-term recovery of native species and communities",
+            "Ensure learning and continual improvement is core of the response"
+        ],
+        "supportedServiceIds": [
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            17,
+            18,
+            19,
+            20,
+            21,
+            22,
+            23,
+            24,
+            25,
+            26,
+            27,
+            28,
+            29,
+            30,
+            31,
+            32,
+            33,
+            34,
+            35,
+            36
+        ]
+    },
+    priorities: [
+    ]
+};
+
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Ramsar"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Ramsar Sites",
+        "type": "secondary",
+        "category": "environment",
+        "supportsMultiplePrioritiesAsSecondary": true,
+        "outcome": "1. By 2024, there is restoration of, and reduction in threats to, the ecological character of Ramsar sites, through the implementation of priority actions"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Threatened Species  Wild Hoses Specific"
+            }
+        ],
+        "targeted": true,
+        "supportsMultiplePrioritiesAsPrimary": true,
+        "shortDescription": "Threatened Species Strategy",
+        "category": "environment",
+        "supportsMultiplePrioritiesAsSecondary": true,
+        "outcome": "2. By 2024, the trajectory of species targeted under the Threatened Species Strategy, and other EPBC Act priority species, is stabilised or improved."
+    },
+    {
+        "priorities": [
+            {
+                "category": "World Heritage Sites"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "World Heritage Areas",
+        "type": "secondary",
+        "category": "environment",
+        "supportsMultiplePrioritiesAsSecondary": true,
+        "outcome": "3. By 2024, invasive species management has reduced threats to the natural heritage Outstanding Universal Value of World Heritage properties through the implementation of priority actions."
+    },
+    {
+        "priorities": [
+            {
+                "category": "Threatened Ecological Communities"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Threatened Ecological Communities",
+        "type": "secondary",
+        "category": "environment",
+        "supportsMultiplePrioritiesAsSecondary": true,
+        "outcome": "4. By 2024, the implementation of priority actions is leading to an improvement in the condition of EPBC Act listed Threatened Ecological Communities."
+    },
+    {
+        "priorities": [
+            {
+                "category": "Land Management"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Soil Condition",
+        "type": "secondary",
+        "category": "agriculture",
+        "supportsMultiplePrioritiesAsSecondary": true,
+        "outcome": "5. By 2024, there is an increase in the awareness and adoption of land management practices that improve and protect the condition of soil, biodiversity and vegetation."
+    },
+    {
+        "priorities": [
+            {
+                "category": "Sustainable Agriculture"
+            }
+        ],
+        "shortDescription": "Climate / Weather Adaption",
+        "type": "secondary",
+        "category": "agriculture",
+        "supportsMultiplePrioritiesAsSecondary": true,
+        "outcome": "6. By 2024, there is an increase in the capacity of agriculture systems to adapt to significant changes in climate and market demands for information on provenance and sustainable production."
+    },
+    {
+        "priorities": [
+            {
+                "category": "Improve the condition for all priority places"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Soil Condition",
+        "type": "secondary",
+        "category": "agriculture",
+        "supportsMultiplePrioritiesAsSecondary": true,
+        "outcome": "7. Improve the condition for all priority places"
+    }
+]
+
+
+subprograms.forEach(function (subprogram){
+    var program = db.program.find({name: subprogram});
+    while(program.hasNext()){
+        var p = program.next();
+        if (p.name === "Practical Action for Priority Threatened Species"){
+            p.config = projectConfig.config
+            p.priorities = projectConfig.priorities
+        }
+        db.program.save(p);
+    }
+});
diff --git a/src/main/scripts/releases/3.0/configureNewProgram.js b/src/main/scripts/releases/3.0/configureNewProgram.js
index a92e87842..05203305a 100644
--- a/src/main/scripts/releases/3.0/configureNewProgram.js
+++ b/src/main/scripts/releases/3.0/configureNewProgram.js
@@ -39,6 +39,8 @@ function addService(newServiceName, legacyId, sectionName) {
     }
 }
 addService("Habitat Condition Assessment Survey", NumberInt(42), "NHT - Habitat condition assessment");
+addService("Sustainable Agriculture Facilitators", NumberInt(43), "NHT - Sustainable agriculture facilitators");
+addService("First Nations Australians Cultural Practices", NumberInt(44), "NHT - First nations australians cultural practices");
 
 
 const newScores = [
@@ -496,11 +498,11 @@ const newScores = [
         scores: [
             {
                 label: 'Area (ha) of site preparation',
-                path: 'data.sitePreparationAreasControlled.areaPreparedHa'
+                path: 'data.sitePreparationDetails.areaPreparedHa'
             },
             {
                 label: 'Length (km) of site preparation',
-                path: 'data.sitePreparationAreasControlled.lengthPreparedKm'
+                path: 'data.sitePreparationDetails.lengthPreparedKm'
             }
         ]
     },
@@ -601,6 +603,26 @@ const newScores = [
                 tags: ['Survey', 'Indicator']
             }
         ]
+    },
+    {
+        serviceId: 43,
+        formSection:  'NHT - Sustainable agriculture facilitators',
+        scores: [
+            {
+                label: 'Number of FTEs invoiced for',
+                path: 'data.sustainableAgricultureFacilitators.numberOfFteInvoicedFor',
+            }
+        ]
+    },
+    {
+        serviceId: 44,
+        formSection:  'NHT - First nations australians cultural practices',
+        scores: [
+            {
+                label: 'Number of days conducting cultural practices',
+                path: 'data.firstNationAreasControlled.noDaysConductingCulturalPractices',
+            }
+        ]
     }
 ];
 
@@ -992,6 +1014,18 @@ var config=
                         'Number of days propagating',
                         'Number of plants propagated'
                     ]
+                },
+                {
+                    serviceId: 43,
+                    serviceTargetLabels: [
+                        'Number of FTEs invoiced for'
+                    ]
+                },
+                {
+                    serviceId: 44,
+                    serviceTargetLabels: [
+                        'Number of days conducting cultural practices'
+                    ]
                 }
             ]
 
diff --git a/src/main/scripts/releases/3.1/add110PrioritiesIntoMUs.js b/src/main/scripts/releases/3.1/add110PrioritiesIntoMUs.js
new file mode 100644
index 000000000..294e136cb
--- /dev/null
+++ b/src/main/scripts/releases/3.1/add110PrioritiesIntoMUs.js
@@ -0,0 +1,1315 @@
+
+var priorities = [
+        {
+            "category": "Plants",
+            "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Ammonite Snail Ammoniropa vigens"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Ammonite Snail Ammoniropa vigens"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Ammonite Snail Ammoniropa vigens"
+        },
+        {
+            "category": "Plants",
+            "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+        },
+        {
+            "category": "Plants",
+            "priority": "Arckaringa Daisy Olearia arckaringensis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Arckaringa Daisy Olearia arckaringensis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Arckaringa Daisy Olearia arckaringensis"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+        },
+        {
+            "category": "Birds",
+            "priority": "Australasian Bittern Botaurus poiciloptilus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Australasian Bittern Botaurus poiciloptilus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Australasian Bittern Botaurus poiciloptilus"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Australian Sea-lion Neophoca cinerea"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Australian Sea-lion Neophoca cinerea"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Australian Sea-lion Neophoca cinerea"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+        },
+        {
+            "category": "Birds",
+            "priority": "Black-eared Miner Manorina melanotis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Black-eared Miner Manorina melanotis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Black-eared Miner Manorina melanotis"
+        },
+        {
+            "category": "Plants",
+            "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+        },
+        {
+            "category": "Plants",
+            "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+        },
+        {
+            "category": "Plants",
+            "priority": "Bulberin Nut Macadamia jansenii "
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Bulberin Nut Macadamia jansenii "
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Bulberin Nut Macadamia jansenii "
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+        },
+        {
+            "category": "Birds",
+            "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+        },
+        {
+            "category": "Plants",
+            "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Cauliflower Soft Coral Dendronephthya australis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Cauliflower Soft Coral Dendronephthya australis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Cauliflower Soft Coral Dendronephthya australis"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+        },
+        {
+            "category": "Birds",
+            "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Collared Delma, Adorned Delma Delma torquata"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Collared Delma, Adorned Delma Delma torquata"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Collared Delma, Adorned Delma Delma torquata"
+        },
+        {
+            "category": "Plants",
+            "priority": "Davies' Waxflower Phebalium daviesii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Davies' Waxflower Phebalium daviesii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Davies' Waxflower Phebalium daviesii"
+        },
+        {
+            "category": "Birds",
+            "priority": "Eastern Curlew Numenius madagascariensis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Eastern Curlew Numenius madagascariensis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Eastern Curlew Numenius madagascariensis"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Eastern Quoll Dasyurus viverrinus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Eastern Quoll Dasyurus viverrinus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Eastern Quoll Dasyurus viverrinus"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+        },
+        {
+            "category": "Plants",
+            "priority": "Foote's Grevillea Grevillea calliantha"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Foote's Grevillea Grevillea calliantha"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Foote's Grevillea Grevillea calliantha"
+        },
+        {
+            "category": "Plants",
+            "priority": "Forked Spyridium Spyridium furculentum"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Forked Spyridium Spyridium furculentum"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Forked Spyridium Spyridium furculentum"
+        },
+        {
+            "category": "Fish",
+            "priority": "Freshwater Sawfish Pristis pristis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Freshwater Sawfish Pristis pristis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Freshwater Sawfish Pristis pristis"
+        },
+        {
+            "category": "Plants",
+            "priority": "Giant Andersonia Andersonia axilliflora"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Giant Andersonia Andersonia axilliflora"
+        },{
+            "category": "High Risk Species",
+            "priority": "Giant Andersonia Andersonia axilliflora"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Giant Gippsland Earthworm Megascolides australis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Giant Gippsland Earthworm Megascolides australis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Giant Gippsland Earthworm Megascolides australis"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+        },
+        {
+            "category": "Birds",
+            "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+        },
+        {
+            "category": "Plants",
+            "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Gorge Rice-flower, Pimelea cremnophila"
+        },
+        {
+            "category": "Plants",
+            "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Greater Bilby Macrotis lagotis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Greater Bilby Macrotis lagotis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Greater Bilby Macrotis lagotis"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Green Turtle Chelonia mydas"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Green Turtle Chelonia mydas"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Green Turtle Chelonia mydas"
+        },
+        {
+            "category": "Fish",
+            "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+        },
+        {
+            "category": "Frogs",
+            "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+        },
+        {
+            "category": "Birds",
+            "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+        },{
+            "category": "Priority Threatened Species Primary",
+            "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+        },
+        {
+            "category": "Plants",
+            "priority": "Imlay Mallee Eucalyptus imlayensis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Imlay Mallee Eucalyptus imlayensis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Imlay Mallee Eucalyptus imlayensis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+        },
+        {
+            "category": "Plants",
+            "priority": "King Blue-grass Dichanthium queenslandicum"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "King Blue-grass Dichanthium queenslandicum"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "King Blue-grass Dichanthium queenslandicum"
+        },
+        {
+            "category": "Birds",
+            "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+        },
+        {
+            "category": "Birds",
+            "priority": "King Island Scrubtit Acanthornis magna greeniana"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "King Island Scrubtit Acanthornis magna greeniana"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "King Island Scrubtit Acanthornis magna greeniana"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Koala Phascolarctos cinereus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Koala Phascolarctos cinereus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Koala Phascolarctos cinereus"
+        },
+        {
+            "category": "Frogs",
+            "priority": "Kroombit Tinker Frog Taudactylus pleione"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Kroombit Tinker Frog Taudactylus pleione"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Kroombit Tinker Frog Taudactylus pleione"
+        },
+        {
+            "category": "Plants",
+            "priority": "Lax Leek Orchid Prasophyllum laxum"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Lax Leek Orchid Prasophyllum laxum"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Lax Leek Orchid Prasophyllum laxum"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Leaf-Scaled Seasnake – Aipysurus foliosquama"
+        },
+        {
+            "category": "Plants",
+            "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Lord Howe Island Phasmid Dryococelus australis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Lord Howe Island Phasmid Dryococelus australis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Lord Howe Island Phasmid Dryococelus australis"
+        },
+        {
+            "category": "Plants",
+            "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+        },
+        {
+            "category": "Birds",
+            "priority": "Malleefowl Leipoa ocellata"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Malleefowl Leipoa ocellata"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Malleefowl Leipoa ocellata"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+        },
+        {
+            "category": "Fish",
+            "priority": "Maugean Skate Zearaja maugeana"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Maugean Skate Zearaja maugeana"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Maugean Skate Zearaja maugeana"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+        },
+        {
+            "category": "Frogs",
+            "priority": "Mountain Frog Philoria kundagungan"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Mountain Frog Philoria kundagungan"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Mountain Frog Philoria kundagungan"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Mountain Pygmy-possum Burramys parvus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Mountain Pygmy-possum Burramys parvus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Mountain Pygmy-possum Burramys parvus"
+        },
+        {
+            "category": "Frogs",
+            "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+        },
+        {
+            "category": "Fish",
+            "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+        },
+        {
+            "category": "Plants",
+            "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+        },
+        {
+            "category": "Plants",
+            "priority": "Native Guava Rhodomyrtus psidioides"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Native Guava Rhodomyrtus psidioides"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Native Guava Rhodomyrtus psidioides"
+        },
+        {
+            "category": "Mammals",
+            "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+        },
+        {
+            "category": "Birds",
+            "priority": "Night Parrot Pezoporus occidentalis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Night Parrot Pezoporus occidentalis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Night Parrot Pezoporus occidentalis"
+        },
+        {
+            "category": "Birds",
+            "priority": "Noisy Scrub-bird Atrichornis clamosus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Noisy Scrub-bird Atrichornis clamosus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Noisy Scrub-bird Atrichornis clamosus"
+        },
+        {
+            "category": "Birds",
+            "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Northern Quoll Dasyurus hallucatus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Northern Quoll Dasyurus hallucatus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Northern Quoll Dasyurus hallucatus"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Numbat Myrmecobius fasciatus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Numbat Myrmecobius fasciatus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Numbat Myrmecobius fasciatus"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+        },
+        {
+            "category": "Birds",
+            "priority": "Orange-bellied Parrot Neophema chrysogaster"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Orange-bellied Parrot Neophema chrysogaster"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Orange-bellied Parrot Neophema chrysogaster"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+        },
+        {
+            "category": "Birds",
+            "priority": "Plains-wanderer Pedionomus torquatus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Plains-wanderer Pedionomus torquatus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Plains-wanderer Pedionomus torquatus"
+        },
+        {
+            "category": "Birds",
+            "priority": "Princess Parrot Polytelis alexandrae"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Princess Parrot Polytelis alexandrae"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Princess Parrot Polytelis alexandrae"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Quokka Setonix brachyurus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Quokka Setonix brachyurus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Quokka Setonix brachyurus"
+        },
+        {
+            "category": "Birds",
+            "priority": "Red Goshawk Erythrotriorchis radiatus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Red Goshawk Erythrotriorchis radiatus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Red Goshawk Erythrotriorchis radiatus"
+        },
+        {
+            "category": "Fish",
+            "priority": "Red Handfish Thymichthys politus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Red Handfish Thymichthys politus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Red Handfish Thymichthys politus"
+        },
+        {
+            "category": "Birds",
+            "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+        },
+        {
+            "category": "Fish",
+            "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+        },
+        {
+            "category": "Birds",
+            "priority": "Regent Honeyeater Anthochaera phrygia"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Regent Honeyeater Anthochaera phrygia"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Regent Honeyeater Anthochaera phrygia"
+        },
+        {
+            "category": "Plants",
+            "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+        },
+        {
+            "category": "Plants",
+            "priority": "Small-flowered Snottygobble Persoonia micranthera"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Small-flowered Snottygobble Persoonia micranthera"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Small-flowered Snottygobble Persoonia micranthera"
+        },
+        {
+            "category": "Plants",
+            "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+        },
+        {
+            "category": "Frogs",
+            "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+        },
+        {
+            "category": "Plants",
+            "priority": "Stiff Groundsel Senecio behrianus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Stiff Groundsel Senecio behrianus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Stiff Groundsel Senecio behrianus"
+        },
+        {
+            "category": "Plants",
+            "priority": "Stirling Range Dryandra Banksia montana"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Stirling Range Dryandra Banksia montana"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Stirling Range Dryandra Banksia montana"
+        },
+        {
+            "category": "Fish",
+            "priority": "Stocky Galaxias Galaxias tantangara"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Stocky Galaxias Galaxias tantangara"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Stocky Galaxias Galaxias tantangara"
+        },
+        {
+            "category": "Fish",
+            "priority": "Swan Galaxias Galaxias fontanus"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Swan Galaxias Galaxias fontanus"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Swan Galaxias Galaxias fontanus"
+        },
+        {
+            "category": "Birds",
+            "priority": "Swift Parrot Lathamus discolor"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Swift Parrot Lathamus discolor"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Swift Parrot Lathamus discolor"
+        },
+        {
+            "category": "Plants",
+            "priority": "Tangled Wattle Acacia volubilis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Tangled Wattle Acacia volubilis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Tangled Wattle Acacia volubilis"
+        },
+        {
+            "category": "Invertebrates",
+            "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+        },
+        {
+            "category": "Plants",
+            "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+        },
+        {
+            "category": "Birds",
+            "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+        },
+        {
+            "category": "Mammals",
+            "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+        },
+        {
+            "category": "Frogs",
+            "priority": "White-bellied Frog Anstisia alba"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "White-bellied Frog Anstisia alba"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "White-bellied Frog Anstisia alba"
+        },
+        {
+            "category": "Birds",
+            "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+        },
+        {
+            "category": "Fish",
+            "priority": "White's Seahorse Hippocampus whitei"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "White's Seahorse Hippocampus whitei"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "White's Seahorse Hippocampus whitei"
+        },
+        {
+            "category": "Plants",
+            "priority": "Wollemi Pine Wollemia nobilis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Wollemi Pine Wollemia nobilis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Wollemi Pine Wollemia nobilis"
+        },
+        {
+            "category": "Plants",
+            "priority": "Wongan Eriostemon Philotheca wonganensis"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Wongan Eriostemon Philotheca wonganensis"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Wongan Eriostemon Philotheca wonganensis"
+        },
+        {
+            "category": "Plants",
+            "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+        },
+        {
+            "category": "Reptiles",
+            "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+        },
+        {
+            "category": "Priority Threatened Species Primary",
+            "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+        },
+        {
+            "category": "High Risk Species",
+            "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+        }
+];
+
+var mus = db.managementUnit.find({});
+while(mus.hasNext()){
+    var m = mus.next();
+    db.managementUnit.updateOne({name:m.name},{$push:{"priorities": {$each : priorities}}});
+}
\ No newline at end of file
diff --git a/src/main/scripts/releases/3.1/addProjectLockEmailSettings.js b/src/main/scripts/releases/3.1/addProjectLockEmailSettings.js
new file mode 100644
index 000000000..007d18419
--- /dev/null
+++ b/src/main/scripts/releases/3.1/addProjectLockEmailSettings.js
@@ -0,0 +1,11 @@
+function addSetting(key, value) {
+    db.setting.insert({key:key, value:value});
+}
+addSetting('meritfielddata.project_lock.subject', "Your MERI Plan edits have been interrupted");
+addSetting('meritfielddata.project_lock.body', "User ${user} has elected to edit a MERI Plan that you may be currently editing.  If you have finished editing and saved your changes then you don't need to do anything.\n" +
+    "If you are currently editing the MERI Plan, you may need to contact ${user} and ask them to allow you to finish before proceeding with their edits.\n" +
+    "\n" +
+    "The related project is: ${url}");
+
+
+
diff --git a/src/main/scripts/releases/3.1/addSAFPrioritiesIntoMUs.js b/src/main/scripts/releases/3.1/addSAFPrioritiesIntoMUs.js
new file mode 100644
index 000000000..c37616835
--- /dev/null
+++ b/src/main/scripts/releases/3.1/addSAFPrioritiesIntoMUs.js
@@ -0,0 +1,104 @@
+
+var priorities = [
+    {
+        "category": "Agriculture Sector Adopting Practices",
+        "priority": "Climate change adaptation"
+    },
+    {
+        "category": "Agriculture Sector Adopting Practices",
+        "priority": "On-farm emissions reduction practices"
+    },
+    {
+        "category": "Agriculture Sector",
+        "priority": "Carbon and biodiversity market information"
+    },
+    {
+        "category": "Agriculture Sector",
+        "priority": "Sustainability framework engagement"
+    },
+    {
+        "category": "Agriculture Sector",
+        "priority": "Market access and traceability"
+    },
+    {
+        "category": "Farmer Sector",
+        "priority": "Native vegetation and biodiversity on-farm"
+    },
+    {
+        "category": "Farmer Sector",
+        "priority": "Soil carbon"
+    },
+    {
+        "category": "Farmer Sector",
+        "priority": "Soil erosion"
+    },
+    {
+        "category": "Farmer Sector",
+        "priority": "Soil acidification"
+    },
+    {
+        "category": "Farmer Sector",
+        "priority": "Sustainable agriculture practices"
+    }
+];
+
+var stateManagementUnitNames = [
+    "ACT",
+    "Northern Territory",
+    "Central Tablelands",
+    "Central West",
+    "Greater Sydney",
+    "Hunter",
+    "Murray",
+    "Northern Tablelands",
+    "North West",
+    "North Coast",
+    "Riverina",
+    "South East NSW",
+    "Western",
+    "Alinytjara Wilurara",
+    "Eyre Peninsula",
+    "Kangaroo Island",
+    "Adelaide and Mount Lofty Ranges",
+    "South Australian Murray Darling Basin",
+    "Northern and Yorke",
+    "South Australian Arid Lands",
+    "South East",
+    "Corangamite",
+    "East Gippsland",
+    "Glenelg Hopkins",
+    "Goulburn Broken",
+    "Mallee",
+    "North Central",
+    "North East",
+    "Port Phillip and Westernport",
+    "West Gippsland",
+    "Wimmera",
+    "Avon River Basin",
+    "Northern Agricultural Region",
+    "Peel-Harvey",
+    "Rangelands Region",
+    "South Coast Region",
+    "South West Region",
+    "Swan Region",
+    "North West NRM Region",
+    "North NRM Region",
+    "South NRM Region",
+    "Burdekin",
+    "Burnett Mary",
+    "Cape York",
+    "Desert Channels",
+    "Fitzroy",
+    "Mackay Whitsunday",
+    "Northern Gulf",
+    "South East Queensland",
+    "Southern Gulf",
+    "Wet Tropics",
+    "Southern Queensland"
+];
+
+var mus = db.managementUnit.find();
+while(mus.hasNext()){
+    var m = mus.next();
+    db.managementUnit.updateOne({name:m.name},{$push:{"priorities": {$each : priorities}}});
+}
\ No newline at end of file
diff --git a/src/main/scripts/releases/3.1/adhoc/addDaysCollectingSeedScore.js b/src/main/scripts/releases/3.1/adhoc/addDaysCollectingSeedScore.js
new file mode 100644
index 000000000..02baf47ac
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/addDaysCollectingSeedScore.js
@@ -0,0 +1,56 @@
+load('../../../utils/uuid.js');
+const label = "Number of days collecting seeds/cuttings";
+let score = db.score.findOne({label:label, status:{$ne:'deleted'}});
+const config = {
+    "childAggregations": [
+        {
+            "filter": {
+                "property": "name",
+                "filterValue": "NHT - Seed Collection",
+                "type": "filter"
+            },
+            "childAggregations": [
+                {
+                    "property": "data.areasOfSeedCollection.seedCollectionDetails.numberDaysCollecting",
+                    "type": "SUM"
+                }
+            ]
+        }
+    ]
+}
+if (!score) {
+    // Insert the score
+    score = {
+        scoreId: UUID.generate(),
+        label: label,
+        status: 'active',
+        isOutputTarget: true,
+        category: 'RLP and Bushfire Recovery',
+        outputType: "Seed Collection",
+        configuration: config,
+        dateCreated: ISODate(),
+        lastUpdated: ISODate()
+    };
+    db.score.insertOne(score);
+    print("Created score "+score.label);
+};
+
+let programs = db.program.find({'config.programServiceConfig.serviceFormName':'NHT Output Report'});
+
+while (programs.hasNext()) {
+    let program = programs.next();
+
+    let serviceConfig = program.config.programServiceConfig.programServices;
+    for (let i=0; i<serviceConfig.length; i++) {
+        if (serviceConfig[i].serviceId == 36) { // Seed Collection service
+            if (serviceConfig[i].serviceTargets.indexOf(score.scoreId) < 0) {
+                serviceConfig[i].serviceTargets.push(score.scoreId);
+                db.program.replaceOne({_id:program._id}, program);
+                print("Added score to program "+program.name);
+                break;
+            }
+        }
+    }
+}
+
+
diff --git a/src/main/scripts/releases/3.1/adhoc/addMeriPlanHelpText.js b/src/main/scripts/releases/3.1/adhoc/addMeriPlanHelpText.js
new file mode 100644
index 000000000..6126600d7
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/addMeriPlanHelpText.js
@@ -0,0 +1,20 @@
+let programs = db.program.find({'config.meriPlanContents.template':'serviceOutcomeTargets'});
+const newText = 'In addition to listing your project assumptions, please list any nominated project services that will not be charged for.';
+programs.forEach(program => {
+    for (let i = 0; i < program.config.meriPlanContents.length; i++) {
+        let template = program.config.meriPlanContents[i];
+        if (template.template === 'projectMethodology') {
+            if (!template.model.helpText) {
+                print("Missing help text for program: "+program.name+", "+program.programId);
+            }
+            else {
+                template.model.helpText = newText+'\n'+template.model.helpText;
+                print("Updating help text for program: "+program.name+", "+program.programId);
+                db.program.replaceOne({_id: program._id}, program);
+            }
+
+            break;
+        }
+    }
+});
+
diff --git a/src/main/scripts/releases/3.1/adhoc/addNewServices.js b/src/main/scripts/releases/3.1/adhoc/addNewServices.js
new file mode 100644
index 000000000..a22f70a8f
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/addNewServices.js
@@ -0,0 +1,41 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/program.js');
+var userId = '';
+
+const serviceFormName = "NHT Output Report";
+
+function addService(newServiceName, legacyId, sectionName) {
+    let outputs = [
+        {
+            formName:serviceFormName,
+            sectionName:sectionName
+        }
+    ];
+    if (!db.service.findOne({legacyId:legacyId})) {
+        let newService = {
+            "outputs": outputs,
+            "name": newServiceName,
+            "legacyId": legacyId,
+            serviceId: UUID.generate(),
+            dateCreated:ISODate(),
+            lastUpdated:ISODate()
+        }
+        db.service.insertOne(newService);
+    } else {
+        db.service.updateOne(
+            {legacyId: legacyId},
+            {$set: {name: newServiceName, outputs:outputs, lastUpdated:ISODate()}});
+    }
+
+    let service = db.service.findOne({legacyId:legacyId});
+    if (!service.outputs) {
+        service.outputs = [{
+            formName: serviceFormName,
+            sectionName: sectionName
+        }]
+    }
+}
+
+addService("Sustainable Agriculture Facilitators", NumberInt(43), "NHT - Sustainable agriculture facilitators");
+addService("First Nations Australians Cultural Practices", NumberInt(44), "NHT - First nations australians cultural practices");
diff --git a/src/main/scripts/releases/3.1/adhoc/addNhtLabelsToNewPrograms.js b/src/main/scripts/releases/3.1/adhoc/addNhtLabelsToNewPrograms.js
new file mode 100644
index 000000000..e40033e16
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/addNhtLabelsToNewPrograms.js
@@ -0,0 +1,28 @@
+const programs = [
+    'Priority Species - Procurements',
+    'World Heritage Protection',
+    'Ramsar Wetland Protection',
+    'Priority Places',
+    'Priority Species',
+    'Saving Native Species'
+];
+var programToCopyLabels = db.program.findOne({name:'Recovery Actions for Species and Landscapes'});
+
+let services = db.service.find({programLabels:{$ne:null}});
+while(services.hasNext()) {
+    let service = services.next();
+    let label = service.programLabels[programToCopyLabels.programId];
+
+    if (!label) {
+        print("No label found for service " + service.name);
+        printjson(service);
+        throw "Help!";
+    }
+
+    for (let i=0; i<programs.length; i++) {
+        let program = db.program.findOne({name:programs[i]});
+        service.programLabels[program.programId] = {label:label.label};
+        print("Updating label for service " + service.name + " to " + label.label);
+    }
+    db.service.replaceOne({_id:service._id}, service);
+}
diff --git a/src/main/scripts/releases/3.1/adhoc/addThreatsToMeriPlan.js b/src/main/scripts/releases/3.1/adhoc/addThreatsToMeriPlan.js
new file mode 100644
index 000000000..e45588dc9
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/addThreatsToMeriPlan.js
@@ -0,0 +1,23 @@
+let programs = db.program.find({'config.meriPlanContents.template':'serviceOutcomeTargets'});
+const newThreats = [
+    "Disconnection from Country - Altered/disrupted connection with land and sea country",
+"Disconnection from Country - Altered or disrupted First Nations engagement/leadership in caring for land and sea country",
+"Disconnection from Country - Altered or disrupted transfer of First Nations knowledge systems",
+"Disconnection from Country - Inadequate recognition of Traditional knowledge and practices",
+"Disengagement of community - Community are not informed and are not engaged in managing the environment"
+];
+while (programs.hasNext()) {
+    let program = programs.next();
+    print(program.name+" "+program.config.keyThreatCodes.length);
+    let insertIndex = 4;
+    if (program.config.keyThreatCodes.length == 46) {
+        for (let i=0; i<newThreats.length; i++) {
+            program.config.keyThreatCodes.splice(insertIndex+i, 0, newThreats[i]);
+            print(program.config.keyThreatCodes)
+        }
+    }
+    else {
+        print("Program "+program.name+" already has "+program.config.keyThreatCodes.length+" key threats");
+    }
+    db.program.replaceOne({_id:program._id}, program);
+}
\ No newline at end of file
diff --git a/src/main/scripts/releases/3.1/adhoc/createGambaGrassControlSubProgram.js b/src/main/scripts/releases/3.1/adhoc/createGambaGrassControlSubProgram.js
new file mode 100644
index 000000000..82229f645
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/createGambaGrassControlSubProgram.js
@@ -0,0 +1,594 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/program.js');
+var userId = '';
+
+const serviceFormName = "NHT Output Report";
+const annualReportFormName = "NHT Annual Report";
+const outcomes1ReportFormName = "NHT Outcomes 1 Report";
+const outcomes2ReportFormName = "NHT Outcomes 2 Report";
+
+var config =
+    {
+        "meriPlanContents": [
+            {
+                "template": "name",
+                "model": {
+                    "tableFormatting": true
+                }
+            },
+            {
+                "template": "priorityPlace",
+                "model": {
+                    "priorityPlaceHelpText": "Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species.",
+                    "priorityPlaceLabel": "Does this project directly support a priority place?"
+                }
+            },
+            {
+                "template": "indigenousInvolvement"
+            },
+            {
+                "template": "description",
+                "model": {
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
+                }
+            },
+            {
+                "template": "programOutcome",
+                "model": {
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
+                }
+            },
+            {
+                "template": "additionalOutcomes",
+                "model": {
+                    "outcomePriority": "Additional outcome/s",
+                    "helpTextHeading": "If the project is not delivering additional benefits, delete the row using the 'x' in the right-most column.",
+                    "title": "Additional benefits",
+                    "priority": "Additional Investment Priorities",
+                    "priorityHelpText": "Other investment priorities that will benefit from the project.  Delete the row if there are no additional outcomes."
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "extendedKeyThreats",
+                "model": {
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "threatHelpText": "Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText": "Describe the proposed method to address the threat or threatening process",
+                    "title": "Key threat(s) and/or key threatening processes"
+                }
+            },
+            {
+                "template": "projectMethodology",
+                "model": {
+                    "helpText": "Include all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic.",
+                    "maxSize": "4000",
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])"
+                }
+            },
+            {
+                "template": "projectPartnerships",
+                "model": {
+                    "helpTextHeading": "Note: Not limited to key subcontractors.",
+                    "helpTextPartnerName": "Insert name of project partner. To be a project partner, they need to be actively involved in the planning or delivery of the project"
+                }
+            },
+            {
+                "template": "extendedBaselineMonitoring",
+                "model": {
+                    "approachHeading": "Monitoring method",
+                    "indicatorHeading": "Monitoring methodology",
+                    "monitoringServiceHelpText": "Select the relevant Project Services(s)/Target measure(s) that will be used to support ongoing monitoring",
+                    "baselineDataDescriptionHelpText": "Describe the project baseline to be established, or the baseline data that currently exists",
+                    "baselineMethodHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "baselineDataHelpText": "Existing baseline data needs to be based on best practice methods and be compatible with the EMSA protocols.",
+                    "approachHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "titleHelpText": "Describe the Project Baseline(s) and ongoing monitoring which will be used to report progress towards this projects outcome(s).  Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "baselineServiceHelpText": "Select the relevant Project Service(s)/Target measure(s) that will be used to support the development of the baseline",
+                    "newIndicatorText": "New monitoring indicator"
+                }
+            },
+            {
+                "template": "projectReview",
+                "model": {
+                    "title": "Project review, improvement and evaluation methodology and approach (3000 character limit [approximately 500 words])"
+                }
+            },
+            {
+                "template": "nationalAndRegionalPlans",
+                "model": {
+                    "includeUrl": true,
+                    "headingTitle": "Conservation and management plans"
+                }
+            },
+            {
+                "template": "serviceOutcomeTargets",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections",
+                    "title": "Project services and targets",
+                    "serviceName": "Service"
+                }
+            },
+            {
+                "template": "serviceForecasts",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                },
+                "excludedModes": [
+                    "PRINT"
+                ]
+            }
+        ],
+        "excludes": [],
+        "programServiceConfig": {
+            "serviceFormName": "NHT Output Report",
+            "programServices": [
+                {
+                    "serviceTargets": [
+                        "c3276929-b8a9-4985-a329-49b86f14018c"
+                    ],
+                    "serviceId": 1
+                },
+                {
+                    "serviceTargets": [
+                        "69deaaf9-cdc2-439a-b684-4cffdc7f224e"
+                    ],
+                    "serviceId": 2
+                },
+                {
+                    "serviceTargets": [
+                        "1f8161bc-908b-4ec8-ab7f-edac973a657d",
+                        "88908921-1248-4a7c-b185-51c625c737e3",
+                        "fe9f1a6c-e614-489a-80fa-4d6d76f1cf95"
+                    ],
+                    "serviceId": 3
+                },
+                {
+                    "serviceTargets": [
+                        "aa0c6b29-285e-4344-987e-dfeaf1d95648",
+                        "a9d98baa-b2ab-4428-82cf-d96185e63aa6",
+                        "c4ea5ce3-4a70-4df8-aff7-ffa929e7df61"
+                    ],
+                    "serviceId": 4
+                },
+                {
+                    "serviceTargets": [
+                        "55d76c03-c89d-40fe-867b-93f7a48ff9c1",
+                        "3cbf653f-f74c-4066-81d2-e3f78268185c",
+                        "3855d565-3b77-497b-90af-addb271aa598",
+                        "5dbfb32a-5933-4d8a-9937-41f350fb5f75"
+                    ],
+                    "serviceId": 5
+                },
+                {
+                    "serviceTargets": [
+                        "22771c0d-8403-433b-b468-e36dc16a1d21",
+                        "675cc878-eb80-435f-a841-d89b657fb2e3",
+                        "dd9f8fd4-b6c7-4f09-bbbf-5d721afc7677",
+                        "6f3cb6ab-5c6a-49be-9af9-9226fa751725"
+                    ],
+                    "serviceId": 7
+                },
+                {
+                    "serviceTargets": [
+                        "e0b4cc3e-e94a-4c97-81dc-a4cb868c2cc3",
+                        "b0bcfc54-76fa-4659-accf-276c18b50c31"
+                    ],
+                    "serviceId": 8
+                },
+                {
+                    "serviceTargets": [
+                        "9416c9f4-48ca-4bd1-8822-cd45ebb56c58",
+                        "2409e649-2ee2-47fd-9e76-ef2ffa07a5e7",
+                        "d58f8dba-109d-4179-b130-a888cd3d303c",
+                        "01686d38-9165-4497-9648-627ef81945a7"
+                    ],
+                    "serviceId": 9
+                },
+                {
+                    "serviceTargets": [
+                        "0e2f8d61-b7b4-4d2d-b07c-4fc20bbe326a",
+                        "bb506258-e907-43d3-99bd-0fe0400f654e"
+                    ],
+                    "serviceId": 10
+                },
+                {
+                    "serviceTargets": [
+                        "3c83e639-9c19-4b31-a86f-9d2d5e78123b",
+                        "e901be5e-8336-432e-b164-f278abd7430b"
+                    ],
+                    "serviceId": 12
+                },
+                {
+                    "serviceTargets": [
+                        "5557288b-190e-4a3f-a60b-4bdff6ca8fe8",
+                        "902df7a8-92f6-420d-9544-47d4b8cf31ca"
+                    ],
+                    "serviceId": 13
+                },
+                {
+                    "serviceTargets": [
+                        "9deb3edf-50c7-4b04-a1fb-d1451eadf641",
+                        "360c8b86-360c-4ca3-b1aa-626be56f2b11"
+                    ],
+                    "serviceId": 14
+                },
+                {
+                    "serviceTargets": [
+                        "7c30bc26-829e-4080-8059-27af9285113b",
+                        "158a5544-78e3-4d00-9f1b-62a85a938268"
+                    ],
+                    "serviceId": 15
+                },
+                {
+                    "serviceTargets": [
+                        "4aa201ec-2066-40e1-a457-99daa569c8e2",
+                        "f46f096a-a274-426b-adad-702e7cf8fab7",
+                        "3b1403f3-139a-4206-b325-62ebfe05ddc4",
+                        "7cb13c22-3dcd-43e7-808d-e0e26f5c090d"
+                    ],
+                    "serviceId": 16
+                },
+                {
+                    "serviceTargets": [
+                        "5c6db4c1-7fde-452e-8735-e52842fe6217",
+                        "41cb1e2c-59bc-4639-8bf7-fe0f528e006e"
+                    ],
+                    "serviceId": 18
+                },
+                {
+                    "serviceTargets": [
+                        "4f71e00a-2d80-488d-9ce4-947e60589149",
+                        "69a2ffba-41e9-406e-8ea4-5bdeee92cbde"
+                    ],
+                    "serviceId": 42
+                },
+                {
+                    "serviceTargets": [
+                        "26ea592f-ee39-4e6e-b6af-5b53fb1a5675"
+                    ],
+                    "serviceId": 17
+                },
+                {
+                    "serviceTargets": [
+                        "3587a984-68f9-4db3-b5af-49f265d853e0",
+                        "9d2d01be-b517-4be2-a225-8b1c887e016e"
+                    ],
+                    "serviceId": 19
+                },
+                {
+                    "serviceTargets": [
+                        "d0516817-5acb-46bd-9871-2696c245bad0",
+                        "7fed132d-6a38-448c-b519-381ab9e1e027",
+                        "e08dda14-360c-4b66-b8c5-eb0269c5aa44",
+                        "f3671aa7-773f-447d-9649-ba7f11dbe97a"
+                    ],
+                    "serviceId": 20
+                },
+                {
+                    "serviceTargets": [
+                        "5ab2b539-a5b4-40da-a556-a2c18066345b",
+                        "36410625-05f3-42d3-b04f-a3b268498ee1"
+                    ],
+                    "serviceId": 23
+                },
+                {
+                    "serviceTargets": [
+                        "0162246b-13fd-40c9-ae26-fb767eee76f8"
+                    ],
+                    "serviceId": 24
+                },
+                {
+                    "serviceTargets": [
+                        "b9e710e4-7dd3-4acc-ac2c-c69f4bcb9787",
+                        "00934509-f102-4d39-a043-7547a8ab9ac8",
+                        "1021bec7-3836-4b33-90b4-76701efd4fe3",
+                        "4dad393e-cbf7-43dd-87bb-62ea8f8afcdd"
+                    ],
+                    "serviceId": 26
+                },
+                {
+                    "serviceTargets": [
+                        "a516c78d-740f-463b-a1ce-5b02b8c82dd3",
+                        "4cbcb2b5-45cd-42dc-96bf-a9a181a4865b",
+                        "fbc45154-1d60-4f5e-a484-fdff514f9d51",
+                        "85191c99-f56d-46e6-9311-a58c1f37965d"
+                    ],
+                    "serviceId": 27
+                },
+                {
+                    "serviceTargets": [
+                        "3cfa82aa-0b38-49c0-be37-0fa61b5b6e3c",
+                        "91e90861-3ba7-4257-a765-6cab24c6f58a"
+                    ],
+                    "serviceId": 28
+                },
+                {
+                    "serviceTargets": [
+                        "96be68cf-783d-452a-b8fd-3832163f95db",
+                        "e70c70fd-4f31-41dc-a4b4-07f79efc3055"
+                    ],
+                    "serviceId": 29
+                },
+                {
+                    "serviceTargets": [
+                        "598bd978-0907-4cad-a7a6-ec5a8a8bbdc4",
+                        "d29bd931-1dd1-47c4-b456-c175099ff1df"
+                    ],
+                    "serviceId": 30
+                },
+                {
+                    "serviceTargets": [
+                        "6db1ebd7-92c5-49f2-98b7-2faa700fd752",
+                        "524d93b4-5cd1-4d0d-b1f8-d393028220ad"
+                    ],
+                    "serviceId": 31
+                },
+                {
+                    "serviceTargets": [
+                        "8040931a-2e6c-41be-9e92-f1035093b2ac",
+                        "5d652e6e-b719-45bf-8ae6-e9f293c24a92"
+                    ],
+                    "serviceId": 32
+                },
+                {
+                    "serviceTargets": [
+                        "f74182bd-7a53-4157-aeb9-eda281bb0234",
+                        "e7b7bb1e-66c2-4140-90f9-9534aa46ffa3"
+                    ],
+                    "serviceId": 33
+                },
+                {
+                    "serviceTargets": [
+                        "15615a70-ee60-46b8-b5e9-b33d4d88de6b",
+                        "d8dc153b-da23-4f7b-947a-89bc98338d6d",
+                        "5f762c6d-4f42-4458-9855-03c6896959c1",
+                        "5885f105-fc7d-43fd-8c26-c72938a95b76"
+                    ],
+                    "serviceId": 34
+                },
+                {
+                    "serviceTargets": [
+                        "dea1ff8b-f4eb-4987-8073-500bbbf97fcd",
+                        "fba17df1-d5cb-4643-987f-0626055b3c78"
+                    ],
+                    "serviceId": 35
+                },
+                {
+                    "serviceTargets": [
+                        "3ec07754-4a7a-46fb-a76d-553921781716",
+                        "fbc2dab8-7454-40f9-94f6-6bf258fcefff",
+                        "7186e284-0cb2-418e-a8cc-4343eb618140",
+                        "c7d0963e-2847-4f5f-8a1c-e149dfa4c9d1"
+                    ],
+                    "serviceId": 36
+                },
+                {
+                    "serviceTargets": [
+                        "3d06b150-bb86-47dc-8ad8-c33a51c3e3b3"
+                    ],
+                    "serviceId": 43
+                },
+                {
+                    "serviceTargets": [
+                        "b8304577-afd8-45e0-8ef4-b71ae10998f5"
+                    ],
+                    "serviceId": 44
+                }
+            ]
+        },
+        "visibility": "public",
+        "declarationPageType": "rdpReportDeclaration",
+        "requiresActivityLocking": true,
+        "supportsMeriPlanComparison": true,
+        "projectTemplate": "rlp",
+        "activityPeriodDescriptor": "Outputs report #",
+        "requireMeritAdminToReturnMeriPlan": true,
+        "emailTemplates": {
+            "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
+            "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
+            "planApprovedEmailTemplate": "RLP_PLAN_APPROVED_EMAIL_TEMPLATE",
+            "planReturnedEmailTemplate": "RLP_PLAN_RETURNED_EMAIL_TEMPLATE",
+            "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
+            "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
+        },
+        "meriPlanTemplate": "configurableMeriPlan",
+        "riskAndThreatTypes": [
+            "Performance",
+            "Work Health and Safety",
+            "People resources",
+            "Financial",
+            "External stakeholders",
+            "Natural Environment"
+        ],
+        "projectReports": [
+            {
+                "reportType": "Activity",
+                "firstReportingPeriodEnd": "2023-06-30T14:00:00Z",
+                "reportDescriptionFormat": "Progress Report %1d",
+                "reportNameFormat": "Progress Report %1d",
+                "reportingPeriodInMonths": 6,
+                "description": "_Please note that the reporting fields for these reports are currently being developed_",
+                "minimumReportDurationInDays": 3,
+                "label": "Semester",
+                "category": "Progress Reports",
+                "activityType": "Progress Report",
+                "reportsAlignedToCalendar": true,
+                "canSubmitDuringReportingPeriod": true
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Final Report",
+                "reportNameFormat": "Final Report",
+                "reportingPeriodInMonths": 0,
+                "multiple": false,
+                "description": "_Please note that the reporting fields for these reports are currently being developed_",
+                "alignToOwnerEnd": true,
+                "label": "Final Report",
+                "category": "Final Report",
+                "reportsAlignedToCalendar": false,
+                "activityType": "Final Report",
+                "alignToOwnerStart": true
+            }
+        ],
+        "keyThreatCodes": [
+            "Climate Change - Changed flooding regime",
+            "Climate Change - Changed rainfall patterns",
+            "Climate Change - Sea level rises",
+            "Climate Change - Unexpected seasonal/temperature extremes",
+            "Disease/pathogens - Areas that are infected",
+            "Disease/pathogens - Possible infection of disease free areas",
+            "Fire - Inappropriate fire regime",
+            "Fire - Lack of protection for ecological assets during fire control activities",
+            "Genetics - Bottleneck/inbreeding",
+            "Habitat loss - Breeding place disturbance",
+            "Habitat loss - Dieback/senescence",
+            "Habitat loss - Feeding habitat loss/interference",
+            "Habitat loss - Habitat fragmentation",
+            "Habitat loss - Land clearing",
+            "Habitat loss - Loss of critical ecosystem service supporting habitat",
+            "Human interference - Fish and harvesting aquatic resources (commercial)",
+            "Human interference - Flow-on effects of housing development",
+            "Human interference - Illegal activities",
+            "Human interference - Industrial development",
+            "Human interference - Land use intensification",
+            "Human interference - Recreational fishing",
+            "Human interference - Recreational pressures",
+            "Human interference - Road/vehicle strike",
+            "Land management practices - Changes to hydrology and aquatic systems",
+            "Land management practices - Domestic grazing/stock impacts",
+            "Land management practices - Excess recharge of groundwater",
+            "Land management practices - Excess use (or over-use) of surface water or groundwater resources",
+            "Land management practices - Excessive fertiliser use",
+            "Land management practices - Inappropriate ground cover management",
+            "Land management practices - Runoff",
+            "Native fauna - Competition",
+            "Native fauna - Predation",
+            "Pest - Competition/exclusion",
+            "Pest - Disease transmission",
+            "Pest - Habitat degradation",
+            "Pest - Introduction of new pest animals",
+            "Pest - Predation",
+            "Pollution - Chemical",
+            "Pollution - Eutrophication/algal blooms",
+            "Pollution - Inappropriate waste disposal",
+            "Pollution - Sediment ",
+            "Population size/range - Low habitat area",
+            "Population size/range - Low population numbers",
+            "Weeds - Competition",
+            "Weeds - Introduction of new weed",
+            "Weeds - Spread of weeds from surrounding areas"
+        ],
+        "navigationMode": "returnToProject",
+        "priorityPlaces": [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
+        ],
+        "supportsParatoo": true,
+        "supportsMeriPlanHistory": true
+    };
+
+
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Priority Threatened Species Primary"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "EPBC Species",
+        "category": "Threatened Species",
+        "type": "primary",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - The trajectory of species targeted under the Threatened Species Action Plan 2022-2032 and other EPBC Act listed Species is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Threatened Ecological Communities"
+            }
+        ],
+        "shortDescription": "Threatened Ecological Communities",
+        "category": "Threatened Ecological Communities",
+        "type": "secondary",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Ecological Communities (TECs) and priority places - The condition of targeted EPBC Act listed Threatened Ecological Communities and identified priority places under the Threatened Species Action Plan 2022-2032 is improved"
+    },
+    {
+        "type": "short",
+        "category": "Gamba Grass Area",
+        "outcome": "1. Gamba Grass is reduced to an area less than its 2022 range"
+    },
+    {
+        "type": "short",
+        "category": "First Nations Recovery Activities",
+        "outcome": "2. First Nations-led recovery activities for threatened species and ecological communities are increased"
+    }
+];
+
+var priorities = [
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gamba Grass (Andropogon gayanus)"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Arnhem Plateau sandstone shrubland complex"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Kakadu and West Arnhem"
+    }
+];
+
+
+//Create the parent program
+let programName = "Saving Native Species";
+var parent = createOrFindProgram(programName);
+var subprograms = ["Gamba Grass Control"]
+
+subprograms.forEach(function (subProgram){
+    createOrFindProgram(subProgram, parent._id);
+});
+
+subprograms.forEach(function (subprogram){
+    var program = db.program.find({name: subprogram});
+    while(program.hasNext()){
+        var p = program.next();
+        print("sub program ID: " + p.programId)
+        db.program.updateOne({programId:p.programId}, {$set:{config:config, outcomes:outcomes, priorities:priorities}});
+        useNhtServiceLabels(p.name);
+    }
+});
+
diff --git a/src/main/scripts/releases/3.1/adhoc/createLandscapeRepairProgramSubProgram.js b/src/main/scripts/releases/3.1/adhoc/createLandscapeRepairProgramSubProgram.js
new file mode 100644
index 000000000..b02ef9a60
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/createLandscapeRepairProgramSubProgram.js
@@ -0,0 +1,123 @@
+load('../../../utils/uuid.js');
+load('../../../utils/program.js');
+
+var program = db.program.findOne({name: "Reef Trust"});
+var subprograms = ["Landscape Repair Program – Procurement", "Landscape Repair Program – Grants"]
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Ecological health"
+            }
+        ],
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Improve water quality in the Great Barrier Reef by reducing fine sediment."
+    },
+    {
+        "priorities": [
+            {
+                "category": "Ecological health"
+            }
+        ],
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Improve water quality in the Great Barrier Reef by reducing dissolved inorganic nitrogen from agricultural sources."
+    },
+    {
+        "priorities": [
+            {
+                "category": "Ecological health"
+            }
+        ],
+
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Improve water quality in the Great Barrier Reef by reducing particulate phosphorus from agricultural sources."
+    },
+    {
+        "priorities": [
+            {
+                "category": "Ecological health"
+            }
+        ],
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Improve water quality in the Great Barrier Reef by reducing particulate nitrogen from agricultural sources."
+    }
+];
+
+var priorities = [
+    {
+        "category": "Ecological health",
+        "priority": "Great Barrier Reef"
+    }
+];
+
+var reports = [
+    {
+        reportType: 'Activity',
+        reportDescriptionFormat: 'Year %5$s - %6$s %7$d Outputs Report',
+        reportNameFormat: 'Year %5$s - %6$s %7$d Outputs Report',
+        reportingPeriodInMonths: 6,
+        description: '',
+        minimumReportDurationInDays: 1,
+        label: 'Semester',
+        reportsAlignedToCalendar: true,
+        category: 'Outputs Reporting',
+        activityType: 'NHT Output Report',
+        canSubmitDuringReportingPeriod: true
+    },
+    {
+        firstReportingPeriodEnd: '2024-06-30T14:00:00Z',
+        reportType: 'Administrative',
+        reportDescriptionFormat: 'Annual Progress Report %2$tY - %3$tY for %4$s',
+        reportNameFormat: 'Annual Progress Report %2$tY - %3$tY',
+        reportingPeriodInMonths: 12,
+        description: 'This report is still being developed.  _Please do not commence reporting until the new report is ready for use._',
+        minimumReportDurationInDays: 1,
+        label: 'Annual',
+        category: 'Annual Progress Reporting',
+        activityType: 'NHT Annual Report'
+    },
+    {
+        reportDescriptionFormat: 'Outcomes Report 1 for %4$s',
+        reportingPeriodInMonths: 36,
+        multiple: false,
+        description: 'This report is still being developed.  _Please do not commence reporting until the new report is ready for use._',
+        maximumOwnerDurationInMonths: 35,
+        label: 'Outcomes Report 1',
+        alignToOwnerStart: true,
+        reportType: 'Single',
+        minimumOwnerDurationInMonths: null,
+        reportNameFormat: 'Outcomes Report 1',
+        alignToOwnerEnd: true,
+        category: 'Outcomes Report 1',
+        reportsAlignedToCalendar: false,
+        activityType: 'NHT Outcomes 1 Report'
+    },
+    {
+        reportType: 'Single',
+        reportDescriptionFormat: 'Outcomes Report 1 for %4$s',
+        minimumOwnerDurationInMonths: 36,
+        reportNameFormat: 'Outcomes Report 1',
+        reportingPeriodInMonths: 36,
+        multiple: false,
+        maximumOwnerDurationInMonths: 72,
+        description: 'This report is still being developed.  _Please do not commence reporting until the new report is ready for use._',
+        label: 'Outcomes Report 1',
+        category: 'Outcomes Report 1',
+        activityType: 'NHT Outcomes 1 Report'
+    }
+];
+for (var i = 0; i < subprograms.length; i++) {
+    var subprogram = subprograms[i];
+    var mintedSubprogram = createOrFindProgram(subprogram, program._id, "Recovery Actions for Species and Landscapes")
+
+    if (subprogram == "Landscape Repair Program – Procurement") {
+        db.program.updateOne({programId: mintedSubprogram.programId}, {$set: {"config.projectReports": reports, outcomes: outcomes, priorities: priorities}});
+    }
+    else if (subprogram === "Landscape Repair Program – Grants") {
+        db.program.updateOne({programId: mintedSubprogram.programId}, {$set: {"config.projectReports": [], outcomes: outcomes, priorities: priorities}});
+    }
+}
\ No newline at end of file
diff --git a/src/main/scripts/releases/3.1/adhoc/createNrmProcurements2024SubProgram.js b/src/main/scripts/releases/3.1/adhoc/createNrmProcurements2024SubProgram.js
new file mode 100644
index 000000000..e59d80b9b
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/createNrmProcurements2024SubProgram.js
@@ -0,0 +1,2060 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/program.js');
+var userId = '';
+
+const serviceFormName = "NHT Output Report";
+const annualReportFormName = "NHT Annual Report";
+const outcomes1ReportFormName = "NHT Outcomes 1 Report";
+const outcomes2ReportFormName = "NHT Outcomes 2 Report";
+
+var config =
+    {
+        "excludes": [],
+        "programServiceConfig": {
+            "serviceFormName": serviceFormName,
+            "programServices": [
+                {
+                    "serviceTargets": [
+                        "c3276929-b8a9-4985-a329-49b86f14018c"
+                    ],
+                    "serviceId": 1
+                },
+                {
+                    "serviceTargets": [
+                        "69deaaf9-cdc2-439a-b684-4cffdc7f224e"
+                    ],
+                    "serviceId": 2
+                },
+                {
+                    "serviceTargets": [
+                        "1f8161bc-908b-4ec8-ab7f-edac973a657d",
+                        "88908921-1248-4a7c-b185-51c625c737e3",
+                        "fe9f1a6c-e614-489a-80fa-4d6d76f1cf95"
+                    ],
+                    "serviceId": 3
+                },
+                {
+                    "serviceTargets": [
+                        "aa0c6b29-285e-4344-987e-dfeaf1d95648",
+                        "a9d98baa-b2ab-4428-82cf-d96185e63aa6",
+                        "c4ea5ce3-4a70-4df8-aff7-ffa929e7df61"
+                    ],
+                    "serviceId": 4
+                },
+                {
+                    "serviceTargets": [
+                        "55d76c03-c89d-40fe-867b-93f7a48ff9c1",
+                        "3cbf653f-f74c-4066-81d2-e3f78268185c",
+                        "3855d565-3b77-497b-90af-addb271aa598",
+                        "5dbfb32a-5933-4d8a-9937-41f350fb5f75"
+                    ],
+                    "serviceId": 5
+                },
+                {
+                    "serviceTargets": [
+                        "22771c0d-8403-433b-b468-e36dc16a1d21",
+                        "675cc878-eb80-435f-a841-d89b657fb2e3",
+                        "dd9f8fd4-b6c7-4f09-bbbf-5d721afc7677",
+                        "6f3cb6ab-5c6a-49be-9af9-9226fa751725"
+                    ],
+                    "serviceId": 7
+                },
+                {
+                    "serviceTargets": [
+                        "e0b4cc3e-e94a-4c97-81dc-a4cb868c2cc3",
+                        "b0bcfc54-76fa-4659-accf-276c18b50c31"
+                    ],
+                    "serviceId": 8
+                },
+                {
+                    "serviceTargets": [
+                        "9416c9f4-48ca-4bd1-8822-cd45ebb56c58",
+                        "2409e649-2ee2-47fd-9e76-ef2ffa07a5e7",
+                        "d58f8dba-109d-4179-b130-a888cd3d303c",
+                        "01686d38-9165-4497-9648-627ef81945a7"
+                    ],
+                    "serviceId": 9
+                },
+                {
+                    "serviceTargets": [
+                        "0e2f8d61-b7b4-4d2d-b07c-4fc20bbe326a",
+                        "bb506258-e907-43d3-99bd-0fe0400f654e"
+                    ],
+                    "serviceId": 10
+                },
+                {
+                    "serviceTargets": [
+                        "3c83e639-9c19-4b31-a86f-9d2d5e78123b",
+                        "e901be5e-8336-432e-b164-f278abd7430b"
+                    ],
+                    "serviceId": 12
+                },
+                {
+                    "serviceTargets": [
+                        "5557288b-190e-4a3f-a60b-4bdff6ca8fe8",
+                        "902df7a8-92f6-420d-9544-47d4b8cf31ca"
+                    ],
+                    "serviceId": 13
+                },
+                {
+                    "serviceTargets": [
+                        "9deb3edf-50c7-4b04-a1fb-d1451eadf641",
+                        "360c8b86-360c-4ca3-b1aa-626be56f2b11"
+                    ],
+                    "serviceId": 14
+                },
+                {
+                    "serviceTargets": [
+                        "7c30bc26-829e-4080-8059-27af9285113b",
+                        "158a5544-78e3-4d00-9f1b-62a85a938268"
+                    ],
+                    "serviceId": 15
+                },
+                {
+                    "serviceTargets": [
+                        "4aa201ec-2066-40e1-a457-99daa569c8e2",
+                        "f46f096a-a274-426b-adad-702e7cf8fab7",
+                        "3b1403f3-139a-4206-b325-62ebfe05ddc4",
+                        "7cb13c22-3dcd-43e7-808d-e0e26f5c090d"
+                    ],
+                    "serviceId": 16
+                },
+                {
+                    "serviceTargets": [
+                        "5c6db4c1-7fde-452e-8735-e52842fe6217",
+                        "41cb1e2c-59bc-4639-8bf7-fe0f528e006e"
+                    ],
+                    "serviceId": 18
+                },
+                {
+                    "serviceTargets": [
+                        "4f71e00a-2d80-488d-9ce4-947e60589149",
+                        "69a2ffba-41e9-406e-8ea4-5bdeee92cbde"
+                    ],
+                    "serviceId": 42
+                },
+                {
+                    "serviceTargets": [
+                        "26ea592f-ee39-4e6e-b6af-5b53fb1a5675"
+                    ],
+                    "serviceId": 17
+                },
+                {
+                    "serviceTargets": [
+                        "3587a984-68f9-4db3-b5af-49f265d853e0",
+                        "9d2d01be-b517-4be2-a225-8b1c887e016e"
+                    ],
+                    "serviceId": 19
+                },
+                {
+                    "serviceTargets": [
+                        "d0516817-5acb-46bd-9871-2696c245bad0",
+                        "7fed132d-6a38-448c-b519-381ab9e1e027",
+                        "e08dda14-360c-4b66-b8c5-eb0269c5aa44",
+                        "f3671aa7-773f-447d-9649-ba7f11dbe97a"
+                    ],
+                    "serviceId": 20
+                },
+                {
+                    "serviceTargets": [
+                        "5ab2b539-a5b4-40da-a556-a2c18066345b",
+                        "36410625-05f3-42d3-b04f-a3b268498ee1"
+                    ],
+                    "serviceId": 23
+                },
+                {
+                    "serviceTargets": [
+                        "0162246b-13fd-40c9-ae26-fb767eee76f8"
+                    ],
+                    "serviceId": 24
+                },
+                {
+                    "serviceTargets": [
+                        "b9e710e4-7dd3-4acc-ac2c-c69f4bcb9787",
+                        "00934509-f102-4d39-a043-7547a8ab9ac8",
+                        "1021bec7-3836-4b33-90b4-76701efd4fe3",
+                        "4dad393e-cbf7-43dd-87bb-62ea8f8afcdd"
+                    ],
+                    "serviceId": 26
+                },
+                {
+                    "serviceTargets": [
+                        "a516c78d-740f-463b-a1ce-5b02b8c82dd3",
+                        "4cbcb2b5-45cd-42dc-96bf-a9a181a4865b",
+                        "fbc45154-1d60-4f5e-a484-fdff514f9d51",
+                        "85191c99-f56d-46e6-9311-a58c1f37965d"
+                    ],
+                    "serviceId": 27
+                },
+                {
+                    "serviceTargets": [
+                        "3cfa82aa-0b38-49c0-be37-0fa61b5b6e3c",
+                        "91e90861-3ba7-4257-a765-6cab24c6f58a"
+                    ],
+                    "serviceId": 28
+                },
+                {
+                    "serviceTargets": [
+                        "96be68cf-783d-452a-b8fd-3832163f95db",
+                        "e70c70fd-4f31-41dc-a4b4-07f79efc3055"
+                    ],
+                    "serviceId": 29
+                },
+                {
+                    "serviceTargets": [
+                        "598bd978-0907-4cad-a7a6-ec5a8a8bbdc4",
+                        "d29bd931-1dd1-47c4-b456-c175099ff1df"
+                    ],
+                    "serviceId": 30
+                },
+                {
+                    "serviceTargets": [
+                        "6db1ebd7-92c5-49f2-98b7-2faa700fd752",
+                        "524d93b4-5cd1-4d0d-b1f8-d393028220ad"
+                    ],
+                    "serviceId": 31
+                },
+                {
+                    "serviceTargets": [
+                        "8040931a-2e6c-41be-9e92-f1035093b2ac",
+                        "5d652e6e-b719-45bf-8ae6-e9f293c24a92"
+                    ],
+                    "serviceId": 32
+                },
+                {
+                    "serviceTargets": [
+                        "f74182bd-7a53-4157-aeb9-eda281bb0234",
+                        "e7b7bb1e-66c2-4140-90f9-9534aa46ffa3"
+                    ],
+                    "serviceId": 33
+                },
+                {
+                    "serviceTargets": [
+                        "15615a70-ee60-46b8-b5e9-b33d4d88de6b",
+                        "d8dc153b-da23-4f7b-947a-89bc98338d6d",
+                        "5f762c6d-4f42-4458-9855-03c6896959c1",
+                        "5885f105-fc7d-43fd-8c26-c72938a95b76"
+                    ],
+                    "serviceId": 34
+                },
+                {
+                    "serviceTargets": [
+                        "dea1ff8b-f4eb-4987-8073-500bbbf97fcd",
+                        "fba17df1-d5cb-4643-987f-0626055b3c78"
+                    ],
+                    "serviceId": 35
+                },
+                {
+                    "serviceTargets": [
+                        "3ec07754-4a7a-46fb-a76d-553921781716",
+                        "fbc2dab8-7454-40f9-94f6-6bf258fcefff",
+                        "7186e284-0cb2-418e-a8cc-4343eb618140"
+                    ],
+                    "serviceId": 36
+                },
+                {
+                    "serviceTargets": [
+                        "3d06b150-bb86-47dc-8ad8-c33a51c3e3b3"
+                    ],
+                    "serviceId": 43
+                },
+                {
+                    "serviceTargets": [
+                        "b8304577-afd8-45e0-8ef4-b71ae10998f5"
+                    ],
+                    "serviceId": 44
+                }
+            ]
+
+        },
+        "visibility": "public",
+        "declarationPageType": "rdpReportDeclaration",
+        "requiresActivityLocking": true,
+        "supportsMeriPlanComparison": true,
+        "projectTemplate": "rlp",
+        "activityPeriodDescriptor": "Outputs report #",
+        "supportsParatoo": true,
+        "emailTemplates": {
+            "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
+            "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
+            "planApprovedEmailTemplate": "RLP_PLAN_APPROVED_EMAIL_TEMPLATE",
+            "planReturnedEmailTemplate": "RLP_PLAN_RETURNED_EMAIL_TEMPLATE",
+            "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
+            "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
+        },
+        "meriPlanTemplate": "configurableMeriPlan",
+        "riskAndThreatTypes": [
+            "Performance",
+            "Work Health and Safety",
+            "People resources",
+            "Financial",
+            "External stakeholders",
+            "Natural Environment"
+        ],
+        "projectReports": [
+            {
+                "reportType": "Activity",
+                "reportsAlignedToCalendar": true,
+                "reportDescriptionFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportNameFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportingPeriodInMonths": 3,
+                "description": "",
+                "category": "Outputs Reporting",
+                "activityType": serviceFormName,
+                "canSubmitDuringReportingPeriod": true,
+                "label": "Quarter",
+                "minimumReportDurationInDays": 1
+
+            },
+            {
+                "firstReportingPeriodEnd": "2024-06-30T14:00:00Z",
+                "reportType": "Administrative",
+                "reportDescriptionFormat": "Annual Progress Report %2$tY - %3$tY for %4$s",
+                "reportNameFormat": "Annual Progress Report %2$tY - %3$tY",
+                "reportingPeriodInMonths": 12,
+                "category": "Annual Progress Reporting",
+                "activityType": annualReportFormName,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "label": "Annual",
+                "minimumReportDurationInDays": 1
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "minimumOwnerDurationInMonths": null,
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 36,
+                "alignToOwnerStart":true,
+                "alignToOwnerEnd":true,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "maximumOwnerDurationInMonths": 35,
+                "category": "Outcomes Report 1",
+                "reportsAlignedToCalendar": false,
+                "activityType": outcomes1ReportFormName,
+                "label":"Outcomes Report 1"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "minimumOwnerDurationInMonths": 36,
+                "maximumOwnerDurationInMonths": 47,
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 24,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "category": "Outcomes Report 1",
+                "activityType": outcomes1ReportFormName,
+                "label": "Outcomes Report 1"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 36,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "minimumOwnerDurationInMonths": 48,
+                "calendarAlignmentMonth": 7,
+                "category": "Outcomes Report",
+                "reportsAlignedToCalendar": true,
+                "activityType": outcomes1ReportFormName,
+                "label": "Outcomes Report 1"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 2 for %4$s",
+                "minimumOwnerDurationInMonths": 36,
+                "reportNameFormat": "Outcomes Report 2",
+                "alignToOwnerStart":true,
+                "alignToOwnerEnd":true,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "category": "Outcomes Report 2",
+                "activityType": outcomes2ReportFormName,
+                "label": "Outcomes Report 2"
+            }
+        ],
+        "navigationMode": "returnToProject",
+        "supportsMeriPlanHistory": true,
+        "requireMeritAdminToReturnMeriPlan":true,
+        "meriPlanContents": [
+            {
+                "template": "name",
+                "model": {
+                    "tableFormatting": true
+                }
+            },
+            {
+                "template": "priorityPlace",
+                "model": {
+                    "priorityPlaceLabel":"Does this project directly support a priority place?",
+                    "priorityPlaceHelpText":"Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species."
+                }
+            },
+            {
+                "template": "indigenousInvolvement"
+            },
+            {
+                "template": "description",
+                "model": {
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
+                }
+            },
+            {
+                "template": "programOutcome",
+                "model": {
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
+                }
+            },
+            {
+                "template": "additionalOutcomes",
+                "model": {
+                    "title": "Additional benefits",
+                    "helpTextHeading":"If the project is not delivering additional benefits, delete the row using the 'x' in the right-most column.",
+                    "outcomePriority":"Additional outcome/s",
+                    "priority":"Additional Investment Priorities",
+                    "priorityHelpText":"Other investment priorities that will benefit from the project.  Delete the row if there are no additional outcomes."
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "mid",
+                    "subtitle": "Medium-term outcome statement/s",
+                    "title": "Project Outcomes",
+                    "extendedOutcomes": true,
+                    "helpText":"Projects more than 3 years in duration must set medium-term Project outcomes achievable at project completion. Ensure proposed outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "minimumNumberOfOutcomes": 0
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "extendedKeyThreats",
+                "model": {
+                    "title":"Key threat(s) and/or key threatening processes",
+                    "threatHelpText":"Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText":"Describe the proposed method to address the threat or threatening process",
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables"
+                }
+            },
+            {
+                "template": "projectMethodology",
+                "model": {
+                    "maxSize": "4000",
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])",
+                    "helpText": "Include all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic."
+                }
+            },
+            {
+                "template": "projectPartnerships",
+                "model": {
+                    "helpTextPartnerName":"Insert name of project partner. To be a project partner, they need to be actively involved in the planning or delivery of the project",
+                    "helpTextHeading":"Note: Not limited to key subcontractors."
+                }
+            },
+            {
+                "template": "extendedBaselineMonitoring",
+                "model": {
+                    "approachHeading": "Monitoring method",
+                    "indicatorHeading": "Monitoring methodology",
+                    "baselineDataHelpText": "Existing baseline data needs to be based on best practice methods and be compatible with the EMSA protocols.",
+                    "baselineDataDescriptionHelpText": "Describe the project baseline to be established, or the baseline data that currently exists",
+                    "baselineServiceHelpText": "Select the relevant Project Service(s)/Target measure(s) that will be used to support the development of the baseline",
+                    "monitoringServiceHelpText": "Select the relevant Project Services(s)/Target measure(s) that will be used to support ongoing monitoring",
+                    "baselineMethodHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "approachHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "titleHelpText": "Describe the Project Baseline(s) and ongoing monitoring which will be used to report progress towards this projects outcome(s).  Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "newIndicatorText": "New monitoring indicator",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance"
+                }
+            },
+            {
+                "template": "projectReview",
+                "model": {
+                    "title": "Project review, improvement and evaluation methodology and approach (3000 character limit [approximately 500 words])"
+                }
+            },
+            {
+                "template": "nationalAndRegionalPlans",
+                "model": {
+                    "includeUrl": true,
+                    "headingTitle": "Conservation and management plans"
+                }
+            },
+            {
+                "template": "serviceOutcomeTargets",
+                "model": {
+                    "title": "Project services and targets",
+                    "serviceName": "Service",
+                    "titleHelpText":"Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                }
+            },
+            {
+                "template": "serviceForecasts",
+                "excludedModes":["PRINT"],
+                "model": {
+                    "titleHelpText":"Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                }
+
+            }
+        ],
+        keyThreatCodes: [
+            'Climate Change - Changed flooding regime',
+            'Climate Change - Changed rainfall patterns',
+            'Climate Change - Sea level rises',
+            'Climate Change - Unexpected seasonal/temperature extremes',
+            'Disease/pathogens - Areas that are infected',
+            'Disease/pathogens - Possible infection of disease free areas',
+            'Fire - Inappropriate fire regime',
+            'Fire - Lack of protection for ecological assets during fire control activities',
+            'Genetics - Bottleneck/inbreeding',
+            'Habitat loss - Breeding place disturbance',
+            'Habitat loss - Dieback/senescence',
+            'Habitat loss - Feeding habitat loss/interference',
+            'Habitat loss - Habitat fragmentation',
+            'Habitat loss - Land clearing',
+            'Habitat loss - Loss of critical ecosystem service supporting habitat',
+            'Human interference - Fish and harvesting aquatic resources (commercial)',
+            'Human interference - Flow-on effects of housing development',
+            'Human interference - Illegal activities',
+            'Human interference - Industrial development',
+            'Human interference - Land use intensification',
+            'Human interference - Recreational fishing',
+            'Human interference - Recreational pressures',
+            'Human interference - Road/vehicle strike',
+            'Land management practices - Changes to hydrology and aquatic systems',
+            'Land management practices - Domestic grazing/stock impacts',
+            'Land management practices - Excess recharge of groundwater',
+            'Land management practices - Excess use (or over-use) of surface water or groundwater resources',
+            'Land management practices - Excessive fertiliser use',
+            'Land management practices - Inappropriate ground cover management',
+            'Land management practices - Runoff',
+            'Native fauna - Competition',
+            'Native fauna - Predation',
+            'Pest - Competition/exclusion',
+            'Pest - Disease transmission',
+            'Pest - Habitat degradation',
+            'Pest - Introduction of new pest animals',
+            'Pest - Predation',
+            'Pollution - Chemical',
+            'Pollution - Eutrophication/algal blooms',
+            'Pollution - Inappropriate waste disposal',
+            'Pollution - Sediment ',
+            'Population size/range - Low habitat area',
+            'Population size/range - Low population numbers',
+            'Weeds - Competition',
+            'Weeds - Introduction of new weed',
+            'Weeds - Spread of weeds from surrounding areas'
+        ],
+        priorityPlaces: [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
+        ]
+
+    };
+
+
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Priority Threatened Species Primary"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "EPBC Species",
+        "category": "Threatened Species",
+        "outcome": "1. The trajectory of species targeted under the Threatened Species Action Plan 2022-2032 and other EPBC Act listed Species is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Priority Threatened Species Primary"
+            }
+        ],
+        "shortDescription": "New extinctions",
+        "category": "Threatened Species",
+        "outcome": "2. New extinctions of plants and animals are prevented"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Threatened Ecological Communities"
+            }
+        ],
+        "shortDescription": "Threatened Ecological Communities",
+        "category": "Threatened Ecological Communities",
+        "outcome": "3. The condition of targeted EPBC Act listed Threatened Ecological Communities and identified priority places under the Threatened Species Action Plan 2022-2032 is improved"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Targeted threatened species (TS) are on track for improved trajectory"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "2.  Species and Landscapes (Medium term): Threatened species - Species at high risk of imminent extinction are identified and supported to persist"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "3.  Species and Landscapes (Medium term): Threatened species - Priority species are being assisted to strengthen reliance and adaptive capacity for climate change"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "4.  Species and Landscapes (Medium term): Threatened species - Increased leadership and/or participation of First Nations people in the management and recovery of threatened species"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "5.  Species and Landscapes (Medium term): Threatened Ecological Communities and priority places - The implementation of priority actions is leading to an improvement in the condition of targeted TECs and priority places"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "6.  Species and Landscapes (Medium term): Threatened Ecological Communities and priority places - Resilience to climate change and extreme events has been increased"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "7.  Species and Landscapes (Medium term): Threatened Ecological Communities and priority places - Increased leadership and/or participation of First Nations people in the management and recovery of threatened ecological communities and priority places"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Managing Threats - Pest predator an competitor species have been controlled or are under active, long-term control programs"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "2.  Species and Landscapes (Short term): Managing Threats - Threats from disease have been contained, reduced or excluded"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "3.  Species and Landscapes (Short term): Improving habitat - Land management practices have improved"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "4.  Species and Landscapes (Short term): Improving habitat - Quality of (TS/TECs) habitat has improved"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "5.  Species and Landscapes (Short term): Improving habitat - Area/Extent of (TS/TECs) habitat has increased"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "6.  Species and Landscapes (Short term): Improving habitat - Increased connectivity between patches"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "7.  Species and Landscapes (Short term): Improving habitat - Quality of breeding and foraging habitat is improved   "
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "8.  Species and Landscapes (Short term): Creating insurance populations - Existing populations have been protected"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "9.  Species and Landscapes (Short term): Creating insurance populations - Re-introductions have enhanced wild populations"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "10.  Species and Landscapes (Short term): Climate adaption and resilience - Climate change resilience and adaptive capacity actions underway"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "11.  Species and Landscapes (Short term): First Nations People and community involvement - First Nations people are leading and/or participating in recovery activities"
+    }
+];
+
+var priorities = [
+    {
+        "category": "Plants",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Plants",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Plants",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Birds",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Birds",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Plants",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Plants",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Target 3",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Birds",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Plants",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Plants",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Birds",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Plants",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Plants",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Fish",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Plants",
+        "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gorge Rice-flower, Pimelea cremnophila"
+    },
+    {
+        "category": "Plants",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Fish",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Birds",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Birds",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Plants",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Leaf-Scaled Seasnake – Aipysurus foliosquama"
+    },
+    {
+        "category": "Plants",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Plants",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Birds",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Fish",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Fish",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Plants",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Mammals",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Target 3",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Birds",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Birds",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Birds",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Fish",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Fish",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Plants",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Plants",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Fish",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Fish",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Plants",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Plants",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Birds",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Frogs",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Target 3",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Birds",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Fish",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Target 3",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Alpine Sphagnum Bogs and Associated Fens"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Natural Temperate Grassland of the South Eastern Highlands"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "White Box-Yellow Box-Blakely's Red Gum Grassy Woodland and Derived Native Grassland"
+    }
+];
+
+let parentProgram = "Saving Koalas Fund";
+var subprograms = ["NRM Procurements 2024"]
+
+var parent = db.program.find({name: parentProgram}).next();
+print(parent.programId)
+subprograms.forEach(function (subProgram){
+    var now = ISODate();
+    var p = {name: subProgram, programId: UUID.generate(), dateCreated: now, lastUpdate: now, parent: parent._id, status: "active"}
+    var program = db.program.find({name: subProgram})
+    if (!program.hasNext()) {
+        db.program.insertOne(p);
+    } else {
+        print("Program Already Exist: " + subProgram)
+    }
+});
+
+subprograms.forEach(function (subprogram){
+    var program = db.program.find({name: subprogram});
+    while(program.hasNext()){
+        var p = program.next();
+        db.program.updateOne({programId:p.programId}, {$set:{config:config, outcomes:outcomes, priorities:priorities}});
+    }
+});
+
+
diff --git a/src/main/scripts/releases/3.1/adhoc/createOMPGRoundFourSubProgram.js b/src/main/scripts/releases/3.1/adhoc/createOMPGRoundFourSubProgram.js
new file mode 100644
index 000000000..cbc82ed16
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/createOMPGRoundFourSubProgram.js
@@ -0,0 +1,1173 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/program.js');
+var userId = '';
+
+const serviceFormName = "NHT Output Report";
+const annualReportFormName = "NHT Annual Report";
+const outcomes1ReportFormName = "NHT Outcomes 1 Report";
+const outcomes2ReportFormName = "NHT Outcomes 2 Report";
+
+var config =
+    {
+        "meriPlanContents": [
+            {
+                "template": "name",
+                "model": {
+                    "tableFormatting": true
+                }
+            },
+            {
+                "template": "priorityPlace",
+                "model": {
+                    "priorityPlaceHelpText": "Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species.",
+                    "priorityPlaceLabel": "Does this project directly support a priority place?"
+                }
+            },
+            {
+                "template": "indigenousInvolvement"
+            },
+            {
+                "template": "description",
+                "model": {
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
+                }
+            },
+            {
+                "template": "programOutcome",
+                "model": {
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
+                }
+            },
+            {
+                "template": "additionalOutcomes",
+                "model": {
+                    "outcomePriority": "Additional outcome/s",
+                    "helpTextHeading": "If the project is not delivering additional benefits, delete the row using the 'x' in the right-most column.",
+                    "title": "Additional benefits",
+                    "priority": "Additional Investment Priorities",
+                    "priorityHelpText": "Other investment priorities that will benefit from the project.  Delete the row if there are no additional outcomes."
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "extendedKeyThreats",
+                "model": {
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "threatHelpText": "Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText": "Describe the proposed method to address the threat or threatening process",
+                    "title": "Key threat(s) and/or key threatening processes"
+                }
+            },
+            {
+                "template": "projectMethodology",
+                "model": {
+                    "helpText": "Include all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic.",
+                    "maxSize": "4000",
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])"
+                }
+            },
+            {
+                "template": "projectPartnerships",
+                "model": {
+                    "helpTextHeading": "Note: Not limited to key subcontractors.",
+                    "helpTextPartnerName": "Insert name of project partner. To be a project partner, they need to be actively involved in the planning or delivery of the project"
+                }
+            },
+            {
+                "template": "extendedBaselineMonitoring",
+                "model": {
+                    "approachHeading": "Monitoring method",
+                    "indicatorHeading": "Monitoring methodology",
+                    "monitoringServiceHelpText": "Select the relevant Project Services(s)/Target measure(s) that will be used to support ongoing monitoring",
+                    "baselineDataDescriptionHelpText": "Describe the project baseline to be established, or the baseline data that currently exists",
+                    "baselineMethodHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "baselineDataHelpText": "Existing baseline data needs to be based on best practice methods and be compatible with the EMSA protocols.",
+                    "approachHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "titleHelpText": "Describe the Project Baseline(s) and ongoing monitoring which will be used to report progress towards this projects outcome(s).  Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "baselineServiceHelpText": "Select the relevant Project Service(s)/Target measure(s) that will be used to support the development of the baseline",
+                    "newIndicatorText": "New monitoring indicator"
+                }
+            },
+            {
+                "template": "projectReview",
+                "model": {
+                    "title": "Project review, improvement and evaluation methodology and approach (3000 character limit [approximately 500 words])"
+                }
+            },
+            {
+                "template": "nationalAndRegionalPlans",
+                "model": {
+                    "includeUrl": true,
+                    "headingTitle": "Conservation and management plans"
+                }
+            },
+            {
+                "template": "serviceOutcomeTargets",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections",
+                    "title": "Project services and targets",
+                    "serviceName": "Service"
+                }
+            },
+            {
+                "template": "serviceForecasts",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                },
+                "excludedModes": [
+                    "PRINT"
+                ]
+            }
+        ],
+        "excludes": [],
+        "programServiceConfig": {
+            "serviceFormName": "NHT Output Report",
+            "programServices": [
+                {
+                    "serviceTargets": [
+                        "c3276929-b8a9-4985-a329-49b86f14018c"
+                    ],
+                    "serviceId": 1
+                },
+                {
+                    "serviceTargets": [
+                        "69deaaf9-cdc2-439a-b684-4cffdc7f224e"
+                    ],
+                    "serviceId": 2
+                },
+                {
+                    "serviceTargets": [
+                        "1f8161bc-908b-4ec8-ab7f-edac973a657d",
+                        "88908921-1248-4a7c-b185-51c625c737e3",
+                        "fe9f1a6c-e614-489a-80fa-4d6d76f1cf95"
+                    ],
+                    "serviceId": 3
+                },
+                {
+                    "serviceTargets": [
+                        "aa0c6b29-285e-4344-987e-dfeaf1d95648",
+                        "a9d98baa-b2ab-4428-82cf-d96185e63aa6",
+                        "c4ea5ce3-4a70-4df8-aff7-ffa929e7df61"
+                    ],
+                    "serviceId": 4
+                },
+                {
+                    "serviceTargets": [
+                        "55d76c03-c89d-40fe-867b-93f7a48ff9c1",
+                        "3cbf653f-f74c-4066-81d2-e3f78268185c",
+                        "3855d565-3b77-497b-90af-addb271aa598",
+                        "5dbfb32a-5933-4d8a-9937-41f350fb5f75"
+                    ],
+                    "serviceId": 5
+                },
+                {
+                    "serviceTargets": [
+                        "22771c0d-8403-433b-b468-e36dc16a1d21",
+                        "675cc878-eb80-435f-a841-d89b657fb2e3",
+                        "dd9f8fd4-b6c7-4f09-bbbf-5d721afc7677",
+                        "6f3cb6ab-5c6a-49be-9af9-9226fa751725"
+                    ],
+                    "serviceId": 7
+                },
+                {
+                    "serviceTargets": [
+                        "e0b4cc3e-e94a-4c97-81dc-a4cb868c2cc3",
+                        "b0bcfc54-76fa-4659-accf-276c18b50c31"
+                    ],
+                    "serviceId": 8
+                },
+                {
+                    "serviceTargets": [
+                        "9416c9f4-48ca-4bd1-8822-cd45ebb56c58",
+                        "2409e649-2ee2-47fd-9e76-ef2ffa07a5e7",
+                        "d58f8dba-109d-4179-b130-a888cd3d303c",
+                        "01686d38-9165-4497-9648-627ef81945a7"
+                    ],
+                    "serviceId": 9
+                },
+                {
+                    "serviceTargets": [
+                        "0e2f8d61-b7b4-4d2d-b07c-4fc20bbe326a",
+                        "bb506258-e907-43d3-99bd-0fe0400f654e"
+                    ],
+                    "serviceId": 10
+                },
+                {
+                    "serviceTargets": [
+                        "3c83e639-9c19-4b31-a86f-9d2d5e78123b",
+                        "e901be5e-8336-432e-b164-f278abd7430b"
+                    ],
+                    "serviceId": 12
+                },
+                {
+                    "serviceTargets": [
+                        "5557288b-190e-4a3f-a60b-4bdff6ca8fe8",
+                        "902df7a8-92f6-420d-9544-47d4b8cf31ca"
+                    ],
+                    "serviceId": 13
+                },
+                {
+                    "serviceTargets": [
+                        "9deb3edf-50c7-4b04-a1fb-d1451eadf641",
+                        "360c8b86-360c-4ca3-b1aa-626be56f2b11"
+                    ],
+                    "serviceId": 14
+                },
+                {
+                    "serviceTargets": [
+                        "7c30bc26-829e-4080-8059-27af9285113b",
+                        "158a5544-78e3-4d00-9f1b-62a85a938268"
+                    ],
+                    "serviceId": 15
+                },
+                {
+                    "serviceTargets": [
+                        "4aa201ec-2066-40e1-a457-99daa569c8e2",
+                        "f46f096a-a274-426b-adad-702e7cf8fab7",
+                        "3b1403f3-139a-4206-b325-62ebfe05ddc4",
+                        "7cb13c22-3dcd-43e7-808d-e0e26f5c090d"
+                    ],
+                    "serviceId": 16
+                },
+                {
+                    "serviceTargets": [
+                        "5c6db4c1-7fde-452e-8735-e52842fe6217",
+                        "41cb1e2c-59bc-4639-8bf7-fe0f528e006e"
+                    ],
+                    "serviceId": 18
+                },
+                {
+                    "serviceTargets": [
+                        "4f71e00a-2d80-488d-9ce4-947e60589149",
+                        "69a2ffba-41e9-406e-8ea4-5bdeee92cbde"
+                    ],
+                    "serviceId": 42
+                },
+                {
+                    "serviceTargets": [
+                        "26ea592f-ee39-4e6e-b6af-5b53fb1a5675"
+                    ],
+                    "serviceId": 17
+                },
+                {
+                    "serviceTargets": [
+                        "3587a984-68f9-4db3-b5af-49f265d853e0",
+                        "9d2d01be-b517-4be2-a225-8b1c887e016e"
+                    ],
+                    "serviceId": 19
+                },
+                {
+                    "serviceTargets": [
+                        "d0516817-5acb-46bd-9871-2696c245bad0",
+                        "7fed132d-6a38-448c-b519-381ab9e1e027",
+                        "e08dda14-360c-4b66-b8c5-eb0269c5aa44",
+                        "f3671aa7-773f-447d-9649-ba7f11dbe97a"
+                    ],
+                    "serviceId": 20
+                },
+                {
+                    "serviceTargets": [
+                        "5ab2b539-a5b4-40da-a556-a2c18066345b",
+                        "36410625-05f3-42d3-b04f-a3b268498ee1"
+                    ],
+                    "serviceId": 23
+                },
+                {
+                    "serviceTargets": [
+                        "0162246b-13fd-40c9-ae26-fb767eee76f8"
+                    ],
+                    "serviceId": 24
+                },
+                {
+                    "serviceTargets": [
+                        "b9e710e4-7dd3-4acc-ac2c-c69f4bcb9787",
+                        "00934509-f102-4d39-a043-7547a8ab9ac8",
+                        "1021bec7-3836-4b33-90b4-76701efd4fe3",
+                        "4dad393e-cbf7-43dd-87bb-62ea8f8afcdd"
+                    ],
+                    "serviceId": 26
+                },
+                {
+                    "serviceTargets": [
+                        "a516c78d-740f-463b-a1ce-5b02b8c82dd3",
+                        "4cbcb2b5-45cd-42dc-96bf-a9a181a4865b",
+                        "fbc45154-1d60-4f5e-a484-fdff514f9d51",
+                        "85191c99-f56d-46e6-9311-a58c1f37965d"
+                    ],
+                    "serviceId": 27
+                },
+                {
+                    "serviceTargets": [
+                        "3cfa82aa-0b38-49c0-be37-0fa61b5b6e3c",
+                        "91e90861-3ba7-4257-a765-6cab24c6f58a"
+                    ],
+                    "serviceId": 28
+                },
+                {
+                    "serviceTargets": [
+                        "96be68cf-783d-452a-b8fd-3832163f95db",
+                        "e70c70fd-4f31-41dc-a4b4-07f79efc3055"
+                    ],
+                    "serviceId": 29
+                },
+                {
+                    "serviceTargets": [
+                        "598bd978-0907-4cad-a7a6-ec5a8a8bbdc4",
+                        "d29bd931-1dd1-47c4-b456-c175099ff1df"
+                    ],
+                    "serviceId": 30
+                },
+                {
+                    "serviceTargets": [
+                        "6db1ebd7-92c5-49f2-98b7-2faa700fd752",
+                        "524d93b4-5cd1-4d0d-b1f8-d393028220ad"
+                    ],
+                    "serviceId": 31
+                },
+                {
+                    "serviceTargets": [
+                        "8040931a-2e6c-41be-9e92-f1035093b2ac",
+                        "5d652e6e-b719-45bf-8ae6-e9f293c24a92"
+                    ],
+                    "serviceId": 32
+                },
+                {
+                    "serviceTargets": [
+                        "f74182bd-7a53-4157-aeb9-eda281bb0234",
+                        "e7b7bb1e-66c2-4140-90f9-9534aa46ffa3"
+                    ],
+                    "serviceId": 33
+                },
+                {
+                    "serviceTargets": [
+                        "15615a70-ee60-46b8-b5e9-b33d4d88de6b",
+                        "d8dc153b-da23-4f7b-947a-89bc98338d6d",
+                        "5f762c6d-4f42-4458-9855-03c6896959c1",
+                        "5885f105-fc7d-43fd-8c26-c72938a95b76"
+                    ],
+                    "serviceId": 34
+                },
+                {
+                    "serviceTargets": [
+                        "dea1ff8b-f4eb-4987-8073-500bbbf97fcd",
+                        "fba17df1-d5cb-4643-987f-0626055b3c78"
+                    ],
+                    "serviceId": 35
+                },
+                {
+                    "serviceTargets": [
+                        "3ec07754-4a7a-46fb-a76d-553921781716",
+                        "fbc2dab8-7454-40f9-94f6-6bf258fcefff",
+                        "7186e284-0cb2-418e-a8cc-4343eb618140",
+                        "c7d0963e-2847-4f5f-8a1c-e149dfa4c9d1"
+                    ],
+                    "serviceId": 36
+                },
+                {
+                    "serviceTargets": [
+                        "3d06b150-bb86-47dc-8ad8-c33a51c3e3b3"
+                    ],
+                    "serviceId": 43
+                },
+                {
+                    "serviceTargets": [
+                        "b8304577-afd8-45e0-8ef4-b71ae10998f5"
+                    ],
+                    "serviceId": 44
+                }
+            ]
+        },
+        "visibility": "public",
+        "declarationPageType": "rdpReportDeclaration",
+        "requiresActivityLocking": true,
+        "supportsMeriPlanComparison": true,
+        "projectTemplate": "rlp",
+        "activityPeriodDescriptor": "Outputs report #",
+        "requireMeritAdminToReturnMeriPlan": true,
+        "emailTemplates": {
+            "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
+            "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
+            "planApprovedEmailTemplate": "RLP_PLAN_APPROVED_EMAIL_TEMPLATE",
+            "planReturnedEmailTemplate": "RLP_PLAN_RETURNED_EMAIL_TEMPLATE",
+            "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
+            "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
+        },
+        "meriPlanTemplate": "configurableMeriPlan",
+        "riskAndThreatTypes": [
+            "Performance",
+            "Work Health and Safety",
+            "People resources",
+            "Financial",
+            "External stakeholders",
+            "Natural Environment"
+        ],
+        "projectReports": [
+            {
+                "reportType": "Activity",
+                "reportDescriptionFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportNameFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportingPeriodInMonths": 3,
+                "description": "",
+                "minimumReportDurationInDays": 1,
+                "label": "Quarter",
+                "reportsAlignedToCalendar": true,
+                "category": "Outputs Reporting",
+                "activityType": "NHT Output Report",
+                "canSubmitDuringReportingPeriod": true
+            },
+            {
+                "firstReportingPeriodEnd": "2024-06-30T14:00:00Z",
+                "reportType": "Administrative",
+                "reportDescriptionFormat": "Annual Progress Report %2$tY - %3$tY for %4$s",
+                "reportNameFormat": "Annual Progress Report %2$tY - %3$tY",
+                "reportingPeriodInMonths": 12,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "minimumReportDurationInDays": 1,
+                "label": "Annual",
+                "category": "Annual Progress Reporting",
+                "activityType": "NHT Annual Report"
+            },
+            {
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "reportingPeriodInMonths": 36,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "maximumOwnerDurationInMonths": 35,
+                "label": "Outcomes Report 1",
+                "alignToOwnerStart": true,
+                "reportType": "Single",
+                "minimumOwnerDurationInMonths": null,
+                "reportNameFormat": "Outcomes Report 1",
+                "alignToOwnerEnd": true,
+                "category": "Outcomes Report 1",
+                "reportsAlignedToCalendar": false,
+                "activityType": "NHT Outcomes 1 Report"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "minimumOwnerDurationInMonths": 36,
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 24,
+                "multiple": false,
+                "maximumOwnerDurationInMonths": 47,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "label": "Outcomes Report 1",
+                "category": "Outcomes Report 1",
+                "activityType": "NHT Outcomes 1 Report"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "minimumOwnerDurationInMonths": 48,
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 36,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "calendarAlignmentMonth": 7,
+                "label": "Outcomes Report 1",
+                "category": "Outcomes Report",
+                "reportsAlignedToCalendar": true,
+                "activityType": "NHT Outcomes 1 Report"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 2 for %4$s",
+                "minimumOwnerDurationInMonths": 36,
+                "reportNameFormat": "Outcomes Report 2",
+                "multiple": false,
+                "alignToOwnerEnd": true,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "label": "Outcomes Report 2",
+                "category": "Outcomes Report 2",
+                "activityType": "NHT Outcomes 2 Report",
+                "alignToOwnerStart": true
+            }
+        ],
+        "keyThreatCodes": [
+            "Changes in Country - altered/disrupted connection with country",
+            "Changes in Country - altered/disrupted engagement or leadership in land and seas management",
+            "Changes in Country - altered/disrupted transfer of Changes in Country knowledge systems",
+            "Changes in Country - Inadequate recognition of Traditional knowledge and practices",
+            "Climate Change - Changed flooding regime",
+            "Climate Change - Changed rainfall patterns",
+            "Climate Change - Sea level rises",
+            "Climate Change - Unexpected seasonal/temperature extremes",
+            "Disconnection from Country - Altered/disrupted connection with land and sea country",
+            "Disconnection from Country - Altered or disrupted First Nations engagement/leadership in caring for land and sea country",
+            "Disconnection from Country - Altered or disrupted transfer of First Nations knowledge systems",
+            "Disconnection from Country - Inadequate recognition of Traditional knowledge and practices",
+            "Disengagement of community - Community are not informed and are not engaged in managing the environment",
+            "Disconnection of general community - Community are not awareness and are not engaged in managing the environment",
+            "Disease/pathogens - Areas that are infected",
+            "Disease/pathogens - Possible infection of disease free areas",
+            "Fire - Inappropriate fire regime",
+            "Fire - Lack of protection for ecological assets during fire control activities",
+            "Genetics - Bottleneck/inbreeding",
+            "Habitat loss - Breeding place disturbance",
+            "Habitat loss - Dieback/senescence",
+            "Habitat loss - Feeding habitat loss/interference",
+            "Habitat loss - Habitat fragmentation",
+            "Habitat loss - Land clearing",
+            "Habitat loss - Loss of critical ecosystem service supporting habitat",
+            "Human interference - Fish and harvesting aquatic resources (commercial)",
+            "Human interference - Flow-on effects of housing development",
+            "Human interference - Illegal activities",
+            "Human interference - Industrial development",
+            "Human interference - Land use intensification",
+            "Human interference - Recreational fishing",
+            "Human interference - Recreational pressures",
+            "Human interference - Road/vehicle strike",
+            "Land management practices - Changes to hydrology and aquatic systems",
+            "Land management practices - Domestic grazing/stock impacts",
+            "Land management practices - Excess recharge of groundwater",
+            "Land management practices - Excess use (or over-use) of surface water or groundwater resources",
+            "Land management practices - Excessive fertiliser use",
+            "Land management practices - Inappropriate ground cover management",
+            "Land management practices - Runoff",
+            "Native fauna - Competition",
+            "Native fauna - Predation",
+            "Pest - Competition/exclusion",
+            "Pest - Disease transmission",
+            "Pest - Habitat degradation",
+            "Pest - Introduction of new pest animals",
+            "Pest - Predation",
+            "Pollution - Chemical",
+            "Pollution - Eutrophication/algal blooms",
+            "Pollution - Inappropriate waste disposal",
+            "Pollution - Sediment ",
+            "Population size/range - Low habitat area",
+            "Population size/range - Low population numbers",
+            "Weeds - Competition",
+            "Weeds - Introduction of new weed",
+            "Weeds - Spread of weeds from surrounding areas"
+        ],
+        "navigationMode": "returnToProject",
+        "priorityPlaces": [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
+        ],
+        "supportsParatoo": true,
+        "supportsMeriPlanHistory": true
+    };
+
+
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Marine Park Networks"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Marine",
+        "category": "Marine",
+        "type": "primary",
+        "outcome": "Australian Marine Park Networks"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Marine Park Networks"
+            },
+            {
+                "category": "Marine Parks"
+            }
+        ],
+        "shortDescription": "New extinctions",
+        "category": "Threatened Species",
+        "type": "secondary",
+        "outcome": "1. Support Traditional Owners to maintain their traditional knowledge, cultural sites and values associated with Sea Country in Australian Marine Parks."
+    },
+    {
+        "priorities": [
+            {
+                "category": "Marine Park Networks"
+            },
+            {
+                "category": "Marine Parks"
+            }
+        ],
+        "shortDescription": "New extinctions",
+        "category": "Threatened Species",
+        "type": "secondary",
+        "outcome": "2. Enhance the capacity of Traditional Owners to engage in marine park management, including leading and participating in research and monitoring projects within Sea Country in Australian Marine Parks."
+    },
+    {
+        "priorities": [
+            {
+                "category": "Marine Park Networks"
+            },
+            {
+                "category": "Marine Parks"
+            }
+        ],
+        "shortDescription": "New extinctions",
+        "category": "Threatened Species",
+        "type": "secondary",
+        "outcome": "3. Develop and implement management solutions to help enhance the health, ecological resilience, and sustainable economic use of the Australian Marine Park network, including in the face of climate-related changes and other emerging pressures."
+    },
+    {
+        "priorities": [
+            {
+                "category": "Marine Park Networks"
+            },
+            {
+                "category": "Marine Parks"
+            }
+        ],
+        "shortDescription": "New extinctions",
+        "category": "Threatened Species",
+        "type": "secondary",
+        "outcome": "4. Support research and monitoring that aligns with Australian Marine Park science priorities and will help inform the 10-yearly statutory review processes for marine park management plans, and protection of marine park values."
+    },
+    {
+        "type": "short",
+        "category": "Australian Marine Park Networks",
+        "outcome": "1. Australian Marine Park Networks"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "2. Support Traditional Owners to maintain their traditional knowledge, cultural sites and values associated with Sea Country in Australian Marine Parks"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "3. Enhance the capacity of Traditional Owners to engage in marine park management, including leading and participating in research and monitoring projects within Sea Country in Australian Marine Parks"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "4. Develop and implement management solutions to help enhance the health, ecological resilience, and sustainable economic use of the Australian Marine Park network, including in the face of climate-related changes and other emerging pressures"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "5. Support research and monitoring that aligns with Australian Marine Park science priorities and will help inform the 10-yearly statutory review processes for marine park management plans, and protection of marine park values"
+    }
+];
+
+var priorities = [
+    {
+        "category": "Priority Threatened Species Primaryy",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gorge Rice-flower, Pimelea cremnophila"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Marine Parks Network",
+        "priority": "South-west Marine Parks Network"
+    },
+    {
+        "category": "Marine Parks Network",
+        "priority": "North-west Marine Parks Network"
+    },
+    {
+        "category": "Marine Parks Network",
+        "priority": "North Marine Parks Network"
+    },
+    {
+        "category": "Marine Parks Network",
+        "priority": "Coral Sea Marine Park"
+    },
+    {
+        "category": "Marine Parks Network",
+        "priority": "Temperate East Marine Parks Network"
+    },
+    {
+        "category": "Marine Parks Network",
+        "priority": "South-east Marine Parks Network"
+    },
+    {
+        "category": "Marine Parks Network",
+        "priority": "Indian Ocean Territories Marine Parks"
+    },
+    {
+        "category": "Marine Parks Network",
+        "priority": "National"
+    }
+];
+
+
+//Create the parent program
+let programName = "Our Marine Parks Grants";
+var parent = createOrFindProgram(programName);
+var subprograms = ["OMPG - Round Four"]
+
+subprograms.forEach(function (subProgram){
+    createOrFindProgram(subProgram, parent._id);
+});
+
+subprograms.forEach(function (subprogram){
+    var program = db.program.find({name: subprogram});
+    while(program.hasNext()){
+        var p = program.next();
+        print("sub program ID: " + p.programId)
+        db.program.updateOne({programId:p.programId}, {$set:{config:config, outcomes:outcomes, priorities:priorities}});
+        useNhtServiceLabels(p.name);
+    }
+});
+
diff --git a/src/main/scripts/releases/3.1/adhoc/createOrganisations.js b/src/main/scripts/releases/3.1/adhoc/createOrganisations.js
new file mode 100644
index 000000000..9b6dc6314
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/createOrganisations.js
@@ -0,0 +1,48 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/organisations.js');
+
+const adminUserId = '<system>'
+const names = ['Northern Tablelands Local Land Services', 'Hunter Local Land Services', 'Riverina Local Land Services', 'North Coast Local Land Services'];
+
+const abn = '57876455969';
+const config = {
+    "organisationReports": [
+        {
+            "reportType": "Administrative",
+            "reportDescriptionFormat": "Regional capacity services report %d for %4$s",
+            "reportNameFormat": "Regional capacity report %d",
+            "reportingPeriodInMonths": 3,
+            "minimumReportDurationInDays": 1,
+            "label": "Quarterly",
+            "category": "Regional Capacity Services Reporting",
+            "activityType": "Regional Capacity Services Report",
+            "periodStart": "2023-06-30T14:00:00Z",
+            "periodEnd": "2028-06-30T13:59:59Z"
+        },
+        {
+            "firstReportingPeriodEnd": "2024-06-30T14:00:00Z",
+            "reportType": "Administrative",
+            "reportDescriptionFormat": "Regional capacity annual report %d for %4$s",
+            "reportNameFormat": "Regional capacity annual report %d",
+            "reportingPeriodInMonths": 12,
+            "minimumReportDurationInDays": 1,
+            "description": "The Regional Capacity Services Annual Report is in development.  _Please do not commence annual reporting until the new report is ready for use._",
+            "label": "Annual",
+            "category": "Regional Capacity Services Annual Reporting",
+            "activityType": "Regional Capacity Services Annual Report",
+            "periodStart": "2023-06-30T14:00:00Z",
+            "periodEnd": "2028-06-30T13:59:59Z"
+        }
+    ]
+};
+for (let i=0; i<names.length; i++) {
+    let org = db.organisation.findOne({name:names[i]});
+    if (!org) {
+        let result = createOrganisation(names[i], 'TBA', abn, adminUserId);
+        print("Created "+names[i]+" with organisationId: "+result.organisationId);
+    }
+
+    db.organisation.updateOne({organisationId:org.organisationId}, {$set:{config:config}});
+
+}
diff --git a/src/main/scripts/releases/3.1/adhoc/createPriorityPlacesGrantsSubProgram.js b/src/main/scripts/releases/3.1/adhoc/createPriorityPlacesGrantsSubProgram.js
new file mode 100644
index 000000000..60db05ccd
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/createPriorityPlacesGrantsSubProgram.js
@@ -0,0 +1,642 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/program.js');
+var userId = '';
+
+const serviceFormName = "NHT Output Report";
+const annualReportFormName = "NHT Annual Report";
+const outcomes1ReportFormName = "NHT Outcomes 1 Report";
+const outcomes2ReportFormName = "NHT Outcomes 2 Report";
+
+var config =
+    {
+        "meriPlanContents": [
+            {
+                "template": "name",
+                "model": {
+                    "tableFormatting": true
+                }
+            },
+            {
+                "template": "priorityPlace",
+                "model": {
+                    "priorityPlaceHelpText": "Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species.",
+                    "priorityPlaceLabel": "Does this project directly support a priority place?"
+                }
+            },
+            {
+                "template": "indigenousInvolvement"
+            },
+            {
+                "template": "description",
+                "model": {
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
+                }
+            },
+            {
+                "template": "programOutcome",
+                "model": {
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "extendedKeyThreats",
+                "model": {
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "threatHelpText": "Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText": "Describe the proposed method to address the threat or threatening process",
+                    "title": "Key threat(s) and/or key threatening processes"
+                }
+            },
+            {
+                "template": "projectMethodology",
+                "model": {
+                    "helpText": "In addition to listing your project assumptions, please list any nominated project services that will not be charged for.\nInclude all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic.",
+                    "maxSize": "4000",
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])"
+                }
+            },
+            {
+                "template": "projectPartnerships",
+                "model": {
+                    "helpTextHeading": "Note: Not limited to key subcontractors.",
+                    "helpTextPartnerName": "Insert name of project partner. To be a project partner, they need to be actively involved in the planning or delivery of the project"
+                }
+            },
+            {
+                "template": "extendedBaselineMonitoring",
+                "model": {
+                    "approachHeading": "Monitoring method",
+                    "indicatorHeading": "Monitoring methodology",
+                    "monitoringServiceHelpText": "Select the relevant Project Services(s)/Target measure(s) that will be used to support ongoing monitoring",
+                    "baselineDataDescriptionHelpText": "Describe the project baseline to be established, or the baseline data that currently exists",
+                    "baselineMethodHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "baselineDataHelpText": "Existing baseline data needs to be based on best practice methods and be compatible with the EMSA protocols.",
+                    "approachHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "titleHelpText": "Describe the Project Baseline(s) and ongoing monitoring which will be used to report progress towards this projects outcome(s).  Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "baselineServiceHelpText": "Select the relevant Project Service(s)/Target measure(s) that will be used to support the development of the baseline",
+                    "newIndicatorText": "New monitoring indicator"
+                }
+            },
+            {
+                "template": "projectReview",
+                "model": {
+                    "title": "Project review, improvement and evaluation methodology and approach (3000 character limit [approximately 500 words])"
+                }
+            },
+            {
+                "template": "nationalAndRegionalPlans",
+                "model": {
+                    "includeUrl": true,
+                    "headingTitle": "Conservation and management plans"
+                }
+            },
+            {
+                "template": "serviceOutcomeTargets",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections",
+                    "title": "Project services and targets",
+                    "serviceName": "Service"
+                }
+            },
+            {
+                "template": "serviceForecasts",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                },
+                "excludedModes": [
+                    "PRINT"
+                ]
+            }
+        ],
+        "excludes": [],
+        "programServiceConfig": {
+            "serviceFormName": "NHT Output Report",
+            "programServices": [
+                {
+                    "serviceTargets": [
+                        "c3276929-b8a9-4985-a329-49b86f14018c"
+                    ],
+                    "serviceId": 1
+                },
+                {
+                    "serviceTargets": [
+                        "69deaaf9-cdc2-439a-b684-4cffdc7f224e"
+                    ],
+                    "serviceId": 2
+                },
+                {
+                    "serviceTargets": [
+                        "1f8161bc-908b-4ec8-ab7f-edac973a657d",
+                        "88908921-1248-4a7c-b185-51c625c737e3",
+                        "fe9f1a6c-e614-489a-80fa-4d6d76f1cf95"
+                    ],
+                    "serviceId": 3
+                },
+                {
+                    "serviceTargets": [
+                        "aa0c6b29-285e-4344-987e-dfeaf1d95648",
+                        "a9d98baa-b2ab-4428-82cf-d96185e63aa6",
+                        "c4ea5ce3-4a70-4df8-aff7-ffa929e7df61"
+                    ],
+                    "serviceId": 4
+                },
+                {
+                    "serviceTargets": [
+                        "55d76c03-c89d-40fe-867b-93f7a48ff9c1",
+                        "3cbf653f-f74c-4066-81d2-e3f78268185c",
+                        "3855d565-3b77-497b-90af-addb271aa598",
+                        "5dbfb32a-5933-4d8a-9937-41f350fb5f75"
+                    ],
+                    "serviceId": 5
+                },
+                {
+                    "serviceTargets": [
+                        "22771c0d-8403-433b-b468-e36dc16a1d21",
+                        "675cc878-eb80-435f-a841-d89b657fb2e3",
+                        "dd9f8fd4-b6c7-4f09-bbbf-5d721afc7677",
+                        "6f3cb6ab-5c6a-49be-9af9-9226fa751725"
+                    ],
+                    "serviceId": 7
+                },
+                {
+                    "serviceTargets": [
+                        "e0b4cc3e-e94a-4c97-81dc-a4cb868c2cc3",
+                        "b0bcfc54-76fa-4659-accf-276c18b50c31"
+                    ],
+                    "serviceId": 8
+                },
+                {
+                    "serviceTargets": [
+                        "9416c9f4-48ca-4bd1-8822-cd45ebb56c58",
+                        "2409e649-2ee2-47fd-9e76-ef2ffa07a5e7",
+                        "d58f8dba-109d-4179-b130-a888cd3d303c",
+                        "01686d38-9165-4497-9648-627ef81945a7"
+                    ],
+                    "serviceId": 9
+                },
+                {
+                    "serviceTargets": [
+                        "0e2f8d61-b7b4-4d2d-b07c-4fc20bbe326a",
+                        "bb506258-e907-43d3-99bd-0fe0400f654e"
+                    ],
+                    "serviceId": 10
+                },
+                {
+                    "serviceTargets": [
+                        "3c83e639-9c19-4b31-a86f-9d2d5e78123b",
+                        "e901be5e-8336-432e-b164-f278abd7430b"
+                    ],
+                    "serviceId": 12
+                },
+                {
+                    "serviceTargets": [
+                        "5557288b-190e-4a3f-a60b-4bdff6ca8fe8",
+                        "902df7a8-92f6-420d-9544-47d4b8cf31ca"
+                    ],
+                    "serviceId": 13
+                },
+                {
+                    "serviceTargets": [
+                        "9deb3edf-50c7-4b04-a1fb-d1451eadf641",
+                        "360c8b86-360c-4ca3-b1aa-626be56f2b11"
+                    ],
+                    "serviceId": 14
+                },
+                {
+                    "serviceTargets": [
+                        "7c30bc26-829e-4080-8059-27af9285113b",
+                        "158a5544-78e3-4d00-9f1b-62a85a938268"
+                    ],
+                    "serviceId": 15
+                },
+                {
+                    "serviceTargets": [
+                        "4aa201ec-2066-40e1-a457-99daa569c8e2",
+                        "f46f096a-a274-426b-adad-702e7cf8fab7",
+                        "3b1403f3-139a-4206-b325-62ebfe05ddc4",
+                        "7cb13c22-3dcd-43e7-808d-e0e26f5c090d"
+                    ],
+                    "serviceId": 16
+                },
+                {
+                    "serviceTargets": [
+                        "5c6db4c1-7fde-452e-8735-e52842fe6217",
+                        "41cb1e2c-59bc-4639-8bf7-fe0f528e006e"
+                    ],
+                    "serviceId": 18
+                },
+                {
+                    "serviceTargets": [
+                        "4f71e00a-2d80-488d-9ce4-947e60589149",
+                        "69a2ffba-41e9-406e-8ea4-5bdeee92cbde"
+                    ],
+                    "serviceId": 42
+                },
+                {
+                    "serviceTargets": [
+                        "26ea592f-ee39-4e6e-b6af-5b53fb1a5675"
+                    ],
+                    "serviceId": 17
+                },
+                {
+                    "serviceTargets": [
+                        "3587a984-68f9-4db3-b5af-49f265d853e0",
+                        "9d2d01be-b517-4be2-a225-8b1c887e016e"
+                    ],
+                    "serviceId": 19
+                },
+                {
+                    "serviceTargets": [
+                        "d0516817-5acb-46bd-9871-2696c245bad0",
+                        "7fed132d-6a38-448c-b519-381ab9e1e027",
+                        "e08dda14-360c-4b66-b8c5-eb0269c5aa44",
+                        "f3671aa7-773f-447d-9649-ba7f11dbe97a"
+                    ],
+                    "serviceId": 20
+                },
+                {
+                    "serviceTargets": [
+                        "5ab2b539-a5b4-40da-a556-a2c18066345b",
+                        "36410625-05f3-42d3-b04f-a3b268498ee1"
+                    ],
+                    "serviceId": 23
+                },
+                {
+                    "serviceTargets": [
+                        "0162246b-13fd-40c9-ae26-fb767eee76f8"
+                    ],
+                    "serviceId": 24
+                },
+                {
+                    "serviceTargets": [
+                        "b9e710e4-7dd3-4acc-ac2c-c69f4bcb9787",
+                        "00934509-f102-4d39-a043-7547a8ab9ac8",
+                        "1021bec7-3836-4b33-90b4-76701efd4fe3",
+                        "4dad393e-cbf7-43dd-87bb-62ea8f8afcdd"
+                    ],
+                    "serviceId": 26
+                },
+                {
+                    "serviceTargets": [
+                        "a516c78d-740f-463b-a1ce-5b02b8c82dd3",
+                        "4cbcb2b5-45cd-42dc-96bf-a9a181a4865b",
+                        "fbc45154-1d60-4f5e-a484-fdff514f9d51",
+                        "85191c99-f56d-46e6-9311-a58c1f37965d"
+                    ],
+                    "serviceId": 27
+                },
+                {
+                    "serviceTargets": [
+                        "3cfa82aa-0b38-49c0-be37-0fa61b5b6e3c",
+                        "91e90861-3ba7-4257-a765-6cab24c6f58a"
+                    ],
+                    "serviceId": 28
+                },
+                {
+                    "serviceTargets": [
+                        "96be68cf-783d-452a-b8fd-3832163f95db",
+                        "e70c70fd-4f31-41dc-a4b4-07f79efc3055"
+                    ],
+                    "serviceId": 29
+                },
+                {
+                    "serviceTargets": [
+                        "598bd978-0907-4cad-a7a6-ec5a8a8bbdc4",
+                        "d29bd931-1dd1-47c4-b456-c175099ff1df"
+                    ],
+                    "serviceId": 30
+                },
+                {
+                    "serviceTargets": [
+                        "6db1ebd7-92c5-49f2-98b7-2faa700fd752",
+                        "524d93b4-5cd1-4d0d-b1f8-d393028220ad"
+                    ],
+                    "serviceId": 31
+                },
+                {
+                    "serviceTargets": [
+                        "8040931a-2e6c-41be-9e92-f1035093b2ac",
+                        "5d652e6e-b719-45bf-8ae6-e9f293c24a92"
+                    ],
+                    "serviceId": 32
+                },
+                {
+                    "serviceTargets": [
+                        "f74182bd-7a53-4157-aeb9-eda281bb0234",
+                        "e7b7bb1e-66c2-4140-90f9-9534aa46ffa3"
+                    ],
+                    "serviceId": 33
+                },
+                {
+                    "serviceTargets": [
+                        "15615a70-ee60-46b8-b5e9-b33d4d88de6b",
+                        "d8dc153b-da23-4f7b-947a-89bc98338d6d",
+                        "5f762c6d-4f42-4458-9855-03c6896959c1",
+                        "5885f105-fc7d-43fd-8c26-c72938a95b76"
+                    ],
+                    "serviceId": 34
+                },
+                {
+                    "serviceTargets": [
+                        "dea1ff8b-f4eb-4987-8073-500bbbf97fcd",
+                        "fba17df1-d5cb-4643-987f-0626055b3c78"
+                    ],
+                    "serviceId": 35
+                },
+                {
+                    "serviceTargets": [
+                        "3ec07754-4a7a-46fb-a76d-553921781716",
+                        "fbc2dab8-7454-40f9-94f6-6bf258fcefff",
+                        "7186e284-0cb2-418e-a8cc-4343eb618140",
+                        "c7d0963e-2847-4f5f-8a1c-e149dfa4c9d1"
+                    ],
+                    "serviceId": 36
+                },
+                {
+                    "serviceTargets": [
+                        "3d06b150-bb86-47dc-8ad8-c33a51c3e3b3"
+                    ],
+                    "serviceId": 43
+                },
+                {
+                    "serviceTargets": [
+                        "b8304577-afd8-45e0-8ef4-b71ae10998f5"
+                    ],
+                    "serviceId": 44
+                }
+            ]
+        },
+        "visibility": "public",
+        "declarationPageType": "rdpReportDeclaration",
+        "requiresActivityLocking": true,
+        "supportsMeriPlanComparison": true,
+        "projectTemplate": "rlp",
+        "activityPeriodDescriptor": "Outputs report #",
+        "requireMeritAdminToReturnMeriPlan": true,
+        "emailTemplates": {
+            "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
+            "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
+            "planApprovedEmailTemplate": "RLP_PLAN_APPROVED_EMAIL_TEMPLATE",
+            "planReturnedEmailTemplate": "RLP_PLAN_RETURNED_EMAIL_TEMPLATE",
+            "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
+            "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
+        },
+        "meriPlanTemplate": "configurableMeriPlan",
+        "riskAndThreatTypes": [
+            "Performance",
+            "Work Health and Safety",
+            "People resources",
+            "Financial",
+            "External stakeholders",
+            "Natural Environment"
+        ],
+        "projectReports": [
+            {
+                "reportType": "Activity",
+                "firstReportingPeriodEnd": "2024-06-30T14:00:00Z",
+                "reportDescriptionFormat": "Progress Report %1d",
+                "reportNameFormat": "Progress Report %1d",
+                "reportingPeriodInMonths": 6,
+                "description": "_Please note that the reporting fields for these reports are currently being developed_",
+                "minimumReportDurationInDays": 3,
+                "label": "Semester",
+                "category": "Progress Reports",
+                "activityType": "Progress Report",
+                "reportsAlignedToCalendar": true,
+                "canSubmitDuringReportingPeriod": true
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Final Report",
+                "reportNameFormat": "Final Report",
+                "reportingPeriodInMonths": 0,
+                "multiple": false,
+                "description": "_Please note that the reporting fields for these reports are currently being developed_",
+                "alignToOwnerEnd": true,
+                "label": "Final Report",
+                "category": "Final Report",
+                "reportsAlignedToCalendar": false,
+                "activityType": "Final Report",
+                "alignToOwnerStart": true
+            }
+        ],
+        "keyThreatCodes": [
+            "Climate Change - Changed flooding regime",
+            "Climate Change - Changed rainfall patterns",
+            "Climate Change - Sea level rises",
+            "Climate Change - Unexpected seasonal/temperature extremes",
+            "Disease/pathogens - Areas that are infected",
+            "Disease/pathogens - Possible infection of disease free areas",
+            "Fire - Inappropriate fire regime",
+            "Fire - Lack of protection for ecological assets during fire control activities",
+            "Genetics - Bottleneck/inbreeding",
+            "Habitat loss - Breeding place disturbance",
+            "Habitat loss - Dieback/senescence",
+            "Habitat loss - Feeding habitat loss/interference",
+            "Habitat loss - Habitat fragmentation",
+            "Habitat loss - Land clearing",
+            "Habitat loss - Loss of critical ecosystem service supporting habitat",
+            "Human interference - Fish and harvesting aquatic resources (commercial)",
+            "Human interference - Flow-on effects of housing development",
+            "Human interference - Illegal activities",
+            "Human interference - Industrial development",
+            "Human interference - Land use intensification",
+            "Human interference - Recreational fishing",
+            "Human interference - Recreational pressures",
+            "Human interference - Road/vehicle strike",
+            "Land management practices - Changes to hydrology and aquatic systems",
+            "Land management practices - Domestic grazing/stock impacts",
+            "Land management practices - Excess recharge of groundwater",
+            "Land management practices - Excess use (or over-use) of surface water or groundwater resources",
+            "Land management practices - Excessive fertiliser use",
+            "Land management practices - Inappropriate ground cover management",
+            "Land management practices - Runoff",
+            "Native fauna - Competition",
+            "Native fauna - Predation",
+            "Pest - Competition/exclusion",
+            "Pest - Disease transmission",
+            "Pest - Habitat degradation",
+            "Pest - Introduction of new pest animals",
+            "Pest - Predation",
+            "Pollution - Chemical",
+            "Pollution - Eutrophication/algal blooms",
+            "Pollution - Inappropriate waste disposal",
+            "Pollution - Sediment ",
+            "Population size/range - Low habitat area",
+            "Population size/range - Low population numbers",
+            "Weeds - Competition",
+            "Weeds - Introduction of new weed",
+            "Weeds - Spread of weeds from surrounding areas"
+        ],
+        "navigationMode": "returnToProject",
+        "priorityPlaces": [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
+        ],
+        "supportsParatoo": true,
+        "supportsMeriPlanHistory": true
+    };
+
+
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Threatened Species"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "EPBC Species",
+        "type": "secondary",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - The trajectory of species targeted under the Threatened Species Action Plan 2022-2032 and other EPBC Act listed Species is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Threatened Species"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "New extinctions",
+        "type": "secondary",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - New extinctions of plants and animals are prevented"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Threatened Ecological Communities"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Threatened Ecological Communities",
+        "category": "Threatened Ecological Communities",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Ecological Communities (TECs) and priority places - The condition of targeted EPBC Act listed Threatened Ecological Communities and identified priority places under the Threatened Species Action Plan 2022-2032 is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Ramsar"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "World Heritage",
+        "supportsMultiplePrioritiesAsPrimary": false,
+        "type": "secondary",
+        "category": "Ramsar",
+        "outcome": "2: World Heritage Protection (Long term): The outstanding universal value of world heritage properties listed for their natural heritage value is maintained and improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Ramsar"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Ramsar Sites",
+        "supportsMultiplePrioritiesAsPrimary": false,
+        "type": "secondary",
+        "category": "Ramsar",
+        "outcome": "3: Ramsar Wetland Protection (Long term): The ecological character of targeted Ramsar sites is maintained and/or improved, building resilience to climate change"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "All priority species are on track for improved trajectory"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "At least half the number of projects that benefit priority species and priority places receive private investment or support from partners"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "Community groups lead or participate in recovery activities for all accessible priority species and places, including through citizen science"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "Feral cats and foxes are managed in all priority places where they are a key threat to condition, using best practice method for the location"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "First Nations-led recovery activities for threatened species and ecological communities are increased"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "Impacts of climate change on priority species and places are identified and actions are underway to strengthen resilience and adaptive capacity"
+    }
+];
+
+var priorities = [
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gamba Grass (Andropogon gayanus)"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Arnhem Plateau sandstone shrubland complex"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Kakadu and West Arnhem"
+    }
+];
+
+
+//Create the parent program
+let programName = "Saving Native Species";
+var parent = createOrFindProgram(programName);
+var subprograms = ["Priority Places - Grants"]
+
+subprograms.forEach(function (subProgram){
+    createOrFindProgram(subProgram, parent._id);
+});
+
+subprograms.forEach(function (subprogram){
+    var program = db.program.find({name: subprogram});
+    while(program.hasNext()){
+        var p = program.next();
+        print("sub program ID: " + p.programId)
+        db.program.updateOne({programId:p.programId}, {$set:{config:config, outcomes:outcomes, priorities:priorities}});
+        useNhtServiceLabels(p.name);
+    }
+});
+
diff --git a/src/main/scripts/releases/3.1/adhoc/createPriorityPlacesOtherSubProgram.js b/src/main/scripts/releases/3.1/adhoc/createPriorityPlacesOtherSubProgram.js
new file mode 100644
index 000000000..06b94b549
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/createPriorityPlacesOtherSubProgram.js
@@ -0,0 +1,642 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/program.js');
+var userId = '';
+
+const serviceFormName = "NHT Output Report";
+const annualReportFormName = "NHT Annual Report";
+const outcomes1ReportFormName = "NHT Outcomes 1 Report";
+const outcomes2ReportFormName = "NHT Outcomes 2 Report";
+
+var config =
+    {
+        "meriPlanContents": [
+            {
+                "template": "name",
+                "model": {
+                    "tableFormatting": true
+                }
+            },
+            {
+                "template": "priorityPlace",
+                "model": {
+                    "priorityPlaceHelpText": "Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species.",
+                    "priorityPlaceLabel": "Does this project directly support a priority place?"
+                }
+            },
+            {
+                "template": "indigenousInvolvement"
+            },
+            {
+                "template": "description",
+                "model": {
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
+                }
+            },
+            {
+                "template": "programOutcome",
+                "model": {
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "extendedKeyThreats",
+                "model": {
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "threatHelpText": "Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText": "Describe the proposed method to address the threat or threatening process",
+                    "title": "Key threat(s) and/or key threatening processes"
+                }
+            },
+            {
+                "template": "projectMethodology",
+                "model": {
+                    "helpText": "In addition to listing your project assumptions, please list any nominated project services that will not be charged for.\nInclude all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic.",
+                    "maxSize": "4000",
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])"
+                }
+            },
+            {
+                "template": "projectPartnerships",
+                "model": {
+                    "helpTextHeading": "Note: Not limited to key subcontractors.",
+                    "helpTextPartnerName": "Insert name of project partner. To be a project partner, they need to be actively involved in the planning or delivery of the project"
+                }
+            },
+            {
+                "template": "extendedBaselineMonitoring",
+                "model": {
+                    "approachHeading": "Monitoring method",
+                    "indicatorHeading": "Monitoring methodology",
+                    "monitoringServiceHelpText": "Select the relevant Project Services(s)/Target measure(s) that will be used to support ongoing monitoring",
+                    "baselineDataDescriptionHelpText": "Describe the project baseline to be established, or the baseline data that currently exists",
+                    "baselineMethodHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "baselineDataHelpText": "Existing baseline data needs to be based on best practice methods and be compatible with the EMSA protocols.",
+                    "approachHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "titleHelpText": "Describe the Project Baseline(s) and ongoing monitoring which will be used to report progress towards this projects outcome(s).  Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "baselineServiceHelpText": "Select the relevant Project Service(s)/Target measure(s) that will be used to support the development of the baseline",
+                    "newIndicatorText": "New monitoring indicator"
+                }
+            },
+            {
+                "template": "projectReview",
+                "model": {
+                    "title": "Project review, improvement and evaluation methodology and approach (3000 character limit [approximately 500 words])"
+                }
+            },
+            {
+                "template": "nationalAndRegionalPlans",
+                "model": {
+                    "includeUrl": true,
+                    "headingTitle": "Conservation and management plans"
+                }
+            },
+            {
+                "template": "serviceOutcomeTargets",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections",
+                    "title": "Project services and targets",
+                    "serviceName": "Service"
+                }
+            },
+            {
+                "template": "serviceForecasts",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                },
+                "excludedModes": [
+                    "PRINT"
+                ]
+            }
+        ],
+        "excludes": [],
+        "programServiceConfig": {
+            "serviceFormName": "NHT Output Report",
+            "programServices": [
+                {
+                    "serviceTargets": [
+                        "c3276929-b8a9-4985-a329-49b86f14018c"
+                    ],
+                    "serviceId": 1
+                },
+                {
+                    "serviceTargets": [
+                        "69deaaf9-cdc2-439a-b684-4cffdc7f224e"
+                    ],
+                    "serviceId": 2
+                },
+                {
+                    "serviceTargets": [
+                        "1f8161bc-908b-4ec8-ab7f-edac973a657d",
+                        "88908921-1248-4a7c-b185-51c625c737e3",
+                        "fe9f1a6c-e614-489a-80fa-4d6d76f1cf95"
+                    ],
+                    "serviceId": 3
+                },
+                {
+                    "serviceTargets": [
+                        "aa0c6b29-285e-4344-987e-dfeaf1d95648",
+                        "a9d98baa-b2ab-4428-82cf-d96185e63aa6",
+                        "c4ea5ce3-4a70-4df8-aff7-ffa929e7df61"
+                    ],
+                    "serviceId": 4
+                },
+                {
+                    "serviceTargets": [
+                        "55d76c03-c89d-40fe-867b-93f7a48ff9c1",
+                        "3cbf653f-f74c-4066-81d2-e3f78268185c",
+                        "3855d565-3b77-497b-90af-addb271aa598",
+                        "5dbfb32a-5933-4d8a-9937-41f350fb5f75"
+                    ],
+                    "serviceId": 5
+                },
+                {
+                    "serviceTargets": [
+                        "22771c0d-8403-433b-b468-e36dc16a1d21",
+                        "675cc878-eb80-435f-a841-d89b657fb2e3",
+                        "dd9f8fd4-b6c7-4f09-bbbf-5d721afc7677",
+                        "6f3cb6ab-5c6a-49be-9af9-9226fa751725"
+                    ],
+                    "serviceId": 7
+                },
+                {
+                    "serviceTargets": [
+                        "e0b4cc3e-e94a-4c97-81dc-a4cb868c2cc3",
+                        "b0bcfc54-76fa-4659-accf-276c18b50c31"
+                    ],
+                    "serviceId": 8
+                },
+                {
+                    "serviceTargets": [
+                        "9416c9f4-48ca-4bd1-8822-cd45ebb56c58",
+                        "2409e649-2ee2-47fd-9e76-ef2ffa07a5e7",
+                        "d58f8dba-109d-4179-b130-a888cd3d303c",
+                        "01686d38-9165-4497-9648-627ef81945a7"
+                    ],
+                    "serviceId": 9
+                },
+                {
+                    "serviceTargets": [
+                        "0e2f8d61-b7b4-4d2d-b07c-4fc20bbe326a",
+                        "bb506258-e907-43d3-99bd-0fe0400f654e"
+                    ],
+                    "serviceId": 10
+                },
+                {
+                    "serviceTargets": [
+                        "3c83e639-9c19-4b31-a86f-9d2d5e78123b",
+                        "e901be5e-8336-432e-b164-f278abd7430b"
+                    ],
+                    "serviceId": 12
+                },
+                {
+                    "serviceTargets": [
+                        "5557288b-190e-4a3f-a60b-4bdff6ca8fe8",
+                        "902df7a8-92f6-420d-9544-47d4b8cf31ca"
+                    ],
+                    "serviceId": 13
+                },
+                {
+                    "serviceTargets": [
+                        "9deb3edf-50c7-4b04-a1fb-d1451eadf641",
+                        "360c8b86-360c-4ca3-b1aa-626be56f2b11"
+                    ],
+                    "serviceId": 14
+                },
+                {
+                    "serviceTargets": [
+                        "7c30bc26-829e-4080-8059-27af9285113b",
+                        "158a5544-78e3-4d00-9f1b-62a85a938268"
+                    ],
+                    "serviceId": 15
+                },
+                {
+                    "serviceTargets": [
+                        "4aa201ec-2066-40e1-a457-99daa569c8e2",
+                        "f46f096a-a274-426b-adad-702e7cf8fab7",
+                        "3b1403f3-139a-4206-b325-62ebfe05ddc4",
+                        "7cb13c22-3dcd-43e7-808d-e0e26f5c090d"
+                    ],
+                    "serviceId": 16
+                },
+                {
+                    "serviceTargets": [
+                        "5c6db4c1-7fde-452e-8735-e52842fe6217",
+                        "41cb1e2c-59bc-4639-8bf7-fe0f528e006e"
+                    ],
+                    "serviceId": 18
+                },
+                {
+                    "serviceTargets": [
+                        "4f71e00a-2d80-488d-9ce4-947e60589149",
+                        "69a2ffba-41e9-406e-8ea4-5bdeee92cbde"
+                    ],
+                    "serviceId": 42
+                },
+                {
+                    "serviceTargets": [
+                        "26ea592f-ee39-4e6e-b6af-5b53fb1a5675"
+                    ],
+                    "serviceId": 17
+                },
+                {
+                    "serviceTargets": [
+                        "3587a984-68f9-4db3-b5af-49f265d853e0",
+                        "9d2d01be-b517-4be2-a225-8b1c887e016e"
+                    ],
+                    "serviceId": 19
+                },
+                {
+                    "serviceTargets": [
+                        "d0516817-5acb-46bd-9871-2696c245bad0",
+                        "7fed132d-6a38-448c-b519-381ab9e1e027",
+                        "e08dda14-360c-4b66-b8c5-eb0269c5aa44",
+                        "f3671aa7-773f-447d-9649-ba7f11dbe97a"
+                    ],
+                    "serviceId": 20
+                },
+                {
+                    "serviceTargets": [
+                        "5ab2b539-a5b4-40da-a556-a2c18066345b",
+                        "36410625-05f3-42d3-b04f-a3b268498ee1"
+                    ],
+                    "serviceId": 23
+                },
+                {
+                    "serviceTargets": [
+                        "0162246b-13fd-40c9-ae26-fb767eee76f8"
+                    ],
+                    "serviceId": 24
+                },
+                {
+                    "serviceTargets": [
+                        "b9e710e4-7dd3-4acc-ac2c-c69f4bcb9787",
+                        "00934509-f102-4d39-a043-7547a8ab9ac8",
+                        "1021bec7-3836-4b33-90b4-76701efd4fe3",
+                        "4dad393e-cbf7-43dd-87bb-62ea8f8afcdd"
+                    ],
+                    "serviceId": 26
+                },
+                {
+                    "serviceTargets": [
+                        "a516c78d-740f-463b-a1ce-5b02b8c82dd3",
+                        "4cbcb2b5-45cd-42dc-96bf-a9a181a4865b",
+                        "fbc45154-1d60-4f5e-a484-fdff514f9d51",
+                        "85191c99-f56d-46e6-9311-a58c1f37965d"
+                    ],
+                    "serviceId": 27
+                },
+                {
+                    "serviceTargets": [
+                        "3cfa82aa-0b38-49c0-be37-0fa61b5b6e3c",
+                        "91e90861-3ba7-4257-a765-6cab24c6f58a"
+                    ],
+                    "serviceId": 28
+                },
+                {
+                    "serviceTargets": [
+                        "96be68cf-783d-452a-b8fd-3832163f95db",
+                        "e70c70fd-4f31-41dc-a4b4-07f79efc3055"
+                    ],
+                    "serviceId": 29
+                },
+                {
+                    "serviceTargets": [
+                        "598bd978-0907-4cad-a7a6-ec5a8a8bbdc4",
+                        "d29bd931-1dd1-47c4-b456-c175099ff1df"
+                    ],
+                    "serviceId": 30
+                },
+                {
+                    "serviceTargets": [
+                        "6db1ebd7-92c5-49f2-98b7-2faa700fd752",
+                        "524d93b4-5cd1-4d0d-b1f8-d393028220ad"
+                    ],
+                    "serviceId": 31
+                },
+                {
+                    "serviceTargets": [
+                        "8040931a-2e6c-41be-9e92-f1035093b2ac",
+                        "5d652e6e-b719-45bf-8ae6-e9f293c24a92"
+                    ],
+                    "serviceId": 32
+                },
+                {
+                    "serviceTargets": [
+                        "f74182bd-7a53-4157-aeb9-eda281bb0234",
+                        "e7b7bb1e-66c2-4140-90f9-9534aa46ffa3"
+                    ],
+                    "serviceId": 33
+                },
+                {
+                    "serviceTargets": [
+                        "15615a70-ee60-46b8-b5e9-b33d4d88de6b",
+                        "d8dc153b-da23-4f7b-947a-89bc98338d6d",
+                        "5f762c6d-4f42-4458-9855-03c6896959c1",
+                        "5885f105-fc7d-43fd-8c26-c72938a95b76"
+                    ],
+                    "serviceId": 34
+                },
+                {
+                    "serviceTargets": [
+                        "dea1ff8b-f4eb-4987-8073-500bbbf97fcd",
+                        "fba17df1-d5cb-4643-987f-0626055b3c78"
+                    ],
+                    "serviceId": 35
+                },
+                {
+                    "serviceTargets": [
+                        "3ec07754-4a7a-46fb-a76d-553921781716",
+                        "fbc2dab8-7454-40f9-94f6-6bf258fcefff",
+                        "7186e284-0cb2-418e-a8cc-4343eb618140",
+                        "c7d0963e-2847-4f5f-8a1c-e149dfa4c9d1"
+                    ],
+                    "serviceId": 36
+                },
+                {
+                    "serviceTargets": [
+                        "3d06b150-bb86-47dc-8ad8-c33a51c3e3b3"
+                    ],
+                    "serviceId": 43
+                },
+                {
+                    "serviceTargets": [
+                        "b8304577-afd8-45e0-8ef4-b71ae10998f5"
+                    ],
+                    "serviceId": 44
+                }
+            ]
+        },
+        "visibility": "public",
+        "declarationPageType": "rdpReportDeclaration",
+        "requiresActivityLocking": true,
+        "supportsMeriPlanComparison": true,
+        "projectTemplate": "rlp",
+        "activityPeriodDescriptor": "Outputs report #",
+        "requireMeritAdminToReturnMeriPlan": true,
+        "emailTemplates": {
+            "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
+            "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
+            "planApprovedEmailTemplate": "RLP_PLAN_APPROVED_EMAIL_TEMPLATE",
+            "planReturnedEmailTemplate": "RLP_PLAN_RETURNED_EMAIL_TEMPLATE",
+            "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
+            "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
+        },
+        "meriPlanTemplate": "configurableMeriPlan",
+        "riskAndThreatTypes": [
+            "Performance",
+            "Work Health and Safety",
+            "People resources",
+            "Financial",
+            "External stakeholders",
+            "Natural Environment"
+        ],
+        "projectReports": [
+            {
+                "reportType": "Activity",
+                "firstReportingPeriodEnd": "2024-06-30T14:00:00Z",
+                "reportDescriptionFormat": "Progress Report %1d",
+                "reportNameFormat": "Progress Report %1d",
+                "reportingPeriodInMonths": 6,
+                "description": "_Please note that the reporting fields for these reports are currently being developed_",
+                "minimumReportDurationInDays": 3,
+                "label": "Semester",
+                "category": "Progress Reports",
+                "activityType": "Progress Report",
+                "reportsAlignedToCalendar": true,
+                "canSubmitDuringReportingPeriod": true
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Final Report",
+                "reportNameFormat": "Final Report",
+                "reportingPeriodInMonths": 0,
+                "multiple": false,
+                "description": "_Please note that the reporting fields for these reports are currently being developed_",
+                "alignToOwnerEnd": true,
+                "label": "Final Report",
+                "category": "Final Report",
+                "reportsAlignedToCalendar": false,
+                "activityType": "Final Report",
+                "alignToOwnerStart": true
+            }
+        ],
+        "keyThreatCodes": [
+            "Climate Change - Changed flooding regime",
+            "Climate Change - Changed rainfall patterns",
+            "Climate Change - Sea level rises",
+            "Climate Change - Unexpected seasonal/temperature extremes",
+            "Disease/pathogens - Areas that are infected",
+            "Disease/pathogens - Possible infection of disease free areas",
+            "Fire - Inappropriate fire regime",
+            "Fire - Lack of protection for ecological assets during fire control activities",
+            "Genetics - Bottleneck/inbreeding",
+            "Habitat loss - Breeding place disturbance",
+            "Habitat loss - Dieback/senescence",
+            "Habitat loss - Feeding habitat loss/interference",
+            "Habitat loss - Habitat fragmentation",
+            "Habitat loss - Land clearing",
+            "Habitat loss - Loss of critical ecosystem service supporting habitat",
+            "Human interference - Fish and harvesting aquatic resources (commercial)",
+            "Human interference - Flow-on effects of housing development",
+            "Human interference - Illegal activities",
+            "Human interference - Industrial development",
+            "Human interference - Land use intensification",
+            "Human interference - Recreational fishing",
+            "Human interference - Recreational pressures",
+            "Human interference - Road/vehicle strike",
+            "Land management practices - Changes to hydrology and aquatic systems",
+            "Land management practices - Domestic grazing/stock impacts",
+            "Land management practices - Excess recharge of groundwater",
+            "Land management practices - Excess use (or over-use) of surface water or groundwater resources",
+            "Land management practices - Excessive fertiliser use",
+            "Land management practices - Inappropriate ground cover management",
+            "Land management practices - Runoff",
+            "Native fauna - Competition",
+            "Native fauna - Predation",
+            "Pest - Competition/exclusion",
+            "Pest - Disease transmission",
+            "Pest - Habitat degradation",
+            "Pest - Introduction of new pest animals",
+            "Pest - Predation",
+            "Pollution - Chemical",
+            "Pollution - Eutrophication/algal blooms",
+            "Pollution - Inappropriate waste disposal",
+            "Pollution - Sediment ",
+            "Population size/range - Low habitat area",
+            "Population size/range - Low population numbers",
+            "Weeds - Competition",
+            "Weeds - Introduction of new weed",
+            "Weeds - Spread of weeds from surrounding areas"
+        ],
+        "navigationMode": "returnToProject",
+        "priorityPlaces": [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
+        ],
+        "supportsParatoo": true,
+        "supportsMeriPlanHistory": true
+    };
+
+
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Threatened Species"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "EPBC Species",
+        "type": "secondary",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - The trajectory of species targeted under the Threatened Species Action Plan 2022-2032 and other EPBC Act listed Species is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Threatened Species"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "New extinctions",
+        "type": "secondary",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - New extinctions of plants and animals are prevented"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Threatened Ecological Communities"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Threatened Ecological Communities",
+        "category": "Threatened Ecological Communities",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Ecological Communities (TECs) and priority places - The condition of targeted EPBC Act listed Threatened Ecological Communities and identified priority places under the Threatened Species Action Plan 2022-2032 is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Ramsar"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "World Heritage",
+        "supportsMultiplePrioritiesAsPrimary": false,
+        "type": "secondary",
+        "category": "Ramsar",
+        "outcome": "2: World Heritage Protection (Long term): The outstanding universal value of world heritage properties listed for their natural heritage value is maintained and improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Ramsar"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Ramsar Sites",
+        "supportsMultiplePrioritiesAsPrimary": false,
+        "type": "secondary",
+        "category": "Ramsar",
+        "outcome": "3: Ramsar Wetland Protection (Long term): The ecological character of targeted Ramsar sites is maintained and/or improved, building resilience to climate change"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "All priority species are on track for improved trajectory"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "At least half the number of projects that benefit priority species and priority places receive private investment or support from partners"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "Community groups lead or participate in recovery activities for all accessible priority species and places, including through citizen science"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "Feral cats and foxes are managed in all priority places where they are a key threat to condition, using best practice method for the location"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "First Nations-led recovery activities for threatened species and ecological communities are increased"
+    },
+    {
+        "type": "short",
+        "category": "Priority species related outcome",
+        "outcome": "Impacts of climate change on priority species and places are identified and actions are underway to strengthen resilience and adaptive capacity"
+    }
+];
+
+var priorities = [
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gamba Grass (Andropogon gayanus)"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Arnhem Plateau sandstone shrubland complex"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Kakadu and West Arnhem"
+    }
+];
+
+
+//Create the parent program
+let programName = "Saving Native Species";
+var parent = createOrFindProgram(programName);
+var subprograms = ["Priority Places - Other"]
+
+subprograms.forEach(function (subProgram){
+    createOrFindProgram(subProgram, parent._id);
+});
+
+subprograms.forEach(function (subprogram){
+    var program = db.program.find({name: subprogram});
+    while(program.hasNext()){
+        var p = program.next();
+        print("sub program ID: " + p.programId)
+        db.program.updateOne({programId:p.programId}, {$set:{config:config, outcomes:outcomes, priorities:priorities}});
+        useNhtServiceLabels(p.name);
+    }
+});
+
diff --git a/src/main/scripts/releases/3.1/adhoc/createPriorityPlacesProcurementsSubProgram.js b/src/main/scripts/releases/3.1/adhoc/createPriorityPlacesProcurementsSubProgram.js
new file mode 100644
index 000000000..86ede86f5
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/createPriorityPlacesProcurementsSubProgram.js
@@ -0,0 +1,2237 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/program.js');
+var userId = '';
+
+const serviceFormName = "NHT Output Report";
+const annualReportFormName = "NHT Annual Report";
+const outcomes1ReportFormName = "NHT Outcomes 1 Report";
+const outcomes2ReportFormName = "NHT Outcomes 2 Report";
+
+var config =
+    {
+        "excludes": [],
+        "programServiceConfig": {
+            "serviceFormName": serviceFormName,
+            "programServices": [
+                {
+                    "serviceTargets": [
+                        "c3276929-b8a9-4985-a329-49b86f14018c"
+                    ],
+                    "serviceId": 1
+                },
+                {
+                    "serviceTargets": [
+                        "69deaaf9-cdc2-439a-b684-4cffdc7f224e"
+                    ],
+                    "serviceId": 2
+                },
+                {
+                    "serviceTargets": [
+                        "1f8161bc-908b-4ec8-ab7f-edac973a657d",
+                        "88908921-1248-4a7c-b185-51c625c737e3",
+                        "fe9f1a6c-e614-489a-80fa-4d6d76f1cf95"
+                    ],
+                    "serviceId": 3
+                },
+                {
+                    "serviceTargets": [
+                        "aa0c6b29-285e-4344-987e-dfeaf1d95648",
+                        "a9d98baa-b2ab-4428-82cf-d96185e63aa6",
+                        "c4ea5ce3-4a70-4df8-aff7-ffa929e7df61"
+                    ],
+                    "serviceId": 4
+                },
+                {
+                    "serviceTargets": [
+                        "55d76c03-c89d-40fe-867b-93f7a48ff9c1",
+                        "3cbf653f-f74c-4066-81d2-e3f78268185c",
+                        "3855d565-3b77-497b-90af-addb271aa598",
+                        "5dbfb32a-5933-4d8a-9937-41f350fb5f75"
+                    ],
+                    "serviceId": 5
+                },
+                {
+                    "serviceTargets": [
+                        "22771c0d-8403-433b-b468-e36dc16a1d21",
+                        "675cc878-eb80-435f-a841-d89b657fb2e3",
+                        "dd9f8fd4-b6c7-4f09-bbbf-5d721afc7677",
+                        "6f3cb6ab-5c6a-49be-9af9-9226fa751725"
+                    ],
+                    "serviceId": 7
+                },
+                {
+                    "serviceTargets": [
+                        "e0b4cc3e-e94a-4c97-81dc-a4cb868c2cc3",
+                        "b0bcfc54-76fa-4659-accf-276c18b50c31"
+                    ],
+                    "serviceId": 8
+                },
+                {
+                    "serviceTargets": [
+                        "9416c9f4-48ca-4bd1-8822-cd45ebb56c58",
+                        "2409e649-2ee2-47fd-9e76-ef2ffa07a5e7",
+                        "d58f8dba-109d-4179-b130-a888cd3d303c",
+                        "01686d38-9165-4497-9648-627ef81945a7"
+                    ],
+                    "serviceId": 9
+                },
+                {
+                    "serviceTargets": [
+                        "0e2f8d61-b7b4-4d2d-b07c-4fc20bbe326a",
+                        "bb506258-e907-43d3-99bd-0fe0400f654e"
+                    ],
+                    "serviceId": 10
+                },
+                {
+                    "serviceTargets": [
+                        "3c83e639-9c19-4b31-a86f-9d2d5e78123b",
+                        "e901be5e-8336-432e-b164-f278abd7430b"
+                    ],
+                    "serviceId": 12
+                },
+                {
+                    "serviceTargets": [
+                        "5557288b-190e-4a3f-a60b-4bdff6ca8fe8",
+                        "902df7a8-92f6-420d-9544-47d4b8cf31ca"
+                    ],
+                    "serviceId": 13
+                },
+                {
+                    "serviceTargets": [
+                        "9deb3edf-50c7-4b04-a1fb-d1451eadf641",
+                        "360c8b86-360c-4ca3-b1aa-626be56f2b11"
+                    ],
+                    "serviceId": 14
+                },
+                {
+                    "serviceTargets": [
+                        "7c30bc26-829e-4080-8059-27af9285113b",
+                        "158a5544-78e3-4d00-9f1b-62a85a938268"
+                    ],
+                    "serviceId": 15
+                },
+                {
+                    "serviceTargets": [
+                        "4aa201ec-2066-40e1-a457-99daa569c8e2",
+                        "f46f096a-a274-426b-adad-702e7cf8fab7",
+                        "3b1403f3-139a-4206-b325-62ebfe05ddc4",
+                        "7cb13c22-3dcd-43e7-808d-e0e26f5c090d"
+                    ],
+                    "serviceId": 16
+                },
+                {
+                    "serviceTargets": [
+                        "5c6db4c1-7fde-452e-8735-e52842fe6217",
+                        "41cb1e2c-59bc-4639-8bf7-fe0f528e006e"
+                    ],
+                    "serviceId": 18
+                },
+                {
+                    "serviceTargets": [
+                        "4f71e00a-2d80-488d-9ce4-947e60589149",
+                        "69a2ffba-41e9-406e-8ea4-5bdeee92cbde"
+                    ],
+                    "serviceId": 42
+                },
+                {
+                    "serviceTargets": [
+                        "26ea592f-ee39-4e6e-b6af-5b53fb1a5675"
+                    ],
+                    "serviceId": 17
+                },
+                {
+                    "serviceTargets": [
+                        "3587a984-68f9-4db3-b5af-49f265d853e0",
+                        "9d2d01be-b517-4be2-a225-8b1c887e016e"
+                    ],
+                    "serviceId": 19
+                },
+                {
+                    "serviceTargets": [
+                        "d0516817-5acb-46bd-9871-2696c245bad0",
+                        "7fed132d-6a38-448c-b519-381ab9e1e027",
+                        "e08dda14-360c-4b66-b8c5-eb0269c5aa44",
+                        "f3671aa7-773f-447d-9649-ba7f11dbe97a"
+                    ],
+                    "serviceId": 20
+                },
+                {
+                    "serviceTargets": [
+                        "5ab2b539-a5b4-40da-a556-a2c18066345b",
+                        "36410625-05f3-42d3-b04f-a3b268498ee1"
+                    ],
+                    "serviceId": 23
+                },
+                {
+                    "serviceTargets": [
+                        "0162246b-13fd-40c9-ae26-fb767eee76f8"
+                    ],
+                    "serviceId": 24
+                },
+                {
+                    "serviceTargets": [
+                        "b9e710e4-7dd3-4acc-ac2c-c69f4bcb9787",
+                        "00934509-f102-4d39-a043-7547a8ab9ac8",
+                        "1021bec7-3836-4b33-90b4-76701efd4fe3",
+                        "4dad393e-cbf7-43dd-87bb-62ea8f8afcdd"
+                    ],
+                    "serviceId": 26
+                },
+                {
+                    "serviceTargets": [
+                        "a516c78d-740f-463b-a1ce-5b02b8c82dd3",
+                        "4cbcb2b5-45cd-42dc-96bf-a9a181a4865b",
+                        "fbc45154-1d60-4f5e-a484-fdff514f9d51",
+                        "85191c99-f56d-46e6-9311-a58c1f37965d"
+                    ],
+                    "serviceId": 27
+                },
+                {
+                    "serviceTargets": [
+                        "3cfa82aa-0b38-49c0-be37-0fa61b5b6e3c",
+                        "91e90861-3ba7-4257-a765-6cab24c6f58a"
+                    ],
+                    "serviceId": 28
+                },
+                {
+                    "serviceTargets": [
+                        "96be68cf-783d-452a-b8fd-3832163f95db",
+                        "e70c70fd-4f31-41dc-a4b4-07f79efc3055"
+                    ],
+                    "serviceId": 29
+                },
+                {
+                    "serviceTargets": [
+                        "598bd978-0907-4cad-a7a6-ec5a8a8bbdc4",
+                        "d29bd931-1dd1-47c4-b456-c175099ff1df"
+                    ],
+                    "serviceId": 30
+                },
+                {
+                    "serviceTargets": [
+                        "6db1ebd7-92c5-49f2-98b7-2faa700fd752",
+                        "524d93b4-5cd1-4d0d-b1f8-d393028220ad"
+                    ],
+                    "serviceId": 31
+                },
+                {
+                    "serviceTargets": [
+                        "8040931a-2e6c-41be-9e92-f1035093b2ac",
+                        "5d652e6e-b719-45bf-8ae6-e9f293c24a92"
+                    ],
+                    "serviceId": 32
+                },
+                {
+                    "serviceTargets": [
+                        "f74182bd-7a53-4157-aeb9-eda281bb0234",
+                        "e7b7bb1e-66c2-4140-90f9-9534aa46ffa3"
+                    ],
+                    "serviceId": 33
+                },
+                {
+                    "serviceTargets": [
+                        "15615a70-ee60-46b8-b5e9-b33d4d88de6b",
+                        "d8dc153b-da23-4f7b-947a-89bc98338d6d",
+                        "5f762c6d-4f42-4458-9855-03c6896959c1",
+                        "5885f105-fc7d-43fd-8c26-c72938a95b76"
+                    ],
+                    "serviceId": 34
+                },
+                {
+                    "serviceTargets": [
+                        "dea1ff8b-f4eb-4987-8073-500bbbf97fcd",
+                        "fba17df1-d5cb-4643-987f-0626055b3c78"
+                    ],
+                    "serviceId": 35
+                },
+                {
+                    "serviceTargets": [
+                        "3ec07754-4a7a-46fb-a76d-553921781716",
+                        "fbc2dab8-7454-40f9-94f6-6bf258fcefff",
+                        "7186e284-0cb2-418e-a8cc-4343eb618140"
+                    ],
+                    "serviceId": 36
+                },
+                {
+                    "serviceTargets": [
+                        "3d06b150-bb86-47dc-8ad8-c33a51c3e3b3"
+                    ],
+                    "serviceId": 43
+                },
+                {
+                    "serviceTargets": [
+                        "b8304577-afd8-45e0-8ef4-b71ae10998f5"
+                    ],
+                    "serviceId": 44
+                }
+            ]
+
+        },
+        "visibility": "public",
+        "declarationPageType": "rdpReportDeclaration",
+        "requiresActivityLocking": true,
+        "supportsMeriPlanComparison": true,
+        "projectTemplate": "rlp",
+        "activityPeriodDescriptor": "Outputs report #",
+        "supportsParatoo": true,
+        "emailTemplates": {
+            "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
+            "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
+            "planApprovedEmailTemplate": "RLP_PLAN_APPROVED_EMAIL_TEMPLATE",
+            "planReturnedEmailTemplate": "RLP_PLAN_RETURNED_EMAIL_TEMPLATE",
+            "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
+            "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
+        },
+        "meriPlanTemplate": "configurableMeriPlan",
+        "riskAndThreatTypes": [
+            "Performance",
+            "Work Health and Safety",
+            "People resources",
+            "Financial",
+            "External stakeholders",
+            "Natural Environment"
+        ],
+        "projectReports": [
+            {
+                "reportType": "Activity",
+                "reportsAlignedToCalendar": true,
+                "reportDescriptionFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportNameFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportingPeriodInMonths": 3,
+                "description": "",
+                "category": "Outputs Reporting",
+                "activityType": serviceFormName,
+                "canSubmitDuringReportingPeriod": true,
+                "label": "Quarter",
+                "minimumReportDurationInDays": 1
+
+            },
+            {
+                "firstReportingPeriodEnd": "2024-06-30T14:00:00Z",
+                "reportType": "Administrative",
+                "reportDescriptionFormat": "Annual Progress Report %2$tY - %3$tY for %4$s",
+                "reportNameFormat": "Annual Progress Report %2$tY - %3$tY",
+                "reportingPeriodInMonths": 12,
+                "category": "Annual Progress Reporting",
+                "activityType": annualReportFormName,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "label": "Annual",
+                "minimumReportDurationInDays": 1
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "minimumOwnerDurationInMonths": null,
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 36,
+                "alignToOwnerStart":true,
+                "alignToOwnerEnd":true,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "maximumOwnerDurationInMonths": 35,
+                "category": "Outcomes Report 1",
+                "reportsAlignedToCalendar": false,
+                "activityType": outcomes1ReportFormName,
+                "label":"Outcomes Report 1"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "minimumOwnerDurationInMonths": 36,
+                "maximumOwnerDurationInMonths": 47,
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 24,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "category": "Outcomes Report 1",
+                "activityType": outcomes1ReportFormName,
+                "label": "Outcomes Report 1"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 36,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "minimumOwnerDurationInMonths": 48,
+                "calendarAlignmentMonth": 7,
+                "category": "Outcomes Report",
+                "reportsAlignedToCalendar": true,
+                "activityType": outcomes1ReportFormName,
+                "label": "Outcomes Report 1"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 2 for %4$s",
+                "minimumOwnerDurationInMonths": 36,
+                "reportNameFormat": "Outcomes Report 2",
+                "alignToOwnerStart":true,
+                "alignToOwnerEnd":true,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "category": "Outcomes Report 2",
+                "activityType": outcomes2ReportFormName,
+                "label": "Outcomes Report 2"
+            }
+        ],
+        "navigationMode": "returnToProject",
+        "supportsMeriPlanHistory": true,
+        "requireMeritAdminToReturnMeriPlan":true,
+        "meriPlanContents": [
+            {
+                "template": "name",
+                "model": {
+                    "tableFormatting": true
+                }
+            },
+            {
+                "template": "priorityPlace",
+                "model": {
+                    "priorityPlaceLabel":"Does this project directly support a priority place?",
+                    "priorityPlaceHelpText":"Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species."
+                }
+            },
+            {
+                "template": "indigenousInvolvement"
+            },
+            {
+                "template": "description",
+                "model": {
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
+                }
+            },
+            {
+                "template": "programOutcome",
+                "model": {
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
+                }
+            },
+            {
+                "template": "additionalOutcomes",
+                "model": {
+                    "title": "Additional benefits",
+                    "helpTextHeading":"If the project is not delivering additional benefits, delete the row using the 'x' in the right-most column.",
+                    "outcomePriority":"Additional outcome/s",
+                    "priority":"Additional Investment Priorities",
+                    "priorityHelpText":"Other investment priorities that will benefit from the project.  Delete the row if there are no additional outcomes."
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "extendedKeyThreats",
+                "model": {
+                    "title":"Key threat(s) and/or key threatening processes",
+                    "threatHelpText":"Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText":"Describe the proposed method to address the threat or threatening process",
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables"
+                }
+            },
+            {
+                "template": "projectMethodology",
+                "model": {
+                    "maxSize": "4000",
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])",
+                    "helpText": "Include all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic."
+                }
+            },
+            {
+                "template": "projectPartnerships",
+                "model": {
+                    "helpTextPartnerName":"Insert name of project partner. To be a project partner, they need to be actively involved in the planning or delivery of the project",
+                    "helpTextHeading":"Note: Not limited to key subcontractors."
+                }
+            },
+            {
+                "template": "extendedBaselineMonitoring",
+                "model": {
+                    "approachHeading": "Monitoring method",
+                    "indicatorHeading": "Monitoring methodology",
+                    "baselineDataHelpText": "Existing baseline data needs to be based on best practice methods and be compatible with the EMSA protocols.",
+                    "baselineDataDescriptionHelpText": "Describe the project baseline to be established, or the baseline data that currently exists",
+                    "baselineServiceHelpText": "Select the relevant Project Service(s)/Target measure(s) that will be used to support the development of the baseline",
+                    "monitoringServiceHelpText": "Select the relevant Project Services(s)/Target measure(s) that will be used to support ongoing monitoring",
+                    "baselineMethodHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "approachHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "titleHelpText": "Describe the Project Baseline(s) and ongoing monitoring which will be used to report progress towards this projects outcome(s).  Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "newIndicatorText": "New monitoring indicator",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance"
+                }
+            },
+            {
+                "template": "projectReview",
+                "model": {
+                    "title": "Project review, improvement and evaluation methodology and approach (3000 character limit [approximately 500 words])"
+                }
+            },
+            {
+                "template": "nationalAndRegionalPlans",
+                "model": {
+                    "includeUrl": true,
+                    "headingTitle": "Conservation and management plans"
+                }
+            },
+            {
+                "template": "serviceOutcomeTargets",
+                "model": {
+                    "title": "Project services and targets",
+                    "serviceName": "Service",
+                    "titleHelpText":"Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                }
+            },
+            {
+                "template": "serviceForecasts",
+                "excludedModes":["PRINT"],
+                "model": {
+                    "titleHelpText":"Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                }
+
+            }
+        ],
+        keyThreatCodes: [
+            'Climate Change - Changed flooding regime',
+            'Climate Change - Changed rainfall patterns',
+            'Climate Change - Sea level rises',
+            'Climate Change - Unexpected seasonal/temperature extremes',
+            'Disease/pathogens - Areas that are infected',
+            'Disease/pathogens - Possible infection of disease free areas',
+            'Fire - Inappropriate fire regime',
+            'Fire - Lack of protection for ecological assets during fire control activities',
+            'Genetics - Bottleneck/inbreeding',
+            'Habitat loss - Breeding place disturbance',
+            'Habitat loss - Dieback/senescence',
+            'Habitat loss - Feeding habitat loss/interference',
+            'Habitat loss - Habitat fragmentation',
+            'Habitat loss - Land clearing',
+            'Habitat loss - Loss of critical ecosystem service supporting habitat',
+            'Human interference - Fish and harvesting aquatic resources (commercial)',
+            'Human interference - Flow-on effects of housing development',
+            'Human interference - Illegal activities',
+            'Human interference - Industrial development',
+            'Human interference - Land use intensification',
+            'Human interference - Recreational fishing',
+            'Human interference - Recreational pressures',
+            'Human interference - Road/vehicle strike',
+            'Land management practices - Changes to hydrology and aquatic systems',
+            'Land management practices - Domestic grazing/stock impacts',
+            'Land management practices - Excess recharge of groundwater',
+            'Land management practices - Excess use (or over-use) of surface water or groundwater resources',
+            'Land management practices - Excessive fertiliser use',
+            'Land management practices - Inappropriate ground cover management',
+            'Land management practices - Runoff',
+            'Native fauna - Competition',
+            'Native fauna - Predation',
+            'Pest - Competition/exclusion',
+            'Pest - Disease transmission',
+            'Pest - Habitat degradation',
+            'Pest - Introduction of new pest animals',
+            'Pest - Predation',
+            'Pollution - Chemical',
+            'Pollution - Eutrophication/algal blooms',
+            'Pollution - Inappropriate waste disposal',
+            'Pollution - Sediment ',
+            'Population size/range - Low habitat area',
+            'Population size/range - Low population numbers',
+            'Weeds - Competition',
+            'Weeds - Introduction of new weed',
+            'Weeds - Spread of weeds from surrounding areas'
+        ],
+        priorityPlaces: [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
+        ]
+
+    };
+
+
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Threatened Species"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "EPBC Species",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - The trajectory of species targeted under the Threatened Species Action Plan 2022-2032 and other EPBC Act listed Species is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Threatened Species"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "New extinctions",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - New extinctions of plants and animals are prevented"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Threatened Ecological Communities"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Threatened Ecological Communities",
+        "category": "Threatened Ecological Communities",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Ecological Communities (TECs) and priority places - The condition of targeted EPBC Act listed Threatened Ecological Communities and identified priority places under the Threatened Species Action Plan 2022-2032 is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "World Heritage Sites"
+            }
+        ],
+        "shortDescription": "World Heritage",
+        "category": "World Heritage Sites",
+        "outcome": "2: World Heritage Protection (Long term): The outstanding universal value of world heritage properties listed for their natural heritage value is maintained and improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Ramsar"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Ramsar Sites",
+        "category": "Ramsar",
+        "outcome": "3: Ramsar Wetland Protection (Long term): The ecological character of targeted Ramsar sites is maintained and/or improved, building resilience to climate change"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Targeted threatened species (TS) are on track for improved trajectory"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Species at high risk of imminent extinction are identified and supported to persist"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Priority species are being assisted to strengthen reliance and adaptive capacity for climate change"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Increased leadership and/or participation of First Nations people in the management and recovery of threatened species"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened Ecological Communities and priority places - The implementation of priority actions is leading to an improvement in the condition of targeted TECs and priority places"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened Ecological Communities and priority places - Resilience to climate change and extreme events has been increased"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened Ecological Communities and priority places - Increased leadership and/or participation of First Nations people in the management and recovery of threatened ecological communities and priority places"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Threats to the outstanding universal value of world heritage properties listed for their natural heritage value have been reduced through the implementation of priority actions"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Managing Threats - Threats from climate change, extreme events and invasive species have been reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Managing Threats - Threats from disease have been reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Managing Threats - Increased leadership and/or participation of First Nations people in the management of threats to World Heritage properties"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Improving land management practices and protecting habitat - Threats from inappropriate fire management are reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Improving land management practices and protecting habitat - Threats from inappropriate management of human impacts, climate change and extreme events are reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Improving land management practices and protecting habitat - Increased leadership and/or participation of First Nations people in the management and protection of World Heritage properties"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Priority actions at targeted Ramsar sites will reduce threats, restore or maintain ecological character and increase climate change resilience"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - The critical components, processes and services of the wetland actively maintained and/or improved"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - Absence/reduction of non-native species"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - Increased leadership and/or participation of First Nations people in the management of threats to Ramsar sites"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - Adaptive management planning and actions are building resilience to extreme climate events"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Wetland biota and/or abundance is maintained and improved"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Hydrological regimes have been restored and maintained"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Improved condition of wetland vegetation/habitat"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Quality of breeding, foraging and roosting habitat is improved"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Increased leadership and/or participation of First Nations people in the restoration and/or maintenance of the ecological character of Ramsar sites"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Managing Threats - Pest predator an competitor species have been controlled or are under active, long-term control programs"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Managing Threats - Threats from disease have been contained, reduced or excluded"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Land management practices have improved"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Quality of (TS/TECs) habitat has improved"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Area/Extent of (TS/TECs) habitat has increased"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Increased connectivity between patches"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Quality of breeding and foraging habitat is improved   "
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Creating insurance populations - Existing populations have been protected"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Creating insurance populations - Re-introductions have enhanced wild populations"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Climate adaption and resilience - Climate change resilience and adaptive capacity actions underway"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): First Nations People and community involvement - First Nations people are leading and/or participating in recovery activities"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Managing threats - Pest predator and competitor species have been controlled"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Managing threats -Threats from disease have been contained or reduced"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Improving land management practices and protecting habitat - Inappropriate fire regimes have been reduced or halted"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Improving land management practices and protecting habitat - Land management practices have improved (within and around heritage properties)"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Improving land management practices and protecting habitat - Actions to reduce nutrient levels have been implemented, and nutrient levels are beginning to stabilise/improve "
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Climate adaption and resilience - Climate change resilience and adaptive capacity actions underway"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): First Nations People and community involvement - First Nations people are leading and/or participating in management and protection activities"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Managing threats -  Inappropriate land management practices have decreased within the catchment"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Managing Threats - Pest predator and competitor species have been controlled "
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term):  Managing Threats - Appropriate fire management regimes within and external to site"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Protecting and Improving Habitat - Area and quality of suitable wetland habitat has increased and/or is maintained"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Protecting and Improving Habitat - Water quality has been stabilised and/or improved  "
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Protecting and Improving Habitat - Improved access control to protect sensitive species and habitats"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Climate adaption and resilience - Climate change resilience and adaptive capacity actions underway to improve and/or maintain the ecological character of Ramsar sites "
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): First Nations People and community involvement - First Nations people are leading and/or participating in restoration, maintenance and protection activities"
+    }
+];
+
+var priorities = [
+    {
+        "category": "Plants",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Plants",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Plants",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Birds",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Birds",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Plants",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Plants",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Target 3",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Birds",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Plants",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Plants",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Birds",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Plants",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Plants",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Fish",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Plants",
+        "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gorge Rice-flower, Pimelea cremnophila"
+    },
+    {
+        "category": "Plants",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Fish",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Birds",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Birds",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Plants",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Leaf-Scaled Seasnake – Aipysurus foliosquama"
+    },
+    {
+        "category": "Plants",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Plants",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Birds",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Fish",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Fish",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Plants",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Mammals",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Target 3",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Birds",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Birds",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Birds",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Fish",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Fish",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Plants",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Plants",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Fish",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Fish",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Plants",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Plants",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Birds",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Frogs",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Target 3",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Birds",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Fish",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Target 3",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Alpine Sphagnum Bogs and Associated Fens"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Natural Temperate Grassland of the South Eastern Highlands"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "White Box-Yellow Box-Blakely's Red Gum Grassy Woodland and Derived Native Grassland"
+    },
+    {
+        "category": "Ramsar",
+        "priority": "Ginini Flats Wetland Complex"
+    }
+];
+
+let parentProgram = "Saving Native Species";
+var subprograms = ["Priority Places - Procurements"]
+
+var parent = db.program.find({name: parentProgram}).next();
+subprograms.forEach(function (subProgram){
+    var now = ISODate();
+    var p = {name: subProgram, programId: UUID.generate(), dateCreated: now, lastUpdate: now, parent: parent._id, status: "active"}
+    var program = db.program.find({name: subProgram})
+    if (!program.hasNext()) {
+        db.program.insertOne(p);
+    } else {
+        print("Program Already Exist: " + subProgram)
+    }
+});
+
+subprograms.forEach(function (subprogram){
+    var program = db.program.find({name: subprogram});
+    while(program.hasNext()){
+        var p = program.next();
+        print("sub program ID: " + p.programId)
+        db.program.updateOne({programId:p.programId}, {$set:{config:config, outcomes:outcomes, priorities:priorities}});
+        useNhtServiceLabels(p.name);
+    }
+});
+
+
diff --git a/src/main/scripts/releases/3.1/adhoc/createPrioritySpeciesProcurementSubProgram.js b/src/main/scripts/releases/3.1/adhoc/createPrioritySpeciesProcurementSubProgram.js
new file mode 100644
index 000000000..6275e5319
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/createPrioritySpeciesProcurementSubProgram.js
@@ -0,0 +1,2228 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/program.js');
+var userId = '';
+
+const serviceFormName = "NHT Output Report";
+const annualReportFormName = "NHT Annual Report";
+const outcomes1ReportFormName = "NHT Outcomes 1 Report";
+const outcomes2ReportFormName = "NHT Outcomes 2 Report";
+
+var config =
+    {
+        "excludes": [],
+        "programServiceConfig": {
+            "serviceFormName": serviceFormName,
+            "programServices": [
+                {
+                    "serviceTargets": [
+                        "c3276929-b8a9-4985-a329-49b86f14018c"
+                    ],
+                    "serviceId": 1
+                },
+                {
+                    "serviceTargets": [
+                        "69deaaf9-cdc2-439a-b684-4cffdc7f224e"
+                    ],
+                    "serviceId": 2
+                },
+                {
+                    "serviceTargets": [
+                        "1f8161bc-908b-4ec8-ab7f-edac973a657d",
+                        "88908921-1248-4a7c-b185-51c625c737e3",
+                        "fe9f1a6c-e614-489a-80fa-4d6d76f1cf95"
+                    ],
+                    "serviceId": 3
+                },
+                {
+                    "serviceTargets": [
+                        "aa0c6b29-285e-4344-987e-dfeaf1d95648",
+                        "a9d98baa-b2ab-4428-82cf-d96185e63aa6",
+                        "c4ea5ce3-4a70-4df8-aff7-ffa929e7df61"
+                    ],
+                    "serviceId": 4
+                },
+                {
+                    "serviceTargets": [
+                        "55d76c03-c89d-40fe-867b-93f7a48ff9c1",
+                        "3cbf653f-f74c-4066-81d2-e3f78268185c",
+                        "3855d565-3b77-497b-90af-addb271aa598",
+                        "5dbfb32a-5933-4d8a-9937-41f350fb5f75"
+                    ],
+                    "serviceId": 5
+                },
+                {
+                    "serviceTargets": [
+                        "22771c0d-8403-433b-b468-e36dc16a1d21",
+                        "675cc878-eb80-435f-a841-d89b657fb2e3",
+                        "dd9f8fd4-b6c7-4f09-bbbf-5d721afc7677",
+                        "6f3cb6ab-5c6a-49be-9af9-9226fa751725"
+                    ],
+                    "serviceId": 7
+                },
+                {
+                    "serviceTargets": [
+                        "e0b4cc3e-e94a-4c97-81dc-a4cb868c2cc3",
+                        "b0bcfc54-76fa-4659-accf-276c18b50c31"
+                    ],
+                    "serviceId": 8
+                },
+                {
+                    "serviceTargets": [
+                        "9416c9f4-48ca-4bd1-8822-cd45ebb56c58",
+                        "2409e649-2ee2-47fd-9e76-ef2ffa07a5e7",
+                        "d58f8dba-109d-4179-b130-a888cd3d303c",
+                        "01686d38-9165-4497-9648-627ef81945a7"
+                    ],
+                    "serviceId": 9
+                },
+                {
+                    "serviceTargets": [
+                        "0e2f8d61-b7b4-4d2d-b07c-4fc20bbe326a",
+                        "bb506258-e907-43d3-99bd-0fe0400f654e"
+                    ],
+                    "serviceId": 10
+                },
+                {
+                    "serviceTargets": [
+                        "3c83e639-9c19-4b31-a86f-9d2d5e78123b",
+                        "e901be5e-8336-432e-b164-f278abd7430b"
+                    ],
+                    "serviceId": 12
+                },
+                {
+                    "serviceTargets": [
+                        "5557288b-190e-4a3f-a60b-4bdff6ca8fe8",
+                        "902df7a8-92f6-420d-9544-47d4b8cf31ca"
+                    ],
+                    "serviceId": 13
+                },
+                {
+                    "serviceTargets": [
+                        "9deb3edf-50c7-4b04-a1fb-d1451eadf641",
+                        "360c8b86-360c-4ca3-b1aa-626be56f2b11"
+                    ],
+                    "serviceId": 14
+                },
+                {
+                    "serviceTargets": [
+                        "7c30bc26-829e-4080-8059-27af9285113b",
+                        "158a5544-78e3-4d00-9f1b-62a85a938268"
+                    ],
+                    "serviceId": 15
+                },
+                {
+                    "serviceTargets": [
+                        "4aa201ec-2066-40e1-a457-99daa569c8e2",
+                        "f46f096a-a274-426b-adad-702e7cf8fab7",
+                        "3b1403f3-139a-4206-b325-62ebfe05ddc4",
+                        "7cb13c22-3dcd-43e7-808d-e0e26f5c090d"
+                    ],
+                    "serviceId": 16
+                },
+                {
+                    "serviceTargets": [
+                        "5c6db4c1-7fde-452e-8735-e52842fe6217",
+                        "41cb1e2c-59bc-4639-8bf7-fe0f528e006e"
+                    ],
+                    "serviceId": 18
+                },
+                {
+                    "serviceTargets": [
+                        "4f71e00a-2d80-488d-9ce4-947e60589149",
+                        "69a2ffba-41e9-406e-8ea4-5bdeee92cbde"
+                    ],
+                    "serviceId": 42
+                },
+                {
+                    "serviceTargets": [
+                        "26ea592f-ee39-4e6e-b6af-5b53fb1a5675"
+                    ],
+                    "serviceId": 17
+                },
+                {
+                    "serviceTargets": [
+                        "3587a984-68f9-4db3-b5af-49f265d853e0",
+                        "9d2d01be-b517-4be2-a225-8b1c887e016e"
+                    ],
+                    "serviceId": 19
+                },
+                {
+                    "serviceTargets": [
+                        "d0516817-5acb-46bd-9871-2696c245bad0",
+                        "7fed132d-6a38-448c-b519-381ab9e1e027",
+                        "e08dda14-360c-4b66-b8c5-eb0269c5aa44",
+                        "f3671aa7-773f-447d-9649-ba7f11dbe97a"
+                    ],
+                    "serviceId": 20
+                },
+                {
+                    "serviceTargets": [
+                        "5ab2b539-a5b4-40da-a556-a2c18066345b",
+                        "36410625-05f3-42d3-b04f-a3b268498ee1"
+                    ],
+                    "serviceId": 23
+                },
+                {
+                    "serviceTargets": [
+                        "0162246b-13fd-40c9-ae26-fb767eee76f8"
+                    ],
+                    "serviceId": 24
+                },
+                {
+                    "serviceTargets": [
+                        "b9e710e4-7dd3-4acc-ac2c-c69f4bcb9787",
+                        "00934509-f102-4d39-a043-7547a8ab9ac8",
+                        "1021bec7-3836-4b33-90b4-76701efd4fe3",
+                        "4dad393e-cbf7-43dd-87bb-62ea8f8afcdd"
+                    ],
+                    "serviceId": 26
+                },
+                {
+                    "serviceTargets": [
+                        "a516c78d-740f-463b-a1ce-5b02b8c82dd3",
+                        "4cbcb2b5-45cd-42dc-96bf-a9a181a4865b",
+                        "fbc45154-1d60-4f5e-a484-fdff514f9d51",
+                        "85191c99-f56d-46e6-9311-a58c1f37965d"
+                    ],
+                    "serviceId": 27
+                },
+                {
+                    "serviceTargets": [
+                        "3cfa82aa-0b38-49c0-be37-0fa61b5b6e3c",
+                        "91e90861-3ba7-4257-a765-6cab24c6f58a"
+                    ],
+                    "serviceId": 28
+                },
+                {
+                    "serviceTargets": [
+                        "96be68cf-783d-452a-b8fd-3832163f95db",
+                        "e70c70fd-4f31-41dc-a4b4-07f79efc3055"
+                    ],
+                    "serviceId": 29
+                },
+                {
+                    "serviceTargets": [
+                        "598bd978-0907-4cad-a7a6-ec5a8a8bbdc4",
+                        "d29bd931-1dd1-47c4-b456-c175099ff1df"
+                    ],
+                    "serviceId": 30
+                },
+                {
+                    "serviceTargets": [
+                        "6db1ebd7-92c5-49f2-98b7-2faa700fd752",
+                        "524d93b4-5cd1-4d0d-b1f8-d393028220ad"
+                    ],
+                    "serviceId": 31
+                },
+                {
+                    "serviceTargets": [
+                        "8040931a-2e6c-41be-9e92-f1035093b2ac",
+                        "5d652e6e-b719-45bf-8ae6-e9f293c24a92"
+                    ],
+                    "serviceId": 32
+                },
+                {
+                    "serviceTargets": [
+                        "f74182bd-7a53-4157-aeb9-eda281bb0234",
+                        "e7b7bb1e-66c2-4140-90f9-9534aa46ffa3"
+                    ],
+                    "serviceId": 33
+                },
+                {
+                    "serviceTargets": [
+                        "15615a70-ee60-46b8-b5e9-b33d4d88de6b",
+                        "d8dc153b-da23-4f7b-947a-89bc98338d6d",
+                        "5f762c6d-4f42-4458-9855-03c6896959c1",
+                        "5885f105-fc7d-43fd-8c26-c72938a95b76"
+                    ],
+                    "serviceId": 34
+                },
+                {
+                    "serviceTargets": [
+                        "dea1ff8b-f4eb-4987-8073-500bbbf97fcd",
+                        "fba17df1-d5cb-4643-987f-0626055b3c78"
+                    ],
+                    "serviceId": 35
+                },
+                {
+                    "serviceTargets": [
+                        "3ec07754-4a7a-46fb-a76d-553921781716",
+                        "fbc2dab8-7454-40f9-94f6-6bf258fcefff",
+                        "7186e284-0cb2-418e-a8cc-4343eb618140"
+                    ],
+                    "serviceId": 36
+                },
+                {
+                    "serviceTargets": [
+                        "3d06b150-bb86-47dc-8ad8-c33a51c3e3b3"
+                    ],
+                    "serviceId": 43
+                },
+                {
+                    "serviceTargets": [
+                        "b8304577-afd8-45e0-8ef4-b71ae10998f5"
+                    ],
+                    "serviceId": 44
+                }
+            ]
+
+        },
+        "visibility": "private",
+        "declarationPageType": "rdpReportDeclaration",
+        "requiresActivityLocking": true,
+        "supportsMeriPlanComparison": true,
+        "projectTemplate": "rlp",
+        "activityPeriodDescriptor": "Outputs report #",
+        "supportsParatoo": true,
+        "emailTemplates": {
+            "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
+            "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
+            "planApprovedEmailTemplate": "RLP_PLAN_APPROVED_EMAIL_TEMPLATE",
+            "planReturnedEmailTemplate": "RLP_PLAN_RETURNED_EMAIL_TEMPLATE",
+            "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
+            "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
+        },
+        "meriPlanTemplate": "configurableMeriPlan",
+        "riskAndThreatTypes": [
+            "Performance",
+            "Work Health and Safety",
+            "People resources",
+            "Financial",
+            "External stakeholders",
+            "Natural Environment"
+        ],
+        "projectReports": [
+            {
+                "reportType": "Activity",
+                "reportsAlignedToCalendar": true,
+                "reportDescriptionFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportNameFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportingPeriodInMonths": 3,
+                "description": "",
+                "category": "Outputs Reporting",
+                "activityType": serviceFormName,
+                "canSubmitDuringReportingPeriod": true,
+                "label": "Quarter",
+                "minimumReportDurationInDays": 1
+
+            },
+            {
+                "firstReportingPeriodEnd": "2024-06-30T14:00:00Z",
+                "reportType": "Administrative",
+                "reportDescriptionFormat": "Annual Progress Report %2$tY - %3$tY for %4$s",
+                "reportNameFormat": "Annual Progress Report %2$tY - %3$tY",
+                "reportingPeriodInMonths": 12,
+                "category": "Annual Progress Reporting",
+                "activityType": annualReportFormName,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "label": "Annual",
+                "minimumReportDurationInDays": 1
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "minimumOwnerDurationInMonths": null,
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 36,
+                "alignToOwnerStart":true,
+                "alignToOwnerEnd":true,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "maximumOwnerDurationInMonths": 35,
+                "category": "Outcomes Report 1",
+                "reportsAlignedToCalendar": false,
+                "activityType": outcomes1ReportFormName,
+                "label":"Outcomes Report 1"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "minimumOwnerDurationInMonths": 36,
+                "maximumOwnerDurationInMonths": 47,
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 24,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "category": "Outcomes Report 1",
+                "activityType": outcomes1ReportFormName,
+                "label": "Outcomes Report 1"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 36,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "minimumOwnerDurationInMonths": 48,
+                "calendarAlignmentMonth": 7,
+                "category": "Outcomes Report",
+                "reportsAlignedToCalendar": true,
+                "activityType": outcomes1ReportFormName,
+                "label": "Outcomes Report 1"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 2 for %4$s",
+                "minimumOwnerDurationInMonths": 36,
+                "reportNameFormat": "Outcomes Report 2",
+                "alignToOwnerStart":true,
+                "alignToOwnerEnd":true,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "category": "Outcomes Report 2",
+                "activityType": outcomes2ReportFormName,
+                "label": "Outcomes Report 2"
+            }
+        ],
+        "navigationMode": "returnToProject",
+        "supportsMeriPlanHistory": true,
+        "requireMeritAdminToReturnMeriPlan":true,
+        "meriPlanContents": [
+            {
+                "template": "name",
+                "model": {
+                    "tableFormatting": true
+                }
+            },
+            {
+                "template": "priorityPlace",
+                "model": {
+                    "priorityPlaceLabel":"Does this project directly support a priority place?",
+                    "priorityPlaceHelpText":"Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species."
+                }
+            },
+            {
+                "template": "indigenousInvolvement"
+            },
+            {
+                "template": "description",
+                "model": {
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
+                }
+            },
+            {
+                "template": "programOutcome",
+                "model": {
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
+                }
+            },
+            {
+                "template": "additionalOutcomes",
+                "model": {
+                    "title": "Additional benefits",
+                    "helpTextHeading":"If the project is not delivering additional benefits, delete the row using the 'x' in the right-most column.",
+                    "outcomePriority":"Additional outcome/s",
+                    "priority":"Additional Investment Priorities",
+                    "priorityHelpText":"Other investment priorities that will benefit from the project.  Delete the row if there are no additional outcomes."
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "mid",
+                    "subtitle": "Medium-term outcome statement/s",
+                    "title": "Project Outcomes",
+                    "extendedOutcomes": true,
+                    "helpText":"Projects more than 3 years in duration must set medium-term Project outcomes achievable at project completion. Ensure proposed outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "minimumNumberOfOutcomes": 0
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "extendedKeyThreats",
+                "model": {
+                    "title":"Key threat(s) and/or key threatening processes",
+                    "threatHelpText":"Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText":"Describe the proposed method to address the threat or threatening process",
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables"
+                }
+            },
+            {
+                "template": "projectMethodology",
+                "model": {
+                    "maxSize": "4000",
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])",
+                    "helpText": "Include all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic."
+                }
+            },
+            {
+                "template": "projectPartnerships",
+                "model": {
+                    "helpTextPartnerName":"Insert name of project partner. To be a project partner, they need to be actively involved in the planning or delivery of the project",
+                    "helpTextHeading":"Note: Not limited to key subcontractors."
+                }
+            },
+            {
+                "template": "extendedBaselineMonitoring",
+                "model": {
+                    "approachHeading": "Monitoring method",
+                    "indicatorHeading": "Monitoring methodology",
+                    "baselineDataHelpText": "Existing baseline data needs to be based on best practice methods and be compatible with the EMSA protocols.",
+                    "baselineDataDescriptionHelpText": "Describe the project baseline to be established, or the baseline data that currently exists",
+                    "baselineServiceHelpText": "Select the relevant Project Service(s)/Target measure(s) that will be used to support the development of the baseline",
+                    "monitoringServiceHelpText": "Select the relevant Project Services(s)/Target measure(s) that will be used to support ongoing monitoring",
+                    "baselineMethodHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "approachHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "titleHelpText": "Describe the Project Baseline(s) and ongoing monitoring which will be used to report progress towards this projects outcome(s).  Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "newIndicatorText": "New monitoring indicator",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance"
+                }
+            },
+            {
+                "template": "projectReview",
+                "model": {
+                    "title": "Project review, improvement and evaluation methodology and approach (3000 character limit [approximately 500 words])"
+                }
+            },
+            {
+                "template": "nationalAndRegionalPlans",
+                "model": {
+                    "includeUrl": true,
+                    "headingTitle": "Conservation and management plans"
+                }
+            },
+            {
+                "template": "serviceOutcomeTargets",
+                "model": {
+                    "title": "Project services and targets",
+                    "serviceName": "Service",
+                    "titleHelpText":"Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                }
+            },
+            {
+                "template": "serviceForecasts",
+                "excludedModes":["PRINT"],
+                "model": {
+                    "titleHelpText":"Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                }
+
+            }
+        ],
+        keyThreatCodes: [
+            'Climate Change - Changed flooding regime',
+            'Climate Change - Changed rainfall patterns',
+            'Climate Change - Sea level rises',
+            'Climate Change - Unexpected seasonal/temperature extremes',
+            'Disease/pathogens - Areas that are infected',
+            'Disease/pathogens - Possible infection of disease free areas',
+            'Fire - Inappropriate fire regime',
+            'Fire - Lack of protection for ecological assets during fire control activities',
+            'Genetics - Bottleneck/inbreeding',
+            'Habitat loss - Breeding place disturbance',
+            'Habitat loss - Dieback/senescence',
+            'Habitat loss - Feeding habitat loss/interference',
+            'Habitat loss - Habitat fragmentation',
+            'Habitat loss - Land clearing',
+            'Habitat loss - Loss of critical ecosystem service supporting habitat',
+            'Human interference - Fish and harvesting aquatic resources (commercial)',
+            'Human interference - Flow-on effects of housing development',
+            'Human interference - Illegal activities',
+            'Human interference - Industrial development',
+            'Human interference - Land use intensification',
+            'Human interference - Recreational fishing',
+            'Human interference - Recreational pressures',
+            'Human interference - Road/vehicle strike',
+            'Land management practices - Changes to hydrology and aquatic systems',
+            'Land management practices - Domestic grazing/stock impacts',
+            'Land management practices - Excess recharge of groundwater',
+            'Land management practices - Excess use (or over-use) of surface water or groundwater resources',
+            'Land management practices - Excessive fertiliser use',
+            'Land management practices - Inappropriate ground cover management',
+            'Land management practices - Runoff',
+            'Native fauna - Competition',
+            'Native fauna - Predation',
+            'Pest - Competition/exclusion',
+            'Pest - Disease transmission',
+            'Pest - Habitat degradation',
+            'Pest - Introduction of new pest animals',
+            'Pest - Predation',
+            'Pollution - Chemical',
+            'Pollution - Eutrophication/algal blooms',
+            'Pollution - Inappropriate waste disposal',
+            'Pollution - Sediment ',
+            'Population size/range - Low habitat area',
+            'Population size/range - Low population numbers',
+            'Weeds - Competition',
+            'Weeds - Introduction of new weed',
+            'Weeds - Spread of weeds from surrounding areas'
+        ],
+        priorityPlaces: [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
+        ]
+
+    };
+
+
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Priority Threatened Species Primary"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "EPBC Species",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - The trajectory of species targeted under the Threatened Species Action Plan 2022-2032 and other EPBC Act listed Species is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Priority Threatened Species Primary"
+            }
+        ],
+        "shortDescription": "New extinctions",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - New extinctions of plants and animals are prevented"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Threatened Ecological Communities"
+            }
+        ],
+        "shortDescription": "Threatened Ecological Communities",
+        "category": "Threatened Ecological Communities",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Ecological Communities (TECs) and priority places - The condition of targeted EPBC Act listed Threatened Ecological Communities and identified priority places under the Threatened Species Action Plan 2022-2032 is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "World Heritage Sites"
+            }
+        ],
+        "shortDescription": "World Heritage",
+        "category": "World Heritage Sites",
+        "type": "secondary",
+        "outcome": "2: World Heritage Protection (Long term): The outstanding universal value of world heritage properties listed for their natural heritage value is maintained and improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Ramsar"
+            }
+        ],
+        "shortDescription": "Ramsar Sites",
+        "category": "Ramsar",
+        "type": "secondary",
+        "outcome": "3: Ramsar Wetland Protection (Long term): The ecological character of targeted Ramsar sites is maintained and/or improved, building resilience to climate change"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Targeted threatened species (TS) are on track for improved trajectory"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Species at high risk of imminent extinction are identified and supported to persist"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Priority species are being assisted to strengthen reliance and adaptive capacity for climate change"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Increased leadership and/or participation of First Nations people in the management and recovery of threatened species"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened Ecological Communities and priority places - The implementation of priority actions is leading to an improvement in the condition of targeted TECs and priority places"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened Ecological Communities and priority places - Resilience to climate change and extreme events has been increased"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened Ecological Communities and priority places - Increased leadership and/or participation of First Nations people in the management and recovery of threatened ecological communities and priority places"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Threats to the outstanding universal value of world heritage properties listed for their natural heritage value have been reduced through the implementation of priority actions"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Managing Threats - Threats from climate change, extreme events and invasive species have been reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Managing Threats - Threats from disease have been reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Managing Threats - Increased leadership and/or participation of First Nations people in the management of threats to World Heritage properties"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Improving land management practices and protecting habitat - Threats from inappropriate fire management are reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Improving land management practices and protecting habitat - Threats from inappropriate management of human impacts, climate change and extreme events are reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Improving land management practices and protecting habitat - Increased leadership and/or participation of First Nations people in the management and protection of World Heritage properties"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Priority actions at targeted Ramsar sites will reduce threats, restore or maintain ecological character and increase climate change resilience"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - The critical components, processes and services of the wetland actively maintained and/or improved"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - Absence/reduction of non-native species"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - Increased leadership and/or participation of First Nations people in the management of threats to Ramsar sites"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - Adaptive management planning and actions are building resilience to extreme climate events"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Wetland biota and/or abundance is maintained and improved"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Hydrological regimes have been restored and maintained"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Improved condition of wetland vegetation/habitat"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Quality of breeding, foraging and roosting habitat is improved"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Increased leadership and/or participation of First Nations people in the restoration and/or maintenance of the ecological character of Ramsar sites"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Managing Threats - Pest predator an competitor species have been controlled or are under active, long-term control programs"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Managing Threats - Threats from disease have been contained, reduced or excluded"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Land management practices have improved"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Quality of (TS/TECs) habitat has improved"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Area/Extent of (TS/TECs) habitat has increased"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Increased connectivity between patches"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Quality of breeding and foraging habitat is improved   "
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Creating insurance populations - Existing populations have been protected"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Creating insurance populations - Re-introductions have enhanced wild populations"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Climate adaption and resilience - Climate change resilience and adaptive capacity actions underway"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): First Nations People and community involvement - First Nations people are leading and/or participating in recovery activities"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Managing threats - Pest predator and competitor species have been controlled"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Managing threats -Threats from disease have been contained or reduced"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Improving land management practices and protecting habitat - Inappropriate fire regimes have been reduced or halted"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Improving land management practices and protecting habitat - Land management practices have improved (within and around heritage properties)"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Improving land management practices and protecting habitat - Actions to reduce nutrient levels have been implemented, and nutrient levels are beginning to stabilise/improve "
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Climate adaption and resilience - Climate change resilience and adaptive capacity actions underway"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): First Nations People and community involvement - First Nations people are leading and/or participating in management and protection activities"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Managing threats -  Inappropriate land management practices have decreased within the catchment"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Managing Threats - Pest predator and competitor species have been controlled "
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term):  Managing Threats - Appropriate fire management regimes within and external to site"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Protecting and Improving Habitat - Area and quality of suitable wetland habitat has increased and/or is maintained"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Protecting and Improving Habitat - Water quality has been stabilised and/or improved  "
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Protecting and Improving Habitat - Improved access control to protect sensitive species and habitats"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Climate adaption and resilience - Climate change resilience and adaptive capacity actions underway to improve and/or maintain the ecological character of Ramsar sites "
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): First Nations People and community involvement - First Nations people are leading and/or participating in restoration, maintenance and protection activities"
+    }
+];
+
+var priorities = [
+    {
+        "category": "Plants",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Plants",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Plants",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Birds",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Birds",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Plants",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Plants",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Birds",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Plants",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Plants",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Birds",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Plants",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Plants",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Fish",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },{
+        "category": "High Risk Species",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Plants",
+        "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gorge Rice-flower, Pimelea cremnophila"
+    },
+    {
+        "category": "Plants",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Fish",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },{
+        "category": "Priority Threatened Species Primary",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Birds",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Birds",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Plants",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Leaf-Scaled Seasnake – Aipysurus foliosquama"
+    },
+    {
+        "category": "Plants",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Plants",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Birds",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Fish",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Fish",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Plants",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Mammals",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Birds",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Birds",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Birds",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Fish",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Fish",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Plants",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Plants",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Fish",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Fish",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Plants",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Plants",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Birds",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Frogs",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Birds",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Fish",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "High Risk Species",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    }
+];
+
+let parentProgram = "Saving Native Species";
+var subprograms = ["Priority Species - Procurements"]
+
+var parent = db.program.find({name: parentProgram}).next();
+subprograms.forEach(function (subProgram){
+    var now = ISODate();
+    var p = {name: subProgram, programId: UUID.generate(), dateCreated: now, lastUpdate: now, parent: parent._id, status: "active"}
+    var program = db.program.find({name: subProgram})
+    if (!program.hasNext()) {
+        db.program.insertOne(p);
+    } else {
+        print("Program Already Exist: " + subProgram)
+    }
+});
+
+subprograms.forEach(function (subprogram){
+    var program = db.program.find({name: subprogram});
+    while(program.hasNext()){
+        var p = program.next();
+        print("sub program ID: " + p.programId)
+        db.program.updateOne({programId:p.programId}, {$set:{config:config, outcomes:outcomes, priorities:priorities}});
+    }
+});
+
+
diff --git a/src/main/scripts/releases/3.1/adhoc/createRamsarWetlandProtectionSubProgram.js b/src/main/scripts/releases/3.1/adhoc/createRamsarWetlandProtectionSubProgram.js
new file mode 100644
index 000000000..387cd6c31
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/createRamsarWetlandProtectionSubProgram.js
@@ -0,0 +1,2248 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/program.js');
+var userId = '';
+
+const serviceFormName = "NHT Output Report";
+const annualReportFormName = "NHT Annual Report";
+const outcomes1ReportFormName = "NHT Outcomes 1 Report";
+const outcomes2ReportFormName = "NHT Outcomes 2 Report";
+
+var config =
+    {
+        "excludes": [],
+        "programServiceConfig": {
+            "serviceFormName": serviceFormName,
+            "programServices": [
+                {
+                    "serviceTargets": [
+                        "c3276929-b8a9-4985-a329-49b86f14018c"
+                    ],
+                    "serviceId": 1
+                },
+                {
+                    "serviceTargets": [
+                        "69deaaf9-cdc2-439a-b684-4cffdc7f224e"
+                    ],
+                    "serviceId": 2
+                },
+                {
+                    "serviceTargets": [
+                        "1f8161bc-908b-4ec8-ab7f-edac973a657d",
+                        "88908921-1248-4a7c-b185-51c625c737e3",
+                        "fe9f1a6c-e614-489a-80fa-4d6d76f1cf95"
+                    ],
+                    "serviceId": 3
+                },
+                {
+                    "serviceTargets": [
+                        "aa0c6b29-285e-4344-987e-dfeaf1d95648",
+                        "a9d98baa-b2ab-4428-82cf-d96185e63aa6",
+                        "c4ea5ce3-4a70-4df8-aff7-ffa929e7df61"
+                    ],
+                    "serviceId": 4
+                },
+                {
+                    "serviceTargets": [
+                        "55d76c03-c89d-40fe-867b-93f7a48ff9c1",
+                        "3cbf653f-f74c-4066-81d2-e3f78268185c",
+                        "3855d565-3b77-497b-90af-addb271aa598",
+                        "5dbfb32a-5933-4d8a-9937-41f350fb5f75"
+                    ],
+                    "serviceId": 5
+                },
+                {
+                    "serviceTargets": [
+                        "22771c0d-8403-433b-b468-e36dc16a1d21",
+                        "675cc878-eb80-435f-a841-d89b657fb2e3",
+                        "dd9f8fd4-b6c7-4f09-bbbf-5d721afc7677",
+                        "6f3cb6ab-5c6a-49be-9af9-9226fa751725"
+                    ],
+                    "serviceId": 7
+                },
+                {
+                    "serviceTargets": [
+                        "e0b4cc3e-e94a-4c97-81dc-a4cb868c2cc3",
+                        "b0bcfc54-76fa-4659-accf-276c18b50c31"
+                    ],
+                    "serviceId": 8
+                },
+                {
+                    "serviceTargets": [
+                        "9416c9f4-48ca-4bd1-8822-cd45ebb56c58",
+                        "2409e649-2ee2-47fd-9e76-ef2ffa07a5e7",
+                        "d58f8dba-109d-4179-b130-a888cd3d303c",
+                        "01686d38-9165-4497-9648-627ef81945a7"
+                    ],
+                    "serviceId": 9
+                },
+                {
+                    "serviceTargets": [
+                        "0e2f8d61-b7b4-4d2d-b07c-4fc20bbe326a",
+                        "bb506258-e907-43d3-99bd-0fe0400f654e"
+                    ],
+                    "serviceId": 10
+                },
+                {
+                    "serviceTargets": [
+                        "3c83e639-9c19-4b31-a86f-9d2d5e78123b",
+                        "e901be5e-8336-432e-b164-f278abd7430b"
+                    ],
+                    "serviceId": 12
+                },
+                {
+                    "serviceTargets": [
+                        "5557288b-190e-4a3f-a60b-4bdff6ca8fe8",
+                        "902df7a8-92f6-420d-9544-47d4b8cf31ca"
+                    ],
+                    "serviceId": 13
+                },
+                {
+                    "serviceTargets": [
+                        "9deb3edf-50c7-4b04-a1fb-d1451eadf641",
+                        "360c8b86-360c-4ca3-b1aa-626be56f2b11"
+                    ],
+                    "serviceId": 14
+                },
+                {
+                    "serviceTargets": [
+                        "7c30bc26-829e-4080-8059-27af9285113b",
+                        "158a5544-78e3-4d00-9f1b-62a85a938268"
+                    ],
+                    "serviceId": 15
+                },
+                {
+                    "serviceTargets": [
+                        "4aa201ec-2066-40e1-a457-99daa569c8e2",
+                        "f46f096a-a274-426b-adad-702e7cf8fab7",
+                        "3b1403f3-139a-4206-b325-62ebfe05ddc4",
+                        "7cb13c22-3dcd-43e7-808d-e0e26f5c090d"
+                    ],
+                    "serviceId": 16
+                },
+                {
+                    "serviceTargets": [
+                        "5c6db4c1-7fde-452e-8735-e52842fe6217",
+                        "41cb1e2c-59bc-4639-8bf7-fe0f528e006e"
+                    ],
+                    "serviceId": 18
+                },
+                {
+                    "serviceTargets": [
+                        "4f71e00a-2d80-488d-9ce4-947e60589149",
+                        "69a2ffba-41e9-406e-8ea4-5bdeee92cbde"
+                    ],
+                    "serviceId": 42
+                },
+                {
+                    "serviceTargets": [
+                        "26ea592f-ee39-4e6e-b6af-5b53fb1a5675"
+                    ],
+                    "serviceId": 17
+                },
+                {
+                    "serviceTargets": [
+                        "3587a984-68f9-4db3-b5af-49f265d853e0",
+                        "9d2d01be-b517-4be2-a225-8b1c887e016e"
+                    ],
+                    "serviceId": 19
+                },
+                {
+                    "serviceTargets": [
+                        "d0516817-5acb-46bd-9871-2696c245bad0",
+                        "7fed132d-6a38-448c-b519-381ab9e1e027",
+                        "e08dda14-360c-4b66-b8c5-eb0269c5aa44",
+                        "f3671aa7-773f-447d-9649-ba7f11dbe97a"
+                    ],
+                    "serviceId": 20
+                },
+                {
+                    "serviceTargets": [
+                        "5ab2b539-a5b4-40da-a556-a2c18066345b",
+                        "36410625-05f3-42d3-b04f-a3b268498ee1"
+                    ],
+                    "serviceId": 23
+                },
+                {
+                    "serviceTargets": [
+                        "0162246b-13fd-40c9-ae26-fb767eee76f8"
+                    ],
+                    "serviceId": 24
+                },
+                {
+                    "serviceTargets": [
+                        "b9e710e4-7dd3-4acc-ac2c-c69f4bcb9787",
+                        "00934509-f102-4d39-a043-7547a8ab9ac8",
+                        "1021bec7-3836-4b33-90b4-76701efd4fe3",
+                        "4dad393e-cbf7-43dd-87bb-62ea8f8afcdd"
+                    ],
+                    "serviceId": 26
+                },
+                {
+                    "serviceTargets": [
+                        "a516c78d-740f-463b-a1ce-5b02b8c82dd3",
+                        "4cbcb2b5-45cd-42dc-96bf-a9a181a4865b",
+                        "fbc45154-1d60-4f5e-a484-fdff514f9d51",
+                        "85191c99-f56d-46e6-9311-a58c1f37965d"
+                    ],
+                    "serviceId": 27
+                },
+                {
+                    "serviceTargets": [
+                        "3cfa82aa-0b38-49c0-be37-0fa61b5b6e3c",
+                        "91e90861-3ba7-4257-a765-6cab24c6f58a"
+                    ],
+                    "serviceId": 28
+                },
+                {
+                    "serviceTargets": [
+                        "96be68cf-783d-452a-b8fd-3832163f95db",
+                        "e70c70fd-4f31-41dc-a4b4-07f79efc3055"
+                    ],
+                    "serviceId": 29
+                },
+                {
+                    "serviceTargets": [
+                        "598bd978-0907-4cad-a7a6-ec5a8a8bbdc4",
+                        "d29bd931-1dd1-47c4-b456-c175099ff1df"
+                    ],
+                    "serviceId": 30
+                },
+                {
+                    "serviceTargets": [
+                        "6db1ebd7-92c5-49f2-98b7-2faa700fd752",
+                        "524d93b4-5cd1-4d0d-b1f8-d393028220ad"
+                    ],
+                    "serviceId": 31
+                },
+                {
+                    "serviceTargets": [
+                        "8040931a-2e6c-41be-9e92-f1035093b2ac",
+                        "5d652e6e-b719-45bf-8ae6-e9f293c24a92"
+                    ],
+                    "serviceId": 32
+                },
+                {
+                    "serviceTargets": [
+                        "f74182bd-7a53-4157-aeb9-eda281bb0234",
+                        "e7b7bb1e-66c2-4140-90f9-9534aa46ffa3"
+                    ],
+                    "serviceId": 33
+                },
+                {
+                    "serviceTargets": [
+                        "15615a70-ee60-46b8-b5e9-b33d4d88de6b",
+                        "d8dc153b-da23-4f7b-947a-89bc98338d6d",
+                        "5f762c6d-4f42-4458-9855-03c6896959c1",
+                        "5885f105-fc7d-43fd-8c26-c72938a95b76"
+                    ],
+                    "serviceId": 34
+                },
+                {
+                    "serviceTargets": [
+                        "dea1ff8b-f4eb-4987-8073-500bbbf97fcd",
+                        "fba17df1-d5cb-4643-987f-0626055b3c78"
+                    ],
+                    "serviceId": 35
+                },
+                {
+                    "serviceTargets": [
+                        "3ec07754-4a7a-46fb-a76d-553921781716",
+                        "fbc2dab8-7454-40f9-94f6-6bf258fcefff",
+                        "7186e284-0cb2-418e-a8cc-4343eb618140"
+                    ],
+                    "serviceId": 36
+                },
+                {
+                    "serviceTargets": [
+                        "3d06b150-bb86-47dc-8ad8-c33a51c3e3b3"
+                    ],
+                    "serviceId": 43
+                },
+                {
+                    "serviceTargets": [
+                        "b8304577-afd8-45e0-8ef4-b71ae10998f5"
+                    ],
+                    "serviceId": 44
+                }
+            ]
+
+        },
+        "visibility": "private",
+        "declarationPageType": "rdpReportDeclaration",
+        "requiresActivityLocking": true,
+        "supportsMeriPlanComparison": true,
+        "projectTemplate": "rlp",
+        "activityPeriodDescriptor": "Outputs report #",
+        "supportsParatoo": true,
+        "emailTemplates": {
+            "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
+            "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
+            "planApprovedEmailTemplate": "RLP_PLAN_APPROVED_EMAIL_TEMPLATE",
+            "planReturnedEmailTemplate": "RLP_PLAN_RETURNED_EMAIL_TEMPLATE",
+            "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
+            "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
+        },
+        "meriPlanTemplate": "configurableMeriPlan",
+        "riskAndThreatTypes": [
+            "Performance",
+            "Work Health and Safety",
+            "People resources",
+            "Financial",
+            "External stakeholders",
+            "Natural Environment"
+        ],
+        "projectReports": [
+            {
+                "reportType": "Activity",
+                "reportsAlignedToCalendar": true,
+                "reportDescriptionFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportNameFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportingPeriodInMonths": 3,
+                "description": "",
+                "category": "Outputs Reporting",
+                "activityType": serviceFormName,
+                "canSubmitDuringReportingPeriod": true,
+                "label": "Quarter",
+                "minimumReportDurationInDays": 1
+
+            },
+            {
+                "firstReportingPeriodEnd": "2024-06-30T14:00:00Z",
+                "reportType": "Administrative",
+                "reportDescriptionFormat": "Annual Progress Report %2$tY - %3$tY for %4$s",
+                "reportNameFormat": "Annual Progress Report %2$tY - %3$tY",
+                "reportingPeriodInMonths": 12,
+                "category": "Annual Progress Reporting",
+                "activityType": annualReportFormName,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "label": "Annual",
+                "minimumReportDurationInDays": 1
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "minimumOwnerDurationInMonths": null,
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 36,
+                "alignToOwnerStart":true,
+                "alignToOwnerEnd":true,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "maximumOwnerDurationInMonths": 35,
+                "category": "Outcomes Report 1",
+                "reportsAlignedToCalendar": false,
+                "activityType": outcomes1ReportFormName,
+                "label":"Outcomes Report 1"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "minimumOwnerDurationInMonths": 36,
+                "maximumOwnerDurationInMonths": 47,
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 24,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "category": "Outcomes Report 1",
+                "activityType": outcomes1ReportFormName,
+                "label": "Outcomes Report 1"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 36,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "minimumOwnerDurationInMonths": 48,
+                "calendarAlignmentMonth": 7,
+                "category": "Outcomes Report",
+                "reportsAlignedToCalendar": true,
+                "activityType": outcomes1ReportFormName,
+                "label": "Outcomes Report 1"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 2 for %4$s",
+                "minimumOwnerDurationInMonths": 36,
+                "reportNameFormat": "Outcomes Report 2",
+                "alignToOwnerStart":true,
+                "alignToOwnerEnd":true,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "category": "Outcomes Report 2",
+                "activityType": outcomes2ReportFormName,
+                "label": "Outcomes Report 2"
+            }
+        ],
+        "navigationMode": "returnToProject",
+        "supportsMeriPlanHistory": true,
+        "requireMeritAdminToReturnMeriPlan":true,
+        "meriPlanContents": [
+            {
+                "template": "name",
+                "model": {
+                    "tableFormatting": true
+                }
+            },
+            {
+                "template": "priorityPlace",
+                "model": {
+                    "priorityPlaceLabel":"Does this project directly support a priority place?",
+                    "priorityPlaceHelpText":"Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species."
+                }
+            },
+            {
+                "template": "indigenousInvolvement"
+            },
+            {
+                "template": "description",
+                "model": {
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
+                }
+            },
+            {
+                "template": "programOutcome",
+                "model": {
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
+                }
+            },
+            {
+                "template": "additionalOutcomes",
+                "model": {
+                    "title": "Additional benefits",
+                    "helpTextHeading":"If the project is not delivering additional benefits, delete the row using the 'x' in the right-most column.",
+                    "outcomePriority":"Additional outcome/s",
+                    "priority":"Additional Investment Priorities",
+                    "priorityHelpText":"Other investment priorities that will benefit from the project.  Delete the row if there are no additional outcomes."
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "mid",
+                    "subtitle": "Medium-term outcome statement/s",
+                    "title": "Project Outcomes",
+                    "extendedOutcomes": true,
+                    "helpText":"Projects more than 3 years in duration must set medium-term Project outcomes achievable at project completion. Ensure proposed outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "minimumNumberOfOutcomes": 0
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "extendedKeyThreats",
+                "model": {
+                    "title":"Key threat(s) and/or key threatening processes",
+                    "threatHelpText":"Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText":"Describe the proposed method to address the threat or threatening process",
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables"
+                }
+            },
+            {
+                "template": "projectMethodology",
+                "model": {
+                    "maxSize": "4000",
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])",
+                    "helpText": "Include all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic."
+                }
+            },
+            {
+                "template": "projectPartnerships",
+                "model": {
+                    "helpTextPartnerName":"Insert name of project partner. To be a project partner, they need to be actively involved in the planning or delivery of the project",
+                    "helpTextHeading":"Note: Not limited to key subcontractors."
+                }
+            },
+            {
+                "template": "extendedBaselineMonitoring",
+                "model": {
+                    "approachHeading": "Monitoring method",
+                    "indicatorHeading": "Monitoring methodology",
+                    "baselineDataHelpText": "Existing baseline data needs to be based on best practice methods and be compatible with the EMSA protocols.",
+                    "baselineDataDescriptionHelpText": "Describe the project baseline to be established, or the baseline data that currently exists",
+                    "baselineServiceHelpText": "Select the relevant Project Service(s)/Target measure(s) that will be used to support the development of the baseline",
+                    "monitoringServiceHelpText": "Select the relevant Project Services(s)/Target measure(s) that will be used to support ongoing monitoring",
+                    "baselineMethodHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "approachHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "titleHelpText": "Describe the Project Baseline(s) and ongoing monitoring which will be used to report progress towards this projects outcome(s).  Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "newIndicatorText": "New monitoring indicator",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance"
+                }
+            },
+            {
+                "template": "projectReview",
+                "model": {
+                    "title": "Project review, improvement and evaluation methodology and approach (3000 character limit [approximately 500 words])"
+                }
+            },
+            {
+                "template": "nationalAndRegionalPlans",
+                "model": {
+                    "includeUrl": true,
+                    "headingTitle": "Conservation and management plans"
+                }
+            },
+            {
+                "template": "serviceOutcomeTargets",
+                "model": {
+                    "title": "Project services and targets",
+                    "serviceName": "Service",
+                    "titleHelpText":"Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                }
+            },
+            {
+                "template": "serviceForecasts",
+                "excludedModes":["PRINT"],
+                "model": {
+                    "titleHelpText":"Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                }
+
+            }
+        ],
+        keyThreatCodes: [
+            'Climate Change - Changed flooding regime',
+            'Climate Change - Changed rainfall patterns',
+            'Climate Change - Sea level rises',
+            'Climate Change - Unexpected seasonal/temperature extremes',
+            'Disease/pathogens - Areas that are infected',
+            'Disease/pathogens - Possible infection of disease free areas',
+            'Fire - Inappropriate fire regime',
+            'Fire - Lack of protection for ecological assets during fire control activities',
+            'Genetics - Bottleneck/inbreeding',
+            'Habitat loss - Breeding place disturbance',
+            'Habitat loss - Dieback/senescence',
+            'Habitat loss - Feeding habitat loss/interference',
+            'Habitat loss - Habitat fragmentation',
+            'Habitat loss - Land clearing',
+            'Habitat loss - Loss of critical ecosystem service supporting habitat',
+            'Human interference - Fish and harvesting aquatic resources (commercial)',
+            'Human interference - Flow-on effects of housing development',
+            'Human interference - Illegal activities',
+            'Human interference - Industrial development',
+            'Human interference - Land use intensification',
+            'Human interference - Recreational fishing',
+            'Human interference - Recreational pressures',
+            'Human interference - Road/vehicle strike',
+            'Land management practices - Changes to hydrology and aquatic systems',
+            'Land management practices - Domestic grazing/stock impacts',
+            'Land management practices - Excess recharge of groundwater',
+            'Land management practices - Excess use (or over-use) of surface water or groundwater resources',
+            'Land management practices - Excessive fertiliser use',
+            'Land management practices - Inappropriate ground cover management',
+            'Land management practices - Runoff',
+            'Native fauna - Competition',
+            'Native fauna - Predation',
+            'Pest - Competition/exclusion',
+            'Pest - Disease transmission',
+            'Pest - Habitat degradation',
+            'Pest - Introduction of new pest animals',
+            'Pest - Predation',
+            'Pollution - Chemical',
+            'Pollution - Eutrophication/algal blooms',
+            'Pollution - Inappropriate waste disposal',
+            'Pollution - Sediment ',
+            'Population size/range - Low habitat area',
+            'Population size/range - Low population numbers',
+            'Weeds - Competition',
+            'Weeds - Introduction of new weed',
+            'Weeds - Spread of weeds from surrounding areas'
+        ],
+        priorityPlaces: [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
+        ]
+
+    };
+
+
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Priority Threatened Species Primary"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "EPBC Species",
+        "category": "Threatened Species",
+        "type": "secondary",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - The trajectory of species targeted under the Threatened Species Action Plan 2022-2032 and other EPBC Act listed Species is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Priority Threatened Species Primary"
+            }
+        ],
+        "shortDescription": "New extinctions",
+        "category": "Threatened Species",
+        "type": "secondary",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - New extinctions of plants and animals are prevented"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Threatened Ecological Communities"
+            }
+        ],
+        "shortDescription": "Threatened Ecological Communities",
+        "category": "Threatened Ecological Communities",
+        "type": "secondary",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Ecological Communities (TECs) and priority places - The condition of targeted EPBC Act listed Threatened Ecological Communities and identified priority places under the Threatened Species Action Plan 2022-2032 is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "World Heritage Sites"
+            }
+        ],
+        "shortDescription": "World Heritage",
+        "category": "World Heritage Sites",
+        "type": "secondary",
+        "outcome": "2: World Heritage Protection (Long term): The outstanding universal value of world heritage properties listed for their natural heritage value is maintained and improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Ramsar"
+            }
+        ],
+        "shortDescription": "Ramsar Sites",
+        "category": "Ramsar",
+        "outcome": "3: Ramsar Wetland Protection (Long term): The ecological character of targeted Ramsar sites is maintained and/or improved, building resilience to climate change"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Targeted threatened species (TS) are on track for improved trajectory"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Species at high risk of imminent extinction are identified and supported to persist"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Priority species are being assisted to strengthen reliance and adaptive capacity for climate change"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Increased leadership and/or participation of First Nations people in the management and recovery of threatened species"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened Ecological Communities and priority places - The implementation of priority actions is leading to an improvement in the condition of targeted TECs and priority places"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened Ecological Communities and priority places - Resilience to climate change and extreme events has been increased"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened Ecological Communities and priority places - Increased leadership and/or participation of First Nations people in the management and recovery of threatened ecological communities and priority places"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Threats to the outstanding universal value of world heritage properties listed for their natural heritage value have been reduced through the implementation of priority actions"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Managing Threats - Threats from climate change, extreme events and invasive species have been reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Managing Threats - Threats from disease have been reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Managing Threats - Increased leadership and/or participation of First Nations people in the management of threats to World Heritage properties"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Improving land management practices and protecting habitat - Threats from inappropriate fire management are reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Improving land management practices and protecting habitat - Threats from inappropriate management of human impacts, climate change and extreme events are reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Improving land management practices and protecting habitat - Increased leadership and/or participation of First Nations people in the management and protection of World Heritage properties"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Priority actions at targeted Ramsar sites will reduce threats, restore or maintain ecological character and increase climate change resilience"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - The critical components, processes and services of the wetland actively maintained and/or improved"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - Absence/reduction of non-native species"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - Increased leadership and/or participation of First Nations people in the management of threats to Ramsar sites"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - Adaptive management planning and actions are building resilience to extreme climate events"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Wetland biota and/or abundance is maintained and improved"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Hydrological regimes have been restored and maintained"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Improved condition of wetland vegetation/habitat"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Quality of breeding, foraging and roosting habitat is improved"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Increased leadership and/or participation of First Nations people in the restoration and/or maintenance of the ecological character of Ramsar sites"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Managing Threats - Pest predator an competitor species have been controlled or are under active, long-term control programs"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Managing Threats - Threats from disease have been contained, reduced or excluded"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Land management practices have improved"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Quality of (TS/TECs) habitat has improved"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Area/Extent of (TS/TECs) habitat has increased"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Increased connectivity between patches"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Quality of breeding and foraging habitat is improved   "
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Creating insurance populations - Existing populations have been protected"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Creating insurance populations - Re-introductions have enhanced wild populations"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Climate adaption and resilience - Climate change resilience and adaptive capacity actions underway"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): First Nations People and community involvement - First Nations people are leading and/or participating in recovery activities"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Managing threats - Pest predator and competitor species have been controlled"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Managing threats -Threats from disease have been contained or reduced"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Improving land management practices and protecting habitat - Inappropriate fire regimes have been reduced or halted"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Improving land management practices and protecting habitat - Land management practices have improved (within and around heritage properties)"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Improving land management practices and protecting habitat - Actions to reduce nutrient levels have been implemented, and nutrient levels are beginning to stabilise/improve "
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Climate adaption and resilience - Climate change resilience and adaptive capacity actions underway"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): First Nations People and community involvement - First Nations people are leading and/or participating in management and protection activities"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Managing threats -  Inappropriate land management practices have decreased within the catchment"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Managing Threats - Pest predator and competitor species have been controlled "
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term):  Managing Threats - Appropriate fire management regimes within and external to site"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Protecting and Improving Habitat - Area and quality of suitable wetland habitat has increased and/or is maintained"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Protecting and Improving Habitat - Water quality has been stabilised and/or improved  "
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Protecting and Improving Habitat - Improved access control to protect sensitive species and habitats"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Climate adaption and resilience - Climate change resilience and adaptive capacity actions underway to improve and/or maintain the ecological character of Ramsar sites "
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): First Nations People and community involvement - First Nations people are leading and/or participating in restoration, maintenance and protection activities"
+    }
+];
+
+var priorities = [
+    {
+        "category": "Plants",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Plants",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Plants",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Birds",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Birds",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Plants",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Plants",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Target 3",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Birds",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Plants",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Plants",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Birds",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Plants",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Plants",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Fish",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Plants",
+        "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gorge Rice-flower, Pimelea cremnophila"
+    },
+    {
+        "category": "Plants",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Fish",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Birds",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Birds",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Plants",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Leaf-Scaled Seasnake – Aipysurus foliosquama"
+    },
+    {
+        "category": "Plants",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Plants",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Birds",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Fish",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Fish",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Plants",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Mammals",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Target 3",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Birds",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Birds",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Birds",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Fish",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Fish",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Plants",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Plants",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Fish",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Fish",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Plants",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Plants",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Birds",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Frogs",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Target 3",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Birds",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Fish",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Target 3",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Alpine Sphagnum Bogs and Associated Fens"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Natural Temperate Grassland of the South Eastern Highlands"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "White Box-Yellow Box-Blakely's Red Gum Grassy Woodland and Derived Native Grassland"
+    },
+    {
+        "category": "Ramsar",
+        "priority": "Ginini Flats Wetland Complex"
+    }
+];
+
+let parentProgram = "Natural Heritage Trust";
+var subprograms = ["Ramsar Wetland Protection"]
+
+var parent = db.program.find({name: parentProgram}).next();
+subprograms.forEach(function (subProgram){
+    var now = ISODate();
+    var p = {name: subProgram, programId: UUID.generate(), dateCreated: now, lastUpdate: now, parent: parent._id, status: "active"}
+    var program = db.program.find({name: subProgram})
+    if (!program.hasNext()) {
+        db.program.insertOne(p);
+    } else {
+        print("Program Already Exist: " + subProgram)
+    }
+});
+
+subprograms.forEach(function (subprogram){
+    var program = db.program.find({name: subprogram});
+    while(program.hasNext()){
+        var p = program.next();
+        print("sub program ID: " + p.programId)
+        db.program.updateOne({programId:p.programId}, {$set:{config:config, outcomes:outcomes, priorities:priorities}});
+    }
+});
+
+
diff --git a/src/main/scripts/releases/3.1/adhoc/createSustainableAgricultureFacilitatorsSubProgram.js b/src/main/scripts/releases/3.1/adhoc/createSustainableAgricultureFacilitatorsSubProgram.js
new file mode 100644
index 000000000..7d2b8eb7d
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/createSustainableAgricultureFacilitatorsSubProgram.js
@@ -0,0 +1,1950 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/program.js');
+var userId = '';
+
+const serviceFormName = "NHT Output Report";
+const annualReportFormName = "NHT Annual Report";
+const outcomes1ReportFormName = "NHT Outcomes 1 Report";
+const outcomes2ReportFormName = "NHT Outcomes 2 Report";
+
+var config =
+    {
+        "meriPlanContents": [
+            {
+                "template": "name",
+                "model": {
+                    "tableFormatting": true
+                }
+            },
+            {
+                "template": "priorityPlace",
+                "model": {
+                    "priorityPlaceHelpText": "Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species.",
+                    "priorityPlaceLabel": "Does this project directly support a priority place?"
+                }
+            },
+            {
+                "template": "indigenousInvolvement"
+            },
+            {
+                "template": "description",
+                "model": {
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
+                }
+            },
+            {
+                "template": "programOutcome",
+                "model": {
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
+                }
+            },
+            {
+                "template": "additionalOutcomes",
+                "model": {
+                    "outcomePriority": "Additional outcome/s",
+                    "helpTextHeading": "If the project is not delivering additional benefits, delete the row using the 'x' in the right-most column.",
+                    "title": "Additional benefits",
+                    "priority": "Additional Investment Priorities",
+                    "priorityHelpText": "Other investment priorities that will benefit from the project.  Delete the row if there are no additional outcomes."
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "mid",
+                    "helpText": "Projects more than 3 years in duration must set medium-term Project outcomes achievable at project completion. Ensure proposed outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "minimumNumberOfOutcomes": 0,
+                    "subtitle": "Medium-term outcome statement/s",
+                    "title": "Project Outcomes",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "extendedKeyThreats",
+                "model": {
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "threatHelpText": "Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText": "Describe the proposed method to address the threat or threatening process",
+                    "title": "Key threat(s) and/or key threatening processes"
+                }
+            },
+            {
+                "template": "projectMethodology",
+                "model": {
+                    "helpText": "Include all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic.",
+                    "maxSize": "4000",
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])"
+                }
+            },
+            {
+                "template": "serviceOutcomeTargets",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections",
+                    "title": "Project services and targets",
+                    "serviceName": "Service"
+                }
+            },
+            {
+                "template": "serviceForecasts",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                },
+                "excludedModes": [
+                    "PRINT"
+                ]
+            }
+        ],
+        "excludes": [],
+        "programServiceConfig": {
+            "serviceFormName": "NHT Output Report",
+            "programServices": [
+                {
+                    "serviceTargets": [
+                        "c3276929-b8a9-4985-a329-49b86f14018c"
+                    ],
+                    "serviceId": 1
+                },
+                {
+                    "serviceTargets": [
+                        "69deaaf9-cdc2-439a-b684-4cffdc7f224e"
+                    ],
+                    "serviceId": 2
+                },
+                {
+                    "serviceTargets": [
+                        "1f8161bc-908b-4ec8-ab7f-edac973a657d",
+                        "88908921-1248-4a7c-b185-51c625c737e3",
+                        "fe9f1a6c-e614-489a-80fa-4d6d76f1cf95"
+                    ],
+                    "serviceId": 3
+                },
+                {
+                    "serviceTargets": [
+                        "a9d98baa-b2ab-4428-82cf-d96185e63aa6",
+                        "c4ea5ce3-4a70-4df8-aff7-ffa929e7df61",
+                        "dcf917dc-eaf7-49e2-ae7b-abf65edeedae"
+                    ],
+                    "serviceId": 4
+                },
+                {
+                    "serviceTargets": [
+                        "55d76c03-c89d-40fe-867b-93f7a48ff9c1",
+                        "3cbf653f-f74c-4066-81d2-e3f78268185c",
+                        "3855d565-3b77-497b-90af-addb271aa598",
+                        "5dbfb32a-5933-4d8a-9937-41f350fb5f75"
+                    ],
+                    "serviceId": 5
+                },
+                {
+                    "serviceTargets": [
+                        "22771c0d-8403-433b-b468-e36dc16a1d21",
+                        "675cc878-eb80-435f-a841-d89b657fb2e3",
+                        "dd9f8fd4-b6c7-4f09-bbbf-5d721afc7677",
+                        "6f3cb6ab-5c6a-49be-9af9-9226fa751725"
+                    ],
+                    "serviceId": 7
+                },
+                {
+                    "serviceTargets": [
+                        "e0b4cc3e-e94a-4c97-81dc-a4cb868c2cc3",
+                        "b0bcfc54-76fa-4659-accf-276c18b50c31"
+                    ],
+                    "serviceId": 8
+                },
+                {
+                    "serviceTargets": [
+                        "9416c9f4-48ca-4bd1-8822-cd45ebb56c58",
+                        "2409e649-2ee2-47fd-9e76-ef2ffa07a5e7",
+                        "d58f8dba-109d-4179-b130-a888cd3d303c",
+                        "01686d38-9165-4497-9648-627ef81945a7"
+                    ],
+                    "serviceId": 9
+                },
+                {
+                    "serviceTargets": [
+                        "0e2f8d61-b7b4-4d2d-b07c-4fc20bbe326a",
+                        "bb506258-e907-43d3-99bd-0fe0400f654e"
+                    ],
+                    "serviceId": 10
+                },
+                {
+                    "serviceTargets": [
+                        "3c83e639-9c19-4b31-a86f-9d2d5e78123b",
+                        "e901be5e-8336-432e-b164-f278abd7430b"
+                    ],
+                    "serviceId": 12
+                },
+                {
+                    "serviceTargets": [
+                        "5557288b-190e-4a3f-a60b-4bdff6ca8fe8",
+                        "902df7a8-92f6-420d-9544-47d4b8cf31ca"
+                    ],
+                    "serviceId": 13
+                },
+                {
+                    "serviceTargets": [
+                        "9deb3edf-50c7-4b04-a1fb-d1451eadf641",
+                        "360c8b86-360c-4ca3-b1aa-626be56f2b11"
+                    ],
+                    "serviceId": 14
+                },
+                {
+                    "serviceTargets": [
+                        "7c30bc26-829e-4080-8059-27af9285113b",
+                        "158a5544-78e3-4d00-9f1b-62a85a938268"
+                    ],
+                    "serviceId": 15
+                },
+                {
+                    "serviceTargets": [
+                        "4aa201ec-2066-40e1-a457-99daa569c8e2",
+                        "f46f096a-a274-426b-adad-702e7cf8fab7",
+                        "3b1403f3-139a-4206-b325-62ebfe05ddc4",
+                        "7cb13c22-3dcd-43e7-808d-e0e26f5c090d"
+                    ],
+                    "serviceId": 16
+                },
+                {
+                    "serviceTargets": [
+                        "5c6db4c1-7fde-452e-8735-e52842fe6217",
+                        "41cb1e2c-59bc-4639-8bf7-fe0f528e006e"
+                    ],
+                    "serviceId": 18
+                },
+                {
+                    "serviceTargets": [
+                        "4f71e00a-2d80-488d-9ce4-947e60589149",
+                        "69a2ffba-41e9-406e-8ea4-5bdeee92cbde"
+                    ],
+                    "serviceId": 42
+                },
+                {
+                    "serviceTargets": [
+                        "26ea592f-ee39-4e6e-b6af-5b53fb1a5675"
+                    ],
+                    "serviceId": 17
+                },
+                {
+                    "serviceTargets": [
+                        "3587a984-68f9-4db3-b5af-49f265d853e0",
+                        "9d2d01be-b517-4be2-a225-8b1c887e016e"
+                    ],
+                    "serviceId": 19
+                },
+                {
+                    "serviceTargets": [
+                        "d0516817-5acb-46bd-9871-2696c245bad0",
+                        "7fed132d-6a38-448c-b519-381ab9e1e027",
+                        "e08dda14-360c-4b66-b8c5-eb0269c5aa44",
+                        "f3671aa7-773f-447d-9649-ba7f11dbe97a"
+                    ],
+                    "serviceId": 20
+                },
+                {
+                    "serviceTargets": [
+                        "5ab2b539-a5b4-40da-a556-a2c18066345b",
+                        "36410625-05f3-42d3-b04f-a3b268498ee1"
+                    ],
+                    "serviceId": 23
+                },
+                {
+                    "serviceTargets": [
+                        "0162246b-13fd-40c9-ae26-fb767eee76f8"
+                    ],
+                    "serviceId": 24
+                },
+                {
+                    "serviceTargets": [
+                        "b9e710e4-7dd3-4acc-ac2c-c69f4bcb9787",
+                        "00934509-f102-4d39-a043-7547a8ab9ac8",
+                        "1021bec7-3836-4b33-90b4-76701efd4fe3",
+                        "4dad393e-cbf7-43dd-87bb-62ea8f8afcdd",
+                        "7186117e-ac17-4ed9-8c9c-8ee1c3bf473b"
+                    ],
+                    "serviceId": 26
+                },
+                {
+                    "serviceTargets": [
+                        "a516c78d-740f-463b-a1ce-5b02b8c82dd3",
+                        "4cbcb2b5-45cd-42dc-96bf-a9a181a4865b",
+                        "fbc45154-1d60-4f5e-a484-fdff514f9d51",
+                        "85191c99-f56d-46e6-9311-a58c1f37965d"
+                    ],
+                    "serviceId": 27
+                },
+                {
+                    "serviceTargets": [
+                        "3cfa82aa-0b38-49c0-be37-0fa61b5b6e3c",
+                        "91e90861-3ba7-4257-a765-6cab24c6f58a"
+                    ],
+                    "serviceId": 28
+                },
+                {
+                    "serviceTargets": [
+                        "96be68cf-783d-452a-b8fd-3832163f95db",
+                        "e70c70fd-4f31-41dc-a4b4-07f79efc3055"
+                    ],
+                    "serviceId": 29
+                },
+                {
+                    "serviceTargets": [
+                        "598bd978-0907-4cad-a7a6-ec5a8a8bbdc4",
+                        "d29bd931-1dd1-47c4-b456-c175099ff1df"
+                    ],
+                    "serviceId": 30
+                },
+                {
+                    "serviceTargets": [
+                        "6db1ebd7-92c5-49f2-98b7-2faa700fd752",
+                        "524d93b4-5cd1-4d0d-b1f8-d393028220ad"
+                    ],
+                    "serviceId": 31
+                },
+                {
+                    "serviceTargets": [
+                        "8040931a-2e6c-41be-9e92-f1035093b2ac",
+                        "5d652e6e-b719-45bf-8ae6-e9f293c24a92"
+                    ],
+                    "serviceId": 32
+                },
+                {
+                    "serviceTargets": [
+                        "f74182bd-7a53-4157-aeb9-eda281bb0234",
+                        "e7b7bb1e-66c2-4140-90f9-9534aa46ffa3"
+                    ],
+                    "serviceId": 33
+                },
+                {
+                    "serviceTargets": [
+                        "15615a70-ee60-46b8-b5e9-b33d4d88de6b",
+                        "d8dc153b-da23-4f7b-947a-89bc98338d6d",
+                        "5f762c6d-4f42-4458-9855-03c6896959c1",
+                        "5885f105-fc7d-43fd-8c26-c72938a95b76"
+                    ],
+                    "serviceId": 34
+                },
+                {
+                    "serviceTargets": [
+                        "dea1ff8b-f4eb-4987-8073-500bbbf97fcd",
+                        "fba17df1-d5cb-4643-987f-0626055b3c78"
+                    ],
+                    "serviceId": 35
+                },
+                {
+                    "serviceTargets": [
+                        "3ec07754-4a7a-46fb-a76d-553921781716",
+                        "fbc2dab8-7454-40f9-94f6-6bf258fcefff",
+                        "7186e284-0cb2-418e-a8cc-4343eb618140",
+                        "c7d0963e-2847-4f5f-8a1c-e149dfa4c9d1"
+                    ],
+                    "serviceId": 36
+                },
+                {
+                    "serviceTargets": [
+                        "3d06b150-bb86-47dc-8ad8-c33a51c3e3b3"
+                    ],
+                    "serviceId": 43
+                },
+                {
+                    "serviceTargets": [
+                        "b8304577-afd8-45e0-8ef4-b71ae10998f5"
+                    ],
+                    "serviceId": 44
+                }
+            ]
+        },
+        "visibility": "public",
+        "declarationPageType": "rdpReportDeclaration",
+        "requiresActivityLocking": true,
+        "supportsMeriPlanComparison": true,
+        "projectTemplate": "rlp",
+        "activityPeriodDescriptor": "Outputs report #",
+        "requireMeritAdminToReturnMeriPlan": true,
+        "emailTemplates": {
+            "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
+            "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
+            "planApprovedEmailTemplate": "RLP_PLAN_APPROVED_EMAIL_TEMPLATE",
+            "planReturnedEmailTemplate": "RLP_PLAN_RETURNED_EMAIL_TEMPLATE",
+            "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
+            "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
+        },
+        "meriPlanTemplate": "configurableMeriPlan",
+        "riskAndThreatTypes": [
+            "Performance",
+            "People resources",
+            "Financial",
+            "External stakeholders",
+            "Natural Environment"
+        ],
+        "projectReports": [
+            {
+                "reportType": "Activity",
+                "reportDescriptionFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportNameFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportingPeriodInMonths": 3,
+                "description": "",
+                "minimumReportDurationInDays": 1,
+                "label": "Quarter",
+                "reportsAlignedToCalendar": true,
+                "category": "Outputs Reporting",
+                "activityType": "NHT Output Report",
+                "canSubmitDuringReportingPeriod": true
+            },
+            {
+                "firstReportingPeriodEnd": "2024-06-30T14:00:00Z",
+                "reportType": "Administrative",
+                "reportDescriptionFormat": "Annual Progress Report %2$tY - %3$tY for %4$s",
+                "reportNameFormat": "Annual Progress Report %2$tY - %3$tY",
+                "reportingPeriodInMonths": 12,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "minimumReportDurationInDays": 1,
+                "label": "Annual",
+                "category": "Annual Progress Reporting",
+                "activityType": "NHT Annual Report"
+            }
+        ],
+        "keyThreatCodes": [
+            "Climate Change - Changed flooding regime",
+            "Climate Change - Changed rainfall patterns",
+            "Climate Change - Sea level rises",
+            "Climate Change - Unexpected seasonal/temperature extremes",
+            "Disease/pathogens - Areas that are infected",
+            "Disease/pathogens - Possible infection of disease free areas",
+            "Fire - Inappropriate fire regime",
+            "Fire - Lack of protection for ecological assets during fire control activities",
+            "Genetics - Bottleneck/inbreeding",
+            "Habitat loss - Breeding place disturbance",
+            "Habitat loss - Dieback/senescence",
+            "Habitat loss - Feeding habitat loss/interference",
+            "Habitat loss - Habitat fragmentation",
+            "Habitat loss - Land clearing",
+            "Habitat loss - Loss of critical ecosystem service supporting habitat",
+            "Human interference - Fish and harvesting aquatic resources (commercial)",
+            "Human interference - Flow-on effects of housing development",
+            "Human interference - Illegal activities",
+            "Human interference - Industrial development",
+            "Human interference - Land use intensification",
+            "Human interference - Recreational fishing",
+            "Human interference - Recreational pressures",
+            "Human interference - Road/vehicle strike",
+            "Land management practices - Changes to hydrology and aquatic systems",
+            "Land management practices - Domestic grazing/stock impacts",
+            "Land management practices - Excess recharge of groundwater",
+            "Land management practices - Excess use (or over-use) of surface water or groundwater resources",
+            "Land management practices - Excessive fertiliser use",
+            "Land management practices - Inappropriate ground cover management",
+            "Land management practices - Runoff",
+            "Native fauna - Competition",
+            "Native fauna - Predation",
+            "Pest - Competition/exclusion",
+            "Pest - Disease transmission",
+            "Pest - Habitat degradation",
+            "Pest - Introduction of new pest animals",
+            "Pest - Predation",
+            "Pollution - Chemical",
+            "Pollution - Eutrophication/algal blooms",
+            "Pollution - Inappropriate waste disposal",
+            "Pollution - Sediment ",
+            "Population size/range - Low habitat area",
+            "Population size/range - Low population numbers",
+            "Weeds - Competition",
+            "Weeds - Introduction of new weed",
+            "Weeds - Spread of weeds from surrounding areas"
+        ],
+        "navigationMode": "returnToProject",
+        "priorityPlaces": [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
+        ],
+        "supportsParatoo": true,
+        "supportsMeriPlanHistory": true
+    };
+
+
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Agriculture Sector Adopting Practices"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Agriculture Sector Adopting Practices",
+        "category": "Agriculture Sector Adopting Practices",
+        "outcome": "1. The agriculture sector is adopting practices to reduce emissions and build resilience to climate change"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Agriculture Sector"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Agriculture Sector",
+        "category": "Agriculture Sector",
+        "outcome": "2. The agriculture sector is supported to harness carbon and biodiversity incentives and implement industry sustainability frameworks"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Farmer Sector"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Farmer Sector",
+        "category": "Farmer Sector",
+        "outcome": "3. Farmers are supported to drive agricultural growth, while adopting sustainable natural resource management practices that protect and conserve natural capital and biodiversity"
+    },
+    {
+        "category": "Agriculture Sector",
+        "type": "medium",
+        "outcome": "1. The agriculture sector is adopting practices to reduce emissions and build resilience to climate change (Medium Term)"
+    },
+    {
+        "category": "Agriculture Sector",
+        "type": "medium",
+        "outcome": "2. The agriculture sector is supported to harness carbon and biodiversity incentives and implement industry sustainability frameworks (Medium Term)"
+    },
+    {
+        "category": "Agriculture Sector",
+        "type": "medium",
+        "outcome": "3. Farmers are supported to drive agricultural growth, while adopting sustainable natural resource management practices that protect and conserve natural capital and biodiversity (Medium Term)"
+    },
+    {
+        "category": "Agriculture Sector",
+        "type": "short",
+        "outcome": "1. The agriculture sector is adopting practices to reduce emissions and build resilience to climate change (Short Term)"
+    },
+    {
+        "category": "Agriculture Sector",
+        "type": "short",
+        "outcome": "2. The agriculture sector is supported to harness carbon and biodiversity incentives and implement industry sustainability frameworks (Short Term)"
+    },
+    {
+        "category": "Agriculture Sector",
+        "type": "short",
+        "outcome": "3. Farmers are supported to drive agricultural growth, while adopting sustainable natural resource management practices that protect and conserve natural capital and biodiversity (Short Term)"
+    }
+];
+
+var priorities = [
+    {
+        "category": "Plants",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Plants",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Plants",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Birds",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Birds",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Plants",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Plants",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Target 3",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Birds",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Plants",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Plants",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Birds",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Plants",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Plants",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Fish",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Plants",
+        "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gorge Rice-flower, Pimelea cremnophila"
+    },
+    {
+        "category": "Plants",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Fish",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Birds",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Birds",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Plants",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Leaf-Scaled Seasnake – Aipysurus foliosquama"
+    },
+    {
+        "category": "Plants",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Plants",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Birds",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Fish",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Fish",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Plants",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Mammals",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Target 3",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Birds",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Birds",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Birds",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Fish",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Fish",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Plants",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Plants",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Fish",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Fish",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Plants",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Plants",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Birds",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Frogs",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Target 3",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Birds",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Fish",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Target 3",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Alpine Sphagnum Bogs and Associated Fens"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Natural Temperate Grassland of the South Eastern Highlands"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "White Box-Yellow Box-Blakely's Red Gum Grassy Woodland and Derived Native Grassland"
+    },
+    {
+        "category": "Ramsar",
+        "priority": "Ginini Flats Wetland Complex"
+    },
+    {
+        "category": "Agriculture Sector Adopting Practices",
+        "priority": "Climate change adaptation"
+    },
+    {
+        "category": "Agriculture Sector Adopting Practices",
+        "priority": "On-farm emissions reduction practices"
+    },
+    {
+        "category": "Agriculture Sector",
+        "priority": "Carbon and biodiversity market information"
+    },
+    {
+        "category": "Agriculture Sector",
+        "priority": "Sustainability framework engagement"
+    },
+    {
+        "category": "Agriculture Sector",
+        "priority": "Market access and traceability"
+    },
+    {
+        "category": "Farmer Sector",
+        "priority": "Native vegetation and biodiversity on-farm"
+    },
+    {
+        "category": "Farmer Sector",
+        "priority": "Soil carbon"
+    },
+    {
+        "category": "Farmer Sector",
+        "priority": "Soil erosion"
+    },
+    {
+        "category": "Farmer Sector",
+        "priority": "Soil acidification"
+    },
+    {
+        "category": "Farmer Sector",
+        "priority": "Sustainable agriculture practices"
+    }
+];
+
+//Create the parent program
+let programName = "Natural Heritage Trust";
+var parent = createOrFindProgram(programName);
+var subprograms = ["Climate-Smart Agriculture Program - Sustainable Agriculture Facilitators"]
+
+subprograms.forEach(function (subProgram){
+    createOrFindProgram(subProgram, parent._id);
+});
+
+subprograms.forEach(function (subprogram){
+    var program = db.program.find({name: subprogram});
+    while(program.hasNext()){
+        var p = program.next();
+        print("sub program ID: " + p.programId)
+        db.program.updateOne({programId:p.programId}, {$set:{config:config, outcomes:outcomes, priorities:priorities}});
+        useNhtServiceLabels(p.name);
+    }
+});
+
+
+
+
diff --git a/src/main/scripts/releases/3.1/adhoc/createUrbanRivers12monthSubProgram.js b/src/main/scripts/releases/3.1/adhoc/createUrbanRivers12monthSubProgram.js
new file mode 100644
index 000000000..9f8863b7c
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/createUrbanRivers12monthSubProgram.js
@@ -0,0 +1,755 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/program.js');
+var userId = '';
+
+const serviceFormName = "NHT Output Report";
+const annualReportFormName = "NHT Annual Report";
+const outcomes1ReportFormName = "NHT Outcomes 1 Report";
+const outcomes2ReportFormName = "NHT Outcomes 2 Report";
+
+var config =
+    {
+        "meriPlanContents": [
+            {
+                "template": "name",
+                "model": {
+                    "tableFormatting": true
+                }
+            },
+            {
+                "template": "priorityPlace",
+                "model": {
+                    "priorityPlaceHelpText": "Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species.",
+                    "priorityPlaceLabel": "Does this project directly support a priority place?"
+                }
+            },
+            {
+                "template": "indigenousInvolvement"
+            },
+            {
+                "template": "description",
+                "model": {
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
+                }
+            },
+            {
+                "template": "programOutcome",
+                "model": {
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
+                }
+            },
+            {
+                "template": "additionalOutcomes",
+                "model": {
+                    "outcomePriority": "Additional outcome/s",
+                    "helpTextHeading": "If the project is not delivering additional benefits, delete the row using the 'x' in the right-most column.",
+                    "title": "Additional benefits",
+                    "priority": "Additional Investment Priorities",
+                    "priorityHelpText": "Other investment priorities that will benefit from the project.  Delete the row if there are no additional outcomes."
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "mid",
+                    "helpText": "Projects more than 3 years in duration must set medium-term Project outcomes achievable at project completion. Ensure proposed outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "minimumNumberOfOutcomes": 0,
+                    "subtitle": "Medium-term outcome statement/s",
+                    "title": "Project Outcomes",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "extendedKeyThreats",
+                "model": {
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "threatHelpText": "Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText": "Describe the proposed method to address the threat or threatening process",
+                    "title": "Key threat(s) and/or key threatening processes"
+                }
+            },
+            {
+                "template": "projectMethodology",
+                "model": {
+                    "helpText": "Include all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic.",
+                    "maxSize": "4000",
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])"
+                }
+            },
+            {
+                "template": "projectPartnerships",
+                "model": {
+                    "helpTextHeading": "Note: Not limited to key subcontractors.",
+                    "helpTextPartnerName": "Insert name of project partner. To be a project partner, they need to be actively involved in the planning or delivery of the project"
+                }
+            },
+            {
+                "template": "extendedBaselineMonitoring",
+                "model": {
+                    "approachHeading": "Monitoring method",
+                    "indicatorHeading": "Monitoring methodology",
+                    "monitoringServiceHelpText": "Select the relevant Project Services(s)/Target measure(s) that will be used to support ongoing monitoring",
+                    "baselineDataDescriptionHelpText": "Describe the project baseline to be established, or the baseline data that currently exists",
+                    "baselineMethodHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "baselineDataHelpText": "Existing baseline data needs to be based on best practice methods and be compatible with the EMSA protocols.",
+                    "approachHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "titleHelpText": "Describe the Project Baseline(s) and ongoing monitoring which will be used to report progress towards this projects outcome(s).  Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "baselineServiceHelpText": "Select the relevant Project Service(s)/Target measure(s) that will be used to support the development of the baseline",
+                    "newIndicatorText": "New monitoring indicator"
+                }
+            },
+            {
+                "template": "projectReview",
+                "model": {
+                    "title": "Project review, improvement and evaluation methodology and approach (3000 character limit [approximately 500 words])"
+                }
+            },
+            {
+                "template": "nationalAndRegionalPlans",
+                "model": {
+                    "includeUrl": true,
+                    "headingTitle": "Conservation and management plans"
+                }
+            },
+            {
+                "template": "serviceOutcomeTargets",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections",
+                    "title": "Project services and targets",
+                    "serviceName": "Service"
+                }
+            },
+            {
+                "template": "serviceForecasts",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                },
+                "excludedModes": [
+                    "PRINT"
+                ]
+            },
+            {
+                "template": "attachmentFooter",
+                "model": {
+                    "heading": "MERI Attachments",
+                    "attachmentText": "Please attach Project logic to your MERI plan using the documents function on the Admin tab.  A \"Document type\" of \"Project Logic\" should be selected when uploading the document."
+                }
+            }
+        ],
+        "excludes": [],
+        "programServiceConfig": {
+            "serviceFormName": "NHT Output Report",
+            "programServices": [
+                {
+                    "serviceTargets": [
+                        "c3276929-b8a9-4985-a329-49b86f14018c"
+                    ],
+                    "serviceId": 1
+                },
+                {
+                    "serviceTargets": [
+                        "69deaaf9-cdc2-439a-b684-4cffdc7f224e"
+                    ],
+                    "serviceId": 2
+                },
+                {
+                    "serviceTargets": [
+                        "1f8161bc-908b-4ec8-ab7f-edac973a657d",
+                        "88908921-1248-4a7c-b185-51c625c737e3",
+                        "fe9f1a6c-e614-489a-80fa-4d6d76f1cf95"
+                    ],
+                    "serviceId": 3
+                },
+                {
+                    "serviceTargets": [
+                        "aa0c6b29-285e-4344-987e-dfeaf1d95648",
+                        "a9d98baa-b2ab-4428-82cf-d96185e63aa6",
+                        "c4ea5ce3-4a70-4df8-aff7-ffa929e7df61"
+                    ],
+                    "serviceId": 4
+                },
+                {
+                    "serviceTargets": [
+                        "55d76c03-c89d-40fe-867b-93f7a48ff9c1",
+                        "3cbf653f-f74c-4066-81d2-e3f78268185c",
+                        "3855d565-3b77-497b-90af-addb271aa598",
+                        "5dbfb32a-5933-4d8a-9937-41f350fb5f75"
+                    ],
+                    "serviceId": 5
+                },
+                {
+                    "serviceTargets": [
+                        "22771c0d-8403-433b-b468-e36dc16a1d21",
+                        "675cc878-eb80-435f-a841-d89b657fb2e3",
+                        "dd9f8fd4-b6c7-4f09-bbbf-5d721afc7677",
+                        "6f3cb6ab-5c6a-49be-9af9-9226fa751725"
+                    ],
+                    "serviceId": 7
+                },
+                {
+                    "serviceTargets": [
+                        "e0b4cc3e-e94a-4c97-81dc-a4cb868c2cc3",
+                        "b0bcfc54-76fa-4659-accf-276c18b50c31"
+                    ],
+                    "serviceId": 8
+                },
+                {
+                    "serviceTargets": [
+                        "9416c9f4-48ca-4bd1-8822-cd45ebb56c58",
+                        "2409e649-2ee2-47fd-9e76-ef2ffa07a5e7",
+                        "d58f8dba-109d-4179-b130-a888cd3d303c",
+                        "01686d38-9165-4497-9648-627ef81945a7"
+                    ],
+                    "serviceId": 9
+                },
+                {
+                    "serviceTargets": [
+                        "0e2f8d61-b7b4-4d2d-b07c-4fc20bbe326a",
+                        "bb506258-e907-43d3-99bd-0fe0400f654e"
+                    ],
+                    "serviceId": 10
+                },
+                {
+                    "serviceTargets": [
+                        "3c83e639-9c19-4b31-a86f-9d2d5e78123b",
+                        "e901be5e-8336-432e-b164-f278abd7430b"
+                    ],
+                    "serviceId": 12
+                },
+                {
+                    "serviceTargets": [
+                        "5557288b-190e-4a3f-a60b-4bdff6ca8fe8",
+                        "902df7a8-92f6-420d-9544-47d4b8cf31ca"
+                    ],
+                    "serviceId": 13
+                },
+                {
+                    "serviceTargets": [
+                        "9deb3edf-50c7-4b04-a1fb-d1451eadf641",
+                        "360c8b86-360c-4ca3-b1aa-626be56f2b11"
+                    ],
+                    "serviceId": 14
+                },
+                {
+                    "serviceTargets": [
+                        "7c30bc26-829e-4080-8059-27af9285113b",
+                        "158a5544-78e3-4d00-9f1b-62a85a938268"
+                    ],
+                    "serviceId": 15
+                },
+                {
+                    "serviceTargets": [
+                        "4aa201ec-2066-40e1-a457-99daa569c8e2",
+                        "f46f096a-a274-426b-adad-702e7cf8fab7",
+                        "3b1403f3-139a-4206-b325-62ebfe05ddc4",
+                        "7cb13c22-3dcd-43e7-808d-e0e26f5c090d"
+                    ],
+                    "serviceId": 16
+                },
+                {
+                    "serviceTargets": [
+                        "5c6db4c1-7fde-452e-8735-e52842fe6217",
+                        "41cb1e2c-59bc-4639-8bf7-fe0f528e006e"
+                    ],
+                    "serviceId": 18
+                },
+                {
+                    "serviceTargets": [
+                        "4f71e00a-2d80-488d-9ce4-947e60589149",
+                        "69a2ffba-41e9-406e-8ea4-5bdeee92cbde"
+                    ],
+                    "serviceId": 42
+                },
+                {
+                    "serviceTargets": [
+                        "26ea592f-ee39-4e6e-b6af-5b53fb1a5675"
+                    ],
+                    "serviceId": 17
+                },
+                {
+                    "serviceTargets": [
+                        "3587a984-68f9-4db3-b5af-49f265d853e0",
+                        "9d2d01be-b517-4be2-a225-8b1c887e016e"
+                    ],
+                    "serviceId": 19
+                },
+                {
+                    "serviceTargets": [
+                        "d0516817-5acb-46bd-9871-2696c245bad0",
+                        "7fed132d-6a38-448c-b519-381ab9e1e027",
+                        "e08dda14-360c-4b66-b8c5-eb0269c5aa44",
+                        "f3671aa7-773f-447d-9649-ba7f11dbe97a"
+                    ],
+                    "serviceId": 20
+                },
+                {
+                    "serviceTargets": [
+                        "5ab2b539-a5b4-40da-a556-a2c18066345b",
+                        "36410625-05f3-42d3-b04f-a3b268498ee1"
+                    ],
+                    "serviceId": 23
+                },
+                {
+                    "serviceTargets": [
+                        "0162246b-13fd-40c9-ae26-fb767eee76f8"
+                    ],
+                    "serviceId": 24
+                },
+                {
+                    "serviceTargets": [
+                        "b9e710e4-7dd3-4acc-ac2c-c69f4bcb9787",
+                        "00934509-f102-4d39-a043-7547a8ab9ac8",
+                        "1021bec7-3836-4b33-90b4-76701efd4fe3",
+                        "4dad393e-cbf7-43dd-87bb-62ea8f8afcdd"
+                    ],
+                    "serviceId": 26
+                },
+                {
+                    "serviceTargets": [
+                        "a516c78d-740f-463b-a1ce-5b02b8c82dd3",
+                        "4cbcb2b5-45cd-42dc-96bf-a9a181a4865b",
+                        "fbc45154-1d60-4f5e-a484-fdff514f9d51",
+                        "85191c99-f56d-46e6-9311-a58c1f37965d"
+                    ],
+                    "serviceId": 27
+                },
+                {
+                    "serviceTargets": [
+                        "3cfa82aa-0b38-49c0-be37-0fa61b5b6e3c",
+                        "91e90861-3ba7-4257-a765-6cab24c6f58a"
+                    ],
+                    "serviceId": 28
+                },
+                {
+                    "serviceTargets": [
+                        "96be68cf-783d-452a-b8fd-3832163f95db",
+                        "e70c70fd-4f31-41dc-a4b4-07f79efc3055"
+                    ],
+                    "serviceId": 29
+                },
+                {
+                    "serviceTargets": [
+                        "598bd978-0907-4cad-a7a6-ec5a8a8bbdc4",
+                        "d29bd931-1dd1-47c4-b456-c175099ff1df"
+                    ],
+                    "serviceId": 30
+                },
+                {
+                    "serviceTargets": [
+                        "6db1ebd7-92c5-49f2-98b7-2faa700fd752",
+                        "524d93b4-5cd1-4d0d-b1f8-d393028220ad"
+                    ],
+                    "serviceId": 31
+                },
+                {
+                    "serviceTargets": [
+                        "8040931a-2e6c-41be-9e92-f1035093b2ac",
+                        "5d652e6e-b719-45bf-8ae6-e9f293c24a92"
+                    ],
+                    "serviceId": 32
+                },
+                {
+                    "serviceTargets": [
+                        "f74182bd-7a53-4157-aeb9-eda281bb0234",
+                        "e7b7bb1e-66c2-4140-90f9-9534aa46ffa3"
+                    ],
+                    "serviceId": 33
+                },
+                {
+                    "serviceTargets": [
+                        "15615a70-ee60-46b8-b5e9-b33d4d88de6b",
+                        "d8dc153b-da23-4f7b-947a-89bc98338d6d",
+                        "5f762c6d-4f42-4458-9855-03c6896959c1",
+                        "5885f105-fc7d-43fd-8c26-c72938a95b76"
+                    ],
+                    "serviceId": 34
+                },
+                {
+                    "serviceTargets": [
+                        "dea1ff8b-f4eb-4987-8073-500bbbf97fcd",
+                        "fba17df1-d5cb-4643-987f-0626055b3c78"
+                    ],
+                    "serviceId": 35
+                },
+                {
+                    "serviceTargets": [
+                        "3ec07754-4a7a-46fb-a76d-553921781716",
+                        "fbc2dab8-7454-40f9-94f6-6bf258fcefff",
+                        "7186e284-0cb2-418e-a8cc-4343eb618140"
+                    ],
+                    "serviceId": 36
+                },
+                {
+                    "serviceTargets": [
+                        "3d06b150-bb86-47dc-8ad8-c33a51c3e3b3"
+                    ],
+                    "serviceId": 43
+                },
+                {
+                    "serviceTargets": [
+                        "b8304577-afd8-45e0-8ef4-b71ae10998f5"
+                    ],
+                    "serviceId": 44
+                }
+            ]
+        },
+        "visibility": "public",
+        "requiresActivityLocking": true,
+        "reportData": {
+            "NHT Output Report": "nhtOutputReportData"
+        },
+        "supportsMeriPlanComparison": true,
+        "projectTemplate": "rlp",
+        "activityPeriodDescriptor": "Outputs report #",
+        "requireMeritAdminToReturnMeriPlan": true,
+        "emailTemplates": {
+            "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
+            "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
+            "planApprovedEmailTemplate": "RLP_PLAN_APPROVED_EMAIL_TEMPLATE",
+            "planReturnedEmailTemplate": "RLP_PLAN_RETURNED_EMAIL_TEMPLATE",
+            "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
+            "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
+        },
+        "meriPlanTemplate": "configurableMeriPlan",
+        "riskAndThreatTypes": [
+            "Performance",
+            "Work Health and Safety",
+            "People resources",
+            "Financial",
+            "External stakeholders",
+            "Natural Environment"
+        ],
+        "projectReports": [
+            {
+                "firstReportingPeriodEnd": "2024-06-30T14:00:00Z",
+                "reportType": "Administrative",
+                "reportDescriptionFormat": "Annual Progress Report %2$tY - %3$tY for %4$s",
+                "reportNameFormat": "Annual Progress Report %2$tY - %3$tY",
+                "reportingPeriodInMonths": 12,
+                "category": "Annual Progress Reporting",
+                "activityType": annualReportFormName,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "label": "Annual",
+                "minimumReportDurationInDays": 1
+            },
+        ],
+        "keyThreatCodes": [
+            "Climate Change - Changed flooding regime",
+            "Climate Change - Changed rainfall patterns",
+            "Climate Change - Sea level rises",
+            "Climate Change - Unexpected seasonal/temperature extremes",
+            "Disease/pathogens - Areas that are infected",
+            "Disease/pathogens - Possible infection of disease free areas",
+            "Fire - Inappropriate fire regime",
+            "Fire - Lack of protection for ecological assets during fire control activities",
+            "Genetics - Bottleneck/inbreeding",
+            "Habitat loss - Breeding place disturbance",
+            "Habitat loss - Dieback/senescence",
+            "Habitat loss - Feeding habitat loss/interference",
+            "Habitat loss - Habitat fragmentation",
+            "Habitat loss - Land clearing",
+            "Habitat loss - Loss of critical ecosystem service supporting habitat",
+            "Human interference - Fish and harvesting aquatic resources (commercial)",
+            "Human interference - Flow-on effects of housing development",
+            "Human interference - Illegal activities",
+            "Human interference - Industrial development",
+            "Human interference - Land use intensification",
+            "Human interference - Recreational fishing",
+            "Human interference - Recreational pressures",
+            "Human interference - Road/vehicle strike",
+            "Land management practices - Changes to hydrology and aquatic systems",
+            "Land management practices - Domestic grazing/stock impacts",
+            "Land management practices - Excess recharge of groundwater",
+            "Land management practices - Excess use (or over-use) of surface water or groundwater resources",
+            "Land management practices - Excessive fertiliser use",
+            "Land management practices - Inappropriate ground cover management",
+            "Land management practices - Runoff",
+            "Native fauna - Competition",
+            "Native fauna - Predation",
+            "Pest - Competition/exclusion",
+            "Pest - Disease transmission",
+            "Pest - Habitat degradation",
+            "Pest - Introduction of new pest animals",
+            "Pest - Predation",
+            "Pollution - Chemical",
+            "Pollution - Eutrophication/algal blooms",
+            "Pollution - Inappropriate waste disposal",
+            "Pollution - Sediment ",
+            "Population size/range - Low habitat area",
+            "Population size/range - Low population numbers",
+            "Weeds - Competition",
+            "Weeds - Introduction of new weed",
+            "Weeds - Spread of weeds from surrounding areas"
+        ],
+        "navigationMode": "returnToProject",
+        "priorityPlaces": [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
+        ],
+        "supportsParatoo": true,
+        "supportsMeriPlanHistory": true
+    };
+
+
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Waterways"
+            },
+            {
+                "category": "Threatened Species"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Ecological health",
+        "category": "Waterways",
+        "outcome": "The ecological health and condition of waterways is improved and/or repaired to benefit native plants and animals (including threatened species), threatened ecological communities, and the ecological character of Ramsar sites, in urban, outer urban /peri-urban and regional centres"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Waterways"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "River health",
+        "category": "River health",
+        "outcome": "The health and qualities of waterways is improved and/or repaired to benefit local communities in urban, outer urban /peri-urban and regional centres."
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "By 30 June 2028, there is measurable repair of waterway habitats (in-stream and terrestrial) to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres."
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "By 30 June 2028, there is measurable repair of water quality, hydrology and in stream connectivity to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres."
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "By June 2028 there is a measurable improvement to the services provided by urban green and blue space to benefit local communities in urban, outer urban /peri-urban and regional centres."
+    },
+    {
+        "category": "River health",
+        "type": "short",
+        "outcome": "By 30 June 2025, there is measurable repair of waterway habitats (in-stream and terrestrial) to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres."
+    },
+    {
+        "category":"River health",
+        "type": "short",
+        "outcome": " By 30 June 2025, there is measurable repair of water quality, hydrology and in stream connectivity to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres."
+    },
+    {
+        "category":"River health",
+        "type": "short",
+        "outcome": "By June 2025 there is a measurable improvement to the services provided by urban green and blue space to benefit local communities in urban, outer urban /peri-urban and regional centres."
+    }
+];
+
+var priorities = [
+    {
+        "category": "Waterways",
+        "priority": "Saltwater Creek, Cairns"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Bulimba Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Cubberla Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Bremer River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Saltwater Creek, Gold Coast"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Fig Tree Creek, Yeppoon"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Downfall Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Dowse Lagoon"
+    },
+    {
+        "category": "Waterways",
+        "priority": "McCready's Creek, Mackay"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Slacks Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Lake Macquarie"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Hawkesbury River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Tuggerah Lakes"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Shoalhaven and Crookshaven Rivers"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Cooks River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Canberra Waterways"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Peter Hopper Lake"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Moonee Ponds Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Karaaf Wetlands"
+    },
+    {
+        "category": "Waterways",
+        "priority": "KooyongKoot (Tooronga Park wetland)"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Diamond Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Yarra Flats"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Elster Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Redan Wetlands and Yarrowee River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Werribee River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Darebin Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Merri Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Gardiners Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Derwent River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Tamar Estuary"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Onkaparinga River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Pedler Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Brownhill Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Port River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Sturt River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Swan and Canning Rivers"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Darwin creeks (Rapid Creek, Mitchell Creek, Ludmilla Creek and Sandy Creek)"
+    }
+];
+
+//Create the parent program
+let programName = "Urban Rivers and Catchments Program";
+var parent = createOrFindProgram(programName);
+var subprograms = ["URCP round 1 election commitments - 12 month reports"]
+
+subprograms.forEach(function (subProgram){
+    createOrFindProgram(subProgram, parent._id);
+});
+
+subprograms.forEach(function (subprogram){
+    var program = db.program.find({name: subprogram});
+    while(program.hasNext()){
+        var p = program.next();
+        print("sub program ID: " + p.programId)
+        db.program.updateOne({programId:p.programId}, {$set:{config:config, outcomes:outcomes, priorities:priorities}});
+        useNhtServiceLabels(p.name);
+    }
+});
+
+
diff --git a/src/main/scripts/releases/3.1/adhoc/createUrbanRivers6monthSubProgram.js b/src/main/scripts/releases/3.1/adhoc/createUrbanRivers6monthSubProgram.js
new file mode 100644
index 000000000..83c61387d
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/createUrbanRivers6monthSubProgram.js
@@ -0,0 +1,759 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/program.js');
+var userId = '';
+
+const serviceFormName = "NHT Output Report";
+const annualReportFormName = "NHT Annual Report";
+const outcomes1ReportFormName = "NHT Outcomes 1 Report";
+const outcomes2ReportFormName = "NHT Outcomes 2 Report";
+
+var config =
+    {
+        "meriPlanContents": [
+            {
+                "template": "name",
+                "model": {
+                    "tableFormatting": true
+                }
+            },
+            {
+                "template": "priorityPlace",
+                "model": {
+                    "priorityPlaceHelpText": "Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species.",
+                    "priorityPlaceLabel": "Does this project directly support a priority place?"
+                }
+            },
+            {
+                "template": "indigenousInvolvement"
+            },
+            {
+                "template": "description",
+                "model": {
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
+                }
+            },
+            {
+                "template": "programOutcome",
+                "model": {
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
+                }
+            },
+            {
+                "template": "additionalOutcomes",
+                "model": {
+                    "outcomePriority": "Additional outcome/s",
+                    "helpTextHeading": "If the project is not delivering additional benefits, delete the row using the 'x' in the right-most column.",
+                    "title": "Additional benefits",
+                    "priority": "Additional Investment Priorities",
+                    "priorityHelpText": "Other investment priorities that will benefit from the project.  Delete the row if there are no additional outcomes."
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "mid",
+                    "helpText": "Projects more than 3 years in duration must set medium-term Project outcomes achievable at project completion. Ensure proposed outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "minimumNumberOfOutcomes": 0,
+                    "subtitle": "Medium-term outcome statement/s",
+                    "title": "Project Outcomes",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "extendedKeyThreats",
+                "model": {
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "threatHelpText": "Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText": "Describe the proposed method to address the threat or threatening process",
+                    "title": "Key threat(s) and/or key threatening processes"
+                }
+            },
+            {
+                "template": "projectMethodology",
+                "model": {
+                    "helpText": "Include all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic.",
+                    "maxSize": "4000",
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])"
+                }
+            },
+            {
+                "template": "projectPartnerships",
+                "model": {
+                    "helpTextHeading": "Note: Not limited to key subcontractors.",
+                    "helpTextPartnerName": "Insert name of project partner. To be a project partner, they need to be actively involved in the planning or delivery of the project"
+                }
+            },
+            {
+                "template": "extendedBaselineMonitoring",
+                "model": {
+                    "approachHeading": "Monitoring method",
+                    "indicatorHeading": "Monitoring methodology",
+                    "monitoringServiceHelpText": "Select the relevant Project Services(s)/Target measure(s) that will be used to support ongoing monitoring",
+                    "baselineDataDescriptionHelpText": "Describe the project baseline to be established, or the baseline data that currently exists",
+                    "baselineMethodHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "baselineDataHelpText": "Existing baseline data needs to be based on best practice methods and be compatible with the EMSA protocols.",
+                    "approachHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "titleHelpText": "Describe the Project Baseline(s) and ongoing monitoring which will be used to report progress towards this projects outcome(s).  Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "baselineServiceHelpText": "Select the relevant Project Service(s)/Target measure(s) that will be used to support the development of the baseline",
+                    "newIndicatorText": "New monitoring indicator"
+                }
+            },
+            {
+                "template": "projectReview",
+                "model": {
+                    "title": "Project review, improvement and evaluation methodology and approach (3000 character limit [approximately 500 words])"
+                }
+            },
+            {
+                "template": "nationalAndRegionalPlans",
+                "model": {
+                    "includeUrl": true,
+                    "headingTitle": "Conservation and management plans"
+                }
+            },
+            {
+                "template": "serviceOutcomeTargets",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections",
+                    "title": "Project services and targets",
+                    "serviceName": "Service"
+                }
+            },
+            {
+                "template": "serviceForecasts",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                },
+                "excludedModes": [
+                    "PRINT"
+                ]
+            },
+            {
+                "template": "attachmentFooter",
+                "model": {
+                    "heading": "MERI Attachments",
+                    "attachmentText": "Please attach Project logic to your MERI plan using the documents function on the Admin tab.  A \"Document type\" of \"Project Logic\" should be selected when uploading the document."
+                }
+            }
+        ],
+        "excludes": [],
+        "programServiceConfig": {
+            "serviceFormName": "NHT Output Report",
+            "programServices": [
+                {
+                    "serviceTargets": [
+                        "c3276929-b8a9-4985-a329-49b86f14018c"
+                    ],
+                    "serviceId": 1
+                },
+                {
+                    "serviceTargets": [
+                        "69deaaf9-cdc2-439a-b684-4cffdc7f224e"
+                    ],
+                    "serviceId": 2
+                },
+                {
+                    "serviceTargets": [
+                        "1f8161bc-908b-4ec8-ab7f-edac973a657d",
+                        "88908921-1248-4a7c-b185-51c625c737e3",
+                        "fe9f1a6c-e614-489a-80fa-4d6d76f1cf95"
+                    ],
+                    "serviceId": 3
+                },
+                {
+                    "serviceTargets": [
+                        "aa0c6b29-285e-4344-987e-dfeaf1d95648",
+                        "a9d98baa-b2ab-4428-82cf-d96185e63aa6",
+                        "c4ea5ce3-4a70-4df8-aff7-ffa929e7df61"
+                    ],
+                    "serviceId": 4
+                },
+                {
+                    "serviceTargets": [
+                        "55d76c03-c89d-40fe-867b-93f7a48ff9c1",
+                        "3cbf653f-f74c-4066-81d2-e3f78268185c",
+                        "3855d565-3b77-497b-90af-addb271aa598",
+                        "5dbfb32a-5933-4d8a-9937-41f350fb5f75"
+                    ],
+                    "serviceId": 5
+                },
+                {
+                    "serviceTargets": [
+                        "22771c0d-8403-433b-b468-e36dc16a1d21",
+                        "675cc878-eb80-435f-a841-d89b657fb2e3",
+                        "dd9f8fd4-b6c7-4f09-bbbf-5d721afc7677",
+                        "6f3cb6ab-5c6a-49be-9af9-9226fa751725"
+                    ],
+                    "serviceId": 7
+                },
+                {
+                    "serviceTargets": [
+                        "e0b4cc3e-e94a-4c97-81dc-a4cb868c2cc3",
+                        "b0bcfc54-76fa-4659-accf-276c18b50c31"
+                    ],
+                    "serviceId": 8
+                },
+                {
+                    "serviceTargets": [
+                        "9416c9f4-48ca-4bd1-8822-cd45ebb56c58",
+                        "2409e649-2ee2-47fd-9e76-ef2ffa07a5e7",
+                        "d58f8dba-109d-4179-b130-a888cd3d303c",
+                        "01686d38-9165-4497-9648-627ef81945a7"
+                    ],
+                    "serviceId": 9
+                },
+                {
+                    "serviceTargets": [
+                        "0e2f8d61-b7b4-4d2d-b07c-4fc20bbe326a",
+                        "bb506258-e907-43d3-99bd-0fe0400f654e"
+                    ],
+                    "serviceId": 10
+                },
+                {
+                    "serviceTargets": [
+                        "3c83e639-9c19-4b31-a86f-9d2d5e78123b",
+                        "e901be5e-8336-432e-b164-f278abd7430b"
+                    ],
+                    "serviceId": 12
+                },
+                {
+                    "serviceTargets": [
+                        "5557288b-190e-4a3f-a60b-4bdff6ca8fe8",
+                        "902df7a8-92f6-420d-9544-47d4b8cf31ca"
+                    ],
+                    "serviceId": 13
+                },
+                {
+                    "serviceTargets": [
+                        "9deb3edf-50c7-4b04-a1fb-d1451eadf641",
+                        "360c8b86-360c-4ca3-b1aa-626be56f2b11"
+                    ],
+                    "serviceId": 14
+                },
+                {
+                    "serviceTargets": [
+                        "7c30bc26-829e-4080-8059-27af9285113b",
+                        "158a5544-78e3-4d00-9f1b-62a85a938268"
+                    ],
+                    "serviceId": 15
+                },
+                {
+                    "serviceTargets": [
+                        "4aa201ec-2066-40e1-a457-99daa569c8e2",
+                        "f46f096a-a274-426b-adad-702e7cf8fab7",
+                        "3b1403f3-139a-4206-b325-62ebfe05ddc4",
+                        "7cb13c22-3dcd-43e7-808d-e0e26f5c090d"
+                    ],
+                    "serviceId": 16
+                },
+                {
+                    "serviceTargets": [
+                        "5c6db4c1-7fde-452e-8735-e52842fe6217",
+                        "41cb1e2c-59bc-4639-8bf7-fe0f528e006e"
+                    ],
+                    "serviceId": 18
+                },
+                {
+                    "serviceTargets": [
+                        "4f71e00a-2d80-488d-9ce4-947e60589149",
+                        "69a2ffba-41e9-406e-8ea4-5bdeee92cbde"
+                    ],
+                    "serviceId": 42
+                },
+                {
+                    "serviceTargets": [
+                        "26ea592f-ee39-4e6e-b6af-5b53fb1a5675"
+                    ],
+                    "serviceId": 17
+                },
+                {
+                    "serviceTargets": [
+                        "3587a984-68f9-4db3-b5af-49f265d853e0",
+                        "9d2d01be-b517-4be2-a225-8b1c887e016e"
+                    ],
+                    "serviceId": 19
+                },
+                {
+                    "serviceTargets": [
+                        "d0516817-5acb-46bd-9871-2696c245bad0",
+                        "7fed132d-6a38-448c-b519-381ab9e1e027",
+                        "e08dda14-360c-4b66-b8c5-eb0269c5aa44",
+                        "f3671aa7-773f-447d-9649-ba7f11dbe97a"
+                    ],
+                    "serviceId": 20
+                },
+                {
+                    "serviceTargets": [
+                        "5ab2b539-a5b4-40da-a556-a2c18066345b",
+                        "36410625-05f3-42d3-b04f-a3b268498ee1"
+                    ],
+                    "serviceId": 23
+                },
+                {
+                    "serviceTargets": [
+                        "0162246b-13fd-40c9-ae26-fb767eee76f8"
+                    ],
+                    "serviceId": 24
+                },
+                {
+                    "serviceTargets": [
+                        "b9e710e4-7dd3-4acc-ac2c-c69f4bcb9787",
+                        "00934509-f102-4d39-a043-7547a8ab9ac8",
+                        "1021bec7-3836-4b33-90b4-76701efd4fe3",
+                        "4dad393e-cbf7-43dd-87bb-62ea8f8afcdd"
+                    ],
+                    "serviceId": 26
+                },
+                {
+                    "serviceTargets": [
+                        "a516c78d-740f-463b-a1ce-5b02b8c82dd3",
+                        "4cbcb2b5-45cd-42dc-96bf-a9a181a4865b",
+                        "fbc45154-1d60-4f5e-a484-fdff514f9d51",
+                        "85191c99-f56d-46e6-9311-a58c1f37965d"
+                    ],
+                    "serviceId": 27
+                },
+                {
+                    "serviceTargets": [
+                        "3cfa82aa-0b38-49c0-be37-0fa61b5b6e3c",
+                        "91e90861-3ba7-4257-a765-6cab24c6f58a"
+                    ],
+                    "serviceId": 28
+                },
+                {
+                    "serviceTargets": [
+                        "96be68cf-783d-452a-b8fd-3832163f95db",
+                        "e70c70fd-4f31-41dc-a4b4-07f79efc3055"
+                    ],
+                    "serviceId": 29
+                },
+                {
+                    "serviceTargets": [
+                        "598bd978-0907-4cad-a7a6-ec5a8a8bbdc4",
+                        "d29bd931-1dd1-47c4-b456-c175099ff1df"
+                    ],
+                    "serviceId": 30
+                },
+                {
+                    "serviceTargets": [
+                        "6db1ebd7-92c5-49f2-98b7-2faa700fd752",
+                        "524d93b4-5cd1-4d0d-b1f8-d393028220ad"
+                    ],
+                    "serviceId": 31
+                },
+                {
+                    "serviceTargets": [
+                        "8040931a-2e6c-41be-9e92-f1035093b2ac",
+                        "5d652e6e-b719-45bf-8ae6-e9f293c24a92"
+                    ],
+                    "serviceId": 32
+                },
+                {
+                    "serviceTargets": [
+                        "f74182bd-7a53-4157-aeb9-eda281bb0234",
+                        "e7b7bb1e-66c2-4140-90f9-9534aa46ffa3"
+                    ],
+                    "serviceId": 33
+                },
+                {
+                    "serviceTargets": [
+                        "15615a70-ee60-46b8-b5e9-b33d4d88de6b",
+                        "d8dc153b-da23-4f7b-947a-89bc98338d6d",
+                        "5f762c6d-4f42-4458-9855-03c6896959c1",
+                        "5885f105-fc7d-43fd-8c26-c72938a95b76"
+                    ],
+                    "serviceId": 34
+                },
+                {
+                    "serviceTargets": [
+                        "dea1ff8b-f4eb-4987-8073-500bbbf97fcd",
+                        "fba17df1-d5cb-4643-987f-0626055b3c78"
+                    ],
+                    "serviceId": 35
+                },
+                {
+                    "serviceTargets": [
+                        "3ec07754-4a7a-46fb-a76d-553921781716",
+                        "fbc2dab8-7454-40f9-94f6-6bf258fcefff",
+                        "7186e284-0cb2-418e-a8cc-4343eb618140"
+                    ],
+                    "serviceId": 36
+                },
+                {
+                    "serviceTargets": [
+                        "3d06b150-bb86-47dc-8ad8-c33a51c3e3b3"
+                    ],
+                    "serviceId": 43
+                },
+                {
+                    "serviceTargets": [
+                        "b8304577-afd8-45e0-8ef4-b71ae10998f5"
+                    ],
+                    "serviceId": 44
+                }
+            ]
+        },
+        "visibility": "public",
+        "requiresActivityLocking": true,
+        "reportData": {
+            "NHT Output Report": "nhtOutputReportData"
+        },
+        "supportsMeriPlanComparison": true,
+        "projectTemplate": "rlp",
+        "activityPeriodDescriptor": "Outputs report #",
+        "requireMeritAdminToReturnMeriPlan": true,
+        "emailTemplates": {
+            "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
+            "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
+            "planApprovedEmailTemplate": "RLP_PLAN_APPROVED_EMAIL_TEMPLATE",
+            "planReturnedEmailTemplate": "RLP_PLAN_RETURNED_EMAIL_TEMPLATE",
+            "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
+            "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
+        },
+        "meriPlanTemplate": "configurableMeriPlan",
+        "riskAndThreatTypes": [
+            "Performance",
+            "Work Health and Safety",
+            "People resources",
+            "Financial",
+            "External stakeholders",
+            "Natural Environment"
+        ],
+        "projectReports": [
+            {
+                "reportType": "Activity",
+                "reportDescriptionFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportNameFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportingPeriodInMonths": 6,
+                "description": "",
+                "minimumReportDurationInDays": 1,
+                "label": "Semester",
+                "calendarAlignmentMonth": 4,
+                "reportsAlignedToCalendar": true,
+                "category": "Outputs Reporting",
+                "activityType": "NHT Output Report",
+                "canSubmitDuringReportingPeriod": true
+            }
+        ],
+        "keyThreatCodes": [
+            "Climate Change - Changed flooding regime",
+            "Climate Change - Changed rainfall patterns",
+            "Climate Change - Sea level rises",
+            "Climate Change - Unexpected seasonal/temperature extremes",
+            "Disease/pathogens - Areas that are infected",
+            "Disease/pathogens - Possible infection of disease free areas",
+            "Fire - Inappropriate fire regime",
+            "Fire - Lack of protection for ecological assets during fire control activities",
+            "Genetics - Bottleneck/inbreeding",
+            "Habitat loss - Breeding place disturbance",
+            "Habitat loss - Dieback/senescence",
+            "Habitat loss - Feeding habitat loss/interference",
+            "Habitat loss - Habitat fragmentation",
+            "Habitat loss - Land clearing",
+            "Habitat loss - Loss of critical ecosystem service supporting habitat",
+            "Human interference - Fish and harvesting aquatic resources (commercial)",
+            "Human interference - Flow-on effects of housing development",
+            "Human interference - Illegal activities",
+            "Human interference - Industrial development",
+            "Human interference - Land use intensification",
+            "Human interference - Recreational fishing",
+            "Human interference - Recreational pressures",
+            "Human interference - Road/vehicle strike",
+            "Land management practices - Changes to hydrology and aquatic systems",
+            "Land management practices - Domestic grazing/stock impacts",
+            "Land management practices - Excess recharge of groundwater",
+            "Land management practices - Excess use (or over-use) of surface water or groundwater resources",
+            "Land management practices - Excessive fertiliser use",
+            "Land management practices - Inappropriate ground cover management",
+            "Land management practices - Runoff",
+            "Native fauna - Competition",
+            "Native fauna - Predation",
+            "Pest - Competition/exclusion",
+            "Pest - Disease transmission",
+            "Pest - Habitat degradation",
+            "Pest - Introduction of new pest animals",
+            "Pest - Predation",
+            "Pollution - Chemical",
+            "Pollution - Eutrophication/algal blooms",
+            "Pollution - Inappropriate waste disposal",
+            "Pollution - Sediment ",
+            "Population size/range - Low habitat area",
+            "Population size/range - Low population numbers",
+            "Weeds - Competition",
+            "Weeds - Introduction of new weed",
+            "Weeds - Spread of weeds from surrounding areas"
+        ],
+        "navigationMode": "returnToProject",
+        "priorityPlaces": [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
+        ],
+        "supportsParatoo": true,
+        "supportsMeriPlanHistory": true
+    };
+
+
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Waterways"
+            },
+            {
+                "category": "Threatened Species"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Ecological health",
+        "category": "Waterways",
+        "outcome": "The ecological health and condition of waterways is improved and/or repaired to benefit native plants and animals (including threatened species), threatened ecological communities, and the ecological character of Ramsar sites, in urban, outer urban /peri-urban and regional centres"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Waterways"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "River health",
+        "category": "River health",
+        "outcome": "The health and qualities of waterways is improved and/or repaired to benefit local communities in urban, outer urban /peri-urban and regional centres."
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "By 30 June 2028, there is measurable repair of waterway habitats (in-stream and terrestrial) to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres."
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "By 30 June 2028, there is measurable repair of water quality, hydrology and in stream connectivity to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres."
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "By June 2028 there is a measurable improvement to the services provided by urban green and blue space to benefit local communities in urban, outer urban /peri-urban and regional centres."
+    },
+    {
+        "category":"River health",
+        "type": "short",
+        "outcome": "By 30 June 2025, there is measurable repair of waterway habitats (in-stream and terrestrial) to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres."
+    }
+    ,
+    {
+        "category":"River health",
+        "type": "short",
+        "outcome": " By 30 June 2025, there is measurable repair of water quality, hydrology and in stream connectivity to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres."
+    }
+    ,
+    {
+        "category":"River health",
+        "type": "short",
+        "outcome": "By June 2025 there is a measurable improvement to the services provided by urban green and blue space to benefit local communities in urban, outer urban /peri-urban and regional centres."
+    }
+];
+
+var priorities = [
+    {
+        "category": "Waterways",
+        "priority": "Saltwater Creek, Cairns"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Bulimba Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Cubberla Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Bremer River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Saltwater Creek, Gold Coast"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Fig Tree Creek, Yeppoon"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Downfall Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Dowse Lagoon"
+    },
+    {
+        "category": "Waterways",
+        "priority": "McCready's Creek, Mackay"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Slacks Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Lake Macquarie"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Hawkesbury River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Tuggerah Lakes"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Shoalhaven and Crookshaven Rivers"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Cooks River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Canberra Waterways"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Peter Hopper Lake"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Moonee Ponds Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Karaaf Wetlands"
+    },
+    {
+        "category": "Waterways",
+        "priority": "KooyongKoot (Tooronga Park wetland)"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Diamond Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Yarra Flats"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Elster Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Redan Wetlands and Yarrowee River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Werribee River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Darebin Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Merri Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Gardiners Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Derwent River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Tamar Estuary"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Onkaparinga River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Pedler Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Brownhill Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Port River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Sturt River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Swan and Canning Rivers"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Darwin creeks (Rapid Creek, Mitchell Creek, Ludmilla Creek and Sandy Creek)"
+    }
+];
+
+//Create the parent program
+let programName = "Urban Rivers and Catchments Program";
+var parent = createOrFindProgram(programName);
+var subprograms = ["URCP round 1 election commitments - 6 month reports"]
+
+subprograms.forEach(function (subProgram){
+    createOrFindProgram(subProgram, parent._id);
+});
+
+subprograms.forEach(function (subprogram){
+    var program = db.program.find({name: subprogram});
+    while(program.hasNext()){
+        var p = program.next();
+        print("sub program ID: " + p.programId)
+        db.program.updateOne({programId:p.programId}, {$set:{config:config, outcomes:outcomes, priorities:priorities}});
+        useNhtServiceLabels(p.name);
+    }
+});
+
+
diff --git a/src/main/scripts/releases/3.1/adhoc/createUrbanRiversFinalReportSubProgram.js b/src/main/scripts/releases/3.1/adhoc/createUrbanRiversFinalReportSubProgram.js
new file mode 100644
index 000000000..1d239e0a2
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/createUrbanRiversFinalReportSubProgram.js
@@ -0,0 +1,757 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/program.js');
+var userId = '';
+
+const serviceFormName = "NHT Output Report";
+const annualReportFormName = "NHT Annual Report";
+const outcomes1ReportFormName = "NHT Outcomes 1 Report";
+const outcomes2ReportFormName = "NHT Outcomes 2 Report";
+
+var config =
+    {
+        "meriPlanContents": [
+            {
+                "template": "name",
+                "model": {
+                    "tableFormatting": true
+                }
+            },
+            {
+                "template": "priorityPlace",
+                "model": {
+                    "priorityPlaceHelpText": "Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species.",
+                    "priorityPlaceLabel": "Does this project directly support a priority place?"
+                }
+            },
+            {
+                "template": "indigenousInvolvement"
+            },
+            {
+                "template": "description",
+                "model": {
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
+                }
+            },
+            {
+                "template": "programOutcome",
+                "model": {
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
+                }
+            },
+            {
+                "template": "additionalOutcomes",
+                "model": {
+                    "outcomePriority": "Additional outcome/s",
+                    "helpTextHeading": "If the project is not delivering additional benefits, delete the row using the 'x' in the right-most column.",
+                    "title": "Additional benefits",
+                    "priority": "Additional Investment Priorities",
+                    "priorityHelpText": "Other investment priorities that will benefit from the project.  Delete the row if there are no additional outcomes."
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "mid",
+                    "helpText": "Projects more than 3 years in duration must set medium-term Project outcomes achievable at project completion. Ensure proposed outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "minimumNumberOfOutcomes": 0,
+                    "subtitle": "Medium-term outcome statement/s",
+                    "title": "Project Outcomes",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "extendedKeyThreats",
+                "model": {
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "threatHelpText": "Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText": "Describe the proposed method to address the threat or threatening process",
+                    "title": "Key threat(s) and/or key threatening processes"
+                }
+            },
+            {
+                "template": "projectMethodology",
+                "model": {
+                    "helpText": "Include all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic.",
+                    "maxSize": "4000",
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])"
+                }
+            },
+            {
+                "template": "projectPartnerships",
+                "model": {
+                    "helpTextHeading": "Note: Not limited to key subcontractors.",
+                    "helpTextPartnerName": "Insert name of project partner. To be a project partner, they need to be actively involved in the planning or delivery of the project"
+                }
+            },
+            {
+                "template": "extendedBaselineMonitoring",
+                "model": {
+                    "approachHeading": "Monitoring method",
+                    "indicatorHeading": "Monitoring methodology",
+                    "monitoringServiceHelpText": "Select the relevant Project Services(s)/Target measure(s) that will be used to support ongoing monitoring",
+                    "baselineDataDescriptionHelpText": "Describe the project baseline to be established, or the baseline data that currently exists",
+                    "baselineMethodHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "baselineDataHelpText": "Existing baseline data needs to be based on best practice methods and be compatible with the EMSA protocols.",
+                    "approachHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "titleHelpText": "Describe the Project Baseline(s) and ongoing monitoring which will be used to report progress towards this projects outcome(s).  Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "baselineServiceHelpText": "Select the relevant Project Service(s)/Target measure(s) that will be used to support the development of the baseline",
+                    "newIndicatorText": "New monitoring indicator"
+                }
+            },
+            {
+                "template": "projectReview",
+                "model": {
+                    "title": "Project review, improvement and evaluation methodology and approach (3000 character limit [approximately 500 words])"
+                }
+            },
+            {
+                "template": "nationalAndRegionalPlans",
+                "model": {
+                    "includeUrl": true,
+                    "headingTitle": "Conservation and management plans"
+                }
+            },
+            {
+                "template": "serviceOutcomeTargets",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections",
+                    "title": "Project services and targets",
+                    "serviceName": "Service"
+                }
+            },
+            {
+                "template": "serviceForecasts",
+                "model": {
+                    "titleHelpText": "Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                },
+                "excludedModes": [
+                    "PRINT"
+                ]
+            },
+            {
+                "template": "attachmentFooter",
+                "model": {
+                    "heading": "MERI Attachments",
+                    "attachmentText": "Please attach Project logic to your MERI plan using the documents function on the Admin tab.  A \"Document type\" of \"Project Logic\" should be selected when uploading the document."
+                }
+            }
+        ],
+        "excludes": [],
+        "programServiceConfig": {
+            "serviceFormName": "NHT Output Report",
+            "programServices": [
+                {
+                    "serviceTargets": [
+                        "c3276929-b8a9-4985-a329-49b86f14018c"
+                    ],
+                    "serviceId": 1
+                },
+                {
+                    "serviceTargets": [
+                        "69deaaf9-cdc2-439a-b684-4cffdc7f224e"
+                    ],
+                    "serviceId": 2
+                },
+                {
+                    "serviceTargets": [
+                        "1f8161bc-908b-4ec8-ab7f-edac973a657d",
+                        "88908921-1248-4a7c-b185-51c625c737e3",
+                        "fe9f1a6c-e614-489a-80fa-4d6d76f1cf95"
+                    ],
+                    "serviceId": 3
+                },
+                {
+                    "serviceTargets": [
+                        "aa0c6b29-285e-4344-987e-dfeaf1d95648",
+                        "a9d98baa-b2ab-4428-82cf-d96185e63aa6",
+                        "c4ea5ce3-4a70-4df8-aff7-ffa929e7df61"
+                    ],
+                    "serviceId": 4
+                },
+                {
+                    "serviceTargets": [
+                        "55d76c03-c89d-40fe-867b-93f7a48ff9c1",
+                        "3cbf653f-f74c-4066-81d2-e3f78268185c",
+                        "3855d565-3b77-497b-90af-addb271aa598",
+                        "5dbfb32a-5933-4d8a-9937-41f350fb5f75"
+                    ],
+                    "serviceId": 5
+                },
+                {
+                    "serviceTargets": [
+                        "22771c0d-8403-433b-b468-e36dc16a1d21",
+                        "675cc878-eb80-435f-a841-d89b657fb2e3",
+                        "dd9f8fd4-b6c7-4f09-bbbf-5d721afc7677",
+                        "6f3cb6ab-5c6a-49be-9af9-9226fa751725"
+                    ],
+                    "serviceId": 7
+                },
+                {
+                    "serviceTargets": [
+                        "e0b4cc3e-e94a-4c97-81dc-a4cb868c2cc3",
+                        "b0bcfc54-76fa-4659-accf-276c18b50c31"
+                    ],
+                    "serviceId": 8
+                },
+                {
+                    "serviceTargets": [
+                        "9416c9f4-48ca-4bd1-8822-cd45ebb56c58",
+                        "2409e649-2ee2-47fd-9e76-ef2ffa07a5e7",
+                        "d58f8dba-109d-4179-b130-a888cd3d303c",
+                        "01686d38-9165-4497-9648-627ef81945a7"
+                    ],
+                    "serviceId": 9
+                },
+                {
+                    "serviceTargets": [
+                        "0e2f8d61-b7b4-4d2d-b07c-4fc20bbe326a",
+                        "bb506258-e907-43d3-99bd-0fe0400f654e"
+                    ],
+                    "serviceId": 10
+                },
+                {
+                    "serviceTargets": [
+                        "3c83e639-9c19-4b31-a86f-9d2d5e78123b",
+                        "e901be5e-8336-432e-b164-f278abd7430b"
+                    ],
+                    "serviceId": 12
+                },
+                {
+                    "serviceTargets": [
+                        "5557288b-190e-4a3f-a60b-4bdff6ca8fe8",
+                        "902df7a8-92f6-420d-9544-47d4b8cf31ca"
+                    ],
+                    "serviceId": 13
+                },
+                {
+                    "serviceTargets": [
+                        "9deb3edf-50c7-4b04-a1fb-d1451eadf641",
+                        "360c8b86-360c-4ca3-b1aa-626be56f2b11"
+                    ],
+                    "serviceId": 14
+                },
+                {
+                    "serviceTargets": [
+                        "7c30bc26-829e-4080-8059-27af9285113b",
+                        "158a5544-78e3-4d00-9f1b-62a85a938268"
+                    ],
+                    "serviceId": 15
+                },
+                {
+                    "serviceTargets": [
+                        "4aa201ec-2066-40e1-a457-99daa569c8e2",
+                        "f46f096a-a274-426b-adad-702e7cf8fab7",
+                        "3b1403f3-139a-4206-b325-62ebfe05ddc4",
+                        "7cb13c22-3dcd-43e7-808d-e0e26f5c090d"
+                    ],
+                    "serviceId": 16
+                },
+                {
+                    "serviceTargets": [
+                        "5c6db4c1-7fde-452e-8735-e52842fe6217",
+                        "41cb1e2c-59bc-4639-8bf7-fe0f528e006e"
+                    ],
+                    "serviceId": 18
+                },
+                {
+                    "serviceTargets": [
+                        "4f71e00a-2d80-488d-9ce4-947e60589149",
+                        "69a2ffba-41e9-406e-8ea4-5bdeee92cbde"
+                    ],
+                    "serviceId": 42
+                },
+                {
+                    "serviceTargets": [
+                        "26ea592f-ee39-4e6e-b6af-5b53fb1a5675"
+                    ],
+                    "serviceId": 17
+                },
+                {
+                    "serviceTargets": [
+                        "3587a984-68f9-4db3-b5af-49f265d853e0",
+                        "9d2d01be-b517-4be2-a225-8b1c887e016e"
+                    ],
+                    "serviceId": 19
+                },
+                {
+                    "serviceTargets": [
+                        "d0516817-5acb-46bd-9871-2696c245bad0",
+                        "7fed132d-6a38-448c-b519-381ab9e1e027",
+                        "e08dda14-360c-4b66-b8c5-eb0269c5aa44",
+                        "f3671aa7-773f-447d-9649-ba7f11dbe97a"
+                    ],
+                    "serviceId": 20
+                },
+                {
+                    "serviceTargets": [
+                        "5ab2b539-a5b4-40da-a556-a2c18066345b",
+                        "36410625-05f3-42d3-b04f-a3b268498ee1"
+                    ],
+                    "serviceId": 23
+                },
+                {
+                    "serviceTargets": [
+                        "0162246b-13fd-40c9-ae26-fb767eee76f8"
+                    ],
+                    "serviceId": 24
+                },
+                {
+                    "serviceTargets": [
+                        "b9e710e4-7dd3-4acc-ac2c-c69f4bcb9787",
+                        "00934509-f102-4d39-a043-7547a8ab9ac8",
+                        "1021bec7-3836-4b33-90b4-76701efd4fe3",
+                        "4dad393e-cbf7-43dd-87bb-62ea8f8afcdd"
+                    ],
+                    "serviceId": 26
+                },
+                {
+                    "serviceTargets": [
+                        "a516c78d-740f-463b-a1ce-5b02b8c82dd3",
+                        "4cbcb2b5-45cd-42dc-96bf-a9a181a4865b",
+                        "fbc45154-1d60-4f5e-a484-fdff514f9d51",
+                        "85191c99-f56d-46e6-9311-a58c1f37965d"
+                    ],
+                    "serviceId": 27
+                },
+                {
+                    "serviceTargets": [
+                        "3cfa82aa-0b38-49c0-be37-0fa61b5b6e3c",
+                        "91e90861-3ba7-4257-a765-6cab24c6f58a"
+                    ],
+                    "serviceId": 28
+                },
+                {
+                    "serviceTargets": [
+                        "96be68cf-783d-452a-b8fd-3832163f95db",
+                        "e70c70fd-4f31-41dc-a4b4-07f79efc3055"
+                    ],
+                    "serviceId": 29
+                },
+                {
+                    "serviceTargets": [
+                        "598bd978-0907-4cad-a7a6-ec5a8a8bbdc4",
+                        "d29bd931-1dd1-47c4-b456-c175099ff1df"
+                    ],
+                    "serviceId": 30
+                },
+                {
+                    "serviceTargets": [
+                        "6db1ebd7-92c5-49f2-98b7-2faa700fd752",
+                        "524d93b4-5cd1-4d0d-b1f8-d393028220ad"
+                    ],
+                    "serviceId": 31
+                },
+                {
+                    "serviceTargets": [
+                        "8040931a-2e6c-41be-9e92-f1035093b2ac",
+                        "5d652e6e-b719-45bf-8ae6-e9f293c24a92"
+                    ],
+                    "serviceId": 32
+                },
+                {
+                    "serviceTargets": [
+                        "f74182bd-7a53-4157-aeb9-eda281bb0234",
+                        "e7b7bb1e-66c2-4140-90f9-9534aa46ffa3"
+                    ],
+                    "serviceId": 33
+                },
+                {
+                    "serviceTargets": [
+                        "15615a70-ee60-46b8-b5e9-b33d4d88de6b",
+                        "d8dc153b-da23-4f7b-947a-89bc98338d6d",
+                        "5f762c6d-4f42-4458-9855-03c6896959c1",
+                        "5885f105-fc7d-43fd-8c26-c72938a95b76"
+                    ],
+                    "serviceId": 34
+                },
+                {
+                    "serviceTargets": [
+                        "dea1ff8b-f4eb-4987-8073-500bbbf97fcd",
+                        "fba17df1-d5cb-4643-987f-0626055b3c78"
+                    ],
+                    "serviceId": 35
+                },
+                {
+                    "serviceTargets": [
+                        "3ec07754-4a7a-46fb-a76d-553921781716",
+                        "fbc2dab8-7454-40f9-94f6-6bf258fcefff",
+                        "7186e284-0cb2-418e-a8cc-4343eb618140"
+                    ],
+                    "serviceId": 36
+                },
+                {
+                    "serviceTargets": [
+                        "3d06b150-bb86-47dc-8ad8-c33a51c3e3b3"
+                    ],
+                    "serviceId": 43
+                },
+                {
+                    "serviceTargets": [
+                        "b8304577-afd8-45e0-8ef4-b71ae10998f5"
+                    ],
+                    "serviceId": 44
+                }
+            ]
+        },
+        "visibility": "public",
+        "requiresActivityLocking": true,
+        "reportData": {
+            "NHT Output Report": "nhtOutputReportData"
+        },
+        "supportsMeriPlanComparison": true,
+        "projectTemplate": "rlp",
+        "activityPeriodDescriptor": "Outputs report #",
+        "requireMeritAdminToReturnMeriPlan": true,
+        "emailTemplates": {
+            "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
+            "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
+            "planApprovedEmailTemplate": "RLP_PLAN_APPROVED_EMAIL_TEMPLATE",
+            "planReturnedEmailTemplate": "RLP_PLAN_RETURNED_EMAIL_TEMPLATE",
+            "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
+            "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
+        },
+        "meriPlanTemplate": "configurableMeriPlan",
+        "riskAndThreatTypes": [
+            "Performance",
+            "Work Health and Safety",
+            "People resources",
+            "Financial",
+            "External stakeholders",
+            "Natural Environment"
+        ],
+        "projectReports": [
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Final Report",
+                "reportNameFormat": "Final Report",
+                "reportingPeriodInMonths": 0,
+                "multiple": false,
+                "description": "_Please note that the reporting fields for these reports are currently being developed_",
+                "alignToOwnerEnd": true,
+                "label": "Final Report",
+                "category": "Final Report",
+                "reportsAlignedToCalendar": false,
+                "activityType": "Final Report",
+                "alignToOwnerStart": true
+            }
+        ],
+        "keyThreatCodes": [
+            "Climate Change - Changed flooding regime",
+            "Climate Change - Changed rainfall patterns",
+            "Climate Change - Sea level rises",
+            "Climate Change - Unexpected seasonal/temperature extremes",
+            "Disease/pathogens - Areas that are infected",
+            "Disease/pathogens - Possible infection of disease free areas",
+            "Fire - Inappropriate fire regime",
+            "Fire - Lack of protection for ecological assets during fire control activities",
+            "Genetics - Bottleneck/inbreeding",
+            "Habitat loss - Breeding place disturbance",
+            "Habitat loss - Dieback/senescence",
+            "Habitat loss - Feeding habitat loss/interference",
+            "Habitat loss - Habitat fragmentation",
+            "Habitat loss - Land clearing",
+            "Habitat loss - Loss of critical ecosystem service supporting habitat",
+            "Human interference - Fish and harvesting aquatic resources (commercial)",
+            "Human interference - Flow-on effects of housing development",
+            "Human interference - Illegal activities",
+            "Human interference - Industrial development",
+            "Human interference - Land use intensification",
+            "Human interference - Recreational fishing",
+            "Human interference - Recreational pressures",
+            "Human interference - Road/vehicle strike",
+            "Land management practices - Changes to hydrology and aquatic systems",
+            "Land management practices - Domestic grazing/stock impacts",
+            "Land management practices - Excess recharge of groundwater",
+            "Land management practices - Excess use (or over-use) of surface water or groundwater resources",
+            "Land management practices - Excessive fertiliser use",
+            "Land management practices - Inappropriate ground cover management",
+            "Land management practices - Runoff",
+            "Native fauna - Competition",
+            "Native fauna - Predation",
+            "Pest - Competition/exclusion",
+            "Pest - Disease transmission",
+            "Pest - Habitat degradation",
+            "Pest - Introduction of new pest animals",
+            "Pest - Predation",
+            "Pollution - Chemical",
+            "Pollution - Eutrophication/algal blooms",
+            "Pollution - Inappropriate waste disposal",
+            "Pollution - Sediment ",
+            "Population size/range - Low habitat area",
+            "Population size/range - Low population numbers",
+            "Weeds - Competition",
+            "Weeds - Introduction of new weed",
+            "Weeds - Spread of weeds from surrounding areas"
+        ],
+        "navigationMode": "returnToProject",
+        "priorityPlaces": [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
+        ],
+        "supportsParatoo": true,
+        "supportsMeriPlanHistory": true
+    };
+
+
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Waterways"
+            },
+            {
+                "category": "Threatened Species"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "Ecological health",
+        "category": "Waterways",
+        "outcome": "The ecological health and condition of waterways is improved and/or repaired to benefit native plants and animals (including threatened species), threatened ecological communities, and the ecological character of Ramsar sites, in urban, outer urban /peri-urban and regional centres"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Waterways"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "River health",
+        "category": "River health",
+        "outcome": "The health and qualities of waterways is improved and/or repaired to benefit local communities in urban, outer urban /peri-urban and regional centres."
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "By 30 June 2028, there is measurable repair of waterway habitats (in-stream and terrestrial) to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres."
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "By 30 June 2028, there is measurable repair of water quality, hydrology and in stream connectivity to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres."
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "By June 2028 there is a measurable improvement to the services provided by urban green and blue space to benefit local communities in urban, outer urban /peri-urban and regional centres."
+    },
+    {
+        "category": "River health",
+        "type": "short",
+        "outcome": "By 30 June 2025, there is measurable repair of waterway habitats (in-stream and terrestrial) to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres."
+    },
+    {
+        "category":"River health",
+        "type": "short",
+        "outcome": " By 30 June 2025, there is measurable repair of water quality, hydrology and in stream connectivity to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres."
+    },
+    {
+        "category":"River health",
+        "type": "short",
+        "outcome": "By June 2025 there is a measurable improvement to the services provided by urban green and blue space to benefit local communities in urban, outer urban /peri-urban and regional centres."
+    }
+];
+
+var priorities = [
+    {
+        "category": "Waterways",
+        "priority": "Saltwater Creek, Cairns"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Bulimba Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Cubberla Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Bremer River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Saltwater Creek, Gold Coast"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Fig Tree Creek, Yeppoon"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Downfall Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Dowse Lagoon"
+    },
+    {
+        "category": "Waterways",
+        "priority": "McCready's Creek, Mackay"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Slacks Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Lake Macquarie"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Hawkesbury River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Tuggerah Lakes"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Shoalhaven and Crookshaven Rivers"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Cooks River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Canberra Waterways"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Peter Hopper Lake"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Moonee Ponds Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Karaaf Wetlands"
+    },
+    {
+        "category": "Waterways",
+        "priority": "KooyongKoot (Tooronga Park wetland)"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Diamond Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Yarra Flats"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Elster Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Redan Wetlands and Yarrowee River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Werribee River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Darebin Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Merri Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Gardiners Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Derwent River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Tamar Estuary"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Onkaparinga River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Pedler Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Brownhill Creek"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Port River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Sturt River"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Swan and Canning Rivers"
+    },
+    {
+        "category": "Waterways",
+        "priority": "Darwin creeks (Rapid Creek, Mitchell Creek, Ludmilla Creek and Sandy Creek)"
+    }
+];
+
+//Create the parent program
+let programName = "Urban Rivers and Catchments Program";
+var parent = createOrFindProgram(programName);
+var subprograms = ["Urban Rivers and Catchments round one - Final report"]
+
+subprograms.forEach(function (subProgram){
+    createOrFindProgram(subProgram, parent._id);
+});
+
+subprograms.forEach(function (subprogram){
+    var program = db.program.find({name: subprogram});
+    while(program.hasNext()){
+        var p = program.next();
+        print("sub program ID: " + p.programId)
+        db.program.updateOne({programId:p.programId}, {$set:{config:config, outcomes:outcomes, priorities:priorities}});
+        useNhtServiceLabels(p.name);
+    }
+});
+
+
diff --git a/src/main/scripts/releases/3.1/adhoc/createWorldHeritageProtectionSubProgram.js b/src/main/scripts/releases/3.1/adhoc/createWorldHeritageProtectionSubProgram.js
new file mode 100644
index 000000000..58d8d327e
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/createWorldHeritageProtectionSubProgram.js
@@ -0,0 +1,2249 @@
+load('../../../utils/uuid.js');
+load('../../../utils/audit.js');
+load('../../../utils/program.js');
+var userId = '';
+
+const serviceFormName = "NHT Output Report";
+const annualReportFormName = "NHT Annual Report";
+const outcomes1ReportFormName = "NHT Outcomes 1 Report";
+const outcomes2ReportFormName = "NHT Outcomes 2 Report";
+
+var config =
+    {
+        "excludes": [],
+        "programServiceConfig": {
+            "serviceFormName": serviceFormName,
+            "programServices": [
+                {
+                    "serviceTargets": [
+                        "c3276929-b8a9-4985-a329-49b86f14018c"
+                    ],
+                    "serviceId": 1
+                },
+                {
+                    "serviceTargets": [
+                        "69deaaf9-cdc2-439a-b684-4cffdc7f224e"
+                    ],
+                    "serviceId": 2
+                },
+                {
+                    "serviceTargets": [
+                        "1f8161bc-908b-4ec8-ab7f-edac973a657d",
+                        "88908921-1248-4a7c-b185-51c625c737e3",
+                        "fe9f1a6c-e614-489a-80fa-4d6d76f1cf95"
+                    ],
+                    "serviceId": 3
+                },
+                {
+                    "serviceTargets": [
+                        "aa0c6b29-285e-4344-987e-dfeaf1d95648",
+                        "a9d98baa-b2ab-4428-82cf-d96185e63aa6",
+                        "c4ea5ce3-4a70-4df8-aff7-ffa929e7df61"
+                    ],
+                    "serviceId": 4
+                },
+                {
+                    "serviceTargets": [
+                        "55d76c03-c89d-40fe-867b-93f7a48ff9c1",
+                        "3cbf653f-f74c-4066-81d2-e3f78268185c",
+                        "3855d565-3b77-497b-90af-addb271aa598",
+                        "5dbfb32a-5933-4d8a-9937-41f350fb5f75"
+                    ],
+                    "serviceId": 5
+                },
+                {
+                    "serviceTargets": [
+                        "22771c0d-8403-433b-b468-e36dc16a1d21",
+                        "675cc878-eb80-435f-a841-d89b657fb2e3",
+                        "dd9f8fd4-b6c7-4f09-bbbf-5d721afc7677",
+                        "6f3cb6ab-5c6a-49be-9af9-9226fa751725"
+                    ],
+                    "serviceId": 7
+                },
+                {
+                    "serviceTargets": [
+                        "e0b4cc3e-e94a-4c97-81dc-a4cb868c2cc3",
+                        "b0bcfc54-76fa-4659-accf-276c18b50c31"
+                    ],
+                    "serviceId": 8
+                },
+                {
+                    "serviceTargets": [
+                        "9416c9f4-48ca-4bd1-8822-cd45ebb56c58",
+                        "2409e649-2ee2-47fd-9e76-ef2ffa07a5e7",
+                        "d58f8dba-109d-4179-b130-a888cd3d303c",
+                        "01686d38-9165-4497-9648-627ef81945a7"
+                    ],
+                    "serviceId": 9
+                },
+                {
+                    "serviceTargets": [
+                        "0e2f8d61-b7b4-4d2d-b07c-4fc20bbe326a",
+                        "bb506258-e907-43d3-99bd-0fe0400f654e"
+                    ],
+                    "serviceId": 10
+                },
+                {
+                    "serviceTargets": [
+                        "3c83e639-9c19-4b31-a86f-9d2d5e78123b",
+                        "e901be5e-8336-432e-b164-f278abd7430b"
+                    ],
+                    "serviceId": 12
+                },
+                {
+                    "serviceTargets": [
+                        "5557288b-190e-4a3f-a60b-4bdff6ca8fe8",
+                        "902df7a8-92f6-420d-9544-47d4b8cf31ca"
+                    ],
+                    "serviceId": 13
+                },
+                {
+                    "serviceTargets": [
+                        "9deb3edf-50c7-4b04-a1fb-d1451eadf641",
+                        "360c8b86-360c-4ca3-b1aa-626be56f2b11"
+                    ],
+                    "serviceId": 14
+                },
+                {
+                    "serviceTargets": [
+                        "7c30bc26-829e-4080-8059-27af9285113b",
+                        "158a5544-78e3-4d00-9f1b-62a85a938268"
+                    ],
+                    "serviceId": 15
+                },
+                {
+                    "serviceTargets": [
+                        "4aa201ec-2066-40e1-a457-99daa569c8e2",
+                        "f46f096a-a274-426b-adad-702e7cf8fab7",
+                        "3b1403f3-139a-4206-b325-62ebfe05ddc4",
+                        "7cb13c22-3dcd-43e7-808d-e0e26f5c090d"
+                    ],
+                    "serviceId": 16
+                },
+                {
+                    "serviceTargets": [
+                        "5c6db4c1-7fde-452e-8735-e52842fe6217",
+                        "41cb1e2c-59bc-4639-8bf7-fe0f528e006e"
+                    ],
+                    "serviceId": 18
+                },
+                {
+                    "serviceTargets": [
+                        "4f71e00a-2d80-488d-9ce4-947e60589149",
+                        "69a2ffba-41e9-406e-8ea4-5bdeee92cbde"
+                    ],
+                    "serviceId": 42
+                },
+                {
+                    "serviceTargets": [
+                        "26ea592f-ee39-4e6e-b6af-5b53fb1a5675"
+                    ],
+                    "serviceId": 17
+                },
+                {
+                    "serviceTargets": [
+                        "3587a984-68f9-4db3-b5af-49f265d853e0",
+                        "9d2d01be-b517-4be2-a225-8b1c887e016e"
+                    ],
+                    "serviceId": 19
+                },
+                {
+                    "serviceTargets": [
+                        "d0516817-5acb-46bd-9871-2696c245bad0",
+                        "7fed132d-6a38-448c-b519-381ab9e1e027",
+                        "e08dda14-360c-4b66-b8c5-eb0269c5aa44",
+                        "f3671aa7-773f-447d-9649-ba7f11dbe97a"
+                    ],
+                    "serviceId": 20
+                },
+                {
+                    "serviceTargets": [
+                        "5ab2b539-a5b4-40da-a556-a2c18066345b",
+                        "36410625-05f3-42d3-b04f-a3b268498ee1"
+                    ],
+                    "serviceId": 23
+                },
+                {
+                    "serviceTargets": [
+                        "0162246b-13fd-40c9-ae26-fb767eee76f8"
+                    ],
+                    "serviceId": 24
+                },
+                {
+                    "serviceTargets": [
+                        "b9e710e4-7dd3-4acc-ac2c-c69f4bcb9787",
+                        "00934509-f102-4d39-a043-7547a8ab9ac8",
+                        "1021bec7-3836-4b33-90b4-76701efd4fe3",
+                        "4dad393e-cbf7-43dd-87bb-62ea8f8afcdd"
+                    ],
+                    "serviceId": 26
+                },
+                {
+                    "serviceTargets": [
+                        "a516c78d-740f-463b-a1ce-5b02b8c82dd3",
+                        "4cbcb2b5-45cd-42dc-96bf-a9a181a4865b",
+                        "fbc45154-1d60-4f5e-a484-fdff514f9d51",
+                        "85191c99-f56d-46e6-9311-a58c1f37965d"
+                    ],
+                    "serviceId": 27
+                },
+                {
+                    "serviceTargets": [
+                        "3cfa82aa-0b38-49c0-be37-0fa61b5b6e3c",
+                        "91e90861-3ba7-4257-a765-6cab24c6f58a"
+                    ],
+                    "serviceId": 28
+                },
+                {
+                    "serviceTargets": [
+                        "96be68cf-783d-452a-b8fd-3832163f95db",
+                        "e70c70fd-4f31-41dc-a4b4-07f79efc3055"
+                    ],
+                    "serviceId": 29
+                },
+                {
+                    "serviceTargets": [
+                        "598bd978-0907-4cad-a7a6-ec5a8a8bbdc4",
+                        "d29bd931-1dd1-47c4-b456-c175099ff1df"
+                    ],
+                    "serviceId": 30
+                },
+                {
+                    "serviceTargets": [
+                        "6db1ebd7-92c5-49f2-98b7-2faa700fd752",
+                        "524d93b4-5cd1-4d0d-b1f8-d393028220ad"
+                    ],
+                    "serviceId": 31
+                },
+                {
+                    "serviceTargets": [
+                        "8040931a-2e6c-41be-9e92-f1035093b2ac",
+                        "5d652e6e-b719-45bf-8ae6-e9f293c24a92"
+                    ],
+                    "serviceId": 32
+                },
+                {
+                    "serviceTargets": [
+                        "f74182bd-7a53-4157-aeb9-eda281bb0234",
+                        "e7b7bb1e-66c2-4140-90f9-9534aa46ffa3"
+                    ],
+                    "serviceId": 33
+                },
+                {
+                    "serviceTargets": [
+                        "15615a70-ee60-46b8-b5e9-b33d4d88de6b",
+                        "d8dc153b-da23-4f7b-947a-89bc98338d6d",
+                        "5f762c6d-4f42-4458-9855-03c6896959c1",
+                        "5885f105-fc7d-43fd-8c26-c72938a95b76"
+                    ],
+                    "serviceId": 34
+                },
+                {
+                    "serviceTargets": [
+                        "dea1ff8b-f4eb-4987-8073-500bbbf97fcd",
+                        "fba17df1-d5cb-4643-987f-0626055b3c78"
+                    ],
+                    "serviceId": 35
+                },
+                {
+                    "serviceTargets": [
+                        "3ec07754-4a7a-46fb-a76d-553921781716",
+                        "fbc2dab8-7454-40f9-94f6-6bf258fcefff",
+                        "7186e284-0cb2-418e-a8cc-4343eb618140"
+                    ],
+                    "serviceId": 36
+                },
+                {
+                    "serviceTargets": [
+                        "3d06b150-bb86-47dc-8ad8-c33a51c3e3b3"
+                    ],
+                    "serviceId": 43
+                },
+                {
+                    "serviceTargets": [
+                        "b8304577-afd8-45e0-8ef4-b71ae10998f5"
+                    ],
+                    "serviceId": 44
+                }
+            ]
+
+        },
+        "visibility": "private",
+        "declarationPageType": "rdpReportDeclaration",
+        "requiresActivityLocking": true,
+        "supportsMeriPlanComparison": true,
+        "projectTemplate": "rlp",
+        "activityPeriodDescriptor": "Outputs report #",
+        "supportsParatoo": true,
+        "emailTemplates": {
+            "reportSubmittedEmailTemplate": "RLP_REPORT_SUBMITTED_EMAIL_TEMPLATE",
+            "reportReturnedEmailTemplate": "RLP_REPORT_RETURNED_EMAIL_TEMPLATE",
+            "planApprovedEmailTemplate": "RLP_PLAN_APPROVED_EMAIL_TEMPLATE",
+            "planReturnedEmailTemplate": "RLP_PLAN_RETURNED_EMAIL_TEMPLATE",
+            "reportApprovedEmailTemplate": "RLP_REPORT_APPROVED_EMAIL_TEMPLATE",
+            "planSubmittedEmailTemplate": "RLP_PLAN_SUBMITTED_EMAIL_TEMPLATE"
+        },
+        "meriPlanTemplate": "configurableMeriPlan",
+        "riskAndThreatTypes": [
+            "Performance",
+            "Work Health and Safety",
+            "People resources",
+            "Financial",
+            "External stakeholders",
+            "Natural Environment"
+        ],
+        "projectReports": [
+            {
+                "reportType": "Activity",
+                "reportsAlignedToCalendar": true,
+                "reportDescriptionFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportNameFormat": "Year %5$s - %6$s %7$d Outputs Report",
+                "reportingPeriodInMonths": 3,
+                "description": "",
+                "category": "Outputs Reporting",
+                "activityType": serviceFormName,
+                "canSubmitDuringReportingPeriod": true,
+                "label": "Quarter",
+                "minimumReportDurationInDays": 1
+
+            },
+            {
+                "firstReportingPeriodEnd": "2024-06-30T14:00:00Z",
+                "reportType": "Administrative",
+                "reportDescriptionFormat": "Annual Progress Report %2$tY - %3$tY for %4$s",
+                "reportNameFormat": "Annual Progress Report %2$tY - %3$tY",
+                "reportingPeriodInMonths": 12,
+                "category": "Annual Progress Reporting",
+                "activityType": annualReportFormName,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "label": "Annual",
+                "minimumReportDurationInDays": 1
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "minimumOwnerDurationInMonths": null,
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 36,
+                "alignToOwnerStart":true,
+                "alignToOwnerEnd":true,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "maximumOwnerDurationInMonths": 35,
+                "category": "Outcomes Report 1",
+                "reportsAlignedToCalendar": false,
+                "activityType": outcomes1ReportFormName,
+                "label":"Outcomes Report 1"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "minimumOwnerDurationInMonths": 36,
+                "maximumOwnerDurationInMonths": 47,
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 24,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "category": "Outcomes Report 1",
+                "activityType": outcomes1ReportFormName,
+                "label": "Outcomes Report 1"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 1 for %4$s",
+                "reportNameFormat": "Outcomes Report 1",
+                "reportingPeriodInMonths": 36,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "minimumOwnerDurationInMonths": 48,
+                "calendarAlignmentMonth": 7,
+                "category": "Outcomes Report",
+                "reportsAlignedToCalendar": true,
+                "activityType": outcomes1ReportFormName,
+                "label": "Outcomes Report 1"
+            },
+            {
+                "reportType": "Single",
+                "reportDescriptionFormat": "Outcomes Report 2 for %4$s",
+                "minimumOwnerDurationInMonths": 36,
+                "reportNameFormat": "Outcomes Report 2",
+                "alignToOwnerStart":true,
+                "alignToOwnerEnd":true,
+                "multiple": false,
+                "description": "This report is still being developed.  _Please do not commence reporting until the new report is ready for use._",
+                "category": "Outcomes Report 2",
+                "activityType": outcomes2ReportFormName,
+                "label": "Outcomes Report 2"
+            }
+        ],
+        "navigationMode": "returnToProject",
+        "supportsMeriPlanHistory": true,
+        "requireMeritAdminToReturnMeriPlan":true,
+        "meriPlanContents": [
+            {
+                "template": "name",
+                "model": {
+                    "tableFormatting": true
+                }
+            },
+            {
+                "template": "priorityPlace",
+                "model": {
+                    "priorityPlaceLabel":"Does this project directly support a priority place?",
+                    "priorityPlaceHelpText":"Priority places recognises that some threatened species share the same habitat, and that place-based action can support protection and recovery of more than one species."
+                }
+            },
+            {
+                "template": "indigenousInvolvement"
+            },
+            {
+                "template": "description",
+                "model": {
+                    "tableFormatting": true,
+                    "maxSize": "1000",
+                    "placeholder": "Please provide a short description of this project. This project description will be visible on the project overview page in MERIT [Free text; limit response to 1000 characters (approx. 150 words)]"
+                }
+            },
+            {
+                "template": "programOutcome",
+                "model": {
+                    "maximumPriorities": "1000",
+                    "priorityHelpText": "Enter the primary investment priority for the primary outcome, noting only one can be selected."
+                }
+            },
+            {
+                "template": "additionalOutcomes",
+                "model": {
+                    "title": "Additional benefits",
+                    "helpTextHeading":"If the project is not delivering additional benefits, delete the row using the 'x' in the right-most column.",
+                    "outcomePriority":"Additional outcome/s",
+                    "priority":"Additional Investment Priorities",
+                    "priorityHelpText":"Other investment priorities that will benefit from the project.  Delete the row if there are no additional outcomes."
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "mid",
+                    "subtitle": "Medium-term outcome statement/s",
+                    "title": "Project Outcomes",
+                    "extendedOutcomes": true,
+                    "helpText":"Projects more than 3 years in duration must set medium-term Project outcomes achievable at project completion. Ensure proposed outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "minimumNumberOfOutcomes": 0
+                }
+            },
+            {
+                "template": "outcomeStatements",
+                "model": {
+                    "outcomeType": "short",
+                    "helpText": "Outline the degree of impact having undertaken the services for up to three years. Ensure the outcomes are measurable with consideration to the baseline and proposed monitoring regime",
+                    "subtitle": "Short-term outcome statement/s",
+                    "extendedOutcomes": true
+                }
+            },
+            {
+                "template": "extendedKeyThreats",
+                "model": {
+                    "title":"Key threat(s) and/or key threatening processes",
+                    "threatHelpText":"Describe the key threats or key threatening processes to the investment priority",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance",
+                    "interventionHelpText":"Describe the proposed method to address the threat or threatening process",
+                    "servicesHelpText": "Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables"
+                }
+            },
+            {
+                "template": "projectMethodology",
+                "model": {
+                    "maxSize": "4000",
+                    "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])",
+                    "helpText": "Include all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic."
+                }
+            },
+            {
+                "template": "projectPartnerships",
+                "model": {
+                    "helpTextPartnerName":"Insert name of project partner. To be a project partner, they need to be actively involved in the planning or delivery of the project",
+                    "helpTextHeading":"Note: Not limited to key subcontractors."
+                }
+            },
+            {
+                "template": "extendedBaselineMonitoring",
+                "model": {
+                    "approachHeading": "Monitoring method",
+                    "indicatorHeading": "Monitoring methodology",
+                    "baselineDataHelpText": "Existing baseline data needs to be based on best practice methods and be compatible with the EMSA protocols.",
+                    "baselineDataDescriptionHelpText": "Describe the project baseline to be established, or the baseline data that currently exists",
+                    "baselineServiceHelpText": "Select the relevant Project Service(s)/Target measure(s) that will be used to support the development of the baseline",
+                    "monitoringServiceHelpText": "Select the relevant Project Services(s)/Target measure(s) that will be used to support ongoing monitoring",
+                    "baselineMethodHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "approachHelpText": "EMSA modules mandatory unless exemption agreed to by the Department. Where an exemption has been provided the user can then select \"Other\"",
+                    "titleHelpText": "Describe the Project Baseline(s) and ongoing monitoring which will be used to report progress towards this projects outcome(s).  Project Services/Target measures selected in this section will be pre-populated into the Project services and targets and Project service forecasts tables",
+                    "newIndicatorText": "New monitoring indicator",
+                    "evidenceHelpText": "List evidence that will be retained to demonstrate delivery of this service. Refer to Evidence Guide and Project Service Summaries for guidance"
+                }
+            },
+            {
+                "template": "projectReview",
+                "model": {
+                    "title": "Project review, improvement and evaluation methodology and approach (3000 character limit [approximately 500 words])"
+                }
+            },
+            {
+                "template": "nationalAndRegionalPlans",
+                "model": {
+                    "includeUrl": true,
+                    "headingTitle": "Conservation and management plans"
+                }
+            },
+            {
+                "template": "serviceOutcomeTargets",
+                "model": {
+                    "title": "Project services and targets",
+                    "serviceName": "Service",
+                    "titleHelpText":"Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                }
+            },
+            {
+                "template": "serviceForecasts",
+                "excludedModes":["PRINT"],
+                "model": {
+                    "titleHelpText":"Service and Target measure fields pre-populated through the Project Service/Target Measure/s to address threats field and Monitoring methodology sections"
+                }
+
+            }
+        ],
+        keyThreatCodes: [
+            'Climate Change - Changed flooding regime',
+            'Climate Change - Changed rainfall patterns',
+            'Climate Change - Sea level rises',
+            'Climate Change - Unexpected seasonal/temperature extremes',
+            'Disease/pathogens - Areas that are infected',
+            'Disease/pathogens - Possible infection of disease free areas',
+            'Fire - Inappropriate fire regime',
+            'Fire - Lack of protection for ecological assets during fire control activities',
+            'Genetics - Bottleneck/inbreeding',
+            'Habitat loss - Breeding place disturbance',
+            'Habitat loss - Dieback/senescence',
+            'Habitat loss - Feeding habitat loss/interference',
+            'Habitat loss - Habitat fragmentation',
+            'Habitat loss - Land clearing',
+            'Habitat loss - Loss of critical ecosystem service supporting habitat',
+            'Human interference - Fish and harvesting aquatic resources (commercial)',
+            'Human interference - Flow-on effects of housing development',
+            'Human interference - Illegal activities',
+            'Human interference - Industrial development',
+            'Human interference - Land use intensification',
+            'Human interference - Recreational fishing',
+            'Human interference - Recreational pressures',
+            'Human interference - Road/vehicle strike',
+            'Land management practices - Changes to hydrology and aquatic systems',
+            'Land management practices - Domestic grazing/stock impacts',
+            'Land management practices - Excess recharge of groundwater',
+            'Land management practices - Excess use (or over-use) of surface water or groundwater resources',
+            'Land management practices - Excessive fertiliser use',
+            'Land management practices - Inappropriate ground cover management',
+            'Land management practices - Runoff',
+            'Native fauna - Competition',
+            'Native fauna - Predation',
+            'Pest - Competition/exclusion',
+            'Pest - Disease transmission',
+            'Pest - Habitat degradation',
+            'Pest - Introduction of new pest animals',
+            'Pest - Predation',
+            'Pollution - Chemical',
+            'Pollution - Eutrophication/algal blooms',
+            'Pollution - Inappropriate waste disposal',
+            'Pollution - Sediment ',
+            'Population size/range - Low habitat area',
+            'Population size/range - Low population numbers',
+            'Weeds - Competition',
+            'Weeds - Introduction of new weed',
+            'Weeds - Spread of weeds from surrounding areas'
+        ],
+        priorityPlaces: [
+            "Australian Alps – NSW/ACT/VIC",
+            "Brigalow Country – QLD",
+            "Bruny Island – TAS",
+            "Christmas Island – External Territory",
+            "Eastern Forests of Far North Queensland – QLD",
+            "Fitz-Stirlings – WA",
+            "French Island – VIC",
+            "Giant Kelp Ecological Community – TAS",
+            "Greater Blue Mountains – NSW",
+            "Kakadu & West Arnhem – NT",
+            "Kangaroo Island – SA",
+            "MacDonnell Ranges – NT",
+            "Mallee Birds Ecological Community – VIC/SA/NSW",
+            "Midlands region of central Tasmanian – TAS",
+            "Norfolk Island – External Territory",
+            "Raine Island – Queensland",
+            "Remnant WA Wheatbelt Woodlands – WA",
+            "South East Coastal Ranges – NSW/VIC",
+            "Southern Plains, including the Western Victorian volcanic plain and karst springs – VIC/SA",
+            "Yampi Sounds and surrounds – WA"
+        ]
+
+    };
+
+
+var outcomes = [
+    {
+        "priorities": [
+            {
+                "category": "Priority Threatened Species Primary"
+            }
+        ],
+        "targeted": true,
+        "shortDescription": "EPBC Species",
+        "category": "Threatened Species",
+        "type": "secondary",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - The trajectory of species targeted under the Threatened Species Action Plan 2022-2032 and other EPBC Act listed Species is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Priority Threatened Species Primary"
+            }
+        ],
+        "shortDescription": "New extinctions",
+        "category": "Threatened Species",
+        "type": "secondary",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Species (TS) - New extinctions of plants and animals are prevented"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Threatened Ecological Communities"
+            }
+        ],
+        "shortDescription": "Threatened Ecological Communities",
+        "category": "Threatened Ecological Communities",
+        "type": "secondary",
+        "outcome": "1.  Species and Landscapes (Long term): Threatened Ecological Communities (TECs) and priority places - The condition of targeted EPBC Act listed Threatened Ecological Communities and identified priority places under the Threatened Species Action Plan 2022-2032 is improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "World Heritage Sites"
+            }
+        ],
+        "shortDescription": "World Heritage",
+        "category": "World Heritage Sites",
+        "outcome": "2: World Heritage Protection (Long term): The outstanding universal value of world heritage properties listed for their natural heritage value is maintained and improved"
+    },
+    {
+        "priorities": [
+            {
+                "category": "Ramsar"
+            }
+        ],
+        "shortDescription": "Ramsar Sites",
+        "category": "Ramsar",
+        "type": "secondary",
+        "outcome": "3: Ramsar Wetland Protection (Long term): The ecological character of targeted Ramsar sites is maintained and/or improved, building resilience to climate change"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Targeted threatened species (TS) are on track for improved trajectory"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Species at high risk of imminent extinction are identified and supported to persist"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Priority species are being assisted to strengthen reliance and adaptive capacity for climate change"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened species - Increased leadership and/or participation of First Nations people in the management and recovery of threatened species"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened Ecological Communities and priority places - The implementation of priority actions is leading to an improvement in the condition of targeted TECs and priority places"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened Ecological Communities and priority places - Resilience to climate change and extreme events has been increased"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "1.  Species and Landscapes (Medium term): Threatened Ecological Communities and priority places - Increased leadership and/or participation of First Nations people in the management and recovery of threatened ecological communities and priority places"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Threats to the outstanding universal value of world heritage properties listed for their natural heritage value have been reduced through the implementation of priority actions"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Managing Threats - Threats from climate change, extreme events and invasive species have been reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Managing Threats - Threats from disease have been reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Managing Threats - Increased leadership and/or participation of First Nations people in the management of threats to World Heritage properties"
+    },
+    {
+        "category": "Threatened Species",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Improving land management practices and protecting habitat - Threats from inappropriate fire management are reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Improving land management practices and protecting habitat - Threats from inappropriate management of human impacts, climate change and extreme events are reduced"
+    },
+    {
+        "category": "World Heritage",
+        "type": "medium",
+        "outcome": "2. World Heritage Protection (Medium term): Improving land management practices and protecting habitat - Increased leadership and/or participation of First Nations people in the management and protection of World Heritage properties"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Priority actions at targeted Ramsar sites will reduce threats, restore or maintain ecological character and increase climate change resilience"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - The critical components, processes and services of the wetland actively maintained and/or improved"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - Absence/reduction of non-native species"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - Increased leadership and/or participation of First Nations people in the management of threats to Ramsar sites"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Managing Threats - Adaptive management planning and actions are building resilience to extreme climate events"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Wetland biota and/or abundance is maintained and improved"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Hydrological regimes have been restored and maintained"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Improved condition of wetland vegetation/habitat"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Quality of breeding, foraging and roosting habitat is improved"
+    },
+    {
+        "category": "Ramsar",
+        "type": "medium",
+        "outcome": "3. Ramsar Wetland Protection (Medium term): Protecting and Improving Habitat - Increased leadership and/or participation of First Nations people in the restoration and/or maintenance of the ecological character of Ramsar sites"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Managing Threats - Pest predator an competitor species have been controlled or are under active, long-term control programs"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Managing Threats - Threats from disease have been contained, reduced or excluded"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Land management practices have improved"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Quality of (TS/TECs) habitat has improved"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Area/Extent of (TS/TECs) habitat has increased"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Increased connectivity between patches"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Improving habitat - Quality of breeding and foraging habitat is improved   "
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Creating insurance populations - Existing populations have been protected"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Creating insurance populations - Re-introductions have enhanced wild populations"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): Climate adaption and resilience - Climate change resilience and adaptive capacity actions underway"
+    },
+    {
+        "type": "short",
+        "category": "Threatened Species",
+        "outcome": "1.  Species and Landscapes (Short term): First Nations People and community involvement - First Nations people are leading and/or participating in recovery activities"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Managing threats - Pest predator and competitor species have been controlled"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Managing threats -Threats from disease have been contained or reduced"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Improving land management practices and protecting habitat - Inappropriate fire regimes have been reduced or halted"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Improving land management practices and protecting habitat - Land management practices have improved (within and around heritage properties)"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Improving land management practices and protecting habitat - Actions to reduce nutrient levels have been implemented, and nutrient levels are beginning to stabilise/improve "
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): Climate adaption and resilience - Climate change resilience and adaptive capacity actions underway"
+    },
+    {
+        "type": "short",
+        "category": "World Heritage",
+        "outcome": "2. World Heritage Protection (Short term): First Nations People and community involvement - First Nations people are leading and/or participating in management and protection activities"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Managing threats -  Inappropriate land management practices have decreased within the catchment"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Managing Threats - Pest predator and competitor species have been controlled "
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term):  Managing Threats - Appropriate fire management regimes within and external to site"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Protecting and Improving Habitat - Area and quality of suitable wetland habitat has increased and/or is maintained"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Protecting and Improving Habitat - Water quality has been stabilised and/or improved  "
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Protecting and Improving Habitat - Improved access control to protect sensitive species and habitats"
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): Climate adaption and resilience - Climate change resilience and adaptive capacity actions underway to improve and/or maintain the ecological character of Ramsar sites "
+    },
+    {
+        "type": "short",
+        "category": "Ramsar",
+        "outcome": "3. Ramsar Wetland Protection (Short term): First Nations People and community involvement - First Nations people are leading and/or participating in restoration, maintenance and protection activities"
+    }
+];
+
+var priorities = [
+    {
+        "category": "Plants",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Adamson’s Blown-grass Lachnagrostis adamsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Ammonite Snail Ammoniropa vigens"
+    },
+    {
+        "category": "Plants",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Angle-stemmed Myrtle Gossia gonoclada"
+    },
+    {
+        "category": "Plants",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Arckaringa Daisy Olearia arckaringensis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Arnhem Land Gorges Skink Bellatorias obiri"
+    },
+    {
+        "category": "Birds",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Australasian Bittern Botaurus poiciloptilus"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Australian Sea-lion Neophoca cinerea"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Bellinger River Snapping Turtle Wollumbinia georgesi"
+    },
+    {
+        "category": "Birds",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Black-eared Miner Manorina melanotis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Bolivia Hill Rice-flower, Pimelea venosa"
+    },
+    {
+        "category": "Plants",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Border Ranges Lined Fern Antrophyum austroqueenslandicum"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Brush-tailed Rock-wallaby Petrogale penicillata"
+    },
+    {
+        "category": "Plants",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Target 3",
+        "priority": "Bulberin Nut Macadamia jansenii "
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Canberra Grassland Earless Dragon Tympanocryptis lineata"
+    },
+    {
+        "category": "Birds",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Carnaby's Cockatoo Calyptorhynchus latirostris"
+    },
+    {
+        "category": "Plants",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Carrington Falls Pomaderris Pomaderris walshii"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Cauliflower Soft Coral Dendronephthya australis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Central Rock-rat Antina Zyzomys pedunculatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Christmas Island Goshawk Accipiter hiogaster natalis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Chuditch, Western Quoll Dasyurus geoffroii"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Collared Delma, Adorned Delma Delma torquata"
+    },
+    {
+        "category": "Plants",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Davies' Waxflower Phebalium daviesii"
+    },
+    {
+        "category": "Birds",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Eastern Curlew Numenius madagascariensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Eastern Quoll Dasyurus viverrinus"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida"
+    },
+    {
+        "category": "Plants",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Foote's Grevillea Grevillea calliantha"
+    },
+    {
+        "category": "Plants",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Forked Spyridium Spyridium furculentum"
+    },
+    {
+        "category": "Fish",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Freshwater Sawfish Pristis pristis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Giant Andersonia Andersonia axilliflora"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Giant Gippsland Earthworm Megascolides australis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Gilbert's Potoroo Ngilkat Potorous gilbertii"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Glenelg Freshwater Mussel Hyridella glenelgensis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Golden-shouldered Parrot, Alwal Psephotus chrysopterygius"
+    },
+    {
+        "category": "Plants",
+        "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Gorge Rice-flower, Pimelelea cremnophila"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Gorge Rice-flower, Pimelea cremnophila"
+    },
+    {
+        "category": "Plants",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Graveside Leek-orchid Prasophyllum taphanyx"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Great Desert Skink, Tjakura, Warrarna, Mulyamiji Liopholis kintorei"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Greater Bilby Macrotis lagotis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Green Turtle Chelonia mydas"
+    },
+    {
+        "category": "Fish",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Grey Nurse Shark (eastern) Carcharias taurus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Growling Grass Frog, Southern Bell Frog Litoria raniformis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Hooded Plover (eastern) Thinornis cucullatus cucullatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Imlay Mallee Eucalyptus imlayensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Kangaroo Island Assassin Spider Zephyrarchaea austini"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Kangaroo Island Echidna Tachyglossus aculeatus multiaculeatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "King Blue-grass Dichanthium queenslandicum"
+    },
+    {
+        "category": "Birds",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "King Island Brown Thornbill Acanthiza pusilla archibaldi"
+    },
+    {
+        "category": "Birds",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "King Island Scrubtit Acanthornis magna greeniana"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Koala Phascolarctos cinereus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Kroombit Tinker Frog Taudactylus pleione"
+    },
+    {
+        "category": "Plants",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Lax Leek Orchid Prasophyllum laxum"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Leadbeater’s Possum Gymnobelideus leadbeateri"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Leaf-Scaled Seasnake – Aipysurus foliosquama"
+    },
+    {
+        "category": "Plants",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Little Mountain Palm Lepidorrhachis mooreana"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Lord Howe Island Phasmid Dryococelus australis"
+    },
+    {
+        "category": "Plants",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "MacDonnell Ranges Cycad Macrozamia macdonnellii"
+    },
+    {
+        "category": "Birds",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Malleefowl Leipoa ocellata"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Margaret River Burrowing Crayfish Engaewa pseudoreducta"
+    },
+    {
+        "category": "Fish",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Maugean Skate Zearaja maugeana"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mount Lidgbird Charopid Land Snail Pseudocharopa ledgbirdi"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mountain Frog Philoria kundagungan"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mountain Pygmy-possum Burramys parvus"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Mountain-top Nursery-frog Cophixalus monticola"
+    },
+    {
+        "category": "Fish",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Murray Hardyhead Craterocephalus fluviatilis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Narrow-leaf Eremophila Eremophila subangustifolia"
+    },
+    {
+        "category": "Plants",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Native Guava Rhodomyrtus psidioides"
+    },
+    {
+        "category": "Mammals",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Target 3",
+        "priority": "New Holland Mouse, Pookila Pseudomys novaehollandiae"
+    },
+    {
+        "category": "Birds",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Night Parrot Pezoporus occidentalis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Noisy Scrub-bird Atrichornis clamosus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Norfolk Island Green Parrot Cyanoramphus cookii"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Brushtail Possum Trichosurus vulpecula arnhemensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Hairy-nosed Wombat, Yaminon Lasiorhinus krefftii"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Hopping-mouse, Woorrentinta Notomys aquilo"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Northern Quoll Dasyurus hallucatus"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Numbat Myrmecobius fasciatus"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Olive Ridley Turtle Lepidochelys olivacea"
+    },
+    {
+        "category": "Birds",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Orange-bellied Parrot Neophema chrysogaster"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Pink Underwing Moth Phyllodes imperialis smithersi"
+    },
+    {
+        "category": "Birds",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Plains-wanderer Pedionomus torquatus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Princess Parrot Polytelis alexandrae"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Pygmy Blue-tongue Lizard Tiliqua adelaidensis"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Quokka Setonix brachyurus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Red Goshawk Erythrotriorchis radiatus"
+    },
+    {
+        "category": "Fish",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Red Handfish Thymichthys politus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Red-tailed Black Cockatoo (SE) Calyptorhynchus banksii graptogyne"
+    },
+    {
+        "category": "Fish",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Redfin Blue-eye Scaturiginichthys vermeilipinnis"
+    },
+    {
+        "category": "Birds",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Regent Honeyeater Anthochaera phrygia"
+    },
+    {
+        "category": "Plants",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Scaly-butt Mallee Eucalyptus leprophloia"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Short-nosed Seasnake Aipysurus apraefrontalis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Small-flowered Snottygobble Persoonia micranthera"
+    },
+    {
+        "category": "Plants",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Smooth Davidson's Plum Davidsonia johnsonii"
+    },
+    {
+        "category": "Frogs",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Southern Corroboree Frog Pseudophryne corroboree"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Spectacled Flying-fox Pteropus conspicillatus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Stiff Groundsel Senecio behrianus"
+    },
+    {
+        "category": "Plants",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Stirling Range Dryandra Banksia montana"
+    },
+    {
+        "category": "Fish",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Stocky Galaxias Galaxias tantangara"
+    },
+    {
+        "category": "Fish",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Swan Galaxias Galaxias fontanus"
+    },
+    {
+        "category": "Birds",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Swift Parrot Lathamus discolor"
+    },
+    {
+        "category": "Plants",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Tangled Wattle Acacia volubilis"
+    },
+    {
+        "category": "Invertebrates",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Tasmanian Giant Freshwater Crayfish Astacopsis gouldi"
+    },
+    {
+        "category": "Plants",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Waddy, Waddi, Waddy-wood, Birdsville Wattle Acacia peuce"
+    },
+    {
+        "category": "Birds",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Western Ground Parrot, Kyloring Pezoporus flaviventris"
+    },
+    {
+        "category": "Mammals",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Western Ringtail Possum Pseudocheirus occidentalis"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Western Swamp Tortoise Pseudemydura umbrina"
+    },
+    {
+        "category": "Frogs",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Target 3",
+        "priority": "White-bellied Frog Anstisia alba"
+    },
+    {
+        "category": "Birds",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Target 3",
+        "priority": "White-throated Grasswren, Yirlinkirrkirr Amytornis woodwardi"
+    },
+    {
+        "category": "Fish",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Target 3",
+        "priority": "White's Seahorse Hippocampus whitei"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Wollemi Pine Wollemia nobilis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Wongan Eriostemon Philotheca wonganensis"
+    },
+    {
+        "category": "Plants",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Wood Well Spyridium Spyridium fontis-woodii"
+    },
+    {
+        "category": "Reptiles",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Priority Threatened Species Primary",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Target 3",
+        "priority": "Yinnietharra Rock-dragon Ctenophorus yinnietharra"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Alpine Sphagnum Bogs and Associated Fens"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "Natural Temperate Grassland of the South Eastern Highlands"
+    },
+    {
+        "category": "Threatened Ecological Communities",
+        "priority": "White Box-Yellow Box-Blakely's Red Gum Grassy Woodland and Derived Native Grassland"
+    },
+    {
+        "category": "Ramsar",
+        "priority": "Ginini Flats Wetland Complex"
+    }
+];
+
+let parentProgram = "Natural Heritage Trust";
+var subprograms = ["World Heritage Protection"]
+
+var parent = db.program.find({name: parentProgram}).next();
+subprograms.forEach(function (subProgram){
+    var now = ISODate();
+    var p = {name: subProgram, programId: UUID.generate(), dateCreated: now, lastUpdate: now, parent: parent._id, status: "active"}
+    var program = db.program.find({name: subProgram})
+    if (!program.hasNext()) {
+        db.program.insertOne(p);
+    } else {
+        print("Program Already Exist: " + subProgram)
+    }
+});
+
+subprograms.forEach(function (subprogram){
+    var program = db.program.find({name: subprogram});
+    while(program.hasNext()){
+        var p = program.next();
+        print("sub program ID: " + p.programId)
+        db.program.updateOne({programId:p.programId}, {$set:{config:config, outcomes:outcomes, priorities:priorities}});
+        useNhtServiceLabels(p.name);
+    }
+});
+
+
diff --git a/src/main/scripts/releases/3.1/adhoc/fixServiceLabels.js b/src/main/scripts/releases/3.1/adhoc/fixServiceLabels.js
new file mode 100644
index 000000000..7d04fe5cf
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/fixServiceLabels.js
@@ -0,0 +1,109 @@
+load('../../../utils/uuid.js');
+// Add labels and output mapping for services used by the new program
+
+let mainProgram = db.program.findOne({name:'Natural Heritage Trust'});
+
+var programName = 'Recovery Actions for Species and Landscapes';
+var program = db.program.findOne({name:programName});
+
+
+let structuresScore = db.score.findOne({label:'Number of structures installed that control access'});
+let oldStructuresScore = db.score.findOne({label: 'Number of structures installed'});
+let oldStructuresScoreId = oldStructuresScore.scoreId;
+
+if (!structuresScore) {
+    structuresScore = db.score.findOne({label: 'Number of structures installed'});
+
+    delete structuresScore._id;
+    structuresScore.label = 'Number of structures installed that control access';
+    structuresScore.scoreId = UUID.generate();
+    db.score.insertOne(structuresScore);
+}
+
+db.service.updateOne({name:'Habitat Condition Assessment Survey'}, {$set:{name:'Habitat condition assessment survey'}})
+db.service.updateOne({name:'First Nations Australians Cultural Practices'}, {$set:{name:'First nations Australians cultural practices'}})
+db.service.updateOne({name:'Sustainable Agriculture Facilitators'}, {$set:{name:'Sustainable agriculture facilitators'}})
+
+
+let programScores = program.config.programServiceConfig.programServices;
+let hydrologyService = db.service.findOne({name:'Remediating riparian and aquatic areas'});
+let controllingAccessService = db.service.findOne({name:"Controlling access"});
+let foundSAF = false;
+let foundCulturalPractices = false;
+
+let safService = db.service.findOne({name:'Sustainable agriculture facilitators'});
+let culturalPracticesService = db.service.findOne({name:'First nations Australians cultural practices'});
+
+for (let i=0; i<programScores.length; i++) {
+
+    if (programScores[i].serviceId == hydrologyService.legacyId) {
+        const score = db.score.findOne({label:'Number of structures installed to promote aquatic health'});
+        if (programScores[i].serviceTargets.indexOf(score.scoreId) == -1) {
+            programScores[i].serviceTargets.push(score.scoreId);
+        }
+    }
+
+    if (programScores[i].serviceId == controllingAccessService.legacyId) {
+
+        programScores[i].serviceTargets.splice(programScores[i].serviceTargets.indexOf(oldStructuresScoreId), 1);
+        if (programScores[i].serviceTargets.indexOf(structuresScore.scoreId) == -1) {
+            programScores[i].serviceTargets.push(structuresScore.scoreId);
+        }
+
+    }
+
+    if (programScores[i].serviceId == safService.legacyId) {
+        foundSAF = true;
+    }
+    if (programScores[i].serviceId == culturalPracticesService.legacyId) {
+        foundCulturalPractices = true;
+    }
+}
+if (!foundSAF) {
+    let safScore = db.score.findOne({label:'Number of SAF FTEs invoiced for'});
+    programScores.push({serviceId:safService.legacyId, serviceTargets:[safScore.scoreId]});
+}
+if (!foundCulturalPractices) {
+    let culturalPracticesScore = db.score.findOne({label:'Number of days conducting cultural practices'});
+    programScores.push({serviceId:culturalPracticesService.legacyId, serviceTargets:[culturalPracticesScore.scoreId]});
+}
+db.program.replaceOne({_id:program._id}, program);
+
+
+let services = db.service.find({programLabels:{$ne:null}});
+while(services.hasNext()) {
+    let service = services.next();
+    let label = service.programLabels[mainProgram.programId].label;
+
+    service.programLabels[program.programId] = {label:label};
+    print("Updating label for service " + service.name + " to " + label);
+    db.service.replaceOne({_id:service._id}, service);
+}
+
+let oldLabelNewLabel = [
+    {oldLabel:'Establishing and maintaining agreements', newLabel: 'Establishing and implementing conservation agreements'},
+    {oldLabel: 'Establishing and maintaining feral-free enclosures', newLabel: 'Establishing and maintaining pest animal-free enclosures'},
+    {oldLabel: 'Establishing and maintaining breeding programs', newLabel: 'Captive breeding, translocation or re-introduction programs'},
+    {oldLabel: 'Fire management actions', newLabel: 'Implementing fire management actions'},
+    {oldLabel: 'Identifying the location of potential sites', newLabel: 'Identifying and prioritising the location of potential sites'},
+    {oldLabel: 'Improving hydrological regimes', newLabel: 'Improving hydrological regimes for site eco-hydrology'},
+    {oldLabel: 'Managing disease', newLabel: 'Managing disease'},
+    {oldLabel: 'Plant survival survey', newLabel: 'Seed germination/plant survival survey'},
+    {oldLabel: 'Seed collection', newLabel: 'Seed collection and propagation'},
+    {oldLabel: 'Undertaking emergency interventions to prevent extinctions', newLabel: 'Undertaking emergency interventions to prevent extinctions'},
+
+]
+
+for (let i=0; i<oldLabelNewLabel.length; i++) {
+    let service = db.service.findOne({name:oldLabelNewLabel[i].oldLabel});
+    for (let label in service.programLabels) {
+        if (service.programLabels.hasOwnProperty(label)) {
+            service.programLabels[label].label = oldLabelNewLabel[i].newLabel;
+        }
+    }
+    print("Updating label for service " + service.name + " from "+ oldLabelNewLabel[i].oldLabel + "to " + oldLabelNewLabel[i].newLabel);
+    db.service.replaceOne({_id:service._id}, service);
+}
+
+
+
diff --git a/src/main/scripts/releases/3.1/adhoc/migrateTestPartaooData.js b/src/main/scripts/releases/3.1/adhoc/migrateTestPartaooData.js
new file mode 100644
index 000000000..4b25c27ae
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/migrateTestPartaooData.js
@@ -0,0 +1,19 @@
+const programs=['Recovery Actions for Species and Landscapes'];
+for (let i=0; i<programs.length; i++) {
+    const program = db.program.findOne({name:programs[i]});
+
+    let projects = db.project.find({programId:program.programId});
+
+    while (projects.hasNext()) {
+        let project = projects.next();
+        let sites = db.site.find({projects:project.projectId, externalIds:{$ne:null}, type:'surveyArea'});
+        while (sites.hasNext()) {
+            let site = sites.next();
+            site.externalIds[0].idType = "MONITOR_PLOT_GUID";
+
+            print("Updating site "+site.name+" for project "+project.name);
+            db.site.replaceOne({_id:site._id}, site);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/scripts/releases/3.1/adhoc/newCommunityScore.js b/src/main/scripts/releases/3.1/adhoc/newCommunityScore.js
new file mode 100644
index 000000000..be273b372
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/newCommunityScore.js
@@ -0,0 +1,66 @@
+let score = {
+    entityTypes: [],
+    tags: [],
+    displayType: '',
+    configuration: {
+        label: 'Number of field days',
+        childAggregations: [
+            {
+                filter: {
+                    filterValue: 'RLP - Output Report Adjustment',
+                    type: 'filter',
+                    property: 'name'
+                },
+                childAggregations: [
+                    {
+                        filter: {
+                            filterValue: '06514e13-3aa4-4f3e-805a-16c7b67d3524',
+                            type: 'filter',
+                            property: 'data.adjustments.scoreId'
+                        },
+                        childAggregations: [
+                            {
+                                property: 'data.adjustments.adjustment',
+                                type: 'SUM'
+                            }
+                        ]
+                    }
+                ]
+            },
+            {
+                filter: {
+                    filterValue: 'RLP - Community engagement',
+                    property: 'name',
+                    type: 'filter'
+                },
+                childAggregations: [{property: 'data.events.numberOfEvents', type: 'SUM'}]
+            },
+            {
+                filter: {
+                    filterValue: 'Community engagement',
+                    property: 'name',
+                    type: 'filter'
+                },
+                childAggregations: [{property: 'data.events.numberOfEvents', type: 'SUM'}]
+            },
+            {
+                filter: {
+                    filterValue: 'NHT - Community engagement',
+                    property: 'name',
+                    type: 'filter'
+                },
+                childAggregations: [{property: 'data.events.numberOfEvents', type: 'SUM'}]
+            }
+        ]
+    },
+    entity: 'Activity',
+    outputType: 'Community/stakeholder engagement',
+    scoreId: 'f9c85612-602e-465c-89e0-e155b34b1f31',
+    isOutputTarget: true,
+    category: 'RLP and Bushfire Recovery',
+    status: 'active',
+    label: 'Number of engagement events'
+};
+
+db.score.insert(score);
+
diff --git a/src/main/scripts/releases/3.1/adhoc/removeNotRequired.js b/src/main/scripts/releases/3.1/adhoc/removeNotRequired.js
new file mode 100644
index 000000000..286fa15c0
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/removeNotRequired.js
@@ -0,0 +1,35 @@
+load('../../../utils/reports.js');
+load('../../../utils/audit.js');
+const adminUserId = '1493';
+const reportIds = [];
+
+const grantIds = [
+'ASP-MU05-P1',
+'ASP-MU38-P1',
+'ASP-MU37-P1',
+'ASP-MU12-P1',
+'ASP-MU20-P1',
+'ASP-MU44-P1',
+'ASP-MU42-P1',
+'ASP-MU16-P1',
+'ASP-MU28-P1',
+'ASP-MU41-P1',
+'ASP-MU26-P1',
+];
+
+
+for (let i=0; i<grantIds.length; i++) {
+    let project = db.project.findOne({grantId:grantIds[i]});
+
+    let report = db.report.findOne({projectId:project.projectId, activityType:'Annual Report 2022', toDate:{$gte:project.plannedEndDate}});
+
+    if (!report) {
+        throw "Uhoh, found no report for project "+grantIds[i];
+    }
+    else {
+        print("Found report "+report.name);
+    }
+
+    removeNotRequiredStatus(report.reportId, 'Extending project end date', adminUserId);
+
+}
\ No newline at end of file
diff --git a/src/main/scripts/releases/3.1/adhoc/setupUrbanRiversMuPriorities.js b/src/main/scripts/releases/3.1/adhoc/setupUrbanRiversMuPriorities.js
new file mode 100644
index 000000000..39316a157
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/setupUrbanRiversMuPriorities.js
@@ -0,0 +1,47 @@
+var mus = [
+    {mu:'Northern Territory', priorities: ['Darwin (Rapid Creek, Mitchell Creek, Ludmilla Creek and Sandy Creek)']},
+    {mu:'Corangamite', priorities: ['Kaaraf Wetlands', 'Redan Wetlands and Yarrowee River']},
+    {mu:'Swan Region', priorities: ['Swan and Canning Rivers - Swan River at Bayswater', 'Swan and Canning Rivers - Swan/Canning Estuary Foreshore', 'Swan and Canning Rivers – Canning River and tributaries']},
+    {mu:'Fitzroy', priorities: ['Fig Tree Creek, Yeppoon']},
+    {mu:'Mackay Whitsunday', priorities: ['McCready\'s Creek, Mackay']},
+    {mu:'Adelaide and Mount Lofty Ranges', priorities: ['Onkaparinga River (a)', 'Pedler Creek', 'Brownhill Keswick Creeks (a)', 'Brownhill Creek (b)', 'Port River Foreshore - shoreline', 'Port River Estuary', 'Onkaparinga River (b)', 'Sturt River - Warrappendi', 'Sturt River - Riverside Drive', 'Sturt River - Oxbow']},
+    {mu:'South NRM Region', priorities: ['Derwent River', 'Tamar Estuary']},
+    {mu:'Port Phillip and Western Port', priorities: ['Peter Hopper Lake', 'Moonee Ponds Creek (a) - Maribyrnong', 'Moonee Ponds Creek (b) – Strathmore to Pascoe Vale', 'KooyongKoot (Tooronga Park wetland)', 'Diamond Creek', 'Yarra Flats', 'Elster Creek', 'Werribee River', 'Darebin Creek', 'Merri Creek', 'Gardiners Creek / KooongKoot waterway']},
+    {mu:'ACT', priorities: ['ACT Urban Waterways', 'Jerrabomberra Creek']},
+    {mu:'South West Queensland', priorities: ['Bulimba Creek', 'Cubberla Creek', 'Bremer River, Ipswich', 'Saltwater Creek, Gold Coast', 'Downfall Creek', 'Dowse Lagoon', 'Brisbane River', 'Slacks Creek']},
+    {mu:'Wet Tropics', priorities: ['Saltwater Creek, Cairns']},
+    {mu:'Hunter', priorities: ['Lake Macquarie (Waterways of Dora Creek, Cockle Creek and Slatey Creek)']},
+    {mu:'Greater Sydney', priorities: ['Hawkesbury River', 'Tuggerah Lakes', 'Cooks River']},
+    {mu:'South East NSW', priorities:['Shoalhaven and Crookshaven Rivers']},
+];
+
+const category = 'Waterways';
+
+for (var i = 0; i < mus.length; i++) {
+    let mu = db.managementUnit.findOne({name:mus[i].mu});
+    print("Checking priorities for "+mu.name);
+
+    // Remove other "Waterways" priorities
+
+    let changed = false;
+    for (let j=0; j<mus[i].priorities.length; j++) {
+        let found = false;
+        for (let k=0; k<mu.priorities.length; k++) {
+            if (mu.priorities[k].category == category && mu.priorities[k].priority == mus[i].priorities[j].priority) {
+                print("Already exists: " + priorities[j].priority);
+                found = true;
+                break;
+            }
+
+        }
+        if (!found) {
+            mu.priorities.push({category:category, priority:mus[i].priorities[j]});
+            changed = true;
+        }
+    }
+    if (changed) {
+        print("Saving: " + mu.name);
+        db.managementUnit.replaceOne({_id:mu._id}, mu);
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/scripts/releases/3.1/adhoc/updateMus.js b/src/main/scripts/releases/3.1/adhoc/updateMus.js
new file mode 100644
index 000000000..ca8e59817
--- /dev/null
+++ b/src/main/scripts/releases/3.1/adhoc/updateMus.js
@@ -0,0 +1,26 @@
+load('../../../utils/audit.js');
+let adminUserId = 'system';
+const projects = [
+    ['PWP-MU42-P1', 'South NRM Region'],
+    ['PWP-MU40-P1', 'North West NRM Region'],
+    ['PWP-MU30-P1', 'Port Phillip and Western Port'],
+    ['PWP-MU17-P2', 'Kangaroo Island'],
+    ['PWP-MU19-P1', 'South Australian Murray Darling Basin'],
+    ['PWP-MU21-P1', 'South Australian Arid Lands'],
+    ['PWP-MU20-P1', 'Northern and Yorke'],
+    ['PWP-MU15-P1', 'Alinytjara Wilurara'],
+    ['PWP-MU37-P1', 'South Coast Region']];
+
+for (let i=0; i<projects.length; i++) {
+    let project = db.project.findOne({grantId:projects[i][0]});
+    let mu = db.managementUnit.findOne({name:projects[i][1]});
+    if (project && mu) {
+        project.managementUnitId = mu.managementUnitId;
+        db.project.replaceOne({_id:project._id}, project);
+        audit(project, project.projectId, 'au.org.ala.ecodata.Project', adminUserId);
+    }
+    else {
+        print('No project or management unit found for ' + projects[i][0]);
+    }
+}
+
diff --git a/src/main/scripts/releases/3.1/fixSiteExternalIds.js b/src/main/scripts/releases/3.1/fixSiteExternalIds.js
new file mode 100644
index 000000000..1ab63851d
--- /dev/null
+++ b/src/main/scripts/releases/3.1/fixSiteExternalIds.js
@@ -0,0 +1,30 @@
+load('../../utils/audit.js');
+let adminUserId = 'system';
+let sites = db.site.find({externalId:{$type:'number'}});
+while (sites.hasNext()) {
+    let site = sites.next();
+    site.externalId = new String(site.externalId);
+    db.site.replaceOne({_id:site._id}, site);
+
+    audit(site, site.siteId, 'au.org.ala.ecodata.Site', adminUserId);
+}
+
+
+sites = db.site.find({externalId:{$type:'object'}});
+while (sites.hasNext()) {
+    let site = sites.next();
+    site.externalId = null;
+    db.site.replaceOne({_id:site._id}, site);
+
+    audit(site, site.siteId, 'au.org.ala.ecodata.Site', adminUserId);
+}
+
+sites = db.site.find({externalId:{$ne:null}});
+while (sites.hasNext()) {
+    let site = sites.next();
+    site.externalIds = [{idType:'UNSPECIFIED', externalId: site.externalId}];
+    delete site.externalId;
+    db.site.replaceOne({_id:site._id}, site);
+
+    audit(site, site.siteId, 'au.org.ala.ecodata.Site', adminUserId);
+}
\ No newline at end of file
diff --git a/src/main/scripts/releases/3.1/insertParatooProtocolConfig.js b/src/main/scripts/releases/3.1/insertParatooProtocolConfig.js
new file mode 100644
index 000000000..264572807
--- /dev/null
+++ b/src/main/scripts/releases/3.1/insertParatooProtocolConfig.js
@@ -0,0 +1,331 @@
+var protocolConfig = {
+    // Vegetation Mapping Survey
+    'cd2cbbc7-2f17-4b0f-91b4-06f46e9c90f2': {
+        apiEndpoint: 'vegetation-mapping-observations',
+        usesPlotLayout: false,
+        geometryType: 'Point',
+        geometryPath: 'attributes.position',
+        startDatePath: 'attributes.vegetation_mapping_survey.data.attributes.start_date_time',
+        endDatePath: null,
+        surveyIdPath: 'attributes.vegetation_mapping_survey.data.attributes.surveyId'
+    },
+    'floristics-veg-survey-lite': {
+        apiEndpoint: 'floristics-veg-survey-lites',
+        usesPlotLayout: true,
+        startDatePath: 'attributes.start_date_time',
+        endDatePath: 'attributes.end_date_time',
+        surveyIdPath: 'attributes.surveyId'
+    },
+    'floristics-veg-survey-fulls': {
+        apiEndpoint: 'floristics-veg-survey-fulls',
+        usesPlotLayout: true,
+        startDatePath: 'attributes.start_date_time',
+        endDatePath: 'attributes.end_date_time',
+        surveyIdPath: 'attributes.surveyId'
+    },
+    'photopoints-survey': {
+        apiEndpoint: 'photopoints-surveys',
+        usesPlotLayout: true,
+        startDatePath: 'attributes.start_date_time',
+        endDatePath: 'attributes.end_date_time',
+        surveyIdPath: 'attributes.surveyId'
+    },
+    // Pest Fauna Control Activities
+    '80360ceb-bd6d-4ed4-b2ea-9bd45d101d0e': {
+        apiEndpoint: 'pest-fauna-control-activities',
+        usesPlotLayout: false,
+        startDatePath: 'attributes.start_time',
+        endDatePath: 'attributes.end_time',
+        geometryType: "LineString",
+        point1: "attributes.start_location", // Type string: format: Lat: -35.2592426, Lng: 149.0651714
+        point2: "attributes.end_location" // Format: Lat: -35.2592426, Lng: 149.0651714
+
+    },
+    // Basal Area DBH
+    '5005b0af-4360-4a8c-a203-b2c9e440547e': {
+        apiEndpoint: 'basal-area-dbh-measure-surveys',
+        usesPlotLayout: true,
+        startDatePath: 'attributes.start_date',
+        endDatePath: 'attributes.start_date',
+    }
+};
+
+var protocols = {
+    "068d17e8-e042-ae42-1e42-cff4006e64b0":
+        {"name": "Opportune", "usesPlotLayout": false, "tags": ["survey"]},
+    "cd2cbbc7-2f17-4b0f-91b4-06f46e9c90f2": {"name": "Vegetation Mapping", "usesPlotLayout": false, "tags": ["survey"]},
+    "a9cb9e38-690f-41c9-8151-06108caf539d":
+        {"name": "Plot Selection", "usesPlotLayout": false, "tags": ["site"]},
+    "d7179862-1be3-49fc-8ec9-2e219c6f3854": {
+        "name": "Plot Layout and Visit",
+        "usesPlotLayout": false,
+        "tags": ["site"]
+    },
+    "617df00c-0e4f-4267-9efc-9ca9eae19686": {
+        "name": "Plot Description(enhanced)",
+        "usesPlotLayout": true,
+        "tags": ["site"]
+    },
+    "dc10f902-e310-45eb-b82a-bebab050b46b": {
+        "name": "Plot Description(standard)",
+        "usesPlotLayout": true,
+        "tags": ["site"]
+    },
+    "3cbc5277-45fb-4e7a-8f33-19d9bff4cd78": {"name": "Drone Survey", "usesPlotLayout": false, "tags": ["survey"]},
+    "3d2eaa76-a610-4575-ac30-abf40e57b68a": {"name": "Dev sandbox", "usesPlotLayout": false, "tags": ["development"]},
+    "5fd206b5-25cb-4371-bd90-7b2e8801ea25": {
+        "name": "Photopoints - DSLR Panorama",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "383fa013-c52d-4186-911b-35e9b2375653": {
+        "name": "Photopoints - Compact Panorama",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "2dbb595b-3541-46bd-b200-13db3a823b74": {
+        "name": "Photopoints - Device Panorama",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "e15db26f-55de-4459-841b-d7ef87dea5cd": {
+        "name": "Floristics - Enhanced",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "bbd550c0-04c5-4a8c-ae39-cc748e920fd4": {
+        "name": "Floristics - Standard",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "b92005b0-f418-4208-8671-58993089f587": {
+        "name": "Plant Tissue Vouchering - Enhanced",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "f01e0673-a29d-48bb-b6ce-cf1c0f0de345": {
+        "name": "Plant Tissue Vouchering - Standard",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "93e65339-4bce-4ca1-a323-78977865ef93": {"name": "Cover - Enhanced", "usesPlotLayout": true, "tags": ["survey"]},
+    "37a3b018-3779-4c4f-bfb3-d38eb53a2568": {"name": "Cover - Standard", "usesPlotLayout": true, "tags": ["survey"]},
+    "8c47b1f8-fc58-4510-a138-e5592edd2dbc": {
+        "name": "Cover + Fire - Enhanced",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "58f2b4a6-6ce1-4364-9bae-f96fc3f86958": {
+        "name": "Cover + Fire - Standard",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "36e9d224-a51f-47ea-9442-865e80144311": {"name": "Fire Survey", "usesPlotLayout": true, "tags": ["survey"]},
+    "5005b0af-4360-4a8c-a203-b2c9e440547e": {"name": "Basal Area - DBH", "usesPlotLayout": true, "tags": ["survey"]},
+    "4b8b35c7-15ef-4abd-a7b2-2f4e24509b52": {
+        "name": "Basal Area - Basal Wedge",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "6e613128-92e8-4525-854c-4021f1d4d02f": {
+        "name": "Coarse Woody Debris",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "a05f8914-ef4f-4a46-8cf1-d035c9c46d4d": {
+        "name": "Recruitment - Age Structure",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "db841be3-dfb7-4860-9474-a131f4de5954": {
+        "name": "Recruitment - Survivorship",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "1dd7d3ff-11b5-4690-8167-d8fe148656b9": {
+        "name": "Soil Sub-pit and Metagenomics",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "15ea86ab-22f6-43fa-8cd5-751eab2347ad": {"name": "Soil Sample Pit", "usesPlotLayout": true, "tags": ["survey"]},
+    "1de5eed1-8f97-431c-b7ca-a8371deb3c28": {
+        "name": "Soil Site Observation and Pit Characterisation",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "39da41f1-dd45-4838-ae57-ea50588fd2bc": {
+        "name": "Soils - Bulk Density",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "c1b38b0f-a888-4f28-871b-83da2ac1e533": {
+        "name": "Vertebrate Fauna - Bird Survey",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "ab990a3a-a972-45d2-a384-13c3b01e9c7b": {
+        "name": "Vertebrate Fauna - Trapping Survey Closure",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "82463b77-aac2-407c-a03c-8669bd73baf0": {
+        "name": "Invertebrate Fauna - Malaise Trapping",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "8041a1a4-3e19-4fd2-86b9-d453023b5592": {
+        "name": "Invertebrate Fauna - Active Search",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "7f95710a-2003-4119-a2c6-41ce4e34d12a": {
+        "name": "Condition - Attributes",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "aae4dbd8-845a-406e-b682-ef01c3497711": {
+        "name": "Dev Sandbox Bulk Survey",
+        "usesPlotLayout": true,
+        "tags": ["development"]
+    },
+    "6000cb5f-ad75-41e2-9e3e-c070c527453a": {
+        "name": "Metadata Collection",
+        "usesPlotLayout": false,
+        "tags": ["survey"]
+    },
+    "949ae38f-c047-42a7-8164-38c24ede35d5": {
+        "name": "Camera Trap Reequipping",
+        "usesPlotLayout": false,
+        "tags": ["survey"]
+    },
+    "90c0f4cc-a22a-4820-9a8b-a01564bc197a": {
+        "name": "Fauna Aerial Survey",
+        "usesPlotLayout": false,
+        "tags": ["survey"]
+    },
+    "2c5bb8d7-b624-4dc4-93d7-3f1276e65ad5": {
+        "name": "Vertebrate Fauna - Trapping Survey Setup",
+        "usesPlotLayout": false,
+        "tags": ["survey"]
+    },
+    "70fbd236-9e51-47a8-93da-125a18a13acc": {
+        "name": "Vertebrate Fauna - Identify, Measure and Release",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "9d2c3fcf-881b-41df-944d-33bb6ef8ac51": {
+        "name": "Vertebrate true - Active and Passive Search",
+        "usesPlotLayout": false,
+        "tags": ["survey"]
+    },
+    "0628e486-9b33-4d86-98db-c6d3f10f7744": {
+        "name": "Vertebrate Fauna - Acoustic and Ultrasonic Recordings",
+        "usesPlotLayout": false,
+        "tags": ["survey"]
+    },
+    "9e75385a-4783-4911-8870-cca78b44d781": {
+        "name": "Invertebrate Fauna - Wet Pitfall Trapping",
+        "usesPlotLayout": false,
+        "tags": ["survey"]
+    },
+    "7dc49039-4999-43f6-8896-e33d7b28a934": {
+        "name": "Invertebrate Fauna - Rapid Ground Trapping",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "7b0e4526-726e-4292-a897-238f336ce51e": {
+        "name": "Invertebrate Fauna - Pan Trapping",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "aa64fd4d-2c5a-4f84-a197-9f3ce6409152": {
+        "name": "Invertebrate Fauna - Post-field Sampling Curation",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "08adf0ff-43c1-4f19-b2c4-f5da667baf65": {
+        "name": "Interventions - Data Collection",
+        "usesPlotLayout": false,
+        "tags": ["intervention"]
+    },
+    "ad088dbe-02b2-472a-901f-bd081e590bcf": {
+        "name": "Camera Trap Deployment",
+        "usesPlotLayout": false,
+        "tags": ["survey"]
+    },
+    "3db7f7b6-a96d-495a-9981-5d6170a7458d": {
+        "name": "Camera Trap Retrieval",
+        "usesPlotLayout": false,
+        "tags": ["survey"]
+    },
+    "648d545a-cdae-4c19-bc65-0c9f93d9c0eb": {
+        "name": "Sign-based Fauna Surveys - Within-plot Belt Transect",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "2cd7b489-b582-41f6-9dcc-264f6ea7801a": {
+        "name": "Sign-based Fauna Surveys - Off-plot Belt Transect",
+        "usesPlotLayout": false,
+        "tags": ["survey"]
+    },
+    "0c5d1d14-c71b-467f-aced-abe1c83c15d3": {
+        "name": "Sign-based Fauna - Vehicle Track",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "a76dac21-94f4-4851-af91-31f6dd00750f": {
+        "name": "Fauna Ground Counts Transects",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "80360ceb-bd6d-4ed4-b2ea-9bd45d101d0e": {
+        "name": "Pest Fauna - Control Activities",
+        "usesPlotLayout": false,
+        "tags": ["intervention"]
+    },
+    "228e5e1e-aa9f-47a3-930b-c1468757f81d": {
+        "name": "Herbivory and Physical Damage - Active Plot Search",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "cc826a19-a1e7-4dfe-8d6e-f135d258d7f9": {
+        "name": "Sign-based Fauna - Plot Sign Search",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "685b5e9b-20c2-4688-9b04-b6caaf084aad": {
+        "name": "Sign-based Fauna - Track Station",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "d706fd34-2f05-4559-b738-a65615a3d756": {
+        "name": "Fauna Ground Counts Vantage Point",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "06cd903e-b8b3-40a5-add4-f779739cce35": {
+        "name": "Herbivory and Physical Damage - Within-plot Belt Transect",
+        "usesPlotLayout": true,
+        "tags": ["survey"]
+    },
+    "49d02f5d-b148-4b5b-ad6a-90e48c81b294": {
+        "name": "Herbivory and Physical Damage - Off-plot Transect",
+        "usesPlotLayout": false,
+        "tags": ["survey"]
+    }
+};
+
+
+var key = 'paratoo.surveyData.mapping';
+var setting = {
+    key: key,
+    value: JSON.stringify(protocols),
+    dateCreated: ISODate(),
+    lastUpdated: ISODate()
+};
+if (db.setting.findOne({key: key})) {
+    db.setting.replaceOne({key: key}, setting);
+} else {
+    db.setting.insertOne(setting);
+}
+
diff --git a/src/main/scripts/releases/3.1/insertRdpDeclarationText.js b/src/main/scripts/releases/3.1/insertRdpDeclarationText.js
new file mode 100644
index 000000000..d09bca8aa
--- /dev/null
+++ b/src/main/scripts/releases/3.1/insertRdpDeclarationText.js
@@ -0,0 +1,25 @@
+var rdpDeclarationText = [
+    {
+        "key":"meritfielddata.rdp.report.declaration",
+        "value":'1. I declare that I am legally authorised to submit this report on behalf of the Regional Delivery Partner pursuant to the Deed of Standing Offer (Deed) between the Regional Delivery Partner and the Commonwealth. \r\n' +
+            '2. I understand that, under the Deed, all information I submit may constitute Contract Material.\r\n' +
+            '3. I understand that, through the Deed, the Commonwealth is licensed to use, reproduce, modify, adapt, communicate, publish, broadcast and distribute the Contract Material on the terms set out in the Deed.\r\n' +
+            '4. I declare that the information I submit is complete and correct and not false or misleading. I understand that it is an offence under the Criminal Code Act 1995 (Cth) to provide false or misleading information.'
+    }
+]
+
+for (var i=0; i<rdpDeclarationText.length; i++) {
+    var setting = {
+        key: rdpDeclarationText[i].key,
+        value: rdpDeclarationText[i].value,
+        dateCreated: ISODate(),
+        lastUpdated: ISODate()
+    };
+    if (db.setting.findOne({key: setting.key})) {
+        print("Inserting " + setting.key)
+        db.setting.replaceOne({key: setting.key}, setting);
+    } else {
+        print("Updating " + setting.key)
+        db.setting.insertOne(setting);
+    }
+}
diff --git a/src/main/scripts/releases/3.1/release3.1.sh b/src/main/scripts/releases/3.1/release3.1.sh
new file mode 100755
index 000000000..e59ee5184
--- /dev/null
+++ b/src/main/scripts/releases/3.1/release3.1.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+mongo -u ecodata -p "$1" ecodata removeDataSetAttributes.js
+mongo -u ecodata -p "$1" ecodata insertParatooProtocolConfig.js
+mongo -u ecodata -p "$1" ecodata updateNhtProgramConfig.js
+mongo -u ecodata -p "$1" ecodata fixSiteExternalIds.js
+mongo -u ecodata -p "$1" ecodata insertRdpDeclarationText.js
diff --git a/src/main/scripts/releases/3.1/removeDataSetAttributes.js b/src/main/scripts/releases/3.1/removeDataSetAttributes.js
new file mode 100644
index 000000000..2f546b9eb
--- /dev/null
+++ b/src/main/scripts/releases/3.1/removeDataSetAttributes.js
@@ -0,0 +1,19 @@
+load('../../../audit.js');
+const adminUserId = 'system';
+let projects = db.projects.find({'custom.dataSets':{$ne:null}});
+while (projects.hasNext()) {
+    let project = projects.next();
+    for (let i = 0; i<project.custom.dataSets.length; i++) {
+        let dataSet = project.custom.dataSets[i];
+
+        delete dataSet.collectorType;
+        delete dataSet.qa;
+        delete dataSet.published;
+        delete dataSet.storageType;
+        delete dataSet.custodian;
+        delete dataSet.owner;
+    }
+    db.project.replaceOne({_id:project._id}, project);
+    audit(project, project.projectId, 'au.org.ala.ecodata.Project', adminUserId);
+}
+
diff --git a/src/main/scripts/releases/3.1/updateNhtProgramConfig.js b/src/main/scripts/releases/3.1/updateNhtProgramConfig.js
new file mode 100644
index 000000000..ee6794cae
--- /dev/null
+++ b/src/main/scripts/releases/3.1/updateNhtProgramConfig.js
@@ -0,0 +1,16 @@
+load('../../utils/program.js');
+
+let programName = "Natural Heritage Trust";
+var program = db.program.findOne({name:programName});
+
+program.config.reportData = {
+    "NHT Output Report": "nhtOutputReportData"
+}
+db.program.replaceOne({_id:program._id}, program);
+
+programName = "Recovery Actions for Species and Landscapes";
+var program = db.program.findOne({name:programName});
+
+program.config.supportsMeriPlanComparison = true;
+program.config.declarationPageType = "rdpReportDeclaration";
+db.program.save(program);
\ No newline at end of file
diff --git a/src/main/scripts/runFunctionalTests.sh b/src/main/scripts/runFunctionalTests.sh
index 1a1b94857..116d2bb14 100755
--- a/src/main/scripts/runFunctionalTests.sh
+++ b/src/main/scripts/runFunctionalTests.sh
@@ -9,7 +9,7 @@ fi
 
 BRANCH=$3
 if [ -z $BRANCH ]; then
-    BRANCH=feature/issue856
+    BRANCH=dev
 fi
 
 ECODATA_LOCAL_DIR=$2
diff --git a/src/main/scripts/utils/organisations.js b/src/main/scripts/utils/organisations.js
new file mode 100644
index 000000000..7a52162df
--- /dev/null
+++ b/src/main/scripts/utils/organisations.js
@@ -0,0 +1,24 @@
+/**
+ * Creates a new report for the given project.
+ * @param reportDetails
+ * @param project
+ * @param adminUserId
+ */
+function createOrganisation(name, description, abn, adminUserId) {
+    const now = ISODate();
+
+    const meritHub = db.hub.findOne({urlPath:'merit'});
+    let org = {
+        name: name,
+        description: description || name,
+        abn: abn,
+        hubId: meritHub.hubId,
+        organisationId: UUID.generate(),
+        dateCreated: now,
+        lastUpdated: now,
+        status:'active'
+    };
+    db.organisation.insertOne(org);
+    audit(org, org.organisationId, "au.org.ala.ecodata.Organisation", adminUserId, null, 'create');
+    return db.organisation.findOne({organisationId:org.organisationId});
+}
\ No newline at end of file
diff --git a/src/main/scripts/utils/program.js b/src/main/scripts/utils/program.js
index b41ed4dab..acd871058 100644
--- a/src/main/scripts/utils/program.js
+++ b/src/main/scripts/utils/program.js
@@ -28,10 +28,15 @@ function setupProgramConfig(subprograms) {
     });
 }
 
-function createOrFindProgram(name, parentId) {
+function createOrFindProgram(name, parentId, nameOfProgramToCopy) {
     var program = db.program.findOne({name:name});
     if (!program) {
-        program = createProgram(name, parentId)
+        if (nameOfProgramToCopy) {
+            program = createProgramAsCopy(name, nameOfProgramToCopy);
+        }
+        else {
+            program = createProgram(name, parentId)
+        }
     }
     return program;
 }
@@ -60,4 +65,36 @@ function createProgramAsCopy(name, nameOfProgramToCopy) {
     copy.dateCreated = now;
     copy.lastUpdated = now;
     db.program.insert(copy);
-}
\ No newline at end of file
+
+    return db.program.findOne({programId:copy.programId});
+}
+
+/** When creating a new program, we often want to use the service labels that the NHT uses.
+ * This mechanism is a bit clunky, but for now this utility function will take the labels used by the
+ * NHT and apply them to the program with the supplied name.
+ * @param programName the name of the program to update labels for.
+ * @param programNameToCopy the name of the progam that already has the labels we want.  By default this will use the
+ * main NHT sub-program, Recovery Actions for Species and Landscapes.
+ */
+function useNhtServiceLabels(programName, programNameToCopy) {
+
+    programNameToCopy = programNameToCopy || 'RASL - Recovery Actions for Species and Landscapes';
+    var programToCopyLabels = db.program.findOne({name: programNameToCopy});
+    let program = db.program.findOne({name: programName});
+    let services = db.service.find({programLabels: {$ne: null}});
+    while (services.hasNext()) {
+        let service = services.next();
+        let label = service.programLabels[programToCopyLabels.programId];
+
+        if (!label) {
+            print("No label found for service " + service.name);
+            printjson(service);
+            throw "Help!";
+        }
+
+        service.programLabels[program.programId] = {label: label.label};
+        print("Updating label for service " + service.name + ", program "+program.name+" to " + label.label);
+
+        db.service.replaceOne({_id: service._id}, service);
+    }
+}
diff --git a/src/main/scripts/utils/reports.js b/src/main/scripts/utils/reports.js
index d3cf9e3c7..739321d52 100644
--- a/src/main/scripts/utils/reports.js
+++ b/src/main/scripts/utils/reports.js
@@ -121,13 +121,13 @@ function removeNotRequiredStatus(reportId, reason, adminUserId) {
             "dateChanged" : ISODate(),
             "status" : report.publicationStatus
         });
-    db.report.save(report);
+    db.report.replaceOne({_id:report._id}, report);
     audit(report, report.reportId, 'au.org.ala.ecodata.Report', adminUserId);
 
     if (report.activityId) {
         var activity = db.activity.findOne({activityId:report.activityId});
         activity.publicationStatus = 'unpublished';
-        db.activity.save(activity);
+        db.activity.replaceOne({_id:activity._id}, activity);
         audit(activity, activity.activityId, 'au.org.ala.ecodata.Activity', adminUserId);
     }
 }
diff --git a/src/test/groovy/au/org/ala/merit/AclInterceptorSpec.groovy b/src/test/groovy/au/org/ala/merit/AclInterceptorSpec.groovy
index fd49faf5b..652d2f918 100644
--- a/src/test/groovy/au/org/ala/merit/AclInterceptorSpec.groovy
+++ b/src/test/groovy/au/org/ala/merit/AclInterceptorSpec.groovy
@@ -1,10 +1,8 @@
 package au.org.ala.merit
 
-
 import grails.core.GrailsApplication
 import grails.core.GrailsClass
 import grails.testing.web.GrailsWebUnitTest
-import grails.testing.web.interceptor.InterceptorUnitTest
 import grails.web.http.HttpHeaders
 import org.apache.http.HttpStatus
 import spock.lang.Specification
@@ -148,7 +146,7 @@ class AclInterceptorSpec extends Specification implements GrailsWebUnitTest {
         GrailsApplication grailsApp = Mock(GrailsApplication)
         GrailsClass grailsClass = Mock(GrailsClass)
         aclInterceptor.grailsApplication = grailsApp
-        aclInterceptor.webRequest.controllerName = "ManagementUnitController"
+        aclInterceptor.webRequest.controllerName = "ReportController"
         aclInterceptor.webRequest.actionName = "generateReportsInPeriod"
         params.id = "p1"
 
@@ -158,7 +156,7 @@ class AclInterceptorSpec extends Specification implements GrailsWebUnitTest {
         then:
         1 * aclInterceptor.grailsApplication.getArtefactByLogicalPropertyName("Controller", _) >> grailsClass
         1 * aclInterceptor.roleService.getAugmentedRoles() >> ["alaAdmin","siteAdmin","officer","siteReadOnly","readOnly"]
-        1 * grailsClass.getClazz() >> ManagementUnitController.class
+        1 * grailsClass.getClazz() >> ReportController.class
         1 * aclInterceptor.userService.getCurrentUserId() >> "test"
         1 * aclInterceptor.userService.userIsAlaOrFcAdmin() >> false
         1 * aclInterceptor.userService.userHasReadOnlyAccess() >> false
diff --git a/src/test/groovy/au/org/ala/merit/DataSetControllerSpec.groovy b/src/test/groovy/au/org/ala/merit/DataSetControllerSpec.groovy
index 8b1379300..3d3f3e6fa 100644
--- a/src/test/groovy/au/org/ala/merit/DataSetControllerSpec.groovy
+++ b/src/test/groovy/au/org/ala/merit/DataSetControllerSpec.groovy
@@ -28,18 +28,25 @@ class DataSetControllerSpec extends Specification implements ControllerUnitTest<
 
     void "The model for the create page has information about the project"() {
         setup:
-        Map project = [projectId:'p1']
+        Map project = [projectId:'p1', custom:[dataSets:[[name:'d1'], [name:'d2']]]]
+        Map programConfig = [program:[name:"program 1"]]
 
         when:
         Map model = controller.create('p1')
 
         then:
         1 * projectService.get('p1') >> project
-        1 * projectService.getProgramConfiguration(project) >> [program:[name:"program 1"]]
+        1 * projectService.getProgramConfiguration(project) >> programConfig
         1 * projectService.getAllProjectOutcomes(project) >> ["1", "2"]
         1 * projectService.listProjectInvestmentPriorities(project) >> ["p1"]
+        1 * projectService.listProjectProtocols(project) >> [["name":"p1", "externalId":"p1"]]
+        1 * projectService.listProjectBaselines(project) >> [["code":"b1", baseline:"a baseline"]]
+
+        model == [project:project, projectId:'p1', programName:"program 1", supportsOutcomeTargets:false,
+                  priorities:["p1"], outcomes:["1", "2"], projectOutcomes:[],
+                    projectBaselines:[[label:"b1 - a baseline", value:"b1"]],
+                    projectProtocols:[[label:"p1", value:"p1"], [label:'Other', value:'other']], dataSetNames:['d1', 'd2']]
 
-        model == [project:project, projectId:'p1', programName:"program 1", priorities:["p1", "Other"], outcomes:["1", "2"]]
     }
 
     void "If the project cannot be found when editing a dataset, a 404 is returned"() {
@@ -67,17 +74,23 @@ class DataSetControllerSpec extends Specification implements ControllerUnitTest<
         setup:
         List existingDataSets = [[name:'data set 1', dataSetId:'d1'], [name:'data set 2', dataSetId:'d2'], [name:'data set 3', dataSetId:'d3']]
         Map project = [projectId:'p1', custom:[dataSets:existingDataSets]]
-
+        Map programConfig = [program:[name:"program 1"], meriPlanContents:[[template:'serviceOutcomeTargets']]]
         when:
         Map model = controller.edit('p1', 'd2')
 
         then:
         1 * projectService.get('p1') >> project
-        1 * projectService.getProgramConfiguration(project) >> [program:[name:"program 1"]]
+        1 * projectService.getProgramConfiguration(project) >> programConfig
         1 * projectService.getAllProjectOutcomes(project) >> ["1", "2"]
         1 * projectService.listProjectInvestmentPriorities(project) >> ["p1"]
+        1 * projectService.listProjectProtocols(project) >> [["name":"p1", "externalId":"p1"]]
+        1 * projectService.listProjectBaselines(project) >> [["code":"b1", baseline:"a baseline"]]
 
-        model == [project:project, projectId:'p1', programName:"program 1", priorities:["p1", "Other"], outcomes:["1", "2"], dataSet:existingDataSets[1]]
+
+        model == [project:project, projectId:'p1', programName:"program 1", priorities:["p1"], supportsOutcomeTargets: true,
+                  outcomes:["1", "2"], projectOutcomes:[], dataSet:existingDataSets[1],
+                  projectBaselines:[[label:"b1 - a baseline", value:"b1"]],
+                  projectProtocols:[[label:"p1", value:"p1"], [label:'Other', value:'other']], dataSetNames: ['data set 1', 'data set 3']]
     }
 
     void "The save method delegates to the projectService"() {
@@ -125,16 +138,23 @@ class DataSetControllerSpec extends Specification implements ControllerUnitTest<
         setup:
         List existingDataSets = [[name:'data set 1', dataSetId:'d1'], [name:'data set 2', dataSetId:'d2'], [name:'data set 3', dataSetId:'d3']]
         Map project = [projectId:'p1', custom:[dataSets:existingDataSets]]
+        Map programConfig = [program:[name:"program 1"], supportsOutcomeTargets:true]
 
         when:
         Map model = controller.view('p1', 'd2')
 
         then:
         1 * projectService.get('p1') >> project
-        1 * projectService.getProgramConfiguration(project) >> [program:[name:"program 1"]]
+        1 * projectService.getProgramConfiguration(project) >> programConfig
         1 * projectService.getAllProjectOutcomes(project) >> ["1", "2"]
         1 * projectService.listProjectInvestmentPriorities(project) >> ["p1"]
+        1 * projectService.listProjectProtocols(project) >> [["name":"p1", "externalId":"p1"]]
+        1 * projectService.listProjectBaselines(project) >> [["code":"b1", baseline:"a baseline"]]
+
 
-        model == [project:project, projectId:'p1', programName:"program 1", priorities:["p1", "Other"], outcomes:["1", "2"], dataSet:existingDataSets[1]]
+        model == [project:project, projectId:'p1', programName:"program 1", priorities:["p1"], supportsOutcomeTargets: false,
+                  outcomes:["1", "2"], projectOutcomes:[], dataSet:existingDataSets[1],
+                  projectBaselines:[[label:"b1 - a baseline", value:"b1"]],
+                  projectProtocols:[[label:"p1", value:"p1"], [label:'Other', value:'other']], dataSetNames: ['data set 1', 'data set 2', 'data set 3']]
     }
 }
diff --git a/src/test/groovy/au/org/ala/merit/ManagementUnitControllerSpec.groovy b/src/test/groovy/au/org/ala/merit/ManagementUnitControllerSpec.groovy
index 1820efdc6..2092ce925 100644
--- a/src/test/groovy/au/org/ala/merit/ManagementUnitControllerSpec.groovy
+++ b/src/test/groovy/au/org/ala/merit/ManagementUnitControllerSpec.groovy
@@ -1,11 +1,10 @@
 package au.org.ala.merit
 
 import au.org.ala.merit.command.SaveReportDataCommand
-import au.org.ala.merit.hub.HubSettings
 import au.org.ala.merit.util.ProjectGroupingHelper
+import grails.testing.web.controllers.ControllerUnitTest
 import org.apache.http.HttpStatus
 import spock.lang.Specification
-import grails.testing.web.controllers.ControllerUnitTest
 
 class ManagementUnitControllerSpec extends Specification implements ControllerUnitTest<ManagementUnitController>{
 
@@ -444,22 +443,6 @@ class ManagementUnitControllerSpec extends Specification implements ControllerUn
         return program
     }
 
-    def "The controller delegates to the managementUnitService to produce reports"() {
-        setup:
-        String fromDate = '01-07-2020'
-        String toDate = '31-12-2020'
-
-        when:
-        params.fromDate = fromDate
-        params.toDate = toDate
-        controller.generateReportsInPeriod()
-
-        then:
-        1 * userService.getUser() >> [userName:'test@test.com']
-        1 * managementUnitService.generateReports(fromDate, toDate, _) >> [status:HttpStatus.SC_OK]
-        response.json == [status:HttpStatus.SC_OK]
-    }
-
     def "User adds star to the management unit "() {
         setup:
         String managementUnitId = 'p1'
diff --git a/src/test/groovy/au/org/ala/merit/ManagementUnitServiceSpec.groovy b/src/test/groovy/au/org/ala/merit/ManagementUnitServiceSpec.groovy
index 8fa2fb6e0..a5753f699 100644
--- a/src/test/groovy/au/org/ala/merit/ManagementUnitServiceSpec.groovy
+++ b/src/test/groovy/au/org/ala/merit/ManagementUnitServiceSpec.groovy
@@ -175,19 +175,6 @@ class ManagementUnitServiceSpec extends Specification implements ServiceUnitTest
         0 * reportService.findReportsForManagementUnit(muId)
     }
 
-    def "The server delegates to the ecodata to produce reports"() {
-        setup:
-        String startDate = '2020-07-01'
-        String endDate = '2020-12-31'
-        Map extras = [test:'test']
-
-        when:
-        service.generateReports(startDate, endDate, extras)
-
-        then:
-        1 * webService.getJson({it.endsWith('/managementunit/generateReportsInPeriod?startDate=2020-07-02T00:00:00Z&endDate=2021-01-01T00:00:00Z&test=test')})
-    }
-
     def "Users with the MERIT siteReadOnly role can retrieve management unit reports and documents"() {
         setup:
         String muId = 'mu1'
diff --git a/src/test/groovy/au/org/ala/merit/OrganisationControllerSpec.groovy b/src/test/groovy/au/org/ala/merit/OrganisationControllerSpec.groovy
index d926413e2..ab479507a 100644
--- a/src/test/groovy/au/org/ala/merit/OrganisationControllerSpec.groovy
+++ b/src/test/groovy/au/org/ala/merit/OrganisationControllerSpec.groovy
@@ -1,12 +1,12 @@
 package au.org.ala.merit
 
 import au.org.ala.merit.command.SaveReportDataCommand
+import au.org.ala.merit.reports.ReportLifecycleListener
 import au.org.ala.merit.util.ProjectGroupingHelper
 import grails.converters.JSON
 import org.apache.http.HttpStatus
 import org.grails.plugins.excelimport.ExcelImportService
 import org.springframework.mock.web.MockMultipartFile
-import spock.lang.Ignore
 import spock.lang.Specification
 import grails.testing.web.controllers.ControllerUnitTest
 
@@ -542,7 +542,8 @@ class OrganisationControllerSpec extends Specification implements ControllerUnit
         Map props = [
                 activityId:activityId,
                 activity:[
-                        test1:'test'
+                        test1:'test',
+                        type:'Org report'
                 ],
                 reportId:reportId,
                 reportService:reportService,
@@ -556,7 +557,7 @@ class OrganisationControllerSpec extends Specification implements ControllerUnit
         params.id = organisationId
         params.reportId = reportId
         params.activityId = props.activityId
-        params.activity = props
+        params.activity = props.activity
         // Normally grails would use dependency injection for this but that doesn't happen in controller unit tests
         params.reportService = reportService
         params.activityService = activityService
@@ -565,8 +566,9 @@ class OrganisationControllerSpec extends Specification implements ControllerUnit
         controller.saveReport()
 
         then:
-        1 * activityService.get(activityId) >> [activityId:activityId]
-        1 * activityService.update(activityId, props) >> [success:true]
+        1 * activityService.get(activityId) >> [activityId:activityId, type:'Org report']
+        1 * activityService.update(activityId, props.activity) >> [success:true]
+        1 * reportService.reportLifeCycleListener('Org report') >> new ReportLifecycleListener()
         response.json.success == true
 
     }
diff --git a/src/test/groovy/au/org/ala/merit/OrganisationServiceSpec.groovy b/src/test/groovy/au/org/ala/merit/OrganisationServiceSpec.groovy
index 60f91753f..386d73e4e 100644
--- a/src/test/groovy/au/org/ala/merit/OrganisationServiceSpec.groovy
+++ b/src/test/groovy/au/org/ala/merit/OrganisationServiceSpec.groovy
@@ -43,63 +43,6 @@ class OrganisationServiceSpec extends Specification implements ServiceUnitTest<O
 		1 * activityService.search([type:['t1', 't2'], projectId:['1', '2', '3'], dateProperty:'plannedEndDate', startDate:"2014-01-01T00:00:00+0000", endDate:'2016-02-28T00:00:00+0000'])
 	}
 
-	void "the projects for an organisation should include projects for which the organisation is the service provider"() {
-        given:
-        def orgId = '1234'
-        def organisation = [organisationId:orgId, name:'name', description:'description']
-        def serviceProviderProjects = ['1', '2', '3', '4'].collect{[projectId:it, name:'p'+it]}
-        def organisationProjects = ['5', '6', '7', '8', '9'].collect{[projectId:it, name:'p'+it]}
-        def organisationProjectsWithDuplicates = ['3', '4', '5', '6', '7', '8', '9'].collect{[projectId:it, name:'p'+it]}
-
-        webService.getJson(_) >> organisation
-
-        when: "the organisation is not a service provider for any projects"
-        organisation = service.get(orgId)
-        def projects = organisation.projects
-
-        then:
-        1 * projectService.search([organisationId:orgId, view:'enhanced', isMERIT:true]) >> [resp:[projects:organisationProjects]]
-        1 * projectService.search([orgIdSvcProvider:orgId, view:'enhanced', isMERIT:true]) >> [resp:[projects:[]]]
-
-        projects.size() == organisationProjects.size()
-        projects == organisationProjects
-
-        when: "the organisation is exclusively a service provider"
-        organisation = service.get(orgId)
-        projects = organisation.projects
-
-
-        then:
-        1 * projectService.search([organisationId:orgId, view:'enhanced', isMERIT:true]) >> [resp:[projects:[]]]
-        1 * projectService.search([orgIdSvcProvider:orgId, view:'enhanced', isMERIT:true]) >> [resp:[projects:serviceProviderProjects]]
-
-        projects.size() == serviceProviderProjects.size()
-        projects == serviceProviderProjects
-
-        when:"the organisation is a service provider and runs it's own projects as well"
-        organisation = service.get(orgId)
-        projects = organisation.projects
-
-        then: "both sets of projects should be returned"
-        1 * projectService.search([organisationId:orgId, view:'enhanced', isMERIT:true]) >> [resp:[projects:organisationProjects]]
-        1 * projectService.search([orgIdSvcProvider:orgId, view:'enhanced', isMERIT:true]) >> [resp:[projects:serviceProviderProjects]]
-
-        projects.size() == serviceProviderProjects.size() + organisationProjects.size()
-        projects ==  organisationProjects + serviceProviderProjects
-
-        when: "there is overlap between the organisation and service provider projects"
-        organisation = service.get(orgId)
-        projects = organisation.projects
-
-        then: "there should be no duplicate projects returned"
-        1 * projectService.search([organisationId:orgId, view:'enhanced', isMERIT:true]) >> [resp:[projects:organisationProjectsWithDuplicates]]
-        1 * projectService.search([orgIdSvcProvider:orgId, view:'enhanced', isMERIT:true]) >> [resp:[projects:serviceProviderProjects]]
-
-        projects.size() == serviceProviderProjects.size() + organisationProjects.size()
-        projects.sort{it.projectId} == (organisationProjects + serviceProviderProjects).sort{it.projectId}
-
-    }
-
 	def "Checking if abn already exist in db"(){
 		setup:
 		String ordId = "123"
@@ -272,7 +215,7 @@ class OrganisationServiceSpec extends Specification implements ServiceUnitTest<O
 		then:
 		1 * webService.getJson({it.endsWith('organisation/o1?view=')}) >> [organisationId:"o1"]
 		1 * reportService.get("r1") >> [reportId:"r1", organisationId:"o1", activityId:'a1']
-		1 * reportService.cancelReport("r1", ['a1'], "Testing", [organisationId:"o1", projects:[], reports:null], [])
+		1 * reportService.cancelReport("r1", ['a1'], "Testing", [organisationId:"o1", reports:null], [])
 		1 * webService.getJson({it.endsWith('permissions/getMembersForOrganisation/o1')}) >> []
 	}
 
diff --git a/src/test/groovy/au/org/ala/merit/ProjectControllerSpec.groovy b/src/test/groovy/au/org/ala/merit/ProjectControllerSpec.groovy
index c161673c8..ae156db71 100644
--- a/src/test/groovy/au/org/ala/merit/ProjectControllerSpec.groovy
+++ b/src/test/groovy/au/org/ala/merit/ProjectControllerSpec.groovy
@@ -3,6 +3,7 @@ package au.org.ala.merit
 import au.org.ala.merit.command.MeriPlanReportCommand
 import au.org.ala.merit.command.SaveReportDataCommand
 import au.org.ala.merit.config.ProgramConfig
+import au.org.ala.merit.reports.ReportLifecycleListener
 import org.apache.http.HttpStatus
 import spock.lang.Specification
 import grails.testing.web.controllers.ControllerUnitTest
@@ -267,6 +268,7 @@ class ProjectControllerSpec extends Specification implements ControllerUnitTest<
         then:
         1 * projectService.doesReportBelongToProject(projectId, reportId) >> true
         1 * reportService.activityReportModel(reportId, ReportService.ReportMode.VIEW, null) >> activityReportModel
+        1 * reportService.reportLifeCycleListener(_) >> new ReportLifecycleListener()
         1 * projectService.filterOutputModel(activityReportModel.metaModel, project, activityReportModel.activity) >> activityReportModel.metaModel
         1 * projectService.getProgramConfiguration(project) >> new ProgramConfig([requiresActivityLocking: true])
 
@@ -291,6 +293,7 @@ class ProjectControllerSpec extends Specification implements ControllerUnitTest<
         then:
         1 * projectService.doesReportBelongToProject(projectId, reportId) >> true
         1 * reportService.activityReportModel(reportId, ReportService.ReportMode.EDIT, null) >> activityReportModel
+        1 * reportService.reportLifeCycleListener(_) >> new ReportLifecycleListener()
         1 * projectService.filterOutputModel(activityReportModel.metaModel, project, activityReportModel.activity) >> activityReportModel.metaModel
         1 * projectService.getProgramConfiguration(project) >> new ProgramConfig([requiresActivityLocking: true])
 
@@ -317,6 +320,7 @@ class ProjectControllerSpec extends Specification implements ControllerUnitTest<
 
         then: "the report activity should not be locked"
         1 * projectService.doesReportBelongToProject(projectId, reportId) >> true
+        1 * reportService.reportLifeCycleListener(_) >> new ReportLifecycleListener()
         // Override the default behaviour from setup
         1 * projectService.getProgramConfiguration(project) >> new ProgramConfig([requiresActivityLocking: true])
         0 * reportService.lockForEditing(_)
@@ -343,6 +347,7 @@ class ProjectControllerSpec extends Specification implements ControllerUnitTest<
 
         then:
         1 * projectService.doesReportBelongToProject(projectId, reportId) >> true
+        1 * reportService.reportLifeCycleListener(_) >> new ReportLifecycleListener()
         1 * reportService.lockForEditing(project.reports[0])
         1 * projectService.filterOutputModel(activityReportModel.metaModel, project, activityReportModel.activity) >> activityReportModel.metaModel
 
@@ -366,6 +371,7 @@ class ProjectControllerSpec extends Specification implements ControllerUnitTest<
 
         then:
         1 * projectService.doesReportBelongToProject(projectId, reportId) >> true
+        1 * reportService.reportLifeCycleListener(_) >> new ReportLifecycleListener()
         0 * reportService.lockForEditing(project.reports[0])
         1 * projectService.filterOutputModel(activityReportModel.metaModel, project, activityReportModel.activity) >> activityReportModel.metaModel
 
@@ -452,7 +458,7 @@ class ProjectControllerSpec extends Specification implements ControllerUnitTest<
         String reportId = 'r1'
 
         when:
-        controller.reportPDF(projectId, reportId)
+        controller.printableReport(projectId, reportId)
 
         then:
         1 * projectService.doesReportBelongToProject(projectId, reportId) >> false
@@ -920,6 +926,17 @@ class ProjectControllerSpec extends Specification implements ControllerUnitTest<
         response.json == result
     }
 
+    def "The hasTarget method allows the target to be a string for historical reasons"() {
+        expect:
+        controller.hasTarget(0) == false
+        controller.hasTarget("0") == false
+        controller.hasTarget(null) == false
+        controller.hasTarget("") == false
+        controller.hasTarget(1) == true
+        controller.hasTarget("1.1") == true
+        controller.hasTarget("abc") == true // this is accepted for legacy reasons
+    }
+
     private Map stubPublicUser() {
         userServiceStub.getUser() >> null
         null
diff --git a/src/test/groovy/au/org/ala/merit/ProjectServiceSpec.groovy b/src/test/groovy/au/org/ala/merit/ProjectServiceSpec.groovy
index 1d09a2dd4..e55feb3e3 100644
--- a/src/test/groovy/au/org/ala/merit/ProjectServiceSpec.groovy
+++ b/src/test/groovy/au/org/ala/merit/ProjectServiceSpec.groovy
@@ -479,7 +479,7 @@ class ProjectServiceSpec extends Specification implements ServiceUnitTest<Projec
         def projectId = 'project1'
         def newStartDate = '2015-06-01T00:00Z'
         reportService.includesSubmittedOrApprovedReports(_) >> true
-        reportService.getReportsForProject(_) >> [[publicationStatus:ReportService.REPORT_APPROVED]]
+        reportService.getReportsForProject(_) >> [[publicationStatus:PublicationStatus.APPROVED]]
         Map project = [projectId:projectId, planStatus:ProjectService.PLAN_NOT_APPROVED, plannedStartDate: '2015-07-01T00:00Z', plannedEndDate:'2016-12-31T00:00Z']
         webService.getJson(_) >> project
 
@@ -497,9 +497,9 @@ class ProjectServiceSpec extends Specification implements ServiceUnitTest<Projec
         def activityIds = ['a1', 'a2']
         def stageReportDetails = [activityIds:activityIds, reportId:reportId, stage:'Stage 2', reason:reason]
         reportService.getReportsForProject(projectId) >>[
-                [reportId:'r1', publicationStatus:ReportService.REPORT_APPROVED, name:'Stage 1', fromDate: '2015-07-01T00:00Z', toDate: '2016-01-01T00:00Z'],
-                [reportId:'r2', publicationStatus:ReportService.REPORT_NOT_APPROVED, name:'Stage 2', fromDate: '2016-01-01T00:00Z', toDate: '2017-01-01T00:00Z'],
-                [reportId:'r3', publicationStatus:ReportService.REPORT_CANCELLED, name:'Stage 3', fromDate: '2016-01-01T00:00Z', toDate: '2017-01-01T00:00Z']]
+                [reportId:'r1', publicationStatus:PublicationStatus.APPROVED, name:'Stage 1', fromDate: '2015-07-01T00:00Z', toDate: '2016-01-01T00:00Z'],
+                [reportId:'r2', publicationStatus:PublicationStatus.NOT_APPROVED, name:'Stage 2', fromDate: '2016-01-01T00:00Z', toDate: '2017-01-01T00:00Z'],
+                [reportId:'r3', publicationStatus:PublicationStatus.CANCELLED, name:'Stage 3', fromDate: '2016-01-01T00:00Z', toDate: '2017-01-01T00:00Z']]
         webService.getJson(_) >> [projectId:projectId, planStatus:ProjectService.PLAN_NOT_APPROVED, plannedStartDate: '2015-07-01T00:00Z', plannedEndDate:'2016-12-31T00:00Z']
 
         when:
@@ -797,7 +797,7 @@ class ProjectServiceSpec extends Specification implements ServiceUnitTest<Projec
         Map project = [projectId:'p1', plannedStartDate: '2015-07-01T00:00Z', plannedEndDate:'2016-12-31T00:00Z', planStatus:ProjectService.PLAN_APPROVED]
 
         webService.getJson(_) >> project
-        reportService.getReportsForProject(project.projectId) >> [[reportId:'r1', publicationStatus:ReportService.REPORT_NOT_APPROVED, fromDate:project.plannedStartDate, toDate:project.plannedEndDate]]
+        reportService.getReportsForProject(project.projectId) >> [[reportId:'r1', publicationStatus:PublicationStatus.NOT_APPROVED, fromDate:project.plannedStartDate, toDate:project.plannedEndDate]]
         reportService.firstReportWithDataByCriteria(_, _) >> null
 
         when:
@@ -814,7 +814,7 @@ class ProjectServiceSpec extends Specification implements ServiceUnitTest<Projec
         project.reports = [r1]
         reportService.firstReportWithDataByCriteria(_, _) >> r1
 
-        boolean submittedOrApproved = (reportStatus == ReportService.REPORT_SUBMITTED || reportStatus == ReportService.REPORT_APPROVED)
+        boolean submittedOrApproved = (reportStatus == PublicationStatus.SUBMITTED || reportStatus == PublicationStatus.APPROVED)
         webService.getJson(_) >> project
         reportService.getReportsForProject(project.projectId) >> [r1]
         reportService.excludesNotApproved(_) >> submittedOrApproved
@@ -827,14 +827,14 @@ class ProjectServiceSpec extends Specification implements ServiceUnitTest<Projec
 
         where:
         reportStatus | date | valid
-        ReportService.REPORT_APPROVED | '2015-07-01T00:00Z' | true
-        ReportService.REPORT_APPROVED | '2015-08-01T00:00Z' | true
-        ReportService.REPORT_APPROVED | '2016-01-01T00:00Z' | false
-        ReportService.REPORT_APPROVED | '2015-04-01T00:00Z' | false
-        ReportService.REPORT_SUBMITTED | '2015-07-01T00:00Z' | true
-        ReportService.REPORT_SUBMITTED | '2015-08-01T00:00Z' | true
-        ReportService.REPORT_SUBMITTED | '2016-01-01T00:00Z' | false
-        ReportService.REPORT_SUBMITTED | '2015-04-01T00:00Z' | false
+        PublicationStatus.APPROVED | '2015-07-01T00:00Z' | true
+        PublicationStatus.APPROVED | '2015-08-01T00:00Z' | true
+        PublicationStatus.APPROVED | '2016-01-01T00:00Z' | false
+        PublicationStatus.APPROVED | '2015-04-01T00:00Z' | false
+        PublicationStatus.SUBMITTED | '2015-07-01T00:00Z' | true
+        PublicationStatus.SUBMITTED | '2015-08-01T00:00Z' | true
+        PublicationStatus.SUBMITTED | '2016-01-01T00:00Z' | false
+        PublicationStatus.SUBMITTED | '2015-04-01T00:00Z' | false
     }
 
     def "if there is an empty report before the first report with data, we should be allowed to change the start date as if the first report with data was the only report"(date, valid) {
@@ -1565,6 +1565,25 @@ class ProjectServiceSpec extends Specification implements ServiceUnitTest<Projec
         result == ['1':1, '2':2, '3':0]
     }
 
+    def "Plot Selection / Visits should not be displayed in data sets"() {
+        setup:
+        List dataSets = [
+                [name:'Plot Selection', dataSetId:'d1', protocol:'1'],
+                [name:'Plot Layout and Visit', dataSetId:'d2', protocol:'2'],
+                [name:'Not a plot selection', dataSetId:'d3', protocol:'3']
+
+        ]
+
+        when:
+        service.filterDataSetSummaries(dataSets)
+
+        then:
+        1 * activityService.monitoringProtocolForms() >> [[externalId:'1', name:"Plot Selection"], [externalId:'2', name: "Plot Layout and Visit"]]
+        and:
+        dataSets.size() == 1
+        dataSets[0].name == 'Not a plot selection'
+    }
+
     private Map setupActivityModelForFiltering(List services) {
         Map activityModel = [name:'output', outputs:[]]
         services.each {
diff --git a/src/test/groovy/au/org/ala/merit/ReportControllerSpec.groovy b/src/test/groovy/au/org/ala/merit/ReportControllerSpec.groovy
new file mode 100644
index 000000000..b9ff3ee60
--- /dev/null
+++ b/src/test/groovy/au/org/ala/merit/ReportControllerSpec.groovy
@@ -0,0 +1,32 @@
+package au.org.ala.merit
+
+import grails.testing.web.controllers.ControllerUnitTest
+import org.apache.http.HttpStatus
+import spock.lang.Specification
+
+class ReportControllerSpec extends Specification implements ControllerUnitTest<ReportController> {
+    ReportService reportService = Mock(ReportService)
+    UserService userService = Mock(UserService)
+
+    def setup() {
+        controller.reportService = reportService
+        controller.userService = userService
+    }
+
+    def "The controller delegates to the reportService to produce reports"() {
+        setup:
+        String fromDate = '01-07-2020'
+        String toDate = '31-12-2020'
+
+        when:
+        params.fromDate = fromDate
+        params.toDate = toDate
+        controller.generateReportsInPeriod()
+
+        then:
+        1 * userService.getUser() >> [userName:'test@test.com']
+        1 * reportService.generateReports(fromDate, toDate, _) >> [status: HttpStatus.SC_OK]
+        response.json == [status:HttpStatus.SC_OK]
+    }
+
+}
diff --git a/src/test/groovy/au/org/ala/merit/ReportServiceSpec.groovy b/src/test/groovy/au/org/ala/merit/ReportServiceSpec.groovy
index 2af284004..88adb8168 100644
--- a/src/test/groovy/au/org/ala/merit/ReportServiceSpec.groovy
+++ b/src/test/groovy/au/org/ala/merit/ReportServiceSpec.groovy
@@ -7,7 +7,6 @@ import au.org.ala.merit.reports.ReportOwner
 import au.org.ala.web.AuthService
 import grails.testing.services.ServiceUnitTest
 import spock.lang.Specification
-
 /**
  * See the API for {@link grails.test.mixin.services.ServiceUnitTestMixin} for usage instructions
  */
@@ -168,7 +167,7 @@ class ReportServiceSpec extends Specification implements ServiceUnitTest<ReportS
         setup:
         def project = project('2015-01-01T00:00:00Z', '2017-07-01T00:00:00Z')
         project.reports = reports()
-        project.reports[0].publicationStatus = ReportService.REPORT_APPROVED
+        project.reports[0].publicationStatus = PublicationStatus.APPROVED
         projectService.get(_, _) >> project
 
         when:
@@ -184,10 +183,10 @@ class ReportServiceSpec extends Specification implements ServiceUnitTest<ReportS
         setup:
         def project = project('2015-01-01T00:00:00Z', '2017-01-01T00:00:00Z')
         project.reports = reports()
-        project.reports[0].publicationStatus = ReportService.REPORT_APPROVED
-        project.reports[1].publicationStatus = ReportService.REPORT_APPROVED
-        project.reports[2].publicationStatus = ReportService.REPORT_APPROVED
-        project.reports[3].publicationStatus = ReportService.REPORT_APPROVED
+        project.reports[0].publicationStatus = PublicationStatus.APPROVED
+        project.reports[1].publicationStatus = PublicationStatus.APPROVED
+        project.reports[2].publicationStatus = PublicationStatus.APPROVED
+        project.reports[3].publicationStatus = PublicationStatus.APPROVED
 
         projectService.get(_, _) >> project
 
@@ -203,10 +202,10 @@ class ReportServiceSpec extends Specification implements ServiceUnitTest<ReportS
         setup:
         def project = project('2015-01-01T00:00:00Z', '2017-01-07T00:00:00Z')
         project.reports = reports()
-        project.reports[0].publicationStatus = ReportService.REPORT_APPROVED
-        project.reports[1].publicationStatus = ReportService.REPORT_APPROVED
-        project.reports[2].publicationStatus = ReportService.REPORT_APPROVED
-        project.reports[3].publicationStatus = ReportService.REPORT_APPROVED
+        project.reports[0].publicationStatus = PublicationStatus.APPROVED
+        project.reports[1].publicationStatus = PublicationStatus.APPROVED
+        project.reports[2].publicationStatus = PublicationStatus.APPROVED
+        project.reports[3].publicationStatus = PublicationStatus.APPROVED
 
         projectService.get(_, _) >> project
 
@@ -225,9 +224,9 @@ class ReportServiceSpec extends Specification implements ServiceUnitTest<ReportS
         setup:
         def project = project('2015-01-01T00:00:00Z', '2015-12-31T13:00:00Z')
         project.reports = reports()
-        project.reports[0].publicationStatus = ReportService.REPORT_APPROVED
-        project.reports[1].publicationStatus = ReportService.REPORT_APPROVED
-        project.reports[2].publicationStatus = ReportService.REPORT_SUBMITTED
+        project.reports[0].publicationStatus = PublicationStatus.APPROVED
+        project.reports[1].publicationStatus = PublicationStatus.APPROVED
+        project.reports[2].publicationStatus = PublicationStatus.SUBMITTED
 
         projectService.get(_, _) >> project
 
@@ -248,7 +247,7 @@ class ReportServiceSpec extends Specification implements ServiceUnitTest<ReportS
         setup:
         def project = project('2016-04-15T00:00:00Z', '2017-06-29T14:00:00Z') // End date extended by 6 months
         project.reports = [
-                [reportId:'1', fromDate: '2016-01-01T00:00:00Z', toDate: '2016-07-01T00:00:00Z', submissionDate: '2016-07-01T00:00:00Z', dueDate: '', type: 'Activity', name: 'Stage 1', description: "Stage 1 for project", projectId: 'p1', category:'Stage reports', publicationStatus:ReportService.REPORT_APPROVED],
+                [reportId:'1', fromDate: '2016-01-01T00:00:00Z', toDate: '2016-07-01T00:00:00Z', submissionDate: '2016-07-01T00:00:00Z', dueDate: '', type: 'Activity', name: 'Stage 1', description: "Stage 1 for project", projectId: 'p1', category:'Stage reports', publicationStatus:PublicationStatus.APPROVED],
                 [reportId:'2', fromDate: '2016-07-01T00:00:00Z', toDate: '2017-01-01T00:00:00Z', submissionDate: '2017-01-01T00:00:00Z', dueDate: '', type: 'Activity', name: 'Stage 2', description: "Stage 2 for project", projectId: 'p1', category:'Stage reports']]
         projectService.get(_, _) >> project
 
@@ -489,4 +488,18 @@ class ReportServiceSpec extends Specification implements ServiceUnitTest<ReportS
         result.size() == 2
 
     }
+
+
+    def "The server delegates to the ecodata to produce reports"() {
+        setup:
+        String startDate = '2020-07-01'
+        String endDate = '2020-12-31'
+        Map extras = [test:'test', entity: 'managementUnit']
+
+        when:
+        service.generateReports(startDate, endDate, extras)
+
+        then:
+        1 * webService.getJson({it.endsWith('/report/generateReportsInPeriod?startDate=2020-07-02T00:00:00Z&endDate=2021-01-01T00:00:00Z&test=test&entity=managementUnit')})
+    }
 }
diff --git a/src/test/groovy/au/org/ala/merit/SiteControllerSpec.groovy b/src/test/groovy/au/org/ala/merit/SiteControllerSpec.groovy
index 2383a6058..40d2cff8f 100644
--- a/src/test/groovy/au/org/ala/merit/SiteControllerSpec.groovy
+++ b/src/test/groovy/au/org/ala/merit/SiteControllerSpec.groovy
@@ -35,7 +35,6 @@ class SiteControllerSpec extends Specification implements ControllerUnitTest<Sit
         when:
         request.addFile(shapefile)
         params.projectId = projectId
-        params.returnTo = "returnTo"
 
         controller.siteUpload()
 
@@ -47,7 +46,6 @@ class SiteControllerSpec extends Specification implements ControllerUnitTest<Sit
         model.shapeFileId == shapefileId
         model.attributeNames == ['a1', 'a2']
         model.shapes == [[id:"0", values:[a1:"v1", a2:"v2"]]]
-        model.returnTo == params.returnTo
     }
 
     def "the site controller checks the user can edit the supplied project before allowing a site upload"() {
@@ -110,4 +108,154 @@ class SiteControllerSpec extends Specification implements ControllerUnitTest<Sit
         response.json == [progress:[total:1, uploaded:0, errors:[]], message:"success"]
     }
 
+    def "the site controller can return site data as geojson"() {
+        setup:
+        String siteId = 's1'
+        Map site = [siteId:siteId, name:"Site 1", projects:[[projectId:'p1', name:'Project 1']], extent:[geometry:[type:"Point", coordinates:[1,2]]]]
+        Map siteGeoJson = [type:"Feature", geometry:[type:"Point", coordinates:[1,2]], properties:[siteId:siteId, name:"Site 1", projects:[[projectId:'p1', name:'Project 1']]]]
+
+        when:
+        controller.geojson(siteId)
+
+        then:
+        1 * siteService.get(siteId) >> site
+        1 * userService.getCurrentUserId() >> 'u1'
+        1 * projectService.canUserEditProject('u1', 'p1') >> true
+        1 * siteService.getSiteGeoJson(siteId) >> [status:200, resp:siteGeoJson]
+
+        response.json == siteGeoJson
+    }
+
+    def "When a project already has a project area, when creating a new site the project extent type cannot be selected"() {
+        setup:
+        Map project = [projectId: 'p1', name: 'project', sites: [[name: 'name', externalId: 'e1', type: 'projectArea']]]
+
+        when:
+        params.projectId = 'p1'
+        controller.createForProject()
+
+        then:
+        1 * projectService.get(project.projectId, 'all') >> project
+        1 * projectService.hasProjectArea(project) >> true
+
+        and:
+        model.siteTypes.collect { it.value } == ['worksArea', 'surveyArea']
+    }
+
+
+    def "When a project does not have a project area, when creating a new site the project extent type can be selected"() {
+        setup:
+        Map project = [projectId:'p1', name:'project', sites:[[name:'name', externalId:'e1', type:'worksArea']]]
+
+        when:
+        params.projectId = 'p1'
+        controller.createForProject()
+
+        then:
+        1 * projectService.get(project.projectId, 'all') >> project
+        1 * projectService.hasProjectArea(project) >> false
+
+        and:
+        model.siteTypes.collect{it.value} == ['worksArea', 'surveyArea', 'projectArea']
+    }
+
+    def "When editing a site, if the site is already a project area, project area can be selected as the site type"() {
+        setup:
+        Map project = [projectId:'p1', name:'project', sites:[[name:'name', externalId:'e1', type:'worksArea']]]
+        String siteId = 's1'
+        Map site = [siteId:siteId, name:"Site 1", projects:['p1'], type:'projectArea', extent:[geometry:[type:"Point", coordinates:[1,2]]]]
+
+        when:
+        params.projectId = 'p1'
+        params.id = site.siteId
+        Map model = controller.edit()
+
+        then:
+        1 * siteService.getRaw(siteId) >> [site:site]
+        1 * projectService.canUserEditProject(_, project.projectId) >> true
+        1 * projectService.get(project.projectId, 'all') >> project
+        0 * projectService.hasProjectArea(project) >> false
+
+        and:
+        model.siteTypes.collect{it.value} == ['worksArea', 'surveyArea', 'projectArea']
+    }
+
+    def "When editing a site, if the site is not already a project area, project area cannot be selected if the site is assigned to more than 1 project"() {
+        setup:
+        Map project = [projectId:'p1', name:'project', sites:[[name:'name', externalId:'e1', type:'worksArea']]]
+        String siteId = 's1'
+        Map site = [siteId:siteId, name:"Site 1", projects:['p1', 'p2'], type:'worksArea', extent:[geometry:[type:"Point", coordinates:[1,2]]]]
+
+        when:
+        params.projectId = 'p1'
+        params.id = site.siteId
+        Map model = controller.edit()
+
+        then:
+        1 * siteService.getRaw(siteId) >> [site:site]
+        2 * projectService.canUserEditProject(_, _) >> true
+        0 * projectService.get(project.projectId, 'all') >> project
+        0 * projectService.hasProjectArea(project) >> false
+
+        and:
+        model.siteTypes.collect{it.value} == ['worksArea', 'surveyArea']
+    }
+
+    def "When editing a site, if the site is not already a project area, project area cannot be selected if the site is not assigned to a project"() {
+        setup:
+        String siteId = 's1'
+        Map site = [siteId:siteId, name:"Site 1", projects:[], type:'worksArea', extent:[geometry:[type:"Point", coordinates:[1,2]]]]
+
+        when:
+        params.id = site.siteId
+        Map model = controller.edit()
+
+        then:
+        1 * siteService.getRaw(siteId) >> [site:site]
+
+        and:
+        model.siteTypes.collect{it.value} == ['worksArea', 'surveyArea']
+    }
+
+    def "When editing a site, if the site is not already a project area, project area cannot be selected if the project the site is assigned to already has a project area"() {
+        setup:
+        Map project = [projectId:'p1', name:'project', sites:[[name:'name', externalId:'e1', type:'projectArea']]]
+        String siteId = 's1'
+        Map site = [siteId:siteId, name:"Site 1", projects:['p1'], type:'worksArea', extent:[geometry:[type:"Point", coordinates:[1,2]]]]
+
+        when:
+        params.projectId = 'p1'
+        params.id = site.siteId
+        Map model = controller.edit()
+
+        then:
+        1 * siteService.getRaw(siteId) >> [site:site]
+        1 * projectService.canUserEditProject(_, _) >> true
+        1 * projectService.get(project.projectId, 'all') >> project
+        1 * projectService.hasProjectArea(project) >> true
+
+        and:
+        model.siteTypes.collect{it.value} == ['worksArea', 'surveyArea']
+    }
+
+    def "When editing a site, if the site is not already a project area, project area can be selected if the project the site is assigned to does not have a project area"() {
+        setup:
+        Map project = [projectId:'p1', name:'project', sites:[[name:'name', externalId:'e1', type:'projectArea']]]
+        String siteId = 's1'
+        Map site = [siteId:siteId, name:"Site 1", projects:['p1'], type:'worksArea', extent:[geometry:[type:"Point", coordinates:[1,2]]]]
+
+        when:
+        params.projectId = 'p1'
+        params.id = site.siteId
+        Map model = controller.edit()
+
+        then:
+        1 * siteService.getRaw(siteId) >> [site:site]
+        1 * projectService.canUserEditProject(_, _) >> true
+        1 * projectService.get(project.projectId, 'all') >> project
+        1 * projectService.hasProjectArea(project) >> false
+
+        and:
+        model.siteTypes.collect{it.value} == ['worksArea', 'surveyArea', 'projectArea']
+    }
 }
diff --git a/src/test/groovy/au/org/ala/merit/command/Reef2050PlanActionReportSummaryCommandSpec.groovy b/src/test/groovy/au/org/ala/merit/command/Reef2050PlanActionReportSummaryCommandSpec.groovy
index 4deb7b26a..81f540765 100644
--- a/src/test/groovy/au/org/ala/merit/command/Reef2050PlanActionReportSummaryCommandSpec.groovy
+++ b/src/test/groovy/au/org/ala/merit/command/Reef2050PlanActionReportSummaryCommandSpec.groovy
@@ -1,7 +1,7 @@
 package au.org.ala.merit.command
 
 import au.org.ala.merit.ActivityService
-import au.org.ala.merit.ReportService
+import au.org.ala.merit.PublicationStatus
 import au.org.ala.merit.reports.Reef2050PlanActionReportConfig
 import grails.converters.JSON
 import grails.testing.spring.AutowiredTest
@@ -34,7 +34,7 @@ class Reef2050PlanActionReportSummaryCommandSpec extends Specification implement
 
         then:
         1 * activityService.search( [type    : Reef2050PlanActionReportConfig.REEF_2050_PLAN_ACTION_REPORTING_2018_ACTIVITY_TYPE,
-                                     progress: ActivityService.PROGRESS_FINISHED, publicationStatus: ReportService.REPORT_APPROVED]) >> [reports:[]]
+                                     progress: ActivityService.PROGRESS_FINISHED, publicationStatus: PublicationStatus.APPROVED]) >> [reports:[]]
         reports.size() == 3
     }
 
@@ -44,7 +44,7 @@ class Reef2050PlanActionReportSummaryCommandSpec extends Specification implement
 
         then:
         1 * activityService.search( [type    : Reef2050PlanActionReportConfig.REEF_2050_PLAN_ACTION_REPORTING_2018_ACTIVITY_TYPE,
-                                     progress: ActivityService.PROGRESS_FINISHED, publicationStatus: ReportService.REPORT_APPROVED]) >> [resp:[activities:[[plannedEndDate:'2018-07-01T00:00:00Z']]]]
+                                     progress: ActivityService.PROGRESS_FINISHED, publicationStatus: PublicationStatus.APPROVED]) >> [resp:[activities:[[plannedEndDate:'2018-07-01T00:00:00Z']]]]
         reports.size() == 4
     }
 
@@ -55,7 +55,7 @@ class Reef2050PlanActionReportSummaryCommandSpec extends Specification implement
 
         then:
         1 * activityService.search( [type    : Reef2050PlanActionReportConfig.REEF_2050_PLAN_ACTION_REPORTING_2018_ACTIVITY_TYPE,
-                                     progress: ActivityService.PROGRESS_FINISHED, publicationStatus: ReportService.REPORT_APPROVED]) >> [reports:[]]
+                                     progress: ActivityService.PROGRESS_FINISHED, publicationStatus: PublicationStatus.APPROVED]) >> [reports:[]]
 
         and:
         reports[0].periodStart == null
diff --git a/src/test/groovy/au/org/ala/merit/command/SaveReportDataCommandSpec.groovy b/src/test/groovy/au/org/ala/merit/command/SaveReportDataCommandSpec.groovy
index 7af2b1a59..8b16f9a7f 100644
--- a/src/test/groovy/au/org/ala/merit/command/SaveReportDataCommandSpec.groovy
+++ b/src/test/groovy/au/org/ala/merit/command/SaveReportDataCommandSpec.groovy
@@ -1,8 +1,10 @@
 package au.org.ala.merit.command
 
 import au.org.ala.merit.ActivityService
+import au.org.ala.merit.PublicationStatus
 import au.org.ala.merit.ReportService
 import au.org.ala.merit.SiteService
+import au.org.ala.merit.reports.ReportLifecycleListener
 import org.apache.http.HttpStatus
 import grails.databinding.DataBinder
 import grails.databinding.SimpleDataBinder
@@ -50,8 +52,8 @@ class SaveReportDataCommandSpec extends Specification {
                 savedData:[activityId:'a2'],
                 report:[reportId:'r2']
         ]
-        Map r1Report = [reportId:jsonData.reportId, publicationStatus:ReportService.REPORT_NOT_APPROVED, activityId:jsonData.activityId]
-        Map savedActivity = [activityId:jsonData.activityId, publicationStatus: ReportService.REPORT_NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED]
+        Map r1Report = [reportId:jsonData.reportId, publicationStatus:PublicationStatus.NOT_APPROVED, activityId:jsonData.activityId]
+        Map savedActivity = [activityId:jsonData.activityId, publicationStatus: PublicationStatus.NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED]
         reportService.get(jsonData.reportId) >> r1Report
         activityService.get(jsonData.activityId) >> savedActivity
 
@@ -73,8 +75,8 @@ class SaveReportDataCommandSpec extends Specification {
                 reportId:'r1',
                 site:[siteId:'s2']
         ]
-        Map r1Report = [reportId:jsonData.reportId, publicationStatus:ReportService.REPORT_NOT_APPROVED, activityId:jsonData.activityId]
-        Map savedActivity = [activityId:jsonData.activityId, publicationStatus: ReportService.REPORT_NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED, siteId:'s1']
+        Map r1Report = [reportId:jsonData.reportId, publicationStatus:PublicationStatus.NOT_APPROVED, activityId:jsonData.activityId]
+        Map savedActivity = [activityId:jsonData.activityId, publicationStatus: PublicationStatus.NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED, siteId:'s1']
         reportService.get(jsonData.reportId) >> r1Report
         activityService.get(jsonData.activityId) >> savedActivity
 
@@ -93,8 +95,8 @@ class SaveReportDataCommandSpec extends Specification {
                 activityId:'a2',
                 reportId:'r1'
         ]
-        Map r1Report = [reportId:jsonData.reportId, publicationStatus:ReportService.REPORT_NOT_APPROVED, activityId:'a1']
-        Map savedActivity = [activityId:jsonData.activityId, publicationStatus: ReportService.REPORT_NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED, siteId:'s1']
+        Map r1Report = [reportId:jsonData.reportId, publicationStatus:PublicationStatus.NOT_APPROVED, activityId:'a1']
+        Map savedActivity = [activityId:jsonData.activityId, publicationStatus: PublicationStatus.NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED, siteId:'s1']
         reportService.get(jsonData.reportId) >> r1Report
         activityService.get(jsonData.activityId) >> savedActivity
 
@@ -116,8 +118,8 @@ class SaveReportDataCommandSpec extends Specification {
                 ],
                 reportId:'r1'
         ]
-        Map r1Report = [reportId:jsonData.reportId, publicationStatus:ReportService.REPORT_NOT_APPROVED, activityId:jsonData.activityId]
-        Map savedActivity = [activityId:jsonData.activityId, publicationStatus: ReportService.REPORT_NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED]
+        Map r1Report = [reportId:jsonData.reportId, publicationStatus:PublicationStatus.NOT_APPROVED, activityId:jsonData.activityId]
+        Map savedActivity = [activityId:jsonData.activityId, type:'Type', publicationStatus: PublicationStatus.NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED]
         reportService.get(jsonData.reportId) >> r1Report
         activityService.get(jsonData.activityId) >> savedActivity
 
@@ -128,7 +130,8 @@ class SaveReportDataCommandSpec extends Specification {
 
         then:
         command.hasErrors() == false
-        1 * activityService.update(jsonData.activityId, jsonData.activity)
+        1 * reportService.reportLifeCycleListener(savedActivity.type) >> new ReportLifecycleListener()
+        1 * activityService.update(jsonData.activityId, jsonData.activity) >> [message:'updated']
     }
 
     def "the command should save site data when it is supplied"() {
@@ -152,8 +155,8 @@ class SaveReportDataCommandSpec extends Specification {
                         ]
                 ]
         ]
-        Map r1Report = [reportId:jsonData.reportId, publicationStatus:ReportService.REPORT_NOT_APPROVED, activityId:jsonData.activityId]
-        Map savedActivity = [activityId:jsonData.activityId, publicationStatus: ReportService.REPORT_NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED, siteId:jsonData.site.siteId]
+        Map r1Report = [reportId:jsonData.reportId, publicationStatus:PublicationStatus.NOT_APPROVED, activityId:jsonData.activityId]
+        Map savedActivity = [activityId:jsonData.activityId, type:'Type', publicationStatus: PublicationStatus.NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED, siteId:jsonData.site.siteId]
         reportService.get(jsonData.reportId) >> r1Report
         activityService.get(jsonData.activityId) >> savedActivity
 
@@ -164,8 +167,9 @@ class SaveReportDataCommandSpec extends Specification {
 
         then:
         command.hasErrors() == false
+        1 * reportService.reportLifeCycleListener(savedActivity.type) >> new ReportLifecycleListener()
         1 * siteService.update(jsonData.site.siteId, jsonData.site) >> [resp:[siteId:jsonData.site.siteId]]
-        1 * activityService.update(jsonData.activityId, jsonData.activity)
+        1 * activityService.update(jsonData.activityId, jsonData.activity) >> [message:'updated']
     }
 
     def "the command should assign a siteId when it exists but is not supplied"() {
@@ -189,8 +193,8 @@ class SaveReportDataCommandSpec extends Specification {
                 ]
         ]
         String siteId = 's1'
-        Map r1Report = [reportId:jsonData.reportId, publicationStatus:ReportService.REPORT_NOT_APPROVED, activityId:jsonData.activityId]
-        Map savedActivity = [activityId:jsonData.activityId, publicationStatus: ReportService.REPORT_NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED, siteId:siteId]
+        Map r1Report = [reportId:jsonData.reportId, publicationStatus:PublicationStatus.NOT_APPROVED, activityId:jsonData.activityId]
+        Map savedActivity = [activityId:jsonData.activityId, type:'Type', publicationStatus: PublicationStatus.NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED, siteId:siteId]
         reportService.get(jsonData.reportId) >> r1Report
         activityService.get(jsonData.activityId) >> savedActivity
 
@@ -201,8 +205,9 @@ class SaveReportDataCommandSpec extends Specification {
 
         then:
         command.hasErrors() == false
+        1 * reportService.reportLifeCycleListener(savedActivity.type) >> new ReportLifecycleListener()
         1 * siteService.update(siteId, jsonData.site) >> [resp:[siteId:siteId]]
-        1 * activityService.update(jsonData.activityId, jsonData.activity)
+        1 * activityService.update(jsonData.activityId, jsonData.activity) >> [message:'updated']
     }
 
     def "the command should assign the siteId to the activity when creating a new site"() {
@@ -227,8 +232,8 @@ class SaveReportDataCommandSpec extends Specification {
         ]
 
         String siteId = 's1'
-        Map r1Report = [reportId:jsonData.reportId, publicationStatus:ReportService.REPORT_NOT_APPROVED, activityId:jsonData.activityId]
-        Map savedActivity = [activityId:jsonData.activityId, publicationStatus: ReportService.REPORT_NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED]
+        Map r1Report = [reportId:jsonData.reportId, publicationStatus:PublicationStatus.NOT_APPROVED, activityId:jsonData.activityId]
+        Map savedActivity = [activityId:jsonData.activityId, type:'Type', publicationStatus: PublicationStatus.NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED]
         reportService.get(jsonData.reportId) >> r1Report
         activityService.get(jsonData.activityId) >> savedActivity
 
@@ -240,11 +245,11 @@ class SaveReportDataCommandSpec extends Specification {
         then:
         command.hasErrors() == false
         1 * siteService.update('', jsonData.site) >> [resp:[siteId:siteId]]
-
+        1 * reportService.reportLifeCycleListener(savedActivity.type) >> new ReportLifecycleListener()
         jsonData.activity.siteId == siteId
         jsonData.activity.activityId == jsonData.activityId
 
-        1 * activityService.update(jsonData.activityId, jsonData.activity)
+        1 * activityService.update(jsonData.activityId, jsonData.activity) >> [message:'updated']
     }
 
     def "If an existing report site contains no features it should be deleted"() {
@@ -264,8 +269,8 @@ class SaveReportDataCommandSpec extends Specification {
                 ]
         ]
 
-        Map r1Report = [reportId:jsonData.reportId, publicationStatus:ReportService.REPORT_NOT_APPROVED, activityId:jsonData.activityId]
-        Map savedActivity = [activityId:jsonData.activityId, publicationStatus: ReportService.REPORT_NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED, siteId:siteId]
+        Map r1Report = [reportId:jsonData.reportId, publicationStatus:PublicationStatus.NOT_APPROVED, activityId:jsonData.activityId]
+        Map savedActivity = [activityId:jsonData.activityId, type:'Type', publicationStatus: PublicationStatus.NOT_APPROVED, progress:ActivityService.PROGRESS_PLANNED, siteId:siteId]
         reportService.get(jsonData.reportId) >> r1Report
         activityService.get(jsonData.activityId) >> savedActivity
 
@@ -276,8 +281,9 @@ class SaveReportDataCommandSpec extends Specification {
 
         then:
         command.hasErrors() == false
+        1 * reportService.reportLifeCycleListener(savedActivity.type) >> new ReportLifecycleListener()
         and: "The activity is updated to remove the site id"
-        1 * activityService.update(jsonData.activityId, expectedActivityData)
+        1 * activityService.update(jsonData.activityId, expectedActivityData) >> [message:'updated']
         and: "The site is deleted"
         1 * siteService.delete(siteId) >> HttpStatus.SC_OK
 
diff --git a/src/test/groovy/au/org/ala/merit/reports/NhtOutputReportLifecycleListenerSpec.groovy b/src/test/groovy/au/org/ala/merit/reports/NhtOutputReportLifecycleListenerSpec.groovy
new file mode 100644
index 000000000..7756f3bc7
--- /dev/null
+++ b/src/test/groovy/au/org/ala/merit/reports/NhtOutputReportLifecycleListenerSpec.groovy
@@ -0,0 +1,74 @@
+package au.org.ala.merit.reports
+
+import au.org.ala.merit.ProjectService
+import au.org.ala.merit.ActivityService
+import spock.lang.Specification
+
+class NhtOutputReportLifecycleListenerSpec extends Specification {
+
+    NHTOutputReportLifecycleListener reportData = new NHTOutputReportLifecycleListener()
+    ProjectService projectService = Mock(ProjectService)
+
+    void setup() {
+        reportData.projectService = projectService
+    }
+
+    def "The context data doesn't need project data sets to exist"() {
+
+        setup:
+        Map project = [:]
+        Map report = [:]
+        List protocols = [[name:'test', externalId:'e1']]
+
+        when:
+        Map contextData = reportData.getContextData(project, report)
+
+        then:
+        1 * projectService.listProjectProtocols(project) >> protocols
+        contextData.protocols.size() == 2
+        contextData.protocols[0].label == 'test'
+        contextData.protocols[0].value == 'e1'
+        contextData.protocols[1].label == 'Other'
+        contextData.protocols[1].value == 'other'
+
+        project.custom == null
+
+    }
+
+
+    def "Project data sets will be filtered to only finished data sets"() {
+        setup:
+        List dataSets = [[dataSetId:'d1', progress:ActivityService.PROGRESS_FINISHED, projectOutcomes:['a','b','c']],
+                         [dataSetId:'d2', progress:ActivityService.PROGRESS_FINISHED, projectOutcomes:['d','e','f']],
+                         [dataSetId:'d3', progress:ActivityService.PROGRESS_STARTED, projectOutcomes:['g','h','i']],
+                         [dataSetId:'d4', progress:ActivityService.PROGRESS_FINISHED, projectOutcomes:['j','k','l']]]
+        Map project = [custom:[dataSets:dataSets]]
+        Map report = [:]
+        List protocols = [[name:'test', externalId:'e1']]
+
+        when:
+        Map contextData = reportData.getContextData(project, report)
+
+        then:
+        1 * projectService.listProjectProtocols(project) >> protocols
+        project.custom.dataSets.size() == 3
+        project.custom.dataSets*.dataSetId == ['d1','d2','d4']
+    }
+
+    def "It will return a list of investment priorities from the MERI plan"() {
+        setup:
+        String projectId = 'p1'
+        Map report = [:]
+        List secondaryOutcomes = [ [ "assets" : [ "Investment priority 1" ], "description" : "Outcome 2" ] ]
+        Map primaryOutcome = [:]
+        Map project = [projectId:projectId, custom:[details:[outcomes:[secondaryOutcomes:secondaryOutcomes, primaryOutcome:primaryOutcome]]]]
+
+        when:
+        Map contextData = reportData.getContextData(project, report)
+
+        then:
+        1 * projectService.listProjectInvestmentPriorities(projectId) >> ['Investment priority 1']
+        contextData.investmentPriorities == ['Investment priority 1']
+
+    }
+}
diff --git a/src/test/groovy/au/org/ala/merit/reports/ReportLifecycleListenerSpec.groovy b/src/test/groovy/au/org/ala/merit/reports/ReportLifecycleListenerSpec.groovy
new file mode 100644
index 000000000..53b8d4734
--- /dev/null
+++ b/src/test/groovy/au/org/ala/merit/reports/ReportLifecycleListenerSpec.groovy
@@ -0,0 +1,83 @@
+package au.org.ala.merit.reports
+
+import au.org.ala.ecodata.forms.ActivityFormService
+import groovy.json.JsonSlurper
+import spock.lang.Specification
+
+class ReportLifecycleListenerSpec extends Specification {
+
+    ReportLifecycleListener reportData = new ReportLifecycleListener()
+    ActivityFormService activityFormService = Mock(ActivityFormService)
+
+    def setup() {
+        reportData.activityFormService = activityFormService
+    }
+
+
+    def "The context data doesn't need project data sets to exist"() {
+        setup:
+        Map data = [
+                prop1: [prop2: [
+                        [prop3:[
+                                [prop4: 'value1'],
+                                [prop4: 'value2']
+                        ]],
+                        [prop3:[
+                                [prop4: 'value3'],
+                                [prop4: 'value4']
+                        ]],
+                        [prop5: 'value5']
+                ]]
+        ]
+
+        when:
+        List result = ReportLifecycleListener.getValueFromPath('prop1.prop2.prop3.prop4', data)
+
+        then:
+        result == ['value1', 'value2', 'value3', 'value4']
+
+
+    }
+
+
+    def "Project data sets will be filtered to only finished data sets"() {
+
+    }
+
+    def "Referenced entities in the saved data can be found"() {
+        setup:
+        Map activityData = nhtActivityData()
+
+        when:
+        List<Map> entities = reportData.findReferencedEntities(activityData)
+
+        then:
+        1 * activityFormService.findActivityForm(_) >> nhtActivityForm()
+        entities == [
+                [entityType:"au.org.ala.ecodata.DataSetSummary", entityIds:["297cbf04-b8b1-43d5-a1b4-e833ef00a718", "0847b4c6-aba9-425c-a3e4-a07035d40b9b"]],
+                [entityType:"au.org.ala.ecodata.DataSetSummary", entityIds:["e4e3f304-5ee7-458b-ad7e-0e3ee0cbb202", "0d2d2b6c-50ce-46f8-a8f0-5f9238d84120", "144ca417-43a8-4eab-94c3-f857263bbc06"]],
+                [entityType:"au.org.ala.ecodata.DataSetSummary", entityIds:["5b1255a4-3b91-4fae-a243-02bd4d163898"]]]
+    }
+
+    private static Map nhtActivityForm() {
+        File file = new File('forms/nht/nhtOutputReport.json')
+
+        Map report = null
+        file.withInputStream {
+            report = new JsonSlurper().parse(it)
+        }
+        report
+    }
+
+    private static Map nhtActivityData() {
+
+        File file = new File("src/test/resources/nhtOutputReportData.json")
+
+        Map report = null
+        file.withInputStream {
+            report = new JsonSlurper().parse(it)
+        }
+        report
+    }
+
+}
diff --git a/src/test/js/spec/AdminReportSpec.js b/src/test/js/spec/AdminReportSpec.js
index 1def9c402..1309d46ef 100644
--- a/src/test/js/spec/AdminReportSpec.js
+++ b/src/test/js/spec/AdminReportSpec.js
@@ -1,4 +1,4 @@
-describe("ManagementUnitReportSelectorViewModel Spec", function () {
+describe("EntityReportSelectorViewModel Spec", function () {
     beforeAll(function() {
         window.fcConfig = {
             imageLocation:'/'
@@ -18,8 +18,8 @@ describe("ManagementUnitReportSelectorViewModel Spec", function () {
     });
 
     it("Should able to download the report", function() {
-        var options = {generateMUReportInPeriodUrl:'/test/url'};
-        var model = new ManagementUnitReportSelectorViewModel(options);
+        var options = {generateEntityReportInPeriodUrl:'/test/url?entity=organisation'};
+        var model = new EntityReportSelectorViewModel(options);
 
         var ajaxCall = spyOn($, 'ajax').and.callFake(function () {
             var d = $.Deferred();
@@ -30,11 +30,11 @@ describe("ManagementUnitReportSelectorViewModel Spec", function () {
 
         spyOn(bootbox, 'alert');
 
-        model.muReportDownloadSummary()
+        model.entityReportDownloadSummary()
         var expected = {
-            url: options.generateMUReportInPeriodUrl,
+            url: options.generateEntityReportInPeriodUrl,
             type: 'GET',
-            data: Object({ fromDate:'2018-07-01T02:04:45Z', toDate:'2018-07-01T02:04:45Z', summaryFlag: true }),
+            data: Object({ fromDate:'2018-07-01T02:04:45Z', toDate:'2018-07-01T02:04:45Z', summaryFlag: true, entity: 'organisation' }),
             dataType: 'json',
             contentType: 'application/json'
         };
diff --git a/src/test/js/spec/DataSetsSpec.js b/src/test/js/spec/DataSetsSpec.js
index dd2d6f29e..79b850132 100644
--- a/src/test/js/spec/DataSetsSpec.js
+++ b/src/test/js/spec/DataSetsSpec.js
@@ -69,9 +69,8 @@ describe("The data set summaries view models behave correctly", function () {
 
     function dataSet() {
         return {
-            "owner" : "Test",
-            "methodDescription" : "Test method",
-            "custodian" : "Test",
+            "dateCreated":"2024-01-01T00:00:00Z",
+            "methodDescription" : "See EMSA Protocols Manual: https://www.tern.org.au/emsa-protocols-manual",
             "investmentPriorities" : ["Botaurus poiciloptilus (Australasian Bittern)", "Other"],
             "otherInvestmentPriority": "Test",
             "endDate" : "2020-12-02T13:00:00Z",
@@ -79,21 +78,19 @@ describe("The data set summaries view models behave correctly", function () {
                 "Surveying - Fauna, Flora"
             ],
             "format" : "Excel",
-            "published" : "No",
             "sensitivities" : [
                 "No"
             ],
             "type" : "Project progress dataset that is tracking change against an established project baseline dataset",
+            "baselines": ["b1"],
             "collectionApp" : "Test app",
-            "collectorType" : "Other",
-            "qa" : "Yes",
             "dataSetId" : "9bbed216-c3d4-4346-912b-0127a4bb53b9",
             "name" : "Test data set",
             "measurementTypes" : [
                 "Abundance"
             ],
-            "storageType" : "Stored internally",
             "location" : "Test",
+            "siteId": null,
             "programOutcome" : "2. By 2023, the trajectory of species targeted under the Threatened Species Strategy, and other EPBC Act priority species, is stabilised or improved.",
             "publicationUrl" : "https://test.com.au",
             "startDate" : "2020-11-30T13:00:00Z",
@@ -101,8 +98,21 @@ describe("The data set summaries view models behave correctly", function () {
             "threatenedSpeciesIndex" : "Yes",
             "progress" : "started",
             "markedAsFinished": false,
-            "term": "Short-term outcome statement",
-            "dataCollectionOngoing": false
+            "dataCollectionOngoing": false,
+            "serviceId":"1",
+            "projectOutcomes":["MT1", "ST1"],
+            "surveyId": {
+                "survey-type":'test',
+                "randNum": 1234,
+                "time":"2023-06-30T00:00:00.000Z"
+            },
+            "term":null,
+            "threatenedSpeciesIndexUploadDate":'',
+            "sizeUnknown": false,
+            "otherSensitivity":null,
+            "otherDataSetType":null,
+            "sizeInKB": 205,
+            "protocol":"guid-1"
         };
     }
 
@@ -110,7 +120,13 @@ describe("The data set summaries view models behave correctly", function () {
     it("The DataSetViewModel can manipulate data set data for the purposes of the Data set edit/create pages", function () {
         var config = {
             returnToUrl: '/project/1',
-            validationContainerSelector: '.validationEngineContainer'
+            validationContainerSelector: '.validationEngineContainer',
+            projectOutcomes: [
+                {
+                    "serviceId":"1",
+                    "outcomes": ["MT1", "ST1"]
+                }
+            ]
         };
 
         var dataSetsVM = new DataSetViewModel(dataSet(), projectService, config);
@@ -123,6 +139,9 @@ describe("The data set summaries view models behave correctly", function () {
         dataSetsVM.save();
 
         expect(projectService.saveDataSet).toHaveBeenCalled();
+        delete savedDataSet.attachValidation;
+        delete savedDataSet.uniqueName;
+        delete savedDataSet.validateEndDate;
         expect(savedDataSet).toEqual(dataSet());
 
 
diff --git a/src/test/js/spec/MeriPlanSpec.js b/src/test/js/spec/MeriPlanSpec.js
index 4a6b4e2ff..bfa59b14c 100644
--- a/src/test/js/spec/MeriPlanSpec.js
+++ b/src/test/js/spec/MeriPlanSpec.js
@@ -195,7 +195,8 @@ describe("Loading the MERI plan is handled correctly", function () {
             plannedStartDate:'2018-07-01T00:00:00Z',
             plannedEndDate:'2021-06-30T00:00:00Z'
         };
-        var projectService = new ProjectService(project, {});
+
+        var projectService = new ProjectService(project, {userHoldsMeriPlanLock:true});
 
         var viewModel = new MERIPlan(project, projectService, config);
 
diff --git a/src/test/resources/nhtOutputReportData.json b/src/test/resources/nhtOutputReportData.json
new file mode 100644
index 000000000..a43347a09
--- /dev/null
+++ b/src/test/resources/nhtOutputReportData.json
@@ -0,0 +1,859 @@
+{
+  "activityId": "40815021-a51b-4297-8253-67a19ba856d4",
+  "description": "Year 2023/2024 - Quarter 1 Outputs Report",
+  "startDate": "2023-06-30T14:00:00Z",
+  "endDate": "2023-09-30T14:00:00Z",
+  "plannedStartDate": "2023-06-30T14:00:00Z",
+  "plannedEndDate": "2023-09-30T14:00:00Z",
+  "projectStage": "",
+  "progress": "started",
+  "mainTheme": "",
+  "type": "NHT Output Report",
+  "projectId": "30b6e207-51fb-4286-881c-9ca31959010c",
+  "formVersion": 1,
+  "siteId": "55ceebc6-9239-4880-88a1-0ab5186b6fc4",
+  "outputs": [
+    {
+      "name": "NHT - Communications",
+      "outputId": "0de3677c-a10d-43a6-b5b8-44292744eb2e",
+      "data": {
+        "nhtCommunications": "Yes",
+        "yesCommunicationsMaterial": "Test"
+      },
+      "outputNotCompleted": false
+    },
+    {
+      "name": "NHT - Project Engagements",
+      "outputId": "390ef464-b250-4da6-a1f0-376de48808ed",
+      "data": {
+        "engagementDetails": [
+          {
+            "engagementType": [
+              "Negotiations with the community, etc."
+            ],
+            "engagementTitle": "Test",
+            "engagementPurpose": "Test",
+            "engagementNoParticipants": "2",
+            "activityDateFrom": "2024-01-29T13:00:00Z",
+            "activityDateTo": "2024-01-30T13:00:00Z"
+          }
+        ],
+        "assuranceDocuments": [
+          {}
+        ]
+      },
+      "outputNotCompleted": false
+    },
+    {
+      "name": "NHT - Coordinate",
+      "outputId": "1e61c456-394e-423b-aa65-95ad50e51d5f",
+      "data": {
+        "undergoneReview": "No",
+        "plansDeveloped": "No",
+        "facilitatedPlanningMeetings": "No",
+        "meetingDetails": [
+          {
+            "meetingDateFrom": "",
+            "meetingDateTo": ""
+          }
+        ],
+        "assuranceDocuments": [
+          {}
+        ]
+      },
+      "outputNotCompleted": false
+    },
+    {
+      "name": "NHT - Project Commencement",
+      "outputId": "e1a3f267-2dad-4674-b1ca-3919161ee00d",
+      "data": {},
+      "outputNotCompleted": false
+    },
+    {
+      "name": "NHT - Project WHS",
+      "outputId": "7ff61f93-b3b3-483d-af5a-9a2d42353ad9",
+      "data": {
+        "undergoneWhsReview": "No",
+        "hasNotifiableIncident": "No",
+        "hasVerifiedSubContractors": "Yes"
+      },
+      "outputNotCompleted": false
+    },
+    {
+      "name": "NHT - Farm Management Survey",
+      "outputId": "28b05dea-f492-405b-a10f-acadb36bbf89",
+      "data": {
+        "farmManagementSurveys": [
+          {
+            "relatedOutcomes": "MT1",
+            "baselineOrIndicatorSurvey": "Baseline",
+            "surveyObjective": "Test objective 4/1/24",
+            "farmManagementDataSets": [
+              {
+                "dataSetId": "297cbf04-b8b1-43d5-a1b4-e833ef00a718",
+                "farmManagementSurveySpeciesTable": [
+                  {
+                    "species": {
+                      "guid": "",
+                      "name": "",
+                      "scientificName": "",
+                      "commonName": ""
+                    },
+                    "numberOfIndividualsOrGroups": "0"
+                  }
+                ],
+                "projectBaselines": [
+                  "B1",
+                  "B2"
+                ],
+                "investmentPriorities2": [
+                  "Botaurus poiciloptilus (Australasian Bittern)"
+                ],
+                "activitiesStartDate": "2023-08-31T14:00:00Z",
+                "activitiesEndDate": "2023-10-07T13:00:00Z",
+                "calculatedAreaTreatedHa": "0.000",
+                "calculatedLengthTreatedKm": "0.000",
+                "areaTreatedHa": "0",
+                "lengthTreatedKm": "0",
+                "emsaProtocol": "other",
+                "otherEmsaProtocol": [
+                  "Hair, track, dung sampling"
+                ],
+                "surveyMethodology": "See EMSA Protocols Manual: https://www.tern.org.au/emsa-protocols-manual",
+                "invoicingThisActivity": "Yes"
+              }
+            ]
+          },
+          {
+            "relatedOutcomes": "MT1",
+            "baselineOrIndicatorSurvey": "Indicator",
+            "surveyObjective": "Test objective 4/1/24",
+            "farmManagementDataSets": [
+              {
+                "dataSetId": "0847b4c6-aba9-425c-a3e4-a07035d40b9b",
+                "farmManagementSurveySpeciesTable": [
+                  {
+                    "species": {
+                      "guid": "",
+                      "name": "",
+                      "scientificName": "",
+                      "commonName": ""
+                    },
+                    "numberOfIndividualsOrGroups": "0"
+                  }
+                ],
+                "projectBaselines": [
+                  "B1"
+                ],
+                "investmentPriorities2": [
+                  "Anthochaera phrygia (Regent Honeyeater)",
+                  "Lathamus discolor (Swift Parrot)"
+                ],
+                "activitiesStartDate": "2024-01-01T13:00:00Z",
+                "activitiesEndDate": "2024-01-01T13:00:00Z",
+                "calculatedAreaTreatedHa": "0.000",
+                "calculatedLengthTreatedKm": "0.000",
+                "areaTreatedHa": "0",
+                "mappingNotAlignedReason": "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                "lengthTreatedKm": "0",
+                "emsaProtocol": "other",
+                "otherEmsaProtocol": [
+                  "Participant surveys"
+                ],
+                "surveyMethodology": "Method detail 2/1/24",
+                "invoicingThisActivity": "Yes"
+              }
+            ]
+          }
+        ],
+        "baselineIndicatorMapping": {
+          "table": [
+            {
+              "input": "Baseline dataset associated with a project outcome",
+              "output": "Baseline"
+            },
+            {
+              "input": "Project progress dataset that is tracking change against an established project baseline dataset",
+              "output": "Indicator"
+            }
+          ],
+          "initialization": {}
+        },
+        "participationInformationTable": [
+          {
+            "participationIndividualsOrGroups": "Individuals",
+            "participationIndividualNumber": "3",
+            "firstNationIndividualNumber": "0",
+            "participationDetails": "TEST "
+          }
+        ],
+        "totalSurveyBaseline": "1",
+        "totalSurveyBaselineInvoiced": "1",
+        "totalSurveyIndicator": "1",
+        "totalSurveyIndicatorInvoiced": "1",
+        "photographicEvidence": [
+          {
+            "dateTaken": "2024-01-04T05:29:45Z",
+            "contentType": "image/jpeg",
+            "url": "/document/download/2024-01/0_Gulf_Savannah_NRM.jpg",
+            "filesize": 20825,
+            "thumbnailUrl": "/document/download/2024-01/thumb_0_Gulf_Savannah_NRM.jpg",
+            "filename": "0_Gulf_Savannah_NRM.jpg",
+            "licence": "CC BY 3.0",
+            "notes": "",
+            "name": "Gulf_Savannah_NRM.jpg",
+            "formattedSize": "20.82 KB",
+            "staged": false,
+            "documentId": "42b42b08-c8c0-4863-a089-e0a235a46a7a",
+            "status": "active",
+            "activityId": "40815021-a51b-4297-8253-67a19ba856d4",
+            "identifier": "/document/download/2024-01/0_Gulf_Savannah_NRM.jpg"
+          }
+        ],
+        "assuranceDocuments": [
+          {
+            "attachments": {
+              "settings": {
+                "roles": [
+                  {
+                    "id": "information",
+                    "name": "Information",
+                    "isPublicRole": true
+                  },
+                  {
+                    "id": "embeddedVideo",
+                    "name": "Embedded Video",
+                    "isPublicRole": true
+                  },
+                  {
+                    "id": "projectLogic",
+                    "name": "Project Logic",
+                    "isPublicRole": false
+                  },
+                  {
+                    "id": "contractAssurance",
+                    "name": "Contract Assurance",
+                    "isPublicRole": false
+                  },
+                  {
+                    "id": "auditableOutputs",
+                    "name": "Auditable Outputs",
+                    "isPublicRole": false
+                  },
+                  {
+                    "id": "projectSupportAndOverheadsEvidence",
+                    "name": "Project Support & Overheads Evidence",
+                    "isPublicRole": false
+                  },
+                  {
+                    "id": "projectServiceEvidence",
+                    "name": "Project Service Evidence",
+                    "isPublicRole": false
+                  }
+                ],
+                "stages": [],
+                "reports": [],
+                "showSettings": true,
+                "thirdPartyDeclarationTextSelector": "#thirdPartyDeclarationText",
+                "imageLocation": "/assets/"
+              },
+              "stages": [],
+              "reports": [],
+              "filename": "Afonso & Hazin 2014 Post-release survival and behavior and exposure to fisheries in juvenile tiger sharks, Galeocerdo cuvier, from the South Atlantic..pdf",
+              "filesize": 816253,
+              "name": "Test upload 4/1/24",
+              "uploadDate": "2024-01-04T05:29:25Z",
+              "status": "active",
+              "type": "application",
+              "role": "information",
+              "roles": [
+                {
+                  "id": "information",
+                  "name": "Information",
+                  "isPublicRole": true
+                },
+                {
+                  "id": "embeddedVideo",
+                  "name": "Embedded Video",
+                  "isPublicRole": true
+                },
+                {
+                  "id": "projectLogic",
+                  "name": "Project Logic",
+                  "isPublicRole": false
+                },
+                {
+                  "id": "contractAssurance",
+                  "name": "Contract Assurance",
+                  "isPublicRole": false
+                },
+                {
+                  "id": "auditableOutputs",
+                  "name": "Auditable Outputs",
+                  "isPublicRole": false
+                },
+                {
+                  "id": "projectSupportAndOverheadsEvidence",
+                  "name": "Project Support & Overheads Evidence",
+                  "isPublicRole": false
+                },
+                {
+                  "id": "projectServiceEvidence",
+                  "name": "Project Service Evidence",
+                  "isPublicRole": false
+                }
+              ],
+              "url": "/document/download/2024-01/Afonso%20%26%20Hazin%202014%20Post-release%20survival%20and%20behavior%20and%20exposure%20to%20fisheries%20in%20juvenile%20tiger%20sharks%2C%20Galeocerdo%20cuvier%2C%20from%20the%20South%20Atlantic..pdf",
+              "thumbnailUrl": "/document/download/2024-01/Afonso%20%26%20Hazin%202014%20Post-release%20survival%20and%20behavior%20and%20exposure%20to%20fisheries%20in%20juvenile%20tiger%20sharks%2C%20Galeocerdo%20cuvier%2C%20from%20the%20South%20Atlantic..pdf",
+              "documentId": "506e48aa-e17f-4bc1-a511-b0a87405c814",
+              "reportId": "3585d49e-3ea0-4cad-b050-562f01fe113e",
+              "reportName": "",
+              "hasPreview": false,
+              "progress": 0,
+              "complete": false,
+              "readOnly": false,
+              "contentType": "application/pdf",
+              "fileButtonText": "Change file",
+              "hasPublicRole": true,
+              "isPrimaryProjectImage": false,
+              "thirdPartyConsentDeclarationMade": false,
+              "thirdPartyConsentDeclarationText": null,
+              "embeddedVideoVisible": false,
+              "labels": [],
+              "thirdPartyConsentDeclarationRequired": false,
+              "fileReady": true,
+              "saveEnabled": true,
+              "saveHelp": "",
+              "fileLabel": "Afonso & Hazin 2014 Post-release survival and behavior and exposure to fisheries in juvenile tiger sharks, Galeocerdo cuvier, from the South Atlantic..pdf (816.25 KB)"
+            }
+          }
+        ]
+      },
+      "outputNotCompleted": false
+    },
+    {
+      "name": "NHT - Fauna survey",
+      "outputId": "0be9653b-84e2-4563-a260-f5936cdaec91",
+      "data": {},
+      "outputNotCompleted": true
+    },
+    {
+      "name": "NHT - Flora survey",
+      "outputId": "cedd9ec2-5bfb-44ba-9fe1-e946e4849061",
+      "data": {
+        "floraSurveys": [
+          {
+            "relatedOutcomes": "MT1",
+            "baselineOrIndicatorSurvey": "Baseline",
+            "surveyObjective": "Test Objective 12/1/24",
+            "numberOfSurveys": "1",
+            "floraDataSets": []
+          },
+          {
+            "relatedOutcomes": "MT1",
+            "baselineOrIndicatorSurvey": "Indicator",
+            "surveyObjective": "Test objective 12/1/24",
+            "numberOfSurveys": "1",
+            "floraDataSets": [
+              {
+                "dataSetId": "e4e3f304-5ee7-458b-ad7e-0e3ee0cbb202",
+                "floraSurveySpeciesTable": [
+                  {
+                    "species": {
+                      "guid": "https://id.biodiversity.org.au/node/apni/2900044",
+                      "name": "Digitalis",
+                      "scientificName": "Digitalis",
+                      "commonName": "Foxgloves"
+                    },
+                    "individualsOrGroups": "Individuals",
+                    "numberOfIndividualsOrGroups": "2"
+                  }
+                ],
+                "projectBaselines": [
+                  "B1"
+                ],
+                "investmentPriorities2": [
+                  "Botaurus poiciloptilus (Australasian Bittern)",
+                  "Lathamus discolor (Swift Parrot)"
+                ],
+                "activitiesStartDate": "2024-01-01T13:00:00Z",
+                "activitiesEndDate": "2024-01-01T13:00:00Z",
+                "sitesCoveredForFloraSurvey": {
+                  "modelId": 2,
+                  "featureIds": [
+                    "2-NHT - Flora survey-sitesCoveredForFloraSurvey-0-0"
+                  ]
+                },
+                "calculatedAreaTreatedHa": "8.846",
+                "calculatedLengthTreatedKm": "0.000",
+                "areaTreatedHa": "8.846",
+                "lengthTreatedKm": "0",
+                "emsaProtocol": "other",
+                "otherEmsaProtocol": [
+                  "Area sampling",
+                  "Active searching",
+                  "Aerial photography",
+                  "Other"
+                ],
+                "surveyMethodology": "See EMSA Protocols Manual: https://www.tern.org.au/emsa-protocols-manual",
+                "invoicingThisActivity": "Yes"
+              }
+            ]
+          },
+          {
+            "relatedOutcomes": "MT1",
+            "baselineOrIndicatorSurvey": "Indicator",
+            "surveyObjective": "test objective 12/1/24",
+            "numberOfSurveys": "1",
+            "floraDataSets": [
+              {
+                "dataSetId": "0d2d2b6c-50ce-46f8-a8f0-5f9238d84120",
+                "floraSurveySpeciesTable": [
+                  {
+                    "species": {
+                      "guid": "https://id.biodiversity.org.au/node/apni/2899861",
+                      "name": "Austrostipa densiflora",
+                      "scientificName": "Austrostipa densiflora",
+                      "commonName": "Foxtail Spear-Grass"
+                    },
+                    "individualsOrGroups": "Groups",
+                    "numberOfIndividualsOrGroups": "1"
+                  }
+                ],
+                "projectBaselines": [
+                  "B2"
+                ],
+                "investmentPriorities2": [
+                  "Anthochaera phrygia (Regent Honeyeater)",
+                  "Lathamus discolor (Swift Parrot)"
+                ],
+                "activitiesStartDate": "2024-01-21T13:00:00Z",
+                "activitiesEndDate": "2024-01-21T13:00:00Z",
+                "sitesCoveredForFloraSurvey": {
+                  "modelId": 3,
+                  "featureIds": [
+                    "3-NHT - Flora survey-sitesCoveredForFloraSurvey-0-0"
+                  ]
+                },
+                "calculatedAreaTreatedHa": "8.846",
+                "calculatedLengthTreatedKm": "0.000",
+                "areaTreatedHa": "6",
+                "mappingNotAlignedReason": "Other",
+                "mappingNotAlignedComments": "Test for other mapping reason 22/1/24",
+                "lengthTreatedKm": "0",
+                "emsaProtocol": "other",
+                "otherEmsaProtocol": [
+                  "Water quality sampling",
+                  "Active searching",
+                  "Transect sampling",
+                  "Trapping",
+                  "Vegetation mapping"
+                ],
+                "surveyMethodology": "Test method 22/1/24",
+                "invoicingThisActivity": "Yes"
+              }
+            ]
+          },
+          {
+            "relatedOutcomes": "MT1",
+            "baselineOrIndicatorSurvey": "Indicator",
+            "surveyObjective": "Test Objective 12/1/24",
+            "numberOfSurveys": "1",
+            "floraDataSets": [
+              {
+                "dataSetId": "144ca417-43a8-4eab-94c3-f857263bbc06",
+                "floraSurveySpeciesTable": [
+                  {
+                    "species": {
+                      "guid": "https://id.biodiversity.org.au/node/apni/2903360",
+                      "name": "Banksia sphaerocarpa",
+                      "scientificName": "Banksia sphaerocarpa",
+                      "commonName": "Fox Banksia"
+                    },
+                    "individualsOrGroups": "Individuals",
+                    "numberOfIndividualsOrGroups": "2"
+                  }
+                ],
+                "projectBaselines": [
+                  "B2"
+                ],
+                "investmentPriorities2": [
+                  "Botaurus poiciloptilus (Australasian Bittern)",
+                  "Lathamus discolor (Swift Parrot)"
+                ],
+                "activitiesStartDate": "2024-01-11T13:00:00Z",
+                "activitiesEndDate": "2024-01-11T13:00:00Z",
+                "sitesCoveredForFloraSurvey": {
+                  "modelId": 4,
+                  "featureIds": [
+                    "4-NHT - Flora survey-sitesCoveredForFloraSurvey-0-0"
+                  ]
+                },
+                "calculatedAreaTreatedHa": "8.846",
+                "calculatedLengthTreatedKm": "0.000",
+                "areaTreatedHa": "8.846",
+                "lengthTreatedKm": "0",
+                "emsaProtocol": "other",
+                "otherEmsaProtocol": [
+                  "Area sampling",
+                  "Aerial photography",
+                  "Other"
+                ],
+                "surveyMethodology": "Test method 12/1/24",
+                "invoicingThisActivity": "Yes"
+              }
+            ]
+          }
+        ],
+        "baselineIndicatorMapping": {
+          "table": [
+            {
+              "input": "Baseline dataset associated with a project outcome",
+              "output": "Baseline"
+            },
+            {
+              "input": "Project progress dataset that is tracking change against an established project baseline dataset",
+              "output": "Indicator"
+            }
+          ],
+          "initialization": {}
+        },
+        "participationInformationTable": [
+          {
+            "participationIndividualsOrGroups": "Individuals",
+            "participationIndividualNumber": "2",
+            "firstNationIndividualNumber": "2",
+            "participationDetails": "TEST"
+          }
+        ],
+        "totalSurveyBaseline": "1",
+        "totalSurveyBaselineInvoiced": "0",
+        "totalSurveyIndicator": "3",
+        "totalSurveyIndicatorInvoiced": "0",
+        "photographicEvidence": [
+          {
+            "dateTaken": "2024-01-08T02:57:48Z",
+            "contentType": "image/png",
+            "url": "/document/download/2024-01/0_Screenshot_2023-03-21_082940.png",
+            "filesize": 17428,
+            "thumbnailUrl": "/document/download/2024-01/thumb_0_Screenshot_2023-03-21_082940.png",
+            "filename": "0_Screenshot_2023-03-21_082940.png",
+            "licence": "CC BY 3.0",
+            "notes": "",
+            "name": "Screenshot_2023-03-21_082940.png",
+            "formattedSize": "17.43 KB",
+            "staged": false,
+            "documentId": "88b96d11-8434-4aac-a6de-605d3466f345",
+            "status": "active",
+            "activityId": "40815021-a51b-4297-8253-67a19ba856d4",
+            "identifier": "/document/download/2024-01/0_Screenshot_2023-03-21_082940.png"
+          }
+        ],
+        "assuranceDocuments": [
+          {
+            "attachments": {
+              "settings": {
+                "roles": [
+                  {
+                    "id": "information",
+                    "name": "Information",
+                    "isPublicRole": true
+                  },
+                  {
+                    "id": "embeddedVideo",
+                    "name": "Embedded Video",
+                    "isPublicRole": true
+                  },
+                  {
+                    "id": "projectLogic",
+                    "name": "Project Logic",
+                    "isPublicRole": false
+                  },
+                  {
+                    "id": "contractAssurance",
+                    "name": "Contract Assurance",
+                    "isPublicRole": false
+                  },
+                  {
+                    "id": "auditableOutputs",
+                    "name": "Auditable Outputs",
+                    "isPublicRole": false
+                  },
+                  {
+                    "id": "projectSupportAndOverheadsEvidence",
+                    "name": "Project Support & Overheads Evidence",
+                    "isPublicRole": false
+                  },
+                  {
+                    "id": "projectServiceEvidence",
+                    "name": "Project Service Evidence",
+                    "isPublicRole": false
+                  }
+                ],
+                "stages": [],
+                "reports": [],
+                "showSettings": true,
+                "thirdPartyDeclarationTextSelector": "#thirdPartyDeclarationText",
+                "imageLocation": "/assets/"
+              },
+              "stages": [],
+              "reports": [],
+              "filename": "20220711_113709.jpg",
+              "filesize": 2348801,
+              "name": "Test 2 8/1/24",
+              "uploadDate": "2024-01-08T02:58:31Z",
+              "status": "active",
+              "type": "image",
+              "role": "contractAssurance",
+              "roles": [
+                {
+                  "id": "information",
+                  "name": "Information",
+                  "isPublicRole": true
+                },
+                {
+                  "id": "embeddedVideo",
+                  "name": "Embedded Video",
+                  "isPublicRole": true
+                },
+                {
+                  "id": "projectLogic",
+                  "name": "Project Logic",
+                  "isPublicRole": false
+                },
+                {
+                  "id": "contractAssurance",
+                  "name": "Contract Assurance",
+                  "isPublicRole": false
+                },
+                {
+                  "id": "auditableOutputs",
+                  "name": "Auditable Outputs",
+                  "isPublicRole": false
+                },
+                {
+                  "id": "projectSupportAndOverheadsEvidence",
+                  "name": "Project Support & Overheads Evidence",
+                  "isPublicRole": false
+                },
+                {
+                  "id": "projectServiceEvidence",
+                  "name": "Project Service Evidence",
+                  "isPublicRole": false
+                }
+              ],
+              "public": false,
+              "url": "/document/download/2024-01/20220711_113709.jpg",
+              "thumbnailUrl": "/document/download/2024-01/thumb_20220711_113709.jpg",
+              "documentId": "f47d377d-89f8-4bbc-a4c1-1055573490b2",
+              "reportId": "3585d49e-3ea0-4cad-b050-562f01fe113e",
+              "reportName": "",
+              "hasPreview": false,
+              "progress": 0,
+              "complete": false,
+              "readOnly": false,
+              "contentType": "image/jpeg",
+              "fileButtonText": "Change file",
+              "hasPublicRole": false,
+              "isPrimaryProjectImage": false,
+              "thirdPartyConsentDeclarationMade": false,
+              "thirdPartyConsentDeclarationText": null,
+              "embeddedVideoVisible": false,
+              "labels": [],
+              "thirdPartyConsentDeclarationRequired": false,
+              "fileReady": true,
+              "saveEnabled": true,
+              "saveHelp": "",
+              "fileLabel": "20220711_113709.jpg (2.35 MB)"
+            }
+          }
+        ]
+      },
+      "outputNotCompleted": false
+    },
+    {
+      "name": "NHT - Habitat condition assessment",
+      "outputId": "2b364b43-6a61-4569-bd26-a637a7336e82",
+      "data": {},
+      "outputNotCompleted": true
+    },
+    {
+      "name": "NHT - Pest animal survey",
+      "outputId": "0672b3d2-cc6e-4245-a902-f22f4aefb330",
+      "data": {},
+      "outputNotCompleted": true
+    },
+    {
+      "name": "NHT - Plant survival survey",
+      "outputId": "21c920a5-9504-443e-a6e4-6189c759c3bd",
+      "data": {},
+      "outputNotCompleted": true
+    },
+    {
+      "name": "NHT - Skills and knowledge survey",
+      "outputId": "43b44e7c-b898-4ce5-b583-d7382cd758a9",
+      "data": {},
+      "outputNotCompleted": true
+    },
+    {
+      "name": "NHT - Water quality survey",
+      "outputId": "78e1d70c-fad7-48dd-909a-ee77f7253074",
+      "data": {},
+      "outputNotCompleted": true
+    },
+    {
+      "name": "NHT - Weed distribution survey",
+      "outputId": "06dc7e55-47e8-4425-9530-a5ad1b507724",
+      "data": {
+        "weedSurveys": [
+          {
+            "relatedOutcomes": "ST1",
+            "baselineOrIndicatorSurvey": "Baseline",
+            "surveyObjective": "Test objective 16/1/24",
+            "numberOfSurveys": "1",
+            "numberOfSurveysInvoiced": "1",
+            "weedDataSets": [
+              {
+                "dataSetId": "5b1255a4-3b91-4fae-a243-02bd4d163898",
+                "weedSurveySpeciesTable": [
+                  {
+                    "species": {
+                      "guid": "https://id.biodiversity.org.au/node/apni/2906890",
+                      "name": "Setaria italica",
+                      "scientificName": "Setaria italica",
+                      "commonName": "Siberian Millet"
+                    },
+                    "estimatedCoverPercent": "14",
+                    "individualsOrGroups": "Individuals",
+                    "numberOfIndividualsOrGroups": "0"
+                  }
+                ],
+                "baselineOrIndicatorSurvey": "Baseline",
+                "projectBaselines": [
+                  "B1"
+                ],
+                "investmentPriorities2": [
+                  "Botaurus poiciloptilus (Australasian Bittern)",
+                  "Anthochaera phrygia (Regent Honeyeater)",
+                  "Lathamus discolor (Swift Parrot)"
+                ],
+                "activitiesStartDate": "2024-01-15T13:00:00Z",
+                "activitiesEndDate": "2024-01-15T13:00:00Z",
+                "sitesCoveredForWeedDistribution": {
+                  "modelId": 5,
+                  "featureIds": [
+                    "5-NHT - Weed distribution survey-sitesCoveredForWeedDistribution-0-0"
+                  ]
+                },
+                "calculatedAreaTreatedHa": "737.609",
+                "calculatedLengthTreatedKm": "0.000",
+                "areaTreatedHa": "0",
+                "mappingNotAlignedReason": "Mapped area simplifies more complex area/s where work was undertaken during this period",
+                "lengthTreatedKm": "0",
+                "emsaProtocol": "other",
+                "otherEmsaProtocol": [
+                  "Genetic sampling",
+                  "Surber sampling",
+                  "Vegetation mapping",
+                  "Ground cover monitoring"
+                ],
+                "surveyMethodology": "Test method 16/1/24",
+                "invoicingThisActivity": "Yes"
+              }
+            ]
+          }
+        ],
+        "baselineIndicatorMapping": {
+          "table": [
+            {
+              "input": "Baseline dataset associated with a project outcome",
+              "output": "Baseline"
+            },
+            {
+              "input": "Project progress dataset that is tracking change against an established project baseline dataset",
+              "output": "Indicator"
+            }
+          ],
+          "initialization": {}
+        },
+        "participationInformationTable": [
+          {
+            "participationIndividualsOrGroups": "Individuals",
+            "participationIndividualNumber": "2",
+            "firstNationIndividualNumber": "2",
+            "participationDetails": "Test"
+          }
+        ],
+        "totalSurveyBaseline": "1",
+        "totalSurveyBaselineInvoiced": "1",
+        "totalSurveyIndicator": "0",
+        "totalSurveyIndicatorInvoiced": "0",
+        "photographicEvidence": [],
+        "assuranceDocuments": [
+          {}
+        ]
+      },
+      "outputNotCompleted": false
+    },
+    {
+      "name": "NHT - Communication materials",
+      "outputId": "5bec9521-9909-4b8a-b969-e0550dc93fbe",
+      "data": {},
+      "outputNotCompleted": true
+    },
+    {
+      "name": "NHT - Maintaining feral free enclosures",
+      "outputId": "a01e134e-d98f-4b83-a8d4-47d42af13221",
+      "data": {},
+      "outputNotCompleted": true
+    },
+    {
+      "name": "NHT - Pest animal management",
+      "outputId": "80334bd5-096f-4cd3-b40d-1479a6e3c568",
+      "data": {},
+      "outputNotCompleted": true
+    },
+    {
+      "name": "NHT - Baseline data",
+      "outputId": "b359377f-eac2-427a-be97-9792bb7accf8",
+      "data": {},
+      "outputNotCompleted": true
+    },
+    {
+      "name": "NHT - Debris removal",
+      "outputId": "613f7e83-c69d-4560-b8d7-d7ff8ac04f6b",
+      "data": {},
+      "outputNotCompleted": true
+    },
+    {
+      "name": "NHT - Seed Collection",
+      "outputId": "e5279f58-2593-4b1c-b564-8228c1a2e58b",
+      "data": {},
+      "outputNotCompleted": true
+    },
+    {
+      "name": "NHT - Soil testing",
+      "outputId": "5e2ab73b-6101-4ce8-9992-bb2d09bc67ed",
+      "data": {},
+      "outputNotCompleted": true
+    },
+    {
+      "name": "NHT - Establishing Agreements",
+      "outputId": "6cdec067-baee-4405-99a2-b2923b560a44",
+      "data": {},
+      "outputNotCompleted": true
+    },
+    {
+      "name": "NHT - Community engagement",
+      "outputId": "2cba3af2-e4e4-4021-bcc8-265c0b1d3020",
+      "data": {},
+      "outputNotCompleted": true
+    },
+    {
+      "name": "NHT - Erosion Management",
+      "outputId": "7bef1c1a-b260-4d0e-98cc-b0bfa2f75b52",
+      "data": {},
+      "outputNotCompleted": true
+    }
+  ]
+}
\ No newline at end of file