diff --git a/src/app/src/main/kotlin/org/imperial/mrc/hint/models/Response.kt b/src/app/src/main/kotlin/org/imperial/mrc/hint/models/Response.kt
index 7140b511c4..d857d2adcf 100644
--- a/src/app/src/main/kotlin/org/imperial/mrc/hint/models/Response.kt
+++ b/src/app/src/main/kotlin/org/imperial/mrc/hint/models/Response.kt
@@ -3,7 +3,7 @@ package org.imperial.mrc.hint.models
 import com.fasterxml.jackson.databind.ObjectMapper
 
 data class SuccessResponse(val data: Any?){
-    val errors = mapOf<Any, Any>()
+    val errors = arrayOf<Any>()
     val status = "success"
 }
 
diff --git a/src/app/src/test/kotlin/org/imperial/mrc/hint/helpers/JSONValidator.kt b/src/app/src/test/kotlin/org/imperial/mrc/hint/helpers/JSONValidator.kt
index 3a0c0a881c..638abdf985 100644
--- a/src/app/src/test/kotlin/org/imperial/mrc/hint/helpers/JSONValidator.kt
+++ b/src/app/src/test/kotlin/org/imperial/mrc/hint/helpers/JSONValidator.kt
@@ -13,6 +13,9 @@ import java.io.File
 import java.net.URI
 import java.net.URL
 import javax.json.stream.JsonParsingException
+import java.io.InputStreamReader
+import java.io.BufferedReader
+import java.net.HttpURLConnection
 
 
 class JSONValidator {
@@ -72,7 +75,9 @@ class JSONValidator {
             "$name.schema.json"
         }
         val url = URL("https://raw.githubusercontent.com/mrc-ide/hintr/$hintrVersion/inst/schema/$path")
-        return url.openStream().use {
+
+        val conn = url.openConnection() as HttpURLConnection
+        return BufferedReader(InputStreamReader(conn.getInputStream())).use {
             val reader = readerFactory.createSchemaReader(it)
             try {
                 reader.read()
diff --git a/src/app/src/test/kotlin/org/imperial/mrc/hint/integration/BaselineTests.kt b/src/app/src/test/kotlin/org/imperial/mrc/hint/integration/BaselineTests.kt
index cf6431004c..03dab4df8a 100644
--- a/src/app/src/test/kotlin/org/imperial/mrc/hint/integration/BaselineTests.kt
+++ b/src/app/src/test/kotlin/org/imperial/mrc/hint/integration/BaselineTests.kt
@@ -17,7 +17,7 @@ class BaselineTests : SecureIntegrationTests() {
         if (isAuthorized == IsAuthorized.TRUE){
             // we can't use the JSONValidator here because this response schema isn't in the spec yet
             assertThat(responseEntity.body!!)
-                    .isEqualTo("{\"errors\":{},\"status\":\"success\",\"data\":{\"pjnz\":null}}")
+                    .isEqualTo("{\"errors\":[],\"status\":\"success\",\"data\":{\"pjnz\":null}}")
         }
     }
 
diff --git a/src/app/src/test/kotlin/org/imperial/mrc/hint/integration/HintApplicationTests.kt b/src/app/src/test/kotlin/org/imperial/mrc/hint/integration/HintApplicationTests.kt
index c2f7061ca5..eee3213a9b 100644
--- a/src/app/src/test/kotlin/org/imperial/mrc/hint/integration/HintApplicationTests.kt
+++ b/src/app/src/test/kotlin/org/imperial/mrc/hint/integration/HintApplicationTests.kt
@@ -75,7 +75,7 @@ class HintApplicationTests(@Autowired val restTemplate: TestRestTemplate) : Inte
         val entity = restTemplate.getForEntity<String>("/baseline/")
 
         assertThat(entity.statusCode).isEqualTo(HttpStatus.OK)
-        assertThat(entity.body!!).isEqualTo("{\"errors\":{},\"status\":\"success\",\"data\":{\"pjnz\":null}}")
+        assertThat(entity.body!!).isEqualTo("{\"errors\":[],\"status\":\"success\",\"data\":{\"pjnz\":null}}")
     }
 
     @Test
diff --git a/src/app/src/test/kotlin/org/imperial/mrc/hint/integration/PasswordTests.kt b/src/app/src/test/kotlin/org/imperial/mrc/hint/integration/PasswordTests.kt
index 3c46ef6c10..d12c49fc69 100644
--- a/src/app/src/test/kotlin/org/imperial/mrc/hint/integration/PasswordTests.kt
+++ b/src/app/src/test/kotlin/org/imperial/mrc/hint/integration/PasswordTests.kt
@@ -28,7 +28,7 @@ class PasswordTests(@Autowired val restTemplate: TestRestTemplate) : CleanDataba
         }
     }
 
-    private val expectedSuccessResponse = "{\"errors\":{},\"status\":\"success\",\"data\":true}"
+    private val expectedSuccessResponse = "{\"errors\":[],\"status\":\"success\",\"data\":true}"
 
     private fun expectedErrorResponse(errorMessage: String): String {
         return "{\"data\":{},\"status\":\"failure\",\"errors\":[{\"error\":\"OTHER_ERROR\",\"detail\":\"$errorMessage\"}]}"
diff --git a/src/app/src/test/kotlin/org/imperial/mrc/hint/unit/controllers/PasswordControllerTests.kt b/src/app/src/test/kotlin/org/imperial/mrc/hint/unit/controllers/PasswordControllerTests.kt
index 1046add7d6..5f8db56c86 100644
--- a/src/app/src/test/kotlin/org/imperial/mrc/hint/unit/controllers/PasswordControllerTests.kt
+++ b/src/app/src/test/kotlin/org/imperial/mrc/hint/unit/controllers/PasswordControllerTests.kt
@@ -30,7 +30,7 @@ class PasswordControllerTests {
 
     val mockEmailManager = mock<EmailManager>()
 
-    val expectedSuccessResponse = "{\"errors\":{},\"status\":\"success\",\"data\":true}"
+    val expectedSuccessResponse = "{\"errors\":[],\"status\":\"success\",\"data\":true}"
 
     @Test
     fun `forgotPassword returns expected template name`() {
diff --git a/src/app/static/package-lock.json b/src/app/static/package-lock.json
index 3d1bd68724..b46f42d9c8 100644
--- a/src/app/static/package-lock.json
+++ b/src/app/static/package-lock.json
@@ -14,27 +14,83 @@
       }
     },
     "@babel/core": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.4.tgz",
-      "integrity": "sha512-lQgGX3FPRgbz2SKmhMtYgJvVzGZrmjaF4apZ2bLwofAKiSjxU0drPh4S/VasyYXwaTs+A1gvQ45BN8SQJzHsQQ==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
+      "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/generator": "^7.4.4",
-        "@babel/helpers": "^7.4.4",
-        "@babel/parser": "^7.4.4",
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.5.5",
+        "@babel/helpers": "^7.5.5",
+        "@babel/parser": "^7.5.5",
         "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.4.4",
-        "@babel/types": "^7.4.4",
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5",
         "convert-source-map": "^1.1.0",
         "debug": "^4.1.0",
         "json5": "^2.1.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.13",
         "resolve": "^1.3.2",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
       },
       "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+          "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.0.0"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz",
+          "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.5.5",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.13",
+            "source-map": "^0.5.0",
+            "trim-right": "^1.0.1"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz",
+          "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz",
+          "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.5.5",
+            "@babel/generator": "^7.5.5",
+            "@babel/helper-function-name": "^7.1.0",
+            "@babel/helper-split-export-declaration": "^7.4.4",
+            "@babel/parser": "^7.5.5",
+            "@babel/types": "^7.5.5",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.13"
+          }
+        },
+        "@babel/types": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz",
+          "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -54,9 +110,9 @@
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
@@ -267,14 +323,87 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.4.tgz",
-      "integrity": "sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz",
+      "integrity": "sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.4.4",
-        "@babel/types": "^7.4.4"
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+          "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.0.0"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz",
+          "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.5.5",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.13",
+            "source-map": "^0.5.0",
+            "trim-right": "^1.0.1"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz",
+          "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz",
+          "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.5.5",
+            "@babel/generator": "^7.5.5",
+            "@babel/helper-function-name": "^7.1.0",
+            "@babel/helper-split-export-declaration": "^7.4.4",
+            "@babel/parser": "^7.5.5",
+            "@babel/types": "^7.5.5",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.13"
+          }
+        },
+        "@babel/types": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz",
+          "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "@babel/highlight": {
@@ -4094,8 +4223,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4116,14 +4244,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4138,20 +4264,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4268,8 +4391,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4281,7 +4403,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4296,7 +4417,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4304,14 +4424,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -4330,7 +4448,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4411,8 +4528,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4424,7 +4540,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4510,8 +4625,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4547,7 +4661,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4567,7 +4680,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4611,14 +4723,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
diff --git a/src/app/static/package.json b/src/app/static/package.json
index b3cfe092d0..f12f8b8262 100644
--- a/src/app/static/package.json
+++ b/src/app/static/package.json
@@ -13,7 +13,7 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "^7.3.4",
+    "@babel/core": "^7.5.5",
     "@babel/polyfill": "^7.4.4",
     "@babel/preset-env": "^7.3.4",
     "@babel/register": "^7.0.0",
diff --git a/src/app/static/scripts/run-dependencies-for-integration-tests.sh b/src/app/static/scripts/run-dependencies-for-integration-tests.sh
index 731b2bf346..3e2af4c313 100755
--- a/src/app/static/scripts/run-dependencies-for-integration-tests.sh
+++ b/src/app/static/scripts/run-dependencies-for-integration-tests.sh
@@ -5,7 +5,7 @@ HERE=$(readlink -f "$(dirname $0)")
 NETWORK=hint_nw
 HINT=hint
 $HERE/../../../../scripts/run-dependencies.sh
-HINT_VERSION=mrc-433_integrationtests
+HINT_VERSION=master
 TEST_CONFIG=$HERE/test.properties
 HINT_IMAGE=mrcide/$HINT:$HINT_VERSION
 
diff --git a/src/app/static/scripts/run-dev-dependencies-for-integration-tests.sh b/src/app/static/scripts/run-dev-dependencies-for-integration-tests.sh
index 670ba06b64..53924298c8 100755
--- a/src/app/static/scripts/run-dev-dependencies-for-integration-tests.sh
+++ b/src/app/static/scripts/run-dev-dependencies-for-integration-tests.sh
@@ -7,7 +7,7 @@ HINT=hint
 DB=hint_db
 API=hintr
 $HERE/../../../../scripts/run-dependencies.sh
-HINT_VERSION=mrc-433_integrationtests
+HINT_VERSION=master
 TEST_CONFIG=$HERE/test.properties
 HINT_IMAGE=mrcide/$HINT:$HINT_VERSION
 
diff --git a/src/app/static/src/app/apiService.ts b/src/app/static/src/app/apiService.ts
index 7b6398b34e..e5b71b0c83 100644
--- a/src/app/static/src/app/apiService.ts
+++ b/src/app/static/src/app/apiService.ts
@@ -1,6 +1,6 @@
 import axios, {AxiosError, AxiosResponse} from "axios";
 import {InternalResponse} from "./types";
-import {Failure, InitialiseModelRunResponse, ModelRunResultResponse, Success, ValidateInputResponse} from "./generated";
+import {Response, InitialiseModelRunResponse, ModelRunResultResponse, ValidateInputResponse} from "./generated";
 import {Commit} from "vuex";
 
 type ResponseData =
@@ -39,17 +39,17 @@ export class APIService<S extends string, E extends string> implements API<S, E>
 
     private _ignoreErrors: Boolean = false;
 
-    static getFirstErrorFromFailure = (failure: Failure) => {
+    static getFirstErrorFromFailure = (failure: Response) => {
         const firstError = failure.errors[0];
         return firstError.detail ? firstError.detail : firstError.error;
     };
 
-    private _onError: ((failure: Failure) => void) | null = null;
+    private _onError: ((failure: Response) => void) | null = null;
 
-    private _onSuccess: ((success: Success) => void) | null = null;
+    private _onSuccess: ((success: Response) => void) | null = null;
 
     withError = (type: E) => {
-        this._onError = (failure: Failure) => {
+        this._onError = (failure: Response) => {
             this._commit({type: type, payload: APIService.getFirstErrorFromFailure(failure)});
         };
         return this
@@ -61,7 +61,7 @@ export class APIService<S extends string, E extends string> implements API<S, E>
     };
 
     withSuccess = (type: S) => {
-        this._onSuccess = (success: Success) => {
+        this._onSuccess = (success: Response) => {
             this._commit({type: type, payload: success.data});
         };
         return this;
@@ -84,7 +84,7 @@ export class APIService<S extends string, E extends string> implements API<S, E>
         if (this._ignoreErrors) {
             return
         }
-        const failure = e.response && e.response.data as Failure;
+        const failure = e.response && e.response.data as Response;
         if (!failure || !failure.status) {
             throw new Error("Could not parse API response");
         }
diff --git a/src/app/static/src/app/components/Stepper.vue b/src/app/static/src/app/components/Stepper.vue
index f914d294b2..37ff52d12c 100644
--- a/src/app/static/src/app/components/Stepper.vue
+++ b/src/app/static/src/app/components/Stepper.vue
@@ -33,7 +33,7 @@
 <script lang="ts">
 
     import Vue from "vue";
-    import {mapState} from "vuex";
+    import {mapGetters, mapState} from "vuex";
     import Step from "./Step.vue";
     import Baseline from "./baseline/Baseline.vue";
     import SurveyAndProgram from "./surveyAndProgram/SurveyAndProgram.vue";
@@ -76,15 +76,21 @@
             }
         },
         computed: {
-            ...mapState<RootState>({
-                complete: (state: RootState): CompleteStatus => ({
-                    1: state.baseline.complete,
-                    2: state.surveyAndProgram.complete,
+            baselineComplete: function() {
+              return this.$store.getters['baseline/complete']
+            },
+            surveyAndProgramComplete: function() {
+                return this.$store.getters['surveyAndProgram/complete']
+            },
+            complete: function(): CompleteStatus {
+                return {
+                    1: this.baselineComplete,
+                    2: this.surveyAndProgramComplete,
                     3: false,
                     4: false,
                     5: false
-                }),
-            })
+                }
+            }
         },
         methods: {
             jump(num: number) {
@@ -99,7 +105,7 @@
                     .length >= num - 1
             },
             next() {
-                if (this.complete[this.activeStep]) {
+               if (this.complete[this.activeStep]) {
                     this.activeStep = this.activeStep + 1;
                 }
             }
diff --git a/src/app/static/src/app/components/surveyAndProgram/SurveyAndProgram.vue b/src/app/static/src/app/components/surveyAndProgram/SurveyAndProgram.vue
index 5cea0ac3c9..18254bbb67 100644
--- a/src/app/static/src/app/components/surveyAndProgram/SurveyAndProgram.vue
+++ b/src/app/static/src/app/components/surveyAndProgram/SurveyAndProgram.vue
@@ -24,6 +24,14 @@
                                  accept="csv,.csv"
                                  name="program">
                     </file-upload>
+                    <file-upload label="ANC"
+                                 :valid="hasANC"
+                                 :error="ancError"
+                                 :upload="uploadANC"
+                                 :existingFileName="ancFileName"
+                                 accept="csv,.csv"
+                                 name="anc">
+                    </file-upload>
                 </form>
             </div>
         </div>
@@ -45,14 +53,20 @@
             hasSurvey: state => state.survey != null,
             surveyError: state => state.surveyError,
             surveyFileName: state => state.survey && state.survey.filename,
+
             hasProgram: state => state.program != null,
             programError: state => state.programError,
-            programFileName: state => state.program && state.program.filename
+            programFileName: state => state.program && state.program.filename,
+
+            hasANC: state => state.anc != null,
+            ancError: state => state.ancError,
+            ancFileName: state => state.anc && state.anc.filename
         }),
         methods: {
             ...mapActions({
                 uploadSurvey: 'surveyAndProgram/uploadSurvey',
-                uploadProgram: 'surveyAndProgram/uploadProgram'
+                uploadProgram: 'surveyAndProgram/uploadProgram',
+                uploadANC: 'surveyAndProgram/uploadANC'
             })
         },
         components: {
diff --git a/src/app/static/src/app/generated.d.ts b/src/app/static/src/app/generated.d.ts
index 4d6cf058ef..ab0e3bd9be 100644
--- a/src/app/static/src/app/generated.d.ts
+++ b/src/app/static/src/app/generated.d.ts
@@ -4,14 +4,19 @@
   * Instead, modify the hintr JSON schema files
   * and run ./generate-types.sh to regenerate this file.
 */
+export type AncResponseData = {
+  iso3: string;
+  area_id: string;
+  [k: string]: any;
+}[];
 export interface Data {
   placeholder?: boolean;
 }
+export type ErrorCode = string;
 export interface Error {
-  error?: "INVALID_FILE" | "FAILED_TO_QUEUE" | "INVALID_PJNZ" | "OTHER_ERROR" | "FAILED_TO_CHECK_STATUS";
+  error?: string;
   detail?: string | null;
 }
-export type ErrorTypes = "INVALID_FILE" | "FAILED_TO_QUEUE" | "INVALID_PJNZ" | "OTHER_ERROR" | "FAILED_TO_CHECK_STATUS";
 export type FileName = string;
 export type FilePath = string | null;
 export interface InitialiseModelRunRequest {
@@ -93,92 +98,18 @@ export interface PjnzResponseData {
   country: string;
 }
 export type PopulationResponseData = null;
-export type Response = Success | Failure;
-
-export interface Success {
-  status: "success";
-  data:
-    | (
-        | {
-            filename: string;
-            type: "pjnz";
-            data: {
-              country: string;
-            };
-          }
-        | {
-            filename: string;
-            type: "shape";
-            data: GeoJSONObject;
-          }
-        | {
-            filename: string;
-            type: "population";
-            data: null;
-          })
-    | {
-        processId: string;
-      }
-    | (
-        | {
-            processId: string;
-            complete: false;
-            progress: number;
-            timeRemaining: number;
-          }
-        | {
-            processId: string;
-            complete: true;
-            result: {
-              plhiv: {
-                placeholder?: boolean;
-              };
-              prevalence: {
-                placeholder?: boolean;
-              };
-              art: {
-                placeholder?: boolean;
-              };
-              incidence: {
-                placeholder?: boolean;
-              };
-            };
-          });
+export type ProgrammeResponseData = {
+  iso3: string;
+  area_id: string;
+  [k: string]: any;
+}[];
+export interface Response {
+  status: "success" | "failure";
+  data: any;
   errors: {
-    [k: string]: any;
-  };
-}
-/**
- * TODO: Validate against a URL e.g. https://geojson.org/schema/FeatureCollection.json
- */
-export interface GeoJSONObject {
-  type: "FeatureCollection";
-  crs?: {
-    [k: string]: any;
-  };
-  name?: {
-    [k: string]: any;
-  };
-  features: {
-    [k: string]: any;
+    error?: string;
+    detail?: string | null;
   }[];
-  [k: string]: any;
-}
-export interface Failure {
-  status: "failure";
-  data: {
-    [k: string]: any;
-  };
-  errors: [
-    {
-      error?: "INVALID_FILE" | "FAILED_TO_QUEUE" | "INVALID_PJNZ" | "OTHER_ERROR" | "FAILED_TO_CHECK_STATUS";
-      detail?: string | null;
-    },
-    ...({
-      error?: "INVALID_FILE" | "FAILED_TO_QUEUE" | "INVALID_PJNZ" | "OTHER_ERROR" | "FAILED_TO_CHECK_STATUS";
-      detail?: string | null;
-    })[]
-  ];
 }
 /**
  * TODO: Validate against a URL e.g. https://geojson.org/schema/FeatureCollection.json
@@ -201,7 +132,7 @@ export interface ValidateInputRequest {
   type: "pjnz" | "shape" | "population" | "survey" | "programme" | "anc";
   path: string | null;
 }
-export type ValidateInputResponse = PjnzResponse | ShapeResponse | PopulationResponse;
+export type ValidateInputResponse = PjnzResponse | ShapeResponse | PopulationResponse | ProgrammeResponse | AncResponse;
 
 export interface PjnzResponse {
   filename: string;
@@ -236,3 +167,21 @@ export interface PopulationResponse {
   type: "population";
   data: null;
 }
+export interface ProgrammeResponse {
+  filename: string;
+  type: "programme";
+  data: {
+    iso3: string;
+    area_id: string;
+    [k: string]: any;
+  }[];
+}
+export interface AncResponse {
+  filename: string;
+  type: "anc";
+  data: {
+    iso3: string;
+    area_id: string;
+    [k: string]: any;
+  }[];
+}
diff --git a/src/app/static/src/app/main.ts b/src/app/static/src/app/main.ts
index a1d135a4db..512640b538 100644
--- a/src/app/static/src/app/main.ts
+++ b/src/app/static/src/app/main.ts
@@ -13,8 +13,8 @@ export interface RootState {
     surveyAndProgram: SurveyAndProgramDataState
 }
 
-export interface StepState {
-    complete: boolean
+export interface StepGetters {
+   complete: boolean
 }
 
 Vue.use(Vuex);
diff --git a/src/app/static/src/app/store/baseline/baseline.ts b/src/app/static/src/app/store/baseline/baseline.ts
index 8028a8b630..2e0be428ac 100644
--- a/src/app/static/src/app/store/baseline/baseline.ts
+++ b/src/app/static/src/app/store/baseline/baseline.ts
@@ -1,20 +1,24 @@
 import { Module } from 'vuex';
 import {actions} from './actions';
 import { mutations } from './mutations';
-import {StepState, RootState} from "../../main";
+import {RootState} from "../../main";
 
-export interface BaselineState extends StepState {
+export interface BaselineState {
     pjnzError: string
     country: string
-    complete: boolean,
     pjnzFilename: string
 }
 
 export const initialBaselineState: BaselineState = {
     country: "",
     pjnzError: "",
-    pjnzFilename: "",
-    complete: false
+    pjnzFilename: ""
+};
+
+export const baselineGetters = {
+  complete: (state: BaselineState) => {
+      return !!state.country
+  }
 };
 
 const namespaced: boolean = true;
@@ -22,7 +26,7 @@ const namespaced: boolean = true;
 export const baseline: Module<BaselineState, RootState> = {
     namespaced,
     state: initialBaselineState,
-    getters: {},
+    getters: baselineGetters,
     actions,
     mutations
 };
diff --git a/src/app/static/src/app/store/baseline/mutations.ts b/src/app/static/src/app/store/baseline/mutations.ts
index c5f0bc2443..b49c9a49f1 100644
--- a/src/app/static/src/app/store/baseline/mutations.ts
+++ b/src/app/static/src/app/store/baseline/mutations.ts
@@ -16,9 +16,6 @@ export const mutations: MutationTree<BaselineState> & BaselineMutations = {
         state.pjnzError = "";
         state.pjnzFilename = action.payload.filename;
         state.country = action.payload.data.country;
-        // TODO this step isn't really complete until all files are uploaded
-        // but for now lets say it is
-        state.complete = true;
     },
 
     PJNZUploadError(state: BaselineState, action: PayloadWithType<string>) {
@@ -30,9 +27,6 @@ export const mutations: MutationTree<BaselineState> & BaselineMutations = {
         if (data.pjnz){
             state.country = data.pjnz.data.country;
             state.pjnzFilename = data.pjnz.filename;
-            // TODO this step isn't really complete until all files are uploaded
-            // but for now lets say it is
-            state.complete = true;
          }
     }
 };
diff --git a/src/app/static/src/app/store/surveyAndProgram/actions.ts b/src/app/static/src/app/store/surveyAndProgram/actions.ts
index e024186f3e..9f726099b6 100644
--- a/src/app/static/src/app/store/surveyAndProgram/actions.ts
+++ b/src/app/static/src/app/store/surveyAndProgram/actions.ts
@@ -4,12 +4,13 @@ import {SurveyAndProgramDataState} from "./surveyAndProgram";
 import {api} from "../../apiService";
 import {ProgramResponse, SurveyResponse} from "../../types";
 
-export type SurveyAndProgramActionTypes = "SurveyLoaded" | "ProgramLoaded"
-export type SurveyAndProgramActionErrorTypes = "SurveyError" | "ProgramError"
+export type SurveyAndProgramActionTypes = "SurveyLoaded" | "ProgramLoaded" | "ANCLoaded"
+export type SurveyAndProgramActionErrorTypes = "SurveyError" | "ProgramError" | "ANCError"
 
 export interface SurveyAndProgramActions {
     uploadSurvey: (store: ActionContext<SurveyAndProgramDataState, RootState>, formData: FormData) => void,
-    uploadProgram: (store: ActionContext<SurveyAndProgramDataState, RootState>, formData: FormData) => void
+    uploadProgram: (store: ActionContext<SurveyAndProgramDataState, RootState>, formData: FormData) => void,
+    uploadANC: (store: ActionContext<SurveyAndProgramDataState, RootState>, formData: FormData) => void
 }
 
 export const actions: ActionTree<SurveyAndProgramDataState, RootState> & SurveyAndProgramActions = {
@@ -26,6 +27,12 @@ export const actions: ActionTree<SurveyAndProgramDataState, RootState> & SurveyA
             .withError("ProgramError")
             .withSuccess("ProgramLoaded")
             .postAndReturn<ProgramResponse>("/disease/program/", formData);
-    }
+    },
 
+    async uploadANC({commit}, formData) {
+        await api<SurveyAndProgramActionTypes, SurveyAndProgramActionErrorTypes>(commit)
+            .withError("ANCError")
+            .withSuccess("ANCLoaded")
+            .postAndReturn<ProgramResponse>("/disease/anc/", formData);
+    }
 };
diff --git a/src/app/static/src/app/store/surveyAndProgram/mutations.ts b/src/app/static/src/app/store/surveyAndProgram/mutations.ts
index 96a1b226bc..b2ecfce92b 100644
--- a/src/app/static/src/app/store/surveyAndProgram/mutations.ts
+++ b/src/app/static/src/app/store/surveyAndProgram/mutations.ts
@@ -1,6 +1,6 @@
 import {Mutation, MutationTree} from 'vuex';
 import {SurveyAndProgramDataState} from "./surveyAndProgram";
-import {PayloadWithType, ProgramResponse, SurveyResponse} from "../../types";
+import {PayloadWithType, ProgramResponse, SurveyResponse, ANCResponse} from "../../types";
 
 type SurveyAndProgramMutation = Mutation<SurveyAndProgramDataState>
 
@@ -8,7 +8,9 @@ export interface SurveyAndProgramMutations {
     SurveyLoaded: SurveyAndProgramMutation
     SurveyError: SurveyAndProgramMutation,
     ProgramLoaded: SurveyAndProgramMutation
-    ProgramError: SurveyAndProgramMutation
+    ProgramError: SurveyAndProgramMutation,
+    ANCLoaded: SurveyAndProgramMutation
+    ANCError: SurveyAndProgramMutation
 }
 
 export const mutations: MutationTree<SurveyAndProgramDataState> & SurveyAndProgramMutations = {
@@ -26,5 +28,13 @@ export const mutations: MutationTree<SurveyAndProgramDataState> & SurveyAndProgr
 
     ProgramError(state: SurveyAndProgramDataState, action: PayloadWithType<string>) {
         state.programError = action.payload;
+    },
+
+    ANCLoaded(state: SurveyAndProgramDataState, action: PayloadWithType<ANCResponse>) {
+        state.anc = action.payload;
+    },
+
+    ANCError(state: SurveyAndProgramDataState, action: PayloadWithType<string>) {
+        state.ancError = action.payload;
     }
 };
diff --git a/src/app/static/src/app/store/surveyAndProgram/surveyAndProgram.ts b/src/app/static/src/app/store/surveyAndProgram/surveyAndProgram.ts
index fdf4ba9169..2da6be0ffa 100644
--- a/src/app/static/src/app/store/surveyAndProgram/surveyAndProgram.ts
+++ b/src/app/static/src/app/store/surveyAndProgram/surveyAndProgram.ts
@@ -1,14 +1,16 @@
 import { Module } from 'vuex';
 import { actions } from './actions';
 import { mutations } from './mutations';
-import {RootState, StepState} from "../../main";
-import {ProgramResponse, SurveyResponse} from "../../types";
+import {RootState} from "../../main";
+import {ProgramResponse, SurveyResponse, ANCResponse} from "../../types";
 
-export interface SurveyAndProgramDataState extends StepState {
+export interface SurveyAndProgramDataState {
     survey: SurveyResponse | null
     surveyError: string,
     program: ProgramResponse | null
     programError: string
+    anc: ANCResponse | null
+    ancError: string
 }
 
 export const initialSurveyAndProgramDataState: SurveyAndProgramDataState = {
@@ -16,7 +18,14 @@ export const initialSurveyAndProgramDataState: SurveyAndProgramDataState = {
     surveyError: "",
     program: null,
     programError: "",
-    complete: false
+    anc: null,
+    ancError: ""
+};
+
+export const surveyAndProgramGetters = {
+    complete: (state: SurveyAndProgramDataState) => {
+        return !!state.survey && !!state.program && !!state.anc
+    }
 };
 
 const namespaced: boolean = true;
@@ -24,7 +33,7 @@ const namespaced: boolean = true;
 export const surveyAndProgram: Module<SurveyAndProgramDataState, RootState> = {
     namespaced,
     state: initialSurveyAndProgramDataState,
-    getters: {},
+    getters: surveyAndProgramGetters,
     actions,
     mutations
 };
diff --git a/src/app/static/src/app/types.ts b/src/app/static/src/app/types.ts
index 3e0505b78d..f9b1dd416d 100644
--- a/src/app/static/src/app/types.ts
+++ b/src/app/static/src/app/types.ts
@@ -22,3 +22,9 @@ export interface ProgramResponse {
     type: "program";
     data: string;
 }
+
+export interface ANCResponse {
+    filename: string;
+    type: "anc";
+    data: string;
+}
diff --git a/src/app/static/src/tests/baseline/mutations.test.ts b/src/app/static/src/tests/baseline/mutations.test.ts
index c0591a8a44..d6c6bab685 100644
--- a/src/app/static/src/tests/baseline/mutations.test.ts
+++ b/src/app/static/src/tests/baseline/mutations.test.ts
@@ -1,6 +1,10 @@
 import {mutations} from "../../app/store/baseline/mutations";
-import {initialBaselineState} from "../../app/store/baseline/baseline";
+import {baseline, baselineGetters, BaselineState, initialBaselineState} from "../../app/store/baseline/baseline";
 import {mockBaselineResponse, mockPJNZResponse} from "../mocks";
+import {initialSurveyAndProgramDataState} from "../../app/store/surveyAndProgram/surveyAndProgram";
+import {Module} from "vuex";
+import {RootState} from "../../app/main";
+import {actions} from "../../app/store/baseline/actions";
 
 describe("Baseline mutations", () => {
 
@@ -16,11 +20,22 @@ describe("Baseline mutations", () => {
         expect(testState.pjnzError).toBe("");
     });
 
-    it("sets state complete once pjnz is uploaded", () => {
+    it("state becomes complete once pjnz is uploaded", () => {
+        const testStore: Module<BaselineState, RootState> = {
+            state: {...initialBaselineState},
+            getters: baselineGetters
+        };
+        const testState = testStore.state as BaselineState;
+        const testRootState = {
+            version: "",
+            baseline: testState,
+            surveyAndProgram: {...initialSurveyAndProgramDataState}
+        };
+        const complete = testStore.getters!!.complete;
 
-        const testState = {...initialBaselineState};
         mutations.PJNZUploaded(testState, {payload: mockPJNZResponse({data: {country: "Malawi"}}), type: "PJNZLoaded"});
-        expect(testState.complete).toBe(true);
+
+        expect(complete(testState, null, testRootState, null)).toBe(true);
     });
 
     it("sets error on PJNZUploadError", () => {
diff --git a/src/app/static/src/tests/components/stepper.test.ts b/src/app/static/src/tests/components/stepper.test.ts
index f56bdece59..e093cc9dc5 100644
--- a/src/app/static/src/tests/components/stepper.test.ts
+++ b/src/app/static/src/tests/components/stepper.test.ts
@@ -1,17 +1,17 @@
 import {createLocalVue, shallowMount} from '@vue/test-utils';
 import Vue from 'vue';
 import Vuex from 'vuex';
-import {BaselineState} from "../../app/store/baseline/baseline";
+import {baselineGetters, BaselineState} from "../../app/store/baseline/baseline";
 import Stepper from "../../app/components/Stepper.vue";
 import Step from "../../app/components/Step.vue";
 import {mockBaselineState, mockSurveyAndProgramState} from "../mocks";
-import {SurveyAndProgramDataState} from "../../app/store/surveyAndProgram/surveyAndProgram";
+import {SurveyAndProgramDataState, surveyAndProgramGetters} from "../../app/store/surveyAndProgram/surveyAndProgram";
+import { mutations } from '../../app/store/baseline/mutations';
 
 const localVue = createLocalVue();
 Vue.use(Vuex);
 
 describe("Stepper component", () => {
-
     const createSut = (baselineState?: Partial<BaselineState>,
                        surveyAndProgramState?: Partial<SurveyAndProgramDataState>) => {
 
@@ -19,11 +19,14 @@ describe("Stepper component", () => {
             modules: {
                 baseline: {
                     namespaced: true,
-                    state: mockBaselineState(baselineState)
+                    state: mockBaselineState(baselineState),
+                    getters: baselineGetters,
+                    mutations
                 },
                 surveyAndProgram: {
                     namespaced: true,
-                    state: mockSurveyAndProgramState(surveyAndProgramState)
+                    state: mockSurveyAndProgramState(surveyAndProgramState),
+                    getters: surveyAndProgramGetters
                 }
             }
         })
@@ -70,7 +73,7 @@ describe("Stepper component", () => {
     });
 
     it("upload survey step is enabled when baseline step is complete", () => {
-        const store = createSut({complete: true});
+        const store = createSut({ country: "testCountry" } );
         const wrapper = shallowMount(Stepper, {store, localVue});
         const steps = wrapper.findAll(Step);
         expect(steps.at(0).props().enabled).toBe(true);
@@ -80,7 +83,7 @@ describe("Stepper component", () => {
     });
 
     it("updates active step when jump event is emitted", () => {
-        const store = createSut({complete: true});
+        const store = createSut({ country: "testCountry" });
         const wrapper = shallowMount(Stepper, {store, localVue});
         const steps = wrapper.findAll(Step);
         steps.at(1).vm.$emit("jump", 2);
@@ -89,7 +92,7 @@ describe("Stepper component", () => {
     });
 
     it("cannot continue when the active step is not complete", () => {
-        const store = createSut({complete: false});
+        const store = createSut({ country: ""});
         const wrapper = shallowMount(Stepper, {store, localVue});
         const continueLink = wrapper.find("#continue");
         expect(continueLink.classes()).toContain("disabled");
@@ -101,7 +104,7 @@ describe("Stepper component", () => {
 
 
     it("can continue when the active step is complete", () => {
-        const store = createSut({complete: true});
+        const store = createSut({ country: "testCountry" });
         const wrapper = shallowMount(Stepper, {store, localVue});
         const continueLink = wrapper.find("#continue");
         expect(continueLink.classes()).not.toContain("disabled");
@@ -111,4 +114,23 @@ describe("Stepper component", () => {
         expect(steps.at(1).props().active).toBe(true);
     });
 
+    it("updates from completed state when active step data is populated", (done) => {
+        const baselineState = { country: ""};
+        const store = createSut(baselineState);
+        const wrapper = shallowMount(Stepper, {store, localVue});
+        const continueLink = wrapper.find("#continue");
+        expect(continueLink.classes()).toContain("disabled");
+
+        //invoke the mutation
+        store.commit("baseline/PJNZUploaded", {
+            "type": "PJNZUploaded",
+            "payload": {"filename": "fn", "data": {"country": "testCountry", }}
+        });
+
+        Vue.nextTick().then( () => {
+            expect(wrapper.find("#continue").classes()).not.toContain("disabled");
+            done();
+        });
+    });
+
 });
\ No newline at end of file
diff --git a/src/app/static/src/tests/components/surveyAndProgram/fileUploads.ts b/src/app/static/src/tests/components/surveyAndProgram/fileUploads.ts
index 9c4c1ec5d8..5ddb84a630 100644
--- a/src/app/static/src/tests/components/surveyAndProgram/fileUploads.ts
+++ b/src/app/static/src/tests/components/surveyAndProgram/fileUploads.ts
@@ -10,77 +10,113 @@ import {mockSurveyAndProgramState} from "../../mocks";
 
 export function testUploadComponent(name: string, position: number) {
 
-        const localVue = createLocalVue();
-        Vue.use(Vuex);
+    const localVue = createLocalVue();
+    Vue.use(Vuex);
 
-        let actions: jest.Mocked<SurveyAndProgramActions>;
-        let mutations: jest.Mocked<SurveyAndProgramMutations>;
-        let expectedAction : any;
+    let actions: jest.Mocked<SurveyAndProgramActions>;
+    let mutations: jest.Mocked<SurveyAndProgramMutations>;
+    let expectedAction: any;
 
-        const createSut = (state?: Partial<SurveyAndProgramDataState>) => {
+    const createSut = (state?: Partial<SurveyAndProgramDataState>) => {
 
-            actions = {
-                uploadSurvey: jest.fn(),
-                uploadProgram: jest.fn()
-            };
-
-            expectedAction = name == "survey" ? actions.uploadSurvey : actions.uploadProgram;
-
-            return new Vuex.Store({
-                modules: {
-                    surveyAndProgram: {
-                        namespaced: true,
-                        state: mockSurveyAndProgramState(state),
-                        actions: {...actions},
-                        mutations: {...mutations}
-                    }
-                }
-            })
-        };
-
-        const errorState = name == "survey" ? {surveyError: "File upload went wrong"}
-            : {programError: "File upload went wrong"};
-
-        const response = {
-            filename: "filename.csv",
-            type: name as any,
-            data: "SOME DATA"
+        actions = {
+            uploadSurvey: jest.fn(),
+            uploadProgram: jest.fn(),
+            uploadANC: jest.fn()
         };
 
-        const successState = name == "survey" ? {
-            survey: response
-        } : {
-            program: response
-        };
-
-        it(`${name} upload is valid if data is present`, () => {
-            const store = createSut(successState);
-            const wrapper = shallowMount(SurveyAndProgram, {store, localVue});
-            expect(wrapper.findAll(FileUpload).at(position).props().valid).toBe(true);
-        });
-
-        it(`${name} upload is invalid if data is null`, () => {
-            const store = createSut();
-            const wrapper = shallowMount(SurveyAndProgram, {store, localVue});
-            expect(wrapper.findAll(FileUpload).at(position).props().valid).toBe(false);
-        });
-
-        it(`passes ${name} upload error to file upload`, () => {
-            const store = createSut(errorState);
-            const wrapper = shallowMount(SurveyAndProgram, {store, localVue});
-            expect(wrapper.findAll(FileUpload).at(position).props().error).toBe("File upload went wrong");
-        });
-
-        it(`upload ${name} dispatches surveyAndProgram/upload${name}`, (done) => {
-            const store = createSut();
-            const wrapper = shallowMount(SurveyAndProgram, {store, localVue});
-
-            wrapper.findAll(FileUpload).at(position).props().upload({name: "TEST"});
-            setTimeout(() => {
-                expect(expectedAction.mock.calls[0][1]).toStrictEqual({name: "TEST"});
-                done();
-            });
+        switch (name) {
+            case "survey":
+                expectedAction = actions.uploadSurvey;
+                break;
+            case "program":
+                expectedAction = actions.uploadProgram;
+                break;
+            case "anc":
+                expectedAction = actions.uploadANC;
+                break;
+        }
+
+        return new Vuex.Store({
+            modules: {
+                surveyAndProgram: {
+                    namespaced: true,
+                    state: mockSurveyAndProgramState(state),
+                    actions: {...actions},
+                    mutations: {...mutations}
+                }
+            }
+        })
+    };
+
+    let errorState: object;
+    switch (name) {
+        case "survey":
+            errorState = {surveyError: "File upload went wrong"};
+            break;
+        case "program":
+            errorState = {programError: "File upload went wrong"};
+            break;
+        case "anc":
+            errorState = {ancError: "File upload went wrong"};
+            break;
+    }
+
+    const response = {
+        filename: "filename.csv",
+        type: name as any,
+        data: "SOME DATA"
+    };
+
+
+    let successState: object;
+    switch (name) {
+        case "survey":
+            successState = {
+                survey: response
+            };
+            break;
+        case "program":
+            successState = {
+                program: response
+            };
+            break;
+        case "anc":
+            successState = {
+                anc: response
+            };
+            break;
+    }
+
+
+    it(`${name} upload is valid if data is present`, () => {
+        const store = createSut(successState);
+        const wrapper = shallowMount(SurveyAndProgram, {store, localVue});
+        expect(wrapper.findAll(FileUpload).at(position).props().valid).toBe(true);
+    });
+
+    it(`${name} upload is invalid if data is null`, () => {
+        const store = createSut();
+        const wrapper = shallowMount(SurveyAndProgram, {store, localVue});
+        expect(wrapper.findAll(FileUpload).at(position).props().valid).toBe(false);
+    });
+
+    it(`passes ${name} upload error to file upload`, () => {
+        const store = createSut(errorState);
+        const wrapper = shallowMount(SurveyAndProgram, {store, localVue});
+        expect(wrapper.findAll(FileUpload).at(position).props().error).toBe("File upload went wrong");
+    });
+
+    it(`upload ${name} dispatches surveyAndProgram/upload${name}`, (done) => {
+        const store = createSut();
+        const wrapper = shallowMount(SurveyAndProgram, {store, localVue});
+
+        wrapper.findAll(FileUpload).at(position).props().upload({name: "TEST"});
+        setTimeout(() => {
+            expect(expectedAction.mock.calls[0][1]).toStrictEqual({name: "TEST"});
+            done();
         });
+    });
 }
 
 
diff --git a/src/app/static/src/tests/components/surveyAndProgram/surveyAndProgram.test.ts b/src/app/static/src/tests/components/surveyAndProgram/surveyAndProgram.test.ts
index c09516e782..29a2a781d9 100644
--- a/src/app/static/src/tests/components/surveyAndProgram/surveyAndProgram.test.ts
+++ b/src/app/static/src/tests/components/surveyAndProgram/surveyAndProgram.test.ts
@@ -4,5 +4,6 @@ describe("Survey and program component", () => {
 
     testUploadComponent("survey", 0);
     testUploadComponent("program", 1);
+    testUploadComponent("anc", 2);
 });
 
diff --git a/src/app/static/src/tests/integration/surveyAndProgram.itest.ts b/src/app/static/src/tests/integration/surveyAndProgram.itest.ts
index 06368a2fd1..390e24ec54 100644
--- a/src/app/static/src/tests/integration/surveyAndProgram.itest.ts
+++ b/src/app/static/src/tests/integration/surveyAndProgram.itest.ts
@@ -45,4 +45,20 @@ describe("Survey and program actions", () => {
         });
     });
 
+    it("can upload anc", async () => {
+
+        const commit = jest.fn();
+
+        const file = fs.createReadStream("fakefile");
+        const formData = new FormData();
+        formData.append('file', file);
+
+        await actions.uploadANC({commit} as any, formData);
+
+        expect(commit.mock.calls[0][0]).toStrictEqual({
+            type: "ANCError",
+            payload: "cannot open the connection"
+        });
+    });
+
 });
diff --git a/src/app/static/src/tests/mocks.ts b/src/app/static/src/tests/mocks.ts
index 7b1b6844b3..ef5ccdec62 100644
--- a/src/app/static/src/tests/mocks.ts
+++ b/src/app/static/src/tests/mocks.ts
@@ -6,9 +6,8 @@ import {
     initialSurveyAndProgramDataState,
     SurveyAndProgramDataState
 } from "../app/store/surveyAndProgram/surveyAndProgram";
-import {Failure, PjnzResponse, ShapeResponse, Success} from "../app/generated";
+import {Response, PjnzResponse, ShapeResponse} from "../app/generated";
 import {BaselineData, ProgramResponse, SurveyResponse} from "../app/types";
-import {Point} from "geojson";
 
 export const mockAxios = new MockAdapter(axios);
 
@@ -47,7 +46,7 @@ export const mockFileList = (filename: string, type: string = "text/csv"): FileL
     return fileList;
 };
 
-export const mockSuccess = (data: any): Success => {
+export const mockSuccess = (data: any): Response => {
     return {
         data,
         status: "success",
@@ -55,7 +54,7 @@ export const mockSuccess = (data: any): Success => {
     }
 };
 
-export const mockFailure = (errorMessage: string): Failure => {
+export const mockFailure = (errorMessage: string): Response => {
     return {
         data: {},
         status: "failure",
diff --git a/src/app/static/src/tests/surveyAndProgram/actions.test.ts b/src/app/static/src/tests/surveyAndProgram/actions.test.ts
index e2db70ac8e..69b3056229 100644
--- a/src/app/static/src/tests/surveyAndProgram/actions.test.ts
+++ b/src/app/static/src/tests/surveyAndProgram/actions.test.ts
@@ -61,4 +61,32 @@ describe("Survey and program actions", () => {
         });
     });
 
+    it("sets data after anc file upload", async () => {
+
+        mockAxios.onPost(`/disease/anc/`)
+            .reply(200, mockSuccess("TEST"));
+
+        const commit = jest.fn();
+        await actions.uploadANC({commit} as any, new FormData());
+
+        expect(commit.mock.calls[0][0]).toStrictEqual({
+            type: "ANCLoaded",
+            payload: "TEST"
+        });
+    });
+
+    it("sets error message after failed anc upload", async () => {
+
+        mockAxios.onPost(`/disease/anc/`)
+            .reply(500, mockFailure("error message"));
+
+        const commit = jest.fn();
+        await actions.uploadANC({commit} as any, new FormData());
+
+        expect(commit.mock.calls[0][0]).toStrictEqual({
+            type: "ANCError",
+            payload: "error message"
+        });
+    });
+
 });
\ No newline at end of file
diff --git a/src/app/static/src/tests/surveyAndProgram/mutations.test.ts b/src/app/static/src/tests/surveyAndProgram/mutations.test.ts
index c7c7d3657d..0128061dfe 100644
--- a/src/app/static/src/tests/surveyAndProgram/mutations.test.ts
+++ b/src/app/static/src/tests/surveyAndProgram/mutations.test.ts
@@ -1,6 +1,13 @@
-import {initialSurveyAndProgramDataState} from "../../app/store/surveyAndProgram/surveyAndProgram";
+import {
+    initialSurveyAndProgramDataState,
+    surveyAndProgram,
+    SurveyAndProgramDataState, surveyAndProgramGetters
+} from "../../app/store/surveyAndProgram/surveyAndProgram";
 import {mutations} from "../../app/store/surveyAndProgram/mutations";
 import { mockSurveyResponse} from "../mocks";
+import {baselineGetters, BaselineState, initialBaselineState} from "../../app/store/baseline/baseline";
+import {Module} from "vuex";
+import {RootState} from "../../app/main";
 
 describe("Survey and program mutations", () => {
 
@@ -11,7 +18,7 @@ describe("Survey and program mutations", () => {
         })
     };
 
-    it("sets survey geoson and filename on SurveyLoaded", () => {
+    it("sets survey data and filename on SurveyLoaded", () => {
         const testState = {...initialSurveyAndProgramDataState};
         mutations.SurveyLoaded(testState, testPayload);
         expect(testState.survey!!.data).toBe("SOME DATA");
@@ -25,7 +32,7 @@ describe("Survey and program mutations", () => {
         expect(testState.surveyError).toBe("Some error");
     });
 
-    it("sets program geoson and filename on ProgramLoaded", () => {
+    it("sets program data and filename on ProgramLoaded", () => {
         const testState = {...initialSurveyAndProgramDataState};
         mutations.ProgramLoaded(testState, testPayload);
         expect(testState.program!!.data).toBe("SOME DATA");
@@ -39,4 +46,44 @@ describe("Survey and program mutations", () => {
         expect(testState.programError).toBe("Some error");
     });
 
+    it("sets anc data and filename on ANCLoaded", () => {
+        const testState = {...initialSurveyAndProgramDataState};
+        mutations.ANCLoaded(testState, testPayload);
+        expect(testState.anc!!.data).toBe("SOME DATA");
+        expect(testState.anc!!.filename).toBe("somefile.csv");
+        expect(testState.ancError).toBe("");
+    });
+
+    it("sets error on ANCError", () => {
+        const testState = {...initialSurveyAndProgramDataState};
+        mutations.ANCError(testState, {payload: "Some error"});
+        expect(testState.ancError).toBe("Some error");
+    });
+
+    it("finds complete is true after all files are uploaded", () => {
+        const testStore:  Module<SurveyAndProgramDataState, RootState> = {
+            state: {...initialSurveyAndProgramDataState},
+            getters: surveyAndProgramGetters
+        };
+        const testState = testStore.state as SurveyAndProgramDataState;
+        const testRootState = {
+            version: "",
+            baseline: {...initialBaselineState},
+            surveyAndProgram: testState
+        };
+        const complete = testStore.getters!!.complete;
+
+        expect(complete(testState, null, testRootState, null)).toBe(false);
+
+        mutations.SurveyLoaded(testState, testPayload);
+        expect(complete(testState, null, testRootState, null)).toBe(false);
+
+        mutations.ProgramLoaded(testState, testPayload);
+        expect(complete(testState, null, testRootState, null)).toBe(false);
+
+        mutations.ANCLoaded(testState, testPayload);
+        expect(complete(testState, null, testRootState, null)).toBe(true);
+
+    });
+
 });