diff --git a/.travis.yml b/.travis.yml
index 808792bbc2..0fea09be45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ before_script:
     - echo $B_NAME
 script:
   - npm run build
-  # - npm run test
+  - npm run test-headless
   # - npm run lint
 
  # - xvfb-run npm run e2e
@@ -51,33 +51,30 @@ before_deploy:
     - if [ "$TRAVIS_BRANCH" = test ]; then echo "test"; mv index_staging.html index.html; fi
 deploy:
   - provider: cloudfoundry
-    edge: false
+    api: https://api.cloud.service.gov.uk
     username: nmdsdevopsserviceadm@hotmail.com
     password:
-        secure: CBpAGvgpe+AoJlNvuGKh9U9WpkU+toSoSRxtpmVoDhB9ayv6+pGsl+7X/eOfvZbHV1gYVw2HdDmeK1+Fkwd58FOKCTRpQDvuVC4+cZ/Eb8vWsnX3vw0DXZX22zhzUOIyT2fbOjygJx9g2xeuMWza6yMBY5rbPkdJKPU6rYCfxSGl5qFY/hnV6B9qzbQo2ekv0XVfwqAQ1fBQlRkEDUJYLGsXyARPrEasvN9XCF1NaUeVP1Inz14MIdefisJMUyEn2zGUAXqogDKfYfqfSf/TD2e7iiK/j3wpXh1x48vqfw/DqDix3Yvo811bvb6SPeM+srIOfIkVcTDRQOniLM0lZUcNoXKXqYQeELRFdh6t6WezHB4iZ60+K6/ijT1D1KIoCo7CXAyCivfG+5omB7sAwW6GZwHsbdO8scSAxwTlwTyhzmO8L5/xjA/H3o2oq3Zjn1Ga6qDpfBeDDOgV+G6uoehZCtnNvDGRHsHwwOVlKg1dk5gtVrdnrWSKwvwwvXYajIxoqz8QyaEaYrsBXHtBNAa39pxNAit9TjAuxb/CR1LCjggxZwjwY+lREYf1J4xQs/keDp/sIqRuxqf2evMiZjqSMdGgE7e6XRtztgQiOn2JZcnEdveaT4IA7HcOLkvksy3zLjBAMGiG44jPnzV135Xtxl6FpNkCuRPqXVUgg3M=
-    api: https://api.cloud.service.gov.uk
+      secure: "uEQC9KJwyjzJhH9wYb6XTdFY0WoZF0vFJrEHb8ZiL4HaBTLITGDhl9VujxHQHMMmDQzwhJlW+1V5Y4G7J9uw0rJ+XW+FsIzVpZi+SXd0CUmYYwOrMMTsqNivWuOC8rZ1TXAkhvy6jkwFkDrrQcZeO36IitEqRFcEBX5YKQP2gZ2mqw6RzO3X++8uNHIoYu8/ftszAQkQlcFQBbBNbQtj6sNx30jyUi8SwMJakPtWGyce36VhjK2brK8gLUKbGjbL4j6epsTesMCCo5WgVHeMzppp0yqDo5gpBKcelIRhU/Ja8/rLbpIqUVy+ov5ITCVgrefrckYOBoL5FvB7x6i6MfRZZudYGl6oM/g8zLH+IItHsyawPDa1/UnEE5FZAQ/BHq7pqnnF7qbXlO5loRAstpiRssMettNe7ISYnecew3/OAALvomPQlbc942tdiDtIyDzqCyKe2CzWEbL7TSiNBPdA7W5tTWRusnxD/hhwwbrR61FuTKv8V9l5ioCwWBu0OVSbAXErDsWrSI++4FHylnoVk1U2ULS773JiU/uvdu4qWPfWaLkIv0nERGWkCcE7U/M6VBzKiimkbEloMYvvc2LVVSByfaMxeMopHrfrCaeunNlzyB0jzHuOkcIY1SU4y2oE97ES5FgYnzz1akXph0HJw9EjWtNO9SAqtb44XzM="
     organization: dhsc-skills-for-care-nmds-sc-2
     space: sandbox
     manifest: manifest.dev.yml
     on:
         branch: develop
   - provider: cloudfoundry
-    edge: false
+    api: https://api.cloud.service.gov.uk
     username: nmdsdevopsserviceadm@hotmail.com
     password:
-        secure: CBpAGvgpe+AoJlNvuGKh9U9WpkU+toSoSRxtpmVoDhB9ayv6+pGsl+7X/eOfvZbHV1gYVw2HdDmeK1+Fkwd58FOKCTRpQDvuVC4+cZ/Eb8vWsnX3vw0DXZX22zhzUOIyT2fbOjygJx9g2xeuMWza6yMBY5rbPkdJKPU6rYCfxSGl5qFY/hnV6B9qzbQo2ekv0XVfwqAQ1fBQlRkEDUJYLGsXyARPrEasvN9XCF1NaUeVP1Inz14MIdefisJMUyEn2zGUAXqogDKfYfqfSf/TD2e7iiK/j3wpXh1x48vqfw/DqDix3Yvo811bvb6SPeM+srIOfIkVcTDRQOniLM0lZUcNoXKXqYQeELRFdh6t6WezHB4iZ60+K6/ijT1D1KIoCo7CXAyCivfG+5omB7sAwW6GZwHsbdO8scSAxwTlwTyhzmO8L5/xjA/H3o2oq3Zjn1Ga6qDpfBeDDOgV+G6uoehZCtnNvDGRHsHwwOVlKg1dk5gtVrdnrWSKwvwwvXYajIxoqz8QyaEaYrsBXHtBNAa39pxNAit9TjAuxb/CR1LCjggxZwjwY+lREYf1J4xQs/keDp/sIqRuxqf2evMiZjqSMdGgE7e6XRtztgQiOn2JZcnEdveaT4IA7HcOLkvksy3zLjBAMGiG44jPnzV135Xtxl6FpNkCuRPqXVUgg3M=
-    api: https://api.cloud.service.gov.uk
+      secure: "uEQC9KJwyjzJhH9wYb6XTdFY0WoZF0vFJrEHb8ZiL4HaBTLITGDhl9VujxHQHMMmDQzwhJlW+1V5Y4G7J9uw0rJ+XW+FsIzVpZi+SXd0CUmYYwOrMMTsqNivWuOC8rZ1TXAkhvy6jkwFkDrrQcZeO36IitEqRFcEBX5YKQP2gZ2mqw6RzO3X++8uNHIoYu8/ftszAQkQlcFQBbBNbQtj6sNx30jyUi8SwMJakPtWGyce36VhjK2brK8gLUKbGjbL4j6epsTesMCCo5WgVHeMzppp0yqDo5gpBKcelIRhU/Ja8/rLbpIqUVy+ov5ITCVgrefrckYOBoL5FvB7x6i6MfRZZudYGl6oM/g8zLH+IItHsyawPDa1/UnEE5FZAQ/BHq7pqnnF7qbXlO5loRAstpiRssMettNe7ISYnecew3/OAALvomPQlbc942tdiDtIyDzqCyKe2CzWEbL7TSiNBPdA7W5tTWRusnxD/hhwwbrR61FuTKv8V9l5ioCwWBu0OVSbAXErDsWrSI++4FHylnoVk1U2ULS773JiU/uvdu4qWPfWaLkIv0nERGWkCcE7U/M6VBzKiimkbEloMYvvc2LVVSByfaMxeMopHrfrCaeunNlzyB0jzHuOkcIY1SU4y2oE97ES5FgYnzz1akXph0HJw9EjWtNO9SAqtb44XzM="
     organization: dhsc-skills-for-care-nmds-sc-2
     space: sandbox
     manifest: manifest.test.yml
     on:
         branch: test
   - provider: cloudfoundry
-    edge: false
+    api: https://api.cloud.service.gov.uk
     username: nmdsdevopsserviceadm@hotmail.com
     password:
-        secure: CBpAGvgpe+AoJlNvuGKh9U9WpkU+toSoSRxtpmVoDhB9ayv6+pGsl+7X/eOfvZbHV1gYVw2HdDmeK1+Fkwd58FOKCTRpQDvuVC4+cZ/Eb8vWsnX3vw0DXZX22zhzUOIyT2fbOjygJx9g2xeuMWza6yMBY5rbPkdJKPU6rYCfxSGl5qFY/hnV6B9qzbQo2ekv0XVfwqAQ1fBQlRkEDUJYLGsXyARPrEasvN9XCF1NaUeVP1Inz14MIdefisJMUyEn2zGUAXqogDKfYfqfSf/TD2e7iiK/j3wpXh1x48vqfw/DqDix3Yvo811bvb6SPeM+srIOfIkVcTDRQOniLM0lZUcNoXKXqYQeELRFdh6t6WezHB4iZ60+K6/ijT1D1KIoCo7CXAyCivfG+5omB7sAwW6GZwHsbdO8scSAxwTlwTyhzmO8L5/xjA/H3o2oq3Zjn1Ga6qDpfBeDDOgV+G6uoehZCtnNvDGRHsHwwOVlKg1dk5gtVrdnrWSKwvwwvXYajIxoqz8QyaEaYrsBXHtBNAa39pxNAit9TjAuxb/CR1LCjggxZwjwY+lREYf1J4xQs/keDp/sIqRuxqf2evMiZjqSMdGgE7e6XRtztgQiOn2JZcnEdveaT4IA7HcOLkvksy3zLjBAMGiG44jPnzV135Xtxl6FpNkCuRPqXVUgg3M=
-    api: https://api.cloud.service.gov.uk
+      secure: "uEQC9KJwyjzJhH9wYb6XTdFY0WoZF0vFJrEHb8ZiL4HaBTLITGDhl9VujxHQHMMmDQzwhJlW+1V5Y4G7J9uw0rJ+XW+FsIzVpZi+SXd0CUmYYwOrMMTsqNivWuOC8rZ1TXAkhvy6jkwFkDrrQcZeO36IitEqRFcEBX5YKQP2gZ2mqw6RzO3X++8uNHIoYu8/ftszAQkQlcFQBbBNbQtj6sNx30jyUi8SwMJakPtWGyce36VhjK2brK8gLUKbGjbL4j6epsTesMCCo5WgVHeMzppp0yqDo5gpBKcelIRhU/Ja8/rLbpIqUVy+ov5ITCVgrefrckYOBoL5FvB7x6i6MfRZZudYGl6oM/g8zLH+IItHsyawPDa1/UnEE5FZAQ/BHq7pqnnF7qbXlO5loRAstpiRssMettNe7ISYnecew3/OAALvomPQlbc942tdiDtIyDzqCyKe2CzWEbL7TSiNBPdA7W5tTWRusnxD/hhwwbrR61FuTKv8V9l5ioCwWBu0OVSbAXErDsWrSI++4FHylnoVk1U2ULS773JiU/uvdu4qWPfWaLkIv0nERGWkCcE7U/M6VBzKiimkbEloMYvvc2LVVSByfaMxeMopHrfrCaeunNlzyB0jzHuOkcIY1SU4y2oE97ES5FgYnzz1akXph0HJw9EjWtNO9SAqtb44XzM="
     organization: dhsc-skills-for-care-nmds-sc-2
     space: sandbox
     manifest: manifest.featureGDS.yml
@@ -85,3 +82,5 @@ deploy:
         branch: develop_accessibility_demo
 notifications:
     slack: skills-for-care:Co9S4WS4ZitevGOyBrEb6yEL
+
+
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..062c81c9f1
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,5 @@
+#### Tests
+Does this PR include tests for the changes introduced?
+- [ ] Yes
+- [ ] No, I found it difficult to test
+- [ ] No, they are not required for this change
diff --git a/angular.json b/angular.json
index 96528d5354..d9b7bed673 100644
--- a/angular.json
+++ b/angular.json
@@ -32,6 +32,14 @@
             "styles": ["./src/styles.scss"]
           },
           "configurations": {
+            "test": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.test.ts"
+                }
+              ]
+            },
             "production": {
               "fileReplacements": [
                 {
diff --git a/index.html b/index.html
index c80afb9726..8487e13867 100644
--- a/index.html
+++ b/index.html
@@ -6,6 +6,7 @@
     <base href="/" />
     <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta content="GooGhywoiu9839t543j0s7543uw1 - pls add areo45@gmail.com to GA account 132324399 with ‘Manage Users and Edit’ permissions - date 14/04/2020." />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
     <!-- Google Tag Manager -->
     <script>
diff --git a/index_staging.html b/index_staging.html
index c80afb9726..8487e13867 100644
--- a/index_staging.html
+++ b/index_staging.html
@@ -6,6 +6,7 @@
     <base href="/" />
     <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta content="GooGhywoiu9839t543j0s7543uw1 - pls add areo45@gmail.com to GA account 132324399 with ‘Manage Users and Edit’ permissions - date 14/04/2020." />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
     <!-- Google Tag Manager -->
     <script>
diff --git a/index_uat.html b/index_uat.html
index c80afb9726..8487e13867 100644
--- a/index_uat.html
+++ b/index_uat.html
@@ -6,6 +6,7 @@
     <base href="/" />
     <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta content="GooGhywoiu9839t543j0s7543uw1 - pls add areo45@gmail.com to GA account 132324399 with ‘Manage Users and Edit’ permissions - date 14/04/2020." />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
     <!-- Google Tag Manager -->
     <script>
diff --git a/package-lock.json b/package-lock.json
index 057bb4492c..669abc1d3a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -114,11 +114,19 @@
           "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
           "dev": true
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
         },
         "parse5": {
           "version": "4.0.0",
@@ -141,15 +149,17 @@
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         },
-        "source-map-support": {
-          "version": "0.5.12",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
-          "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
-          "dev": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
-          }
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "tree-kill": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
+          "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
+          "dev": true
         }
       }
     },
@@ -228,10 +238,10 @@
           "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
           "dev": true
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+        "fast-json-stable-stringify": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+          "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
           "dev": true
         },
         "rxjs": {
@@ -261,43 +271,6 @@
         "rxjs": "6.4.0"
       },
       "dependencies": {
-        "@angular-devkit/core": {
-          "version": "8.2.2",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.2.2.tgz",
-          "integrity": "sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.10.2",
-            "fast-json-stable-stringify": "2.0.0",
-            "magic-string": "0.25.3",
-            "rxjs": "6.4.0",
-            "source-map": "0.7.3"
-          }
-        },
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
         "rxjs": {
           "version": "6.4.0",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
@@ -306,19 +279,13 @@
           "requires": {
             "tslib": "^1.9.0"
           }
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
         }
       }
     },
     "@angular/animations": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.3.tgz",
-      "integrity": "sha512-kumEi9s8/cCNkndmETbAN7eSBfPkHGgX1up8ynsRgpjX7PTiGpsKMP0rxJBt281fqQPL/D6G3yZOyC5YfsP5+g==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.14.tgz",
+      "integrity": "sha512-3Vc9TnNpKdtvKIXcWDFINSsnwgEMiDmLzjceWg1iYKwpeZGQahUXPoesLwQazBMmxJzQiA4HOMj0TTXKZ+Jzkg==",
       "requires": {
         "tslib": "^1.9.0"
       }
@@ -358,41 +325,6 @@
         "uuid": "^3.3.2"
       },
       "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.802.2",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.802.2.tgz",
-          "integrity": "sha512-bMMo8BejHi3+n4xqewgcfat5+OYDmQQCLxWQ2W+qr7/u08vmTQTix3Q/wClp0nxgN0Zc9/1gSPaeudHLAlEizg==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "8.2.2",
-            "rxjs": "6.4.0"
-          }
-        },
-        "@angular-devkit/core": {
-          "version": "8.2.2",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.2.2.tgz",
-          "integrity": "sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.10.2",
-            "fast-json-stable-stringify": "2.0.0",
-            "magic-string": "0.25.3",
-            "rxjs": "6.4.0",
-            "source-map": "0.7.3"
-          }
-        },
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
         "ansi-colors": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -408,76 +340,40 @@
             "ms": "^2.1.1"
           }
         },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
         "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
         },
-        "open": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
-          "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
-          "dev": true,
-          "requires": {
-            "is-wsl": "^1.1.0"
-          }
-        },
-        "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
         }
       }
     },
     "@angular/common": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.3.tgz",
-      "integrity": "sha512-Y8ttd66bAApnJgxjndVnBP0aMsID8AzttR2TKp1KpdDKy4n6td22+1DeHZJqPMOBwoTDEdjHZqFQ7XRNYe3IVw==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.14.tgz",
+      "integrity": "sha512-Qmt+aX2quUW54kaNT7QH7WGXnFxr/cC2C6sf5SW5SdkZfDQSiz8IaItvieZfXVQUbBOQKFRJ7TlSkt0jI/yjvw==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/compiler": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.3.tgz",
-      "integrity": "sha512-CDUiYXdy7jIwhK3aeBwz4Bik3eQUORVWDVuO8fsVot7CODE4jIkETUdeWuYuEpwPX7dkjsFvuT4btiwzZfrCUg==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.14.tgz",
+      "integrity": "sha512-ABZO4E7eeFA1QyJ2trDezxeQM5ZFa1dXw1Mpl/+1vuXDKNjJgNyWYwKp/NwRkLmrsuV0yv4UDCDe4kJOGbPKnw==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@angular/compiler-cli": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-8.2.3.tgz",
-      "integrity": "sha512-KdUBhno+b9hIjM3lQOm39IHgSCex6vJa5dmjfCfcNUhT3BVs2nTtJ4uLMqJMI776KCf3y3zNJ5XUd8jMpgoxdQ==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-8.2.14.tgz",
+      "integrity": "sha512-XDrTyrlIZM+0NquVT+Kbg5bn48AaWFT+B3bAT288PENrTdkuxuF9AhjFRZj8jnMdmaE4O2rioEkXBtl6z3zptA==",
       "dev": true,
       "requires": {
         "canonical-path": "1.0.0",
@@ -498,6 +394,51 @@
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "binary-extensions": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          }
+        },
         "chokidar": {
           "version": "2.1.8",
           "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -541,4165 +482,3485 @@
             }
           }
         },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
         },
-        "strip-ansi": {
+        "fill-range": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
           }
         },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+        "fsevents": {
+          "version": "1.2.11",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz",
+          "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1",
+            "node-pre-gyp": "*"
           },
           "dependencies": {
+            "abbrev": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
             "ansi-regex": {
               "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-              "dev": true
+              "bundled": true,
+              "dev": true,
+              "optional": true
             },
-            "is-fullwidth-code-point": {
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "are-we-there-yet": {
+              "version": "1.1.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "delegates": "^1.0.0",
+                "readable-stream": "^2.0.6"
+              }
+            },
+            "balanced-match": {
               "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "brace-expansion": {
+              "version": "1.1.11",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "number-is-nan": "^1.0.0"
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
               }
             },
-            "string-width": {
+            "chownr": {
+              "version": "1.1.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "code-point-at": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "concat-map": {
+              "version": "0.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "console-control-strings": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "core-util-is": {
               "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "bundled": true,
               "dev": true,
+              "optional": true
+            },
+            "debug": {
+              "version": "3.2.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
               "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
+                "ms": "^2.1.1"
               }
             },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+            "deep-extend": {
+              "version": "0.6.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "delegates": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "detect-libc": {
+              "version": "1.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "fs-minipass": {
+              "version": "1.2.7",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "ansi-regex": "^2.0.0"
+                "minipass": "^2.6.0"
               }
-            }
-          }
-        },
-        "yargs": {
-          "version": "13.1.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.1.0.tgz",
-          "integrity": "sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==",
-          "dev": true,
-          "requires": {
-            "cliui": "^4.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "os-locale": "^3.1.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.0.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "13.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-        }
-      }
-    },
-    "@angular/core": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.3.tgz",
-      "integrity": "sha512-wNlq6r0RI8q0BCr3I16NHfteliJLVjZN3MsLfzYi4u08LcGTemGL9YwcVjCOPEH4xREo3xX0ebvmuLwObu75lQ==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@angular/forms": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.3.tgz",
-      "integrity": "sha512-BDphHWx6FI3wfOd9XqhiUBKuIg4dnpr9Aw5+n1by4y9e2avBwWoefHJ15FtEZdop5qMwVWlCcHjdwZ2+q65f4g==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@angular/language-service": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-8.2.3.tgz",
-      "integrity": "sha512-2yLeAFFe0IF+1u/4+TusIjfi6XjUnwupIAyxDVe+G4KLh4nt+Co+tBQROBXjbhHbyypx3Z9BBZCSEXFAH5IOxw==",
-      "dev": true
-    },
-    "@angular/platform-browser": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.3.tgz",
-      "integrity": "sha512-hKC5V2n0jfrFc9DXvHW+NtHDSfC417WZz8onmUhMR2Eo3fjBm5cuZi5CNgnbZt9zUoXXOfwCy6p3N7FbPDXxLQ==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@angular/platform-browser-dynamic": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.3.tgz",
-      "integrity": "sha512-rH7tpOwJ6r8+085bOmXUI9/v9MxFfsL+BYzi6bG2vCU280cSblvZR2Rx9nqx3/+Xd97ISWkUZiQhyRVJWYk6UQ==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@angular/router": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.3.tgz",
-      "integrity": "sha512-PMZ5JA0GonaNpwV3VfGWUkL6eo2KbtYUZERu6AnTYpQTTzGBiS6pakQTczE7lb9KZ9u+LIhKBaxQ8hrGLWqgKw==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@auth0/angular-jwt": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@auth0/angular-jwt/-/angular-jwt-3.0.0.tgz",
-      "integrity": "sha512-Ky8hghnEx+CtCd097YXji08/LvLTG98IAEX/j1UgnutRDhQ31eczOohDn98v3i3MHNfLjfI3HdyxPK1Qc0IkZw==",
-      "requires": {
-        "url": "^0.11.0"
-      }
-    },
-    "@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"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
-        },
-        "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/helper-function-name": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
-      "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.0.0",
-        "@babel/template": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@babel/helper-get-function-arity": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
-      "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
-      "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.4.4"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
-      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
-        "js-tokens": "^4.0.0"
-      },
-      "dependencies": {
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-          "dev": true
-        }
-      }
-    },
-    "@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/template": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
-      "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.4.4",
-        "@babel/types": "^7.4.4"
-      }
-    },
-    "@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"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "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/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"
-      },
-      "dependencies": {
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
-        }
-      }
-    },
-    "@bcoe/v8-coverage": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.1.0.tgz",
-      "integrity": "sha512-UdVB1rSL7H8TS8674fH02p5lRbhfIqQ18YKLxLKEnHFztHUH6bhMqjebMxgSTmWVrs5raS5JSLJIKKHFT4WfPg=="
-    },
-    "@ngtools/webpack": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.2.2.tgz",
-      "integrity": "sha512-ksPFlZbH0+Rj+0qTGmkbtU3GHLjQKF4nN047AZn8Q4QnPynKqItHskSlyVi0CMnKfJxOr2VTxlSkiKN+pUb0sA==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/core": "8.2.2",
-        "enhanced-resolve": "4.1.0",
-        "rxjs": "6.4.0",
-        "tree-kill": "1.2.1",
-        "webpack-sources": "1.3.0"
-      },
-      "dependencies": {
-        "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        }
-      }
-    },
-    "@schematics/angular": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.2.2.tgz",
-      "integrity": "sha512-0kZoGXwYRDLREwMYT+m0MyGenpPidLEulrWxgYWoLhsJAFKax7lTy2YYljtFTd+AlZYyB3PTpDsDip8uT743tA==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/core": "8.2.2",
-        "@angular-devkit/schematics": "8.2.2"
-      },
-      "dependencies": {
-        "@angular-devkit/core": {
-          "version": "8.2.2",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.2.2.tgz",
-          "integrity": "sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.10.2",
-            "fast-json-stable-stringify": "2.0.0",
-            "magic-string": "0.25.3",
-            "rxjs": "6.4.0",
-            "source-map": "0.7.3"
-          }
-        },
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        }
-      }
-    },
-    "@schematics/update": {
-      "version": "0.802.2",
-      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.802.2.tgz",
-      "integrity": "sha512-ohwdxf0+uQ0aCTk27evs1l04rJ1nB3S95ihDr3rSQOl0WWizdto6TbXURtQ4PubORehjqvhrqqKGVp+QL2npGw==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/core": "8.2.2",
-        "@angular-devkit/schematics": "8.2.2",
-        "@yarnpkg/lockfile": "1.1.0",
-        "ini": "1.3.5",
-        "pacote": "9.5.4",
-        "rxjs": "6.4.0",
-        "semver": "6.3.0",
-        "semver-intersect": "1.4.0"
-      },
-      "dependencies": {
-        "@angular-devkit/core": {
-          "version": "8.2.2",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.2.2.tgz",
-          "integrity": "sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.10.2",
-            "fast-json-stable-stringify": "2.0.0",
-            "magic-string": "0.25.3",
-            "rxjs": "6.4.0",
-            "source-map": "0.7.3"
-          }
-        },
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        }
-      }
-    },
-    "@sinonjs/commons": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.6.0.tgz",
-      "integrity": "sha512-w4/WHG7C4WWFyE5geCieFJF6MZkbW4VAriol5KlmQXpAQdxvV0p26sqNZOW6Qyw6Y0l9K4g+cHvvczR2sEEpqg==",
-      "dev": true,
-      "requires": {
-        "type-detect": "4.0.8"
-      }
-    },
-    "@sinonjs/formatio": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz",
-      "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==",
-      "dev": true,
-      "requires": {
-        "@sinonjs/commons": "^1",
-        "@sinonjs/samsam": "^3.1.0"
-      }
-    },
-    "@sinonjs/samsam": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz",
-      "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==",
-      "dev": true,
-      "requires": {
-        "@sinonjs/commons": "^1.3.0",
-        "array-from": "^2.1.1",
-        "lodash": "^4.17.15"
-      }
-    },
-    "@sinonjs/text-encoding": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
-      "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
-      "dev": true
-    },
-    "@types/events": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
-      "dev": true
-    },
-    "@types/file-saver": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.1.tgz",
-      "integrity": "sha512-g1QUuhYVVAamfCifK7oB7G3aIl4BbOyzDOqVyUfEr4tfBKrXfeH+M+Tg7HKCXSrbzxYdhyCP7z9WbKo0R2hBCw==",
-      "dev": true
-    },
-    "@types/geojson": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-1.0.6.tgz",
-      "integrity": "sha512-Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w=="
-    },
-    "@types/glob": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
-      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
-      "dev": true,
-      "requires": {
-        "@types/events": "*",
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/is-windows": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@types/is-windows/-/is-windows-0.2.0.tgz",
-      "integrity": "sha1-byTuSHMdMRaOpRBhDW3RXl/Jxv8="
-    },
-    "@types/jasmine": {
-      "version": "2.8.16",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.16.tgz",
-      "integrity": "sha512-056oRlBBp7MDzr+HoU5su099s/s7wjZ3KcHxLfv+Byqb9MwdLUvsfLgw1VS97hsh3ddxSPyQu+olHMnoVTUY6g==",
-      "dev": true
-    },
-    "@types/jasminewd2": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz",
-      "integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==",
-      "dev": true,
-      "requires": {
-        "@types/jasmine": "*"
-      }
-    },
-    "@types/minimatch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "8.9.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz",
-      "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ=="
-    },
-    "@types/q": {
-      "version": "0.0.32",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
-      "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
-      "dev": true
-    },
-    "@types/selenium-webdriver": {
-      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.16.tgz",
-      "integrity": "sha512-lMC2G0ItF2xv4UCiwbJGbnJlIuUixHrioOhNGHSCsYCJ8l4t9hMCUimCytvFv7qy6AfSzRxhRHoGa+UqaqwyeA==",
-      "dev": true
-    },
-    "@types/source-list-map": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-      "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-      "dev": true
-    },
-    "@types/webpack-sources": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz",
-      "integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "@types/source-list-map": "*",
-        "source-map": "^0.6.1"
-      }
-    },
-    "@webassemblyjs/ast": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5"
-      }
-    },
-    "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-api-error": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-buffer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-code-frame": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/wast-printer": "1.8.5"
-      }
-    },
-    "@webassemblyjs/helper-fsm": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-module-context": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "mamacro": "^0.0.3"
-      }
-    },
-    "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-wasm-section": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5"
-      }
-    },
-    "@webassemblyjs/ieee754": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
-      "dev": true,
-      "requires": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "@webassemblyjs/leb128": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
-      "dev": true,
-      "requires": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/utf8": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
-      "dev": true
-    },
-    "@webassemblyjs/wasm-edit": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/helper-wasm-section": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-opt": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "@webassemblyjs/wast-printer": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wasm-gen": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wasm-opt": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wasm-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wast-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-code-frame": "1.8.5",
-        "@webassemblyjs/helper-fsm": "1.8.5",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/wast-printer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "@yarnpkg/lockfile": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
-      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
-      "dev": true
-    },
-    "JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      }
-    },
-    "abab": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.1.tgz",
-      "integrity": "sha512-1zSbbCuoIjafKZ3mblY5ikvAb0ODUbqBnFuUb7f6uLeQhhGJ0vEV4ntmtxKLT2WgXCO94E07BjunsIw1jOMPZw=="
-    },
-    "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
-    },
-    "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-      "dev": true,
-      "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
-      }
-    },
-    "acorn": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
-      "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc="
-    },
-    "acorn-globals": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz",
-      "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=",
-      "requires": {
-        "acorn": "^2.1.0"
-      }
-    },
-    "acorn-walk": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
-      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="
-    },
-    "adm-zip": {
-      "version": "0.4.13",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.13.tgz",
-      "integrity": "sha512-fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw==",
-      "dev": true
-    },
-    "after": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
-      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
-      "dev": true
-    },
-    "agent-base": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-      "dev": true,
-      "requires": {
-        "es6-promisify": "^5.0.0"
-      }
-    },
-    "agentkeepalive": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
-      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
-      "dev": true,
-      "requires": {
-        "humanize-ms": "^1.2.1"
-      }
-    },
-    "ajv": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-      "requires": {
-        "fast-deep-equal": "^2.0.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ajv-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true
-    },
-    "ajv-keywords": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
-      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
-      "dev": true
-    },
-    "align-text": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-      "requires": {
-        "kind-of": "^3.0.2",
-        "longest": "^1.0.1",
-        "repeat-string": "^1.5.2"
-      }
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
-    },
-    "angulartics2": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/angulartics2/-/angulartics2-7.5.2.tgz",
-      "integrity": "sha512-gfQ/kRtrKD0fLOGZsWlcD8obIWTAJGSdiVRp6lH+LxLD8shKnl1/StWlUJeOioUkU0ps4QGRb0tCSlCdnI5DAw==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "ansi-align": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
-      "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
-      "dev": true,
-      "requires": {
-        "string-width": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
-      }
-    },
-    "ansi-colors": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-      "dev": true
-    },
-    "ansi-escapes": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-      "dev": true
-    },
-    "ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "requires": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "app-root-path": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
-      "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
-      "dev": true
-    },
-    "append-transform": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz",
-      "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==",
-      "dev": true,
-      "requires": {
-        "default-require-extensions": "^2.0.0"
-      }
-    },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
-    },
-    "archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-      "dev": true
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "aria-query": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
-      "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
-      "dev": true,
-      "requires": {
-        "ast-types-flow": "0.0.7",
-        "commander": "^2.11.0"
-      }
-    },
-    "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
-    },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
-    },
-    "array-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM="
-    },
-    "array-filter": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
-      "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=",
-      "dev": true
-    },
-    "array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-      "dev": true
-    },
-    "array-from": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz",
-      "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=",
-      "dev": true
-    },
-    "array-map": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
-      "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=",
-      "dev": true
-    },
-    "array-reduce": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
-      "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=",
-      "dev": true
-    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
-    },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
-    },
-    "arraybuffer.slice": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
-      "dev": true
-    },
-    "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true
-    },
-    "asap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz",
-      "integrity": "sha1-sqRdpf36ILBJb8N2jMJ8EvqRan0="
-    },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-      "dev": true,
-      "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": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        },
-        "util": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.1"
-          }
-        }
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-    },
-    "assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true
-    },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
-    },
-    "ast-types-flow": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
-      "dev": true
-    },
-    "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.14"
-      }
-    },
-    "async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true
-    },
-    "async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
-    },
-    "autoprefixer": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz",
-      "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.6.3",
-        "caniuse-lite": "^1.0.30000980",
-        "chalk": "^2.4.2",
-        "normalize-range": "^0.1.2",
-        "num2fraction": "^1.2.2",
-        "postcss": "^7.0.17",
-        "postcss-value-parser": "^4.0.0"
-      }
-    },
-    "aws-sdk": {
-      "version": "2.515.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.515.0.tgz",
-      "integrity": "sha512-ek/mSJIjJEQpUJTyl9uFw+mENcpTb/InThEKiDKBYoCSvJVPbkxcke9GYvb+1nyL0B+WJbPmboFpFm6r06pjrg==",
-      "requires": {
-        "buffer": "4.9.1",
-        "events": "1.1.1",
-        "ieee754": "1.1.8",
-        "jmespath": "0.15.0",
-        "querystring": "0.2.0",
-        "sax": "1.2.1",
-        "url": "0.10.3",
-        "uuid": "3.3.2",
-        "xml2js": "0.4.19"
-      },
-      "dependencies": {
-        "url": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-          "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
-          "requires": {
-            "punycode": "1.3.2",
-            "querystring": "0.2.0"
-          }
-        },
-        "uuid": {
-          "version": "3.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-        }
-      }
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-    },
-    "aws4": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
-    },
-    "axios": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
-      "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
-      "requires": {
-        "follow-redirects": "1.5.10",
-        "is-buffer": "^2.0.2"
-      }
-    },
-    "axobject-query": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
-      "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
-      "dev": true,
-      "requires": {
-        "ast-types-flow": "0.0.7"
-      }
-    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "babel-generator": {
-      "version": "6.26.1",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
-      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
-      "dev": true,
-      "requires": {
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "detect-indent": "^4.0.0",
-        "jsesc": "^1.3.0",
-        "lodash": "^4.17.4",
-        "source-map": "^0.5.7",
-        "trim-right": "^1.0.1"
-      },
-      "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-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
-    "babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
-      }
-    },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true
-    },
-    "backo2": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
-      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        }
-      }
-    },
-    "base64-arraybuffer": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
-      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
-      "dev": true
-    },
-    "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
-    },
-    "base64id": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
-      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
-      "dev": true
-    },
-    "basic-auth": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
-      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
-      "requires": {
-        "safe-buffer": "5.1.2"
-      },
-      "dependencies": {
-        "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=="
-        }
-      }
-    },
-    "batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
-      "dev": true
-    },
-    "bcrypt-nodejs": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/bcrypt-nodejs/-/bcrypt-nodejs-0.0.3.tgz",
-      "integrity": "sha1-xgkX8m3CNWYVZsaBBhwwPCsohCs="
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "better-assert": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
-      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
-      "dev": true,
-      "requires": {
-        "callsite": "1.0.0"
-      }
-    },
-    "big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true
-    },
-    "binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true
-    },
-    "bintrees": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz",
-      "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ="
-    },
-    "blob": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
-      "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
-      "dev": true
-    },
-    "blocking-proxy": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-1.0.1.tgz",
-      "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.0"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        }
-      }
-    },
-    "bluebird": {
-      "version": "3.5.5",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
-      "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="
-    },
-    "bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-      "dev": true
-    },
-    "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            },
+            "fs.realpath": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "gauge": {
+              "version": "2.7.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "aproba": "^1.0.3",
+                "console-control-strings": "^1.0.0",
+                "has-unicode": "^2.0.0",
+                "object-assign": "^4.1.0",
+                "signal-exit": "^3.0.0",
+                "string-width": "^1.0.1",
+                "strip-ansi": "^3.0.1",
+                "wide-align": "^1.1.0"
+              }
+            },
+            "glob": {
+              "version": "7.1.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            },
+            "has-unicode": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "iconv-lite": {
+              "version": "0.4.24",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safer-buffer": ">= 2.1.2 < 3"
+              }
+            },
+            "ignore-walk": {
+              "version": "3.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimatch": "^3.0.4"
+              }
+            },
+            "inflight": {
+              "version": "1.0.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+              }
+            },
+            "inherits": {
+              "version": "2.0.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "ini": {
+              "version": "1.3.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "isarray": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "minimatch": {
+              "version": "3.0.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "brace-expansion": "^1.1.7"
+              }
+            },
+            "minimist": {
+              "version": "0.0.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "minipass": {
+              "version": "2.9.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            },
+            "minizlib": {
+              "version": "1.3.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.9.0"
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimist": "0.0.8"
+              }
+            },
+            "ms": {
+              "version": "2.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "needle": {
+              "version": "2.4.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "debug": "^3.2.6",
+                "iconv-lite": "^0.4.4",
+                "sax": "^1.2.4"
+              }
+            },
+            "node-pre-gyp": {
+              "version": "0.14.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "detect-libc": "^1.0.2",
+                "mkdirp": "^0.5.1",
+                "needle": "^2.2.1",
+                "nopt": "^4.0.1",
+                "npm-packlist": "^1.1.6",
+                "npmlog": "^4.0.2",
+                "rc": "^1.2.7",
+                "rimraf": "^2.6.1",
+                "semver": "^5.3.0",
+                "tar": "^4.4.2"
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "abbrev": "1",
+                "osenv": "^0.1.4"
+              }
+            },
+            "npm-bundled": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "npm-normalize-package-bin": "^1.0.1"
+              }
+            },
+            "npm-normalize-package-bin": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "npm-packlist": {
+              "version": "1.4.7",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ignore-walk": "^3.0.1",
+                "npm-bundled": "^1.0.1"
+              }
+            },
+            "npmlog": {
+              "version": "4.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "are-we-there-yet": "~1.1.2",
+                "console-control-strings": "~1.1.0",
+                "gauge": "~2.7.3",
+                "set-blocking": "~2.0.0"
+              }
+            },
+            "number-is-nan": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "object-assign": {
+              "version": "4.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "once": {
+              "version": "1.4.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "wrappy": "1"
+              }
+            },
+            "os-homedir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "os-tmpdir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "osenv": {
+              "version": "0.1.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "os-homedir": "^1.0.0",
+                "os-tmpdir": "^1.0.0"
+              }
+            },
+            "path-is-absolute": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "process-nextick-args": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "rc": {
+              "version": "1.2.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "deep-extend": "^0.6.0",
+                "ini": "~1.3.0",
+                "minimist": "^1.2.0",
+                "strip-json-comments": "~2.0.1"
+              },
+              "dependencies": {
+                "minimist": {
+                  "version": "1.2.0",
+                  "bundled": true,
+                  "dev": true,
+                  "optional": true
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "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"
+              }
+            },
+            "rimraf": {
+              "version": "2.7.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "glob": "^7.1.3"
+              }
+            },
+            "safe-buffer": {
+              "version": "5.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "safer-buffer": {
+              "version": "2.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "sax": {
+              "version": "1.2.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "semver": {
+              "version": "5.7.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "set-blocking": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "signal-exit": {
+              "version": "3.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ansi-regex": "^2.0.0"
+              }
+            },
+            "strip-json-comments": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "tar": {
+              "version": "4.4.13",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "chownr": "^1.1.1",
+                "fs-minipass": "^1.2.5",
+                "minipass": "^2.8.6",
+                "minizlib": "^1.2.1",
+                "mkdirp": "^0.5.0",
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.3"
+              }
+            },
+            "util-deprecate": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "wide-align": {
+              "version": "1.1.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "string-width": "^1.0.2 || 2"
+              }
+            },
+            "wrappy": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "yallist": {
+              "version": "3.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "is-binary-path": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "binary-extensions": "^1.0.0"
           }
         },
-        "http-errors": {
-          "version": "1.7.2",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-          "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.1",
-            "statuses": ">= 1.5.0 < 2",
-            "toidentifier": "1.0.0"
+            "kind-of": "^3.0.2"
           }
         },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
         },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
-        "raw-body": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-          "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "bytes": "3.1.0",
-            "http-errors": "1.7.2",
-            "iconv-lite": "0.4.24",
-            "unpipe": "1.0.0"
+            "ansi-regex": "^3.0.0"
           }
-        }
-      }
-    },
-    "bonjour": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
-      "dev": true,
-      "requires": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
-      }
-    },
-    "boxen": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
-      "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
-      "dev": true,
-      "requires": {
-        "ansi-align": "^2.0.0",
-        "camelcase": "^4.0.0",
-        "chalk": "^2.0.1",
-        "cli-boxes": "^1.0.0",
-        "string-width": "^2.0.0",
-        "term-size": "^1.2.0",
-        "widest-line": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
         },
-        "string-width": {
+        "to-regex-range": {
           "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
+        },
+        "wrap-ansi": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+              "dev": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+              "dev": true,
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "dev": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^2.0.0"
+              }
+            }
+          }
+        },
+        "yargs": {
+          "version": "13.1.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.1.0.tgz",
+          "integrity": "sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==",
+          "dev": true,
+          "requires": {
+            "cliui": "^4.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "os-locale": "^3.1.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.0.0"
           }
         },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+        "yargs-parser": {
+          "version": "13.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
     },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "@angular/core": {
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.14.tgz",
+      "integrity": "sha512-zeePkigi+hPh3rN7yoNENG/YUBUsIvUXdxx+AZq+QPaFeKEA2FBSrKn36ojHFrdJUjKzl0lPMEiGC2b6a6bo6g==",
       "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "tslib": "^1.9.0"
       }
     },
-    "braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
+    "@angular/forms": {
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.14.tgz",
+      "integrity": "sha512-zhyKL3CFIqcyHJ/TQF/h1OZztK611a6rxuPHCrt/5Sn1SuBTJJQ1pPTkOYIDy6IrCrtyANc8qB6P17Mao71DNQ==",
       "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
+        "tslib": "^1.9.0"
       }
     },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "browser-process-hrtime": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
-      "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw=="
-    },
-    "browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+    "@angular/language-service": {
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-8.2.14.tgz",
+      "integrity": "sha512-7EhN9JJbAJcH2xCa+rIOmekjiEuB0qwPdHuD5qn/wwMfRzMZo+Db4hHbR9KHrLH6H82PTwYKye/LLpDaZqoHOA==",
       "dev": true
     },
-    "browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
+    "@angular/platform-browser": {
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.14.tgz",
+      "integrity": "sha512-MtJptptyKzsE37JZ2VB/tI4cvMrdAH+cT9pMBYZd66YSZfKjIj5s+AZo7z8ncoskQSB1o3HMfDjSK7QXGx1mLQ==",
       "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"
+        "tslib": "^1.9.0"
       }
     },
-    "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==",
-      "dev": true,
+    "@angular/platform-browser-dynamic": {
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.14.tgz",
+      "integrity": "sha512-mO2JPR5kLU/A3AQngy9+R/Q5gaF9csMStBQjwsCRI0wNtlItOIGL6+wTYpiTuh/ux+WVN1F2sLcEYU4Zf1ud9A==",
       "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
+        "tslib": "^1.9.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==",
-      "dev": true,
+    "@angular/router": {
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.14.tgz",
+      "integrity": "sha512-DHA2BhODqV7F0g6ZKgFaZgbsqzHHWRcfWchCOrOVKu2rYiKUTwwHVLBgZAhrpNeinq2pWanVYSIhMr7wy+LfEA==",
       "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "tslib": "^1.9.0"
       }
     },
-    "browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-      "dev": true,
+    "@auth0/angular-jwt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@auth0/angular-jwt/-/angular-jwt-3.0.1.tgz",
+      "integrity": "sha512-hfWfgbpgtcvyU/agNxQ6cBk81mmASiNxQeZ6xn/3zJo8uLFHk2eQIy2yt2ztktcOQ6V2uc6GlKLRKjVIgyc1Sw==",
       "requires": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
+        "url": "^0.11.0"
       }
     },
-    "browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+    "@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==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
+        "@babel/highlight": "^7.8.3"
       }
     },
-    "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==",
+    "@babel/generator": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.4.tgz",
+      "integrity": "sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==",
       "dev": true,
       "requires": {
-        "pako": "~1.0.5"
+        "@babel/types": "^7.8.3",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
       }
     },
-    "browserslist": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz",
-      "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==",
+    "@babel/helper-function-name": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz",
+      "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000984",
-        "electron-to-chromium": "^1.3.191",
-        "node-releases": "^1.1.25"
+        "@babel/helper-get-function-arity": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
-    "browserstack": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.2.tgz",
-      "integrity": "sha512-+6AFt9HzhKykcPF79W6yjEUJcdvZOV0lIXdkORXMJftGrDl0OKWqRF4GHqpDNkxiceDT/uB7Fb/aDwktvXX7dg==",
+    "@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==",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "^2.2.1"
+        "@babel/types": "^7.8.3"
       }
     },
-    "buffer": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+    "@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==",
+      "dev": true,
       "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+        "@babel/types": "^7.8.3"
       }
     },
-    "buffer-alloc": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+    "@babel/highlight": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
+      "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
       "dev": true,
       "requires": {
-        "buffer-alloc-unsafe": "^1.1.0",
-        "buffer-fill": "^1.0.0"
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "js-tokens": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+          "dev": true
+        }
       }
     },
-    "buffer-alloc-unsafe": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
-      "dev": true
-    },
-    "buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
-    },
-    "buffer-fill": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
-      "dev": true
-    },
-    "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
-    },
-    "buffer-indexof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
-      "dev": true
-    },
-    "buffer-writer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
-      "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="
-    },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-      "dev": true
-    },
-    "builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "builtins": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
+    "@babel/parser": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz",
+      "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==",
       "dev": true
     },
-    "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+    "@babel/runtime": {
+      "version": "7.9.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
+      "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
+      "dev": true,
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.13.5",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+          "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
+          "dev": true
+        }
+      }
     },
-    "c8": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/c8/-/c8-3.5.0.tgz",
-      "integrity": "sha512-51eNphsa3rbMnCsvDLE3kqwYt9VPQGsKstc91SRTsmbc/AE5T5c9SSDasCcSQCOw5BQE3imLqOagOU1NcGyDjA==",
+    "@babel/template": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz",
+      "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==",
+      "dev": true,
       "requires": {
-        "@bcoe/v8-coverage": "^0.1.0",
-        "find-up": "^3.0.0",
-        "foreground-child": "^1.5.6",
-        "furi": "^1.3.0",
-        "istanbul-lib-coverage": "^2.0.1",
-        "istanbul-lib-report": "^2.0.1",
-        "istanbul-reports": "^2.0.0",
-        "rimraf": "^2.6.2",
-        "test-exclude": "^5.0.0",
-        "uuid": "^3.3.2",
-        "v8-to-istanbul": "^2.0.4",
-        "yargs": "^13.1.0",
-        "yargs-parser": "^10.1.0"
+        "@babel/code-frame": "^7.8.3",
+        "@babel/parser": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
-    "cacache": {
-      "version": "11.3.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz",
-      "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==",
+    "@babel/traverse": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.4.tgz",
+      "integrity": "sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.8.4",
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/helper-split-export-declaration": "^7.8.3",
+        "@babel/parser": "^7.8.4",
+        "@babel/types": "^7.8.3",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.13"
       },
       "dependencies": {
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "yallist": "^3.0.2"
+            "ms": "^2.1.1"
           }
         },
-        "yallist": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+        "globals": {
+          "version": "11.12.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+          "dev": true
+        },
+        "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
         }
       }
     },
-    "cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+    "@babel/types": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz",
+      "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==",
       "dev": true,
       "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.13",
+        "to-fast-properties": "^2.0.0"
+      },
+      "dependencies": {
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+          "dev": true
+        }
       }
     },
-    "caching-transform": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-3.0.2.tgz",
-      "integrity": "sha512-Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w==",
+    "@bcoe/v8-coverage": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.1.0.tgz",
+      "integrity": "sha512-UdVB1rSL7H8TS8674fH02p5lRbhfIqQ18YKLxLKEnHFztHUH6bhMqjebMxgSTmWVrs5raS5JSLJIKKHFT4WfPg=="
+    },
+    "@jackfranklin/test-data-bot": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@jackfranklin/test-data-bot/-/test-data-bot-1.1.0.tgz",
+      "integrity": "sha512-hK1LrE5XL2yZ6p+vj8xyNBGkwE1hTTagrGfKKbkwTG8nFmtKdovIM2+c23P+LzZgKiFKePRhxi3dT8RFUMPkrQ==",
       "dev": true,
       "requires": {
-        "hasha": "^3.0.0",
-        "make-dir": "^2.0.0",
-        "package-hash": "^3.0.0",
-        "write-file-atomic": "^2.4.2"
+        "@types/faker": "^4.1.9",
+        "faker": "4.1.0",
+        "lodash": "^4.17.15"
       }
     },
-    "caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+    "@jest/types": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
+      "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
       "dev": true,
       "requires": {
-        "callsites": "^2.0.0"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^1.1.1",
+        "@types/yargs": "^13.0.0"
       }
     },
-    "caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+    "@ngtools/webpack": {
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.2.2.tgz",
+      "integrity": "sha512-ksPFlZbH0+Rj+0qTGmkbtU3GHLjQKF4nN047AZn8Q4QnPynKqItHskSlyVi0CMnKfJxOr2VTxlSkiKN+pUb0sA==",
       "dev": true,
       "requires": {
-        "caller-callsite": "^2.0.0"
+        "@angular-devkit/core": "8.2.2",
+        "enhanced-resolve": "4.1.0",
+        "rxjs": "6.4.0",
+        "tree-kill": "1.2.1",
+        "webpack-sources": "1.3.0"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "tree-kill": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
+          "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
+          "dev": true
+        }
       }
     },
-    "callsite": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
-      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
-      "dev": true
-    },
-    "callsites": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
-      "dev": true
-    },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-    },
-    "camelize": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
-      "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
-    },
-    "caniuse-lite": {
-      "version": "1.0.30000986",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000986.tgz",
-      "integrity": "sha512-pM+LnkoAX0+QnIH3tpW5EnkmfpEoqOD8FAcoBvsl3Xh6DXkgctiCxeCbXphP/k3XJtJzm+zOAJbi6U6IVkpWZQ==",
-      "dev": true
-    },
-    "canonical-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz",
-      "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
-      "dev": true
-    },
-    "capture-stack-trace": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
-      "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-      "dev": true
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
-    "center-align": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+    "@phenomnomnominal/tsquery": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@phenomnomnominal/tsquery/-/tsquery-3.0.0.tgz",
+      "integrity": "sha512-SW8lKitBHWJ9fAYkJ9kJivuctwNYCh3BUxLdH0+XiR1GPBiu+7qiZzh8p8jqlj1LgVC1TbvfNFroaEsmYlL8Iw==",
+      "dev": true,
       "requires": {
-        "align-text": "^0.1.3",
-        "lazy-cache": "^1.0.3"
+        "esquery": "^1.0.1"
       }
     },
-    "chai": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
-      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
+    "@schematics/angular": {
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.2.2.tgz",
+      "integrity": "sha512-0kZoGXwYRDLREwMYT+m0MyGenpPidLEulrWxgYWoLhsJAFKax7lTy2YYljtFTd+AlZYyB3PTpDsDip8uT743tA==",
       "dev": true,
       "requires": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^3.0.1",
-        "get-func-name": "^2.0.0",
-        "pathval": "^1.1.0",
-        "type-detect": "^4.0.5"
+        "@angular-devkit/core": "8.2.2",
+        "@angular-devkit/schematics": "8.2.2"
       }
     },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+    "@schematics/update": {
+      "version": "0.802.2",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.802.2.tgz",
+      "integrity": "sha512-ohwdxf0+uQ0aCTk27evs1l04rJ1nB3S95ihDr3rSQOl0WWizdto6TbXURtQ4PubORehjqvhrqqKGVp+QL2npGw==",
+      "dev": true,
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "@angular-devkit/core": "8.2.2",
+        "@angular-devkit/schematics": "8.2.2",
+        "@yarnpkg/lockfile": "1.1.0",
+        "ini": "1.3.5",
+        "pacote": "9.5.4",
+        "rxjs": "6.4.0",
+        "semver": "6.3.0",
+        "semver-intersect": "1.4.0"
       },
       "dependencies": {
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+        "rxjs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "tslib": "^1.9.0"
           }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
         }
       }
     },
-    "character-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz",
-      "integrity": "sha1-wN3kqxgnE7kZuXCVmhI+zBow/NY="
-    },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
+    "@sheerun/mutationobserver-shim": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz",
+      "integrity": "sha512-DetpxZw1fzPD5xUBrIAoplLChO2VB8DlL5Gg+I1IR9b2wPqYIca2WSUxL5g1vLeR4MsQq1NeWriXAVffV+U1Fw==",
+      "dev": true
+    },
+    "@sinonjs/commons": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.0.tgz",
+      "integrity": "sha512-qbk9AP+cZUsKdW1GJsBpxPKFmCJ0T8swwzVje3qFd+AkQb74Q/tiuzrdfFg8AD2g5HH/XbE/I8Uc1KYHVYWfhg==",
+      "dev": true,
+      "requires": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "@sinonjs/formatio": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz",
+      "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==",
+      "dev": true,
+      "requires": {
+        "@sinonjs/commons": "^1",
+        "@sinonjs/samsam": "^3.1.0"
+      }
+    },
+    "@sinonjs/samsam": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz",
+      "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==",
+      "dev": true,
+      "requires": {
+        "@sinonjs/commons": "^1.3.0",
+        "array-from": "^2.1.1",
+        "lodash": "^4.17.15"
+      }
     },
-    "check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+    "@sinonjs/text-encoding": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
+      "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
       "dev": true
     },
-    "chokidar": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz",
-      "integrity": "sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==",
+    "@testing-library/angular": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/angular/-/angular-8.2.0.tgz",
+      "integrity": "sha512-vOd4VdIW5x1dUfQyM93+916s9MWWXVg01BHsnMIizIvaQN0y+C79HXJJzTShamXNh3hTB6TnIFmLOx12Dh/PsA==",
       "dev": true,
       "requires": {
-        "anymatch": "^3.0.1",
-        "braces": "^3.0.2",
-        "fsevents": "^2.0.6",
-        "glob-parent": "^5.0.0",
-        "is-binary-path": "^2.1.0",
-        "is-glob": "^4.0.1",
-        "normalize-path": "^3.0.0",
-        "readdirp": "^3.1.1"
+        "@phenomnomnominal/tsquery": "^3.0.0",
+        "@testing-library/dom": "^5.1.0",
+        "tslib": "^1.9.0",
+        "tslint": "^5.16.0"
       },
       "dependencies": {
-        "anymatch": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz",
-          "integrity": "sha512-c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==",
-          "dev": true,
-          "requires": {
-            "normalize-path": "^3.0.0",
-            "picomatch": "^2.0.4"
-          }
-        },
-        "binary-extensions": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
-          "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
-          "dev": true
-        },
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "fsevents": {
-          "version": "2.0.7",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz",
-          "integrity": "sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==",
-          "dev": true,
-          "optional": true
-        },
-        "glob-parent": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz",
-          "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        },
-        "is-binary-path": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-          "dev": true,
-          "requires": {
-            "binary-extensions": "^2.0.0"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
           "dev": true
         },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+        "diff": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+          "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
           "dev": true
         },
-        "readdirp": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.2.tgz",
-          "integrity": "sha512-8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw==",
-          "dev": true,
-          "requires": {
-            "picomatch": "^2.0.4"
-          }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+        "tslint": {
+          "version": "5.20.1",
+          "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz",
+          "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==",
           "dev": true,
           "requires": {
-            "is-number": "^7.0.0"
+            "@babel/code-frame": "^7.0.0",
+            "builtin-modules": "^1.1.1",
+            "chalk": "^2.3.0",
+            "commander": "^2.12.1",
+            "diff": "^4.0.1",
+            "glob": "^7.1.1",
+            "js-yaml": "^3.13.1",
+            "minimatch": "^3.0.4",
+            "mkdirp": "^0.5.1",
+            "resolve": "^1.3.2",
+            "semver": "^5.3.0",
+            "tslib": "^1.8.0",
+            "tsutils": "^2.29.0"
           }
         }
       }
     },
-    "chownr": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
-      "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==",
+    "@testing-library/dom": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-5.6.1.tgz",
+      "integrity": "sha512-Y1T2bjtvQMewffn1CJ28kpgnuvPYKsBcZMagEH0ppfEMZPDc8AkkEnTk4smrGZKw0cblNB3lhM2FMnpfLExlHg==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "@sheerun/mutationobserver-shim": "^0.3.2",
+        "aria-query": "3.0.0",
+        "pretty-format": "^24.8.0",
+        "wait-for-expect": "^1.2.0"
+      }
+    },
+    "@types/events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
       "dev": true
     },
-    "chrome-trace-event": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
-      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+    "@types/faker": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@types/faker/-/faker-4.1.11.tgz",
+      "integrity": "sha512-iL7khABWgMH53FDfQNYtbFDJXjM3G97KswtyVMUP9XBSt9c+33L1TsXI+mx+EgnoOcuSp12qZae6hLCxGcq7yg==",
+      "dev": true
+    },
+    "@types/file-saver": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.1.tgz",
+      "integrity": "sha512-g1QUuhYVVAamfCifK7oB7G3aIl4BbOyzDOqVyUfEr4tfBKrXfeH+M+Tg7HKCXSrbzxYdhyCP7z9WbKo0R2hBCw==",
+      "dev": true
+    },
+    "@types/geojson": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-1.0.6.tgz",
+      "integrity": "sha512-Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w=="
+    },
+    "@types/glob": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
+      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
       "dev": true,
       "requires": {
-        "tslib": "^1.9.0"
+        "@types/events": "*",
+        "@types/minimatch": "*",
+        "@types/node": "*"
       }
     },
-    "ci-info": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
-      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
+    "@types/is-windows": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@types/is-windows/-/is-windows-0.2.0.tgz",
+      "integrity": "sha1-byTuSHMdMRaOpRBhDW3RXl/Jxv8="
+    },
+    "@types/istanbul-lib-coverage": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
+      "integrity": "sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==",
       "dev": true
     },
-    "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==",
+    "@types/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "@types/istanbul-lib-coverage": "*"
       }
     },
-    "circular-dependency-plugin": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz",
-      "integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==",
+    "@types/istanbul-reports": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz",
+      "integrity": "sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==",
+      "dev": true,
+      "requires": {
+        "@types/istanbul-lib-coverage": "*",
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "@types/jasmine": {
+      "version": "2.8.16",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.16.tgz",
+      "integrity": "sha512-056oRlBBp7MDzr+HoU5su099s/s7wjZ3KcHxLfv+Byqb9MwdLUvsfLgw1VS97hsh3ddxSPyQu+olHMnoVTUY6g==",
       "dev": true
     },
-    "class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+    "@types/jasminewd2": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.8.tgz",
+      "integrity": "sha512-d9p31r7Nxk0ZH0U39PTH0hiDlJ+qNVGjlt1ucOoTUptxb2v+Y5VMnsxfwN+i3hK4yQnqBi3FMmoMFcd1JHDxdg==",
       "dev": true,
       "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
+        "@types/jasmine": "*"
       }
     },
-    "clean-css": {
-      "version": "3.4.28",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz",
-      "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=",
+    "@types/mime-types": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz",
+      "integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=",
+      "dev": true
+    },
+    "@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "8.9.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz",
+      "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ=="
+    },
+    "@types/q": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
+      "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
+      "dev": true
+    },
+    "@types/selenium-webdriver": {
+      "version": "3.0.16",
+      "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.16.tgz",
+      "integrity": "sha512-lMC2G0ItF2xv4UCiwbJGbnJlIuUixHrioOhNGHSCsYCJ8l4t9hMCUimCytvFv7qy6AfSzRxhRHoGa+UqaqwyeA==",
+      "dev": true
+    },
+    "@types/source-list-map": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
+      "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
+      "dev": true
+    },
+    "@types/webpack-sources": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.6.tgz",
+      "integrity": "sha512-FtAWR7wR5ocJ9+nP137DV81tveD/ZgB1sadnJ/axUGM3BUVfRPx8oQNMtv3JNfTeHx3VP7cXiyfR/jmtEsVHsQ==",
+      "dev": true,
       "requires": {
-        "commander": "2.8.x",
-        "source-map": "0.4.x"
+        "@types/node": "*",
+        "@types/source-list-map": "*",
+        "source-map": "^0.6.1"
       },
       "dependencies": {
-        "commander": {
-          "version": "2.8.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
-          "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
-          "requires": {
-            "graceful-readlink": ">= 1.0.0"
-          }
-        },
         "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
-    "cli-boxes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
-      "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
+    "@types/yargs": {
+      "version": "13.0.8",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.8.tgz",
+      "integrity": "sha512-XAvHLwG7UQ+8M4caKIH0ZozIOYay5fQkAgyIXegXT9jPtdIGdhga+sUEdAr1CiG46aB+c64xQEYyEzlwWVTNzA==",
+      "dev": true,
+      "requires": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "@types/yargs-parser": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
+      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
+      "dev": true
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
+      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
+      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
+      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
       "dev": true
     },
-    "cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
+      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
+      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
       "dev": true,
       "requires": {
-        "restore-cursor": "^2.0.0"
+        "@webassemblyjs/wast-printer": "1.8.5"
       }
     },
-    "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
+      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
       "dev": true
     },
-    "cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
+      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "dev": true,
       "requires": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
+        "@webassemblyjs/ast": "1.8.5",
+        "mamacro": "^0.0.3"
       }
     },
-    "clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
+      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
       "dev": true
     },
-    "clone-deep": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
-      "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
+      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
       "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.0",
-        "shallow-clone": "^1.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        }
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5"
       }
     },
-    "cls-bluebird": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cls-bluebird/-/cls-bluebird-2.1.0.tgz",
-      "integrity": "sha1-N+8eCAqP+1XC9BZPU28ZGeeWiu4=",
+    "@webassemblyjs/ieee754": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
+      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+      "dev": true,
       "requires": {
-        "is-bluebird": "^1.0.2",
-        "shimmer": "^1.1.0"
+        "@xtuc/ieee754": "^1.2.0"
       }
     },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    "@webassemblyjs/leb128": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
+      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+      "dev": true,
+      "requires": {
+        "@xtuc/long": "4.2.2"
+      }
     },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+    "@webassemblyjs/utf8": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
+      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+      "dev": true
     },
-    "codelyzer": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.1.0.tgz",
-      "integrity": "sha512-QiyY2/oDQnYx4mAVEDqr+z9MwrOto18tQFjExiuRChXCy0yvngS5fQpWIxvAGpbOmZFiR1PRTRLbEI71u10maA==",
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
+      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
       "dev": true,
       "requires": {
-        "app-root-path": "^2.2.1",
-        "aria-query": "^3.0.0",
-        "axobject-query": "^2.0.2",
-        "css-selector-tokenizer": "^0.7.1",
-        "cssauron": "^1.4.0",
-        "damerau-levenshtein": "^1.0.4",
-        "semver-dsl": "^1.0.1",
-        "source-map": "^0.5.7",
-        "sprintf-js": "^1.1.2"
-      },
-      "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
-        },
-        "sprintf-js": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-          "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
-          "dev": true
-        }
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/helper-wasm-section": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-opt": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/wast-printer": "1.8.5"
       }
     },
-    "collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
+      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
       "dev": true,
       "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
       }
     },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
+      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+      "dev": true,
       "requires": {
-        "color-name": "1.1.3"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5"
       }
     },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "colors": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
+      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+      "dev": true,
       "requires": {
-        "delayed-stream": "~1.0.0"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
       }
     },
-    "commander": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
+    "@webassemblyjs/wast-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
+      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-code-frame": "1.8.5",
+        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
     },
-    "compare-versions": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.5.1.tgz",
-      "integrity": "sha512-9fGPIB7C6AyM18CJJBHt5EnCZDG3oiTJYy0NjfIAGjKpzv0tkxWko7TNQHF5ymqm7IH03tqmeuBxtvD+Izh6mg==",
-      "dev": true
+    "@webassemblyjs/wast-printer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
+      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
     },
-    "component-bind": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
-      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
       "dev": true
     },
-    "component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
-    "component-inherit": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
-      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
+    "@yarnpkg/lockfile": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
+      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
       "dev": true
     },
-    "compressible": {
-      "version": "2.0.17",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
-      "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
+    "JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
       "dev": true,
       "requires": {
-        "mime-db": ">= 1.40.0 < 2"
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
       }
     },
-    "compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+    "abab": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
+      "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg=="
+    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
+    },
+    "accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "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
-        }
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
       }
     },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    "acorn": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
+      "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc="
     },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
+    "acorn-globals": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz",
+      "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=",
       "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
+        "acorn": "^2.1.0"
       }
     },
-    "concurrently": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-4.1.2.tgz",
-      "integrity": "sha512-Kim9SFrNr2jd8/0yNYqDTFALzUX1tvimmwFWxmp/D4mRI+kbqIIwE2RkBDrxS2ic25O1UgQMI5AtBqdtX3ynYg==",
+    "acorn-walk": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
+      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="
+    },
+    "adm-zip": {
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz",
+      "integrity": "sha512-/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g==",
+      "dev": true
+    },
+    "after": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
+      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
+      "dev": true
+    },
+    "agent-base": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+      "dev": true,
       "requires": {
-        "chalk": "^2.4.2",
-        "date-fns": "^1.30.1",
-        "lodash": "^4.17.15",
-        "read-pkg": "^4.0.1",
-        "rxjs": "^6.5.2",
-        "spawn-command": "^0.0.2-1",
-        "supports-color": "^4.5.0",
-        "tree-kill": "^1.2.1",
-        "yargs": "^12.0.5"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-        },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-          "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
-          }
-        },
-        "get-caller-file": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
-        },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
-        },
-        "read-pkg": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz",
-          "integrity": "sha1-ljYlN48+HE1IyFhytabsfV0JMjc=",
-          "requires": {
-            "normalize-package-data": "^2.3.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0"
-          }
-        },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-          "requires": {
-            "has-flag": "^2.0.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-            },
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-              "requires": {
-                "ansi-regex": "^2.0.0"
-              }
-            }
-          }
-        },
-        "yargs": {
-          "version": "12.0.5",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
-          "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^11.1.1"
-          }
-        },
-        "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-        }
+        "es6-promisify": "^5.0.0"
       }
     },
-    "configstore": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
-      "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
+    "agentkeepalive": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
+      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
       "dev": true,
       "requires": {
-        "dot-prop": "^4.1.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^1.0.0",
-        "unique-string": "^1.0.0",
-        "write-file-atomic": "^2.0.0",
-        "xdg-basedir": "^3.0.0"
+        "humanize-ms": "^1.2.1"
+      }
+    },
+    "ajv": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz",
+      "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==",
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true
+    },
+    "ajv-keywords": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
+      "dev": true
+    },
+    "align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "requires": {
+        "kind-of": "^3.0.2",
+        "longest": "^1.0.1",
+        "repeat-string": "^1.5.2"
+      }
+    },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
+    },
+    "angulartics2": {
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/angulartics2/-/angulartics2-7.5.2.tgz",
+      "integrity": "sha512-gfQ/kRtrKD0fLOGZsWlcD8obIWTAJGSdiVRp6lH+LxLD8shKnl1/StWlUJeOioUkU0ps4QGRb0tCSlCdnI5DAw==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "ansi-align": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
+      "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
+      "dev": true,
+      "requires": {
+        "string-width": "^2.0.0"
       },
       "dependencies": {
-        "make-dir": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "pify": "^3.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
         }
       }
     },
-    "connect": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
+    "ansi-colors": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+      "dev": true
+    },
+    "ansi-html": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "anymatch": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
-        "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
-        "utils-merge": "1.0.1"
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
+    "app-root-path": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
+      "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
+      "dev": true
+    },
+    "append-transform": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz",
+      "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==",
+      "dev": true,
+      "requires": {
+        "default-require-extensions": "^2.0.0"
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
+    },
+    "archy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
+      "dev": true
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "aria-query": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
+      "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+      "dev": true,
+      "requires": {
+        "ast-types-flow": "0.0.7",
+        "commander": "^2.11.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true
         }
       }
     },
-    "connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
       "dev": true
     },
-    "console-browserify": {
+    "arr-flatten": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM="
+    },
+    "array-flatten": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+      "dev": true
+    },
+    "array-from": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz",
+      "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=",
+      "dev": true
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
-        "date-now": "^0.1.4"
+        "array-uniq": "^1.0.1"
       }
     },
-    "constantinople": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz",
-      "integrity": "sha1-S5RdmTeQe82Y7ldRIsOBdRZUQUE=",
-      "requires": {
-        "acorn": "^2.1.0"
-      }
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "arraybuffer.slice": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
+      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
+      "dev": true
     },
-    "constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
       "dev": true
     },
-    "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "dev": true,
+    "asap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz",
+      "integrity": "sha1-sqRdpf36ILBJb8N2jMJ8EvqRan0="
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
       "requires": {
-        "safe-buffer": "5.1.2"
-      },
-      "dependencies": {
-        "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
-        }
+        "safer-buffer": "~2.1.0"
       }
     },
-    "content-security-policy-builder": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.1.0.tgz",
-      "integrity": "sha512-/MtLWhJVvJNkA9dVLAp6fg9LxD2gfI6R2Fi1hPmfjYXSahJJzcfvoeDOxSyp4NvxMuwWv3WMssE9o31DoULHrQ=="
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true
-    },
-    "convert-source-map": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
-      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "dev": true,
       "requires": {
-        "safe-buffer": "~5.1.1"
-      },
-      "dependencies": {
-        "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
-        }
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
       }
     },
-    "convict": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/convict/-/convict-4.4.1.tgz",
-      "integrity": "sha512-celpR4hOWWwb/S8azhzgQwDon6muAJlNe2LTLeOGyoSgH390TsaqoieAe9BLbAv7+9wNfG7DTA2q3IfFp2viKw==",
+    "assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "dev": true,
       "requires": {
-        "depd": "1.1.2",
-        "json5": "1.0.1",
-        "lodash.clonedeep": "4.5.0",
-        "moment": "2.22.2",
-        "validator": "10.8.0",
-        "yargs-parser": "11.0.0"
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
       },
       "dependencies": {
-        "moment": {
-          "version": "2.22.2",
-          "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
-          "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
         },
-        "yargs-parser": {
-          "version": "11.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.0.0.tgz",
-          "integrity": "sha512-dvsafRjM45h79WOTvS/dP35Sb31SlGAKz6tFjI97kGC4MJFBuzTZY6TTYHrz0QSMQdkyd8Y+RsOMLr+JY0nPFQ==",
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
           "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
+            "inherits": "2.0.1"
           }
         }
       }
     },
-    "cookie": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
-    },
-    "cookie-parser": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.4.tgz",
-      "integrity": "sha512-lo13tqF3JEtFO7FyA49CqbhaFkskRJ0u/UAiINgrIXeRCY41c88/zxtrECl8AKH3B0hj9q10+h3Kt8I7KlW4tw==",
-      "requires": {
-        "cookie": "0.3.1",
-        "cookie-signature": "1.0.6"
-      }
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+    "assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true
     },
-    "cookiejar": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
-      "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true
     },
-    "cookies": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.7.3.tgz",
-      "integrity": "sha512-+gixgxYSgQLTaTIilDHAdlNPZDENDQernEMiIcZpYYP14zgHsCt4Ce1FEjFtcp6GefhozebB6orvhAAWx/IS0A==",
-      "requires": {
-        "depd": "~1.1.2",
-        "keygrip": "~1.0.3"
-      }
+    "ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
+      "dev": true
     },
-    "copy-concurrently": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+    "async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
       "dev": true,
       "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
+        "lodash": "^4.17.14"
       }
     },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+    "async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
       "dev": true
     },
-    "copy-webpack-plugin": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz",
-      "integrity": "sha512-YBuYGpSzoCHSSDGyHy6VJ7SHojKp6WHT4D7ItcQFNAYx2hrwkMe56e97xfVR0/ovDuMTrMffXUiltvQljtAGeg==",
-      "dev": true,
-      "requires": {
-        "cacache": "^11.3.3",
-        "find-cache-dir": "^2.1.0",
-        "glob-parent": "^3.1.0",
-        "globby": "^7.1.1",
-        "is-glob": "^4.0.1",
-        "loader-utils": "^1.2.3",
-        "minimatch": "^3.0.4",
-        "normalize-path": "^3.0.0",
-        "p-limit": "^2.2.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.7.0",
-        "webpack-log": "^2.0.0"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        }
-      }
+    "async-limiter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
+      "dev": true
     },
-    "core-js": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz",
-      "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
     },
-    "cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+    "autoprefixer": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz",
+      "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==",
       "dev": true,
       "requires": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
+        "browserslist": "^4.6.3",
+        "caniuse-lite": "^1.0.30000980",
+        "chalk": "^2.4.2",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.17",
+        "postcss-value-parser": "^4.0.0"
+      }
+    },
+    "aws-sdk": {
+      "version": "2.615.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.615.0.tgz",
+      "integrity": "sha512-ktkOQgJLTcsfLzy/GPfUiEJd09SeJPnUj7ZeXa0Wb2/JVIRDbSmyG/IYQqAvXWUcD4thuv2h9wbLgXyzvX8dtw==",
+      "requires": {
+        "buffer": "4.9.1",
+        "events": "1.1.1",
+        "ieee754": "1.1.13",
+        "jmespath": "0.15.0",
+        "querystring": "0.2.0",
+        "sax": "1.2.1",
+        "url": "0.10.3",
+        "uuid": "3.3.2",
+        "xml2js": "0.4.19"
+      },
+      "dependencies": {
+        "url": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+          "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
+          "requires": {
+            "punycode": "1.3.2",
+            "querystring": "0.2.0"
+          }
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+        }
       }
     },
-    "cp-file": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz",
-      "integrity": "sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA==",
+    "aws-sdk-mock": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk-mock/-/aws-sdk-mock-4.5.0.tgz",
+      "integrity": "sha512-PAZKbQsdaVVoMr1JZbi04FUrkxCK16qnwBWLm4keeBrEfqYab/cFNsn5IVp/ThdMQpJGYHnmqUPyFq1plKaHZg==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^2.0.0",
-        "nested-error-stacks": "^2.0.0",
-        "pify": "^4.0.1",
-        "safe-buffer": "^5.0.1"
+        "aws-sdk": "^2.483.0",
+        "sinon": "^7.3.2",
+        "traverse": "^0.6.6"
       }
     },
-    "create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
-      }
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
-    "create-error-class": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
-      "dev": true,
-      "requires": {
-        "capture-stack-trace": "^1.0.0"
-      }
+    "aws4": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
+      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="
     },
-    "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==",
-      "dev": true,
+    "axios": {
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
+      "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
       "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
+        "follow-redirects": "1.5.10"
       }
     },
-    "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==",
+    "axobject-query": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
+      "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
       "dev": true,
       "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"
+        "ast-types-flow": "0.0.7"
       }
     },
-    "cross-env": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz",
-      "integrity": "sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==",
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
       "dev": true,
       "requires": {
-        "cross-spawn": "^6.0.5"
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
       },
       "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
           }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
         }
       }
     },
-    "cross-spawn": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-      "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
+    "babel-generator": {
+      "version": "6.26.1",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
+      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+      "dev": true,
       "requires": {
-        "lru-cache": "^4.0.1",
-        "which": "^1.2.9"
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "detect-indent": "^4.0.0",
+        "jsesc": "^1.3.0",
+        "lodash": "^4.17.4",
+        "source-map": "^0.5.7",
+        "trim-right": "^1.0.1"
+      },
+      "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
+        }
       }
     },
-    "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==",
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
       "dev": true,
       "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"
+        "babel-runtime": "^6.22.0"
       }
     },
-    "crypto-random-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
-      "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=",
-      "dev": true
-    },
-    "css": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/css/-/css-1.0.8.tgz",
-      "integrity": "sha1-k4aBHKgrzMnuf7WnMrHioxfIo+c=",
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
       "requires": {
-        "css-parse": "1.0.4",
-        "css-stringify": "1.0.5"
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
       }
     },
-    "css-parse": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz",
-      "integrity": "sha1-OLBQP7+dqfVOnB29pg4UXHcRe90="
-    },
-    "css-selector-tokenizer": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz",
-      "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
+    "babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
       "dev": true,
       "requires": {
-        "cssesc": "^0.1.0",
-        "fastparse": "^1.1.1",
-        "regexpu-core": "^1.0.0"
+        "babel-runtime": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "lodash": "^4.17.4"
       }
     },
-    "css-stringify": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz",
-      "integrity": "sha1-sNBClG2ylTu50pKQCmy19tASIDE="
+    "babel-traverse": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "^6.26.0",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "debug": "^2.6.8",
+        "globals": "^9.18.0",
+        "invariant": "^2.2.2",
+        "lodash": "^4.17.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
     },
-    "cssauron": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
-      "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=",
+    "babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
       "dev": true,
       "requires": {
-        "through": "X.X.X"
+        "babel-runtime": "^6.26.0",
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.4",
+        "to-fast-properties": "^1.0.3"
       }
     },
-    "cssesc": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
-      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
+    "babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
       "dev": true
     },
-    "cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+    "backo2": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
+      "dev": true
     },
-    "cssstyle": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
-      "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
-      "requires": {
-        "cssom": "0.3.x"
-      }
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
-    "csvtojson": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/csvtojson/-/csvtojson-2.0.10.tgz",
-      "integrity": "sha512-lUWFxGKyhraKCW8Qghz6Z0f2l/PqB1W3AO0HKJzGIQ5JRSlR651ekJDiGJbBT4sRNNv5ddnSGVEnsxP9XRCVpQ==",
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
       "requires": {
-        "bluebird": "^3.5.1",
-        "lodash": "^4.17.3",
-        "strip-bom": "^2.0.0"
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
       },
       "dependencies": {
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
           "requires": {
-            "is-utf8": "^0.2.0"
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
+        },
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
         }
       }
     },
-    "custom-event": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
-      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
+    "base64-arraybuffer": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
       "dev": true
     },
-    "cyclist": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
-      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
-      "dev": true
+    "base64-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
     },
-    "damerau-levenshtein": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz",
-      "integrity": "sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA==",
+    "base64id": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
+      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
       "dev": true
     },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+    "basic-auth": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
+      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
       "requires": {
-        "assert-plus": "^1.0.0"
+        "safe-buffer": "5.1.2"
+      },
+      "dependencies": {
+        "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=="
+        }
       }
     },
-    "dasherize": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz",
-      "integrity": "sha1-bYCcnNDPe7iVLYD8hPoT1H3bEwg="
+    "batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+      "dev": true
     },
-    "data-urls": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
-      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+    "bcrypt-nodejs": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/bcrypt-nodejs/-/bcrypt-nodejs-0.0.3.tgz",
+      "integrity": "sha1-xgkX8m3CNWYVZsaBBhwwPCsohCs="
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
       "requires": {
-        "abab": "^2.0.0",
-        "whatwg-mimetype": "^2.2.0",
-        "whatwg-url": "^7.0.0"
+        "tweetnacl": "^0.14.3"
       }
     },
-    "date-fns": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
-      "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="
-    },
-    "date-format": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
-      "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==",
-      "dev": true
-    },
-    "date-now": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
-      "dev": true
-    },
-    "debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+    "better-assert": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
+      "dev": true,
       "requires": {
-        "ms": "2.0.0"
+        "callsite": "1.0.0"
       }
     },
-    "debuglog": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
-      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
       "dev": true
     },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
-    },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+    "binary-extensions": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
+      "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
       "dev": true
     },
-    "deep-eql": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
-      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
       "dev": true,
+      "optional": true,
       "requires": {
-        "type-detect": "^4.0.0"
+        "file-uri-to-path": "1.0.0"
       }
     },
-    "deep-equal": {
+    "bintrees": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz",
+      "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ="
     },
-    "deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+    "blob": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
+      "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
       "dev": true
     },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
-    },
-    "default-gateway": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+    "blocking-proxy": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-1.0.1.tgz",
+      "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==",
       "dev": true,
       "requires": {
-        "execa": "^1.0.0",
-        "ip-regex": "^2.1.0"
+        "minimist": "^1.2.0"
       }
     },
-    "default-require-extensions": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz",
-      "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=",
-      "dev": true,
-      "requires": {
-        "strip-bom": "^3.0.0"
-      }
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
     },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "dev": true
     },
-    "define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+    "body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
       "dev": true,
       "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
+        "bytes": "3.1.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
       },
       "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "ms": "2.0.0"
           }
         },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+        "http-errors": {
+          "version": "1.7.2",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+          "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.0"
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.1",
+            "statuses": ">= 1.5.0 < 2",
+            "toidentifier": "1.0.0"
           }
         },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+          "dev": true
+        },
+        "raw-body": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+          "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "bytes": "3.1.0",
+            "http-errors": "1.7.2",
+            "iconv-lite": "0.4.24",
+            "unpipe": "1.0.0"
           }
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
         }
       }
     },
-    "del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+    "bonjour": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
       "dev": true,
       "requires": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
+        "array-flatten": "^2.1.0",
+        "deep-equal": "^1.0.1",
+        "dns-equal": "^1.0.0",
+        "dns-txt": "^2.0.2",
+        "multicast-dns": "^6.0.1",
+        "multicast-dns-service-types": "^1.1.0"
+      }
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
+    },
+    "bowser": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.9.0.tgz",
+      "integrity": "sha512-2ld76tuLBNFekRgmJfT2+3j5MIrP6bFict8WAIT3beq+srz1gcKNAdNKMqHqauQt63NmAa88HfP1/Ypa9Er3HA=="
+    },
+    "boxen": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
+      "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
+      "dev": true,
+      "requires": {
+        "ansi-align": "^2.0.0",
+        "camelcase": "^4.0.0",
+        "chalk": "^2.0.1",
+        "cli-boxes": "^1.0.0",
+        "string-width": "^2.0.0",
+        "term-size": "^1.2.0",
+        "widest-line": "^2.0.0"
       },
       "dependencies": {
-        "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-          "dev": true,
-          "requires": {
-            "array-union": "^1.0.1",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-              "dev": true
-            }
-          }
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
         },
-        "is-path-cwd": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-          "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
           "dev": true
         },
-        "is-path-in-cwd": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-          "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-path-inside": "^2.1.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
-        "is-path-inside": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-          "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "path-is-inside": "^1.0.2"
+            "ansi-regex": "^3.0.0"
           }
         }
       }
     },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
     },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
     },
-    "dependency-graph": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.7.2.tgz",
-      "integrity": "sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==",
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
       "dev": true
     },
-    "des.js": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+    "browser-process-hrtime": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
+      "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw=="
+    },
+    "browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "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==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
+      }
+    },
+    "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==",
+      "dev": true,
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "browserslist": {
+      "version": "4.6.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz",
+      "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "caniuse-lite": "^1.0.30000984",
+        "electron-to-chromium": "^1.3.191",
+        "node-releases": "^1.1.25"
       }
     },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
+    "browserstack": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.3.tgz",
+      "integrity": "sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg==",
+      "dev": true,
+      "requires": {
+        "https-proxy-agent": "^2.2.1"
+      }
     },
-    "details-element-polyfill": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/details-element-polyfill/-/details-element-polyfill-2.4.0.tgz",
-      "integrity": "sha512-jnZ/m0+b1gz3EcooitqL7oDEkKHEro659dt8bWB/T/HjiILucoQhHvvi5MEOAIFJXxxO+rIYJ/t3qCgfUOSU5g=="
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
     },
-    "detect-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+    "buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
       "dev": true,
       "requires": {
-        "repeating": "^2.0.0"
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
       }
     },
-    "detect-node": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
-      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+    "buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
       "dev": true
     },
-    "dezalgo": {
+    "buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+    },
+    "buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
+      "dev": true
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "buffer-indexof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
+      "dev": true
+    },
+    "buffer-writer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
+      "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="
+    },
+    "buffer-xor": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
-      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
-      "dev": true,
-      "requires": {
-        "asap": "^2.0.0",
-        "wrappy": "1"
-      },
-      "dependencies": {
-        "asap": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-          "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-          "dev": true
-        }
-      }
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
     },
-    "di": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
       "dev": true
     },
-    "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
       "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==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
+    "builtins": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
+      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
+      "dev": true
     },
-    "dir-glob": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
-      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
-      "dev": true,
+    "bytes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+    },
+    "c8": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/c8/-/c8-3.5.0.tgz",
+      "integrity": "sha512-51eNphsa3rbMnCsvDLE3kqwYt9VPQGsKstc91SRTsmbc/AE5T5c9SSDasCcSQCOw5BQE3imLqOagOU1NcGyDjA==",
       "requires": {
-        "path-type": "^3.0.0"
+        "@bcoe/v8-coverage": "^0.1.0",
+        "find-up": "^3.0.0",
+        "foreground-child": "^1.5.6",
+        "furi": "^1.3.0",
+        "istanbul-lib-coverage": "^2.0.1",
+        "istanbul-lib-report": "^2.0.1",
+        "istanbul-reports": "^2.0.0",
+        "rimraf": "^2.6.2",
+        "test-exclude": "^5.0.0",
+        "uuid": "^3.3.2",
+        "v8-to-istanbul": "^2.0.4",
+        "yargs": "^13.1.0",
+        "yargs-parser": "^10.1.0"
       }
     },
-    "dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
-      "dev": true
-    },
-    "dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+    "cacache": {
+      "version": "11.3.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz",
+      "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==",
       "dev": true,
       "requires": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
       }
     },
-    "dns-prefetch-control": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.2.0.tgz",
-      "integrity": "sha512-hvSnros73+qyZXhHFjx2CMLwoj3Fe7eR9EJsFsqmcI1bB2OBWL/+0YzaEaKssCHnj/6crawNnUyw74Gm2EKe+Q=="
-    },
-    "dns-txt": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
       "requires": {
-        "buffer-indexof": "^1.0.0"
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
       }
     },
-    "dom-serialize": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
-      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
+    "caching-transform": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-3.0.2.tgz",
+      "integrity": "sha512-Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w==",
       "dev": true,
       "requires": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
+        "hasha": "^3.0.0",
+        "make-dir": "^2.0.0",
+        "package-hash": "^3.0.0",
+        "write-file-atomic": "^2.4.2"
       }
     },
-    "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==",
-      "dev": true
-    },
-    "domexception": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
-      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+    "caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "dev": true,
       "requires": {
-        "webidl-conversions": "^4.0.2"
+        "callsites": "^2.0.0"
       }
     },
-    "dont-sniff-mimetype": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz",
-      "integrity": "sha512-ZjI4zqTaxveH2/tTlzS1wFp+7ncxNZaIEWYg3lzZRHkKf5zPT/MnEG6WL0BhHMJUabkh8GeU5NL5j+rEUCb7Ug=="
-    },
-    "dot-prop": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+    "caller-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
       "dev": true,
       "requires": {
-        "is-obj": "^1.0.0"
+        "caller-callsite": "^2.0.0"
       }
     },
-    "dottie": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.1.tgz",
-      "integrity": "sha512-ch5OQgvGDK2u8pSZeSYAQaV/lczImd7pMJ7BcEPXmnFVjy4yJIzP6CsODJUTH8mg1tyH1Z2abOiuJO3DjZ/GBw=="
+    "callsite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
+      "dev": true
     },
-    "duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+    "callsites": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
       "dev": true
     },
-    "duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
+    "camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+    },
+    "camelize": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
+      "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
+    },
+    "caniuse-lite": {
+      "version": "1.0.30000986",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000986.tgz",
+      "integrity": "sha512-pM+LnkoAX0+QnIH3tpW5EnkmfpEoqOD8FAcoBvsl3Xh6DXkgctiCxeCbXphP/k3XJtJzm+zOAJbi6U6IVkpWZQ==",
+      "dev": true
+    },
+    "canonical-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz",
+      "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
+      "dev": true
+    },
+    "capture-stack-trace": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
+      "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
       "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
+        "align-text": "^0.1.3",
+        "lazy-cache": "^1.0.3"
       }
     },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+    "chai": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
+      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
+      "dev": true,
       "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^3.0.1",
+        "get-func-name": "^2.0.0",
+        "pathval": "^1.1.0",
+        "type-detect": "^4.0.5"
       }
     },
-    "ecdsa-sig-formatter": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
-      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "requires": {
-        "safe-buffer": "^5.0.1"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    "character-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz",
+      "integrity": "sha1-wN3kqxgnE7kZuXCVmhI+zBow/NY="
     },
-    "electron-to-chromium": {
-      "version": "1.3.237",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.237.tgz",
-      "integrity": "sha512-SPAFjDr/7iiVK2kgTluwxela6eaWjjFkS9rO/iYpB/KGXgccUom5YC7OIf19c8m8GGptWxLU0Em8xM64A/N7Fg==",
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
-    "elliptic": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz",
-      "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==",
-      "dev": true,
+    "check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "dev": true
+    },
+    "cheerio": {
+      "version": "1.0.0-rc.3",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz",
+      "integrity": "sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==",
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "css-select": "~1.2.0",
+        "dom-serializer": "~0.1.1",
+        "entities": "~1.1.1",
+        "htmlparser2": "^3.9.1",
+        "lodash": "^4.15.0",
+        "parse5": "^3.0.1"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+          "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
+          "requires": {
+            "@types/node": "*"
+          }
+        }
       }
     },
-    "emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+    "chokidar": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz",
+      "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==",
+      "dev": true,
+      "requires": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "fsevents": "~2.1.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.3.0"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
+          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        }
+      }
     },
-    "emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+    "chownr": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
+      "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
       "dev": true
     },
-    "encodeurl": {
+    "chrome-trace-event": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true
-    },
-    "encoding": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
       "dev": true,
       "requires": {
-        "iconv-lite": "~0.4.13"
+        "tslib": "^1.9.0"
       }
     },
-    "end-of-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-      "requires": {
-        "once": "^1.4.0"
-      }
+    "ci-info": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
+      "dev": true
     },
-    "engine.io": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
-      "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
+    "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==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.4",
-        "base64id": "1.0.0",
-        "cookie": "0.3.1",
-        "debug": "~3.1.0",
-        "engine.io-parser": "~2.1.0",
-        "ws": "~3.3.1"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
-    "engine.io-client": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
-      "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+    "circular-dependency-plugin": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz",
+      "integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==",
+      "dev": true
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "requires": {
-        "component-emitter": "1.2.1",
-        "component-inherit": "0.0.3",
-        "debug": "~3.1.0",
-        "engine.io-parser": "~2.1.1",
-        "has-cors": "1.1.0",
-        "indexof": "0.0.1",
-        "parseqs": "0.0.5",
-        "parseuri": "0.0.5",
-        "ws": "~3.3.1",
-        "xmlhttprequest-ssl": "~1.5.4",
-        "yeast": "0.1.2"
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
       },
       "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
         }
       }
     },
-    "engine.io-parser": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
-      "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
-      "dev": true,
+    "clean-css": {
+      "version": "3.4.28",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz",
+      "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=",
       "requires": {
-        "after": "0.8.2",
-        "arraybuffer.slice": "~0.0.7",
-        "base64-arraybuffer": "0.1.5",
-        "blob": "0.0.5",
-        "has-binary2": "~1.0.2"
+        "commander": "2.8.x",
+        "source-map": "0.4.x"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.8.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+          "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
+          "requires": {
+            "graceful-readlink": ">= 1.0.0"
+          }
+        }
       }
     },
-    "enhanced-resolve": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
-      "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+    "cli-boxes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
+      "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
+      "dev": true
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.4.0",
-        "tapable": "^1.0.0"
+        "restore-cursor": "^2.0.0"
       }
     },
-    "ent": {
+    "cli-width": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
-      "dev": true
-    },
-    "err-code": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
-      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
       "dev": true
     },
-    "errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-      "dev": true,
+    "cliui": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
       "requires": {
-        "prr": "~1.0.1"
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
       }
     },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
+    "clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+      "dev": true
     },
-    "es-abstract": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
-      "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+    "clone-deep": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
+      "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
       "dev": true,
       "requires": {
-        "es-to-primitive": "^1.2.0",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "is-callable": "^1.1.4",
-        "is-regex": "^1.0.4",
-        "object-keys": "^1.0.12"
+        "for-own": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.0",
+        "shallow-clone": "^1.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
       }
     },
-    "es-to-primitive": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
-      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
-      "dev": true,
+    "cls-bluebird": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cls-bluebird/-/cls-bluebird-2.1.0.tgz",
+      "integrity": "sha1-N+8eCAqP+1XC9BZPU28ZGeeWiu4=",
       "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "is-bluebird": "^1.0.2",
+        "shimmer": "^1.1.0"
       }
     },
-    "es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "dev": true
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
     },
-    "es6-promise": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
-    "es6-promisify": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+    "codelyzer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.2.1.tgz",
+      "integrity": "sha512-awBZXFcJUyC5HMYXiHzjr3D24tww2l1D1OqtfA9vUhEtYr32a65A+Gblm/OvsO+HuKLYzn8EDMw1inSM3VbxWA==",
       "dev": true,
       "requires": {
-        "es6-promise": "^4.0.3"
-      }
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
-    "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="
-    },
-    "escodegen": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
-      "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
-      "requires": {
-        "esprima": "^3.1.3",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.6.1"
+        "app-root-path": "^2.2.1",
+        "aria-query": "^3.0.0",
+        "axobject-query": "2.0.2",
+        "css-selector-tokenizer": "^0.7.1",
+        "cssauron": "^1.4.0",
+        "damerau-levenshtein": "^1.0.4",
+        "semver-dsl": "^1.0.1",
+        "source-map": "^0.5.7",
+        "sprintf-js": "^1.1.2"
       },
       "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
+        "sprintf-js": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+          "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+          "dev": true
         }
       }
     },
-    "eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
       "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
       }
     },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
     },
-    "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-      "dev": true,
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "colors": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "requires": {
-        "estraverse": "^4.1.0"
+        "delayed-stream": "~1.0.0"
       }
     },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+    "commander": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
+      "integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0="
     },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
     },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+    "compare-versions": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.5.1.tgz",
+      "integrity": "sha512-9fGPIB7C6AyM18CJJBHt5EnCZDG3oiTJYy0NjfIAGjKpzv0tkxWko7TNQHF5ymqm7IH03tqmeuBxtvD+Izh6mg==",
+      "dev": true
+    },
+    "component-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
     },
-    "eventemitter3": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
-      "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==",
+    "component-inherit": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
       "dev": true
     },
-    "events": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+    "compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "dev": true,
+      "requires": {
+        "mime-db": ">= 1.43.0 < 2"
+      }
     },
-    "eventsource": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+    "compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
       "requires": {
-        "original": "^1.0.0"
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "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
+        }
       }
     },
-    "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==",
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "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==",
       "dev": true,
       "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
       }
     },
-    "execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+    "concurrently": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-4.1.2.tgz",
+      "integrity": "sha512-Kim9SFrNr2jd8/0yNYqDTFALzUX1tvimmwFWxmp/D4mRI+kbqIIwE2RkBDrxS2ic25O1UgQMI5AtBqdtX3ynYg==",
       "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
+        "chalk": "^2.4.2",
+        "date-fns": "^1.30.1",
+        "lodash": "^4.17.15",
+        "read-pkg": "^4.0.1",
+        "rxjs": "^6.5.2",
+        "spawn-command": "^0.0.2-1",
+        "supports-color": "^4.5.0",
+        "tree-kill": "^1.2.1",
+        "yargs": "^12.0.5"
       },
       "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          }
+        },
+        "get-caller-file": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+        },
+        "read-pkg": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz",
+          "integrity": "sha1-ljYlN48+HE1IyFhytabsfV0JMjc=",
+          "requires": {
+            "normalize-package-data": "^2.3.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0"
+          }
+        },
+        "require-main-filename": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "requires": {
+            "has-flag": "^2.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "requires": {
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+              "requires": {
+                "ansi-regex": "^2.0.0"
+              }
+            }
+          }
+        },
+        "yargs": {
+          "version": "12.0.5",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+          "requires": {
+            "cliui": "^4.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^3.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1 || ^4.0.0",
+            "yargs-parser": "^11.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
     },
-    "exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-      "dev": true
-    },
-    "expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+    "configstore": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
+      "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
       "dev": true,
       "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "dot-prop": "^4.1.0",
+        "graceful-fs": "^4.1.2",
+        "make-dir": "^1.0.0",
+        "unique-string": "^1.0.0",
+        "write-file-atomic": "^2.0.0",
+        "xdg-basedir": "^3.0.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+        "make-dir": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
           "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "pify": "^3.0.0"
           }
         },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
         }
       }
     },
-    "expect-ct": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/expect-ct/-/expect-ct-0.2.0.tgz",
-      "integrity": "sha512-6SK3MG/Bbhm8MsgyJAylg+ucIOU71/FzyFalcfu5nY19dH8y/z0tBJU0wrNBXD4B27EoQtqPF/9wqH0iYAd04g=="
-    },
-    "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+    "connect": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.7",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
-        "content-type": "~1.0.4",
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "finalhandler": "1.1.2",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
+        "utils-merge": "1.0.1"
       },
       "dependencies": {
-        "array-flatten": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-          "dev": true
-        },
-        "cookie": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-          "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
-          "dev": true
-        },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -4708,1056 +3969,1915 @@
           "requires": {
             "ms": "2.0.0"
           }
-        },
-        "path-to-regexp": {
-          "version": "0.1.7",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-          "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-          "dev": true
-        },
-        "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
         }
       }
     },
-    "express-http-proxy": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/express-http-proxy/-/express-http-proxy-1.5.1.tgz",
-      "integrity": "sha512-k1RdysZWZ8wdPnsLa4iyrrYyUFih/sYKkn6WfkU/q5A8eUdh3l+oXhrRuQmEYEsZmiexVvpiOCkogl03jYfcbg==",
-      "requires": {
-        "debug": "^3.0.1",
-        "es6-promise": "^4.1.1",
-        "raw-body": "^2.3.0"
-      }
+    "connect-history-api-fallback": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+      "dev": true
     },
-    "express-sanitizer": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/express-sanitizer/-/express-sanitizer-1.0.5.tgz",
-      "integrity": "sha512-48/Tf1DZ7JklRVTcXQLHAxhq4GNJTuHq2jjIYhyTmu0Bw+X06YPDD/e/tdn1QLYk706xw4N8JFxtjslRrDGb8g==",
+    "console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true
+    },
+    "constantinople": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz",
+      "integrity": "sha1-S5RdmTeQe82Y7ldRIsOBdRZUQUE=",
       "requires": {
-        "sanitizer": "0.1.3",
-        "underscore": "1.8.3"
+        "acorn": "^2.1.0"
       }
     },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
     },
-    "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+    "content-disposition": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
       "dev": true,
       "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
+        "safe-buffer": "5.1.2"
       },
       "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
+        "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
         }
       }
     },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      }
+    "content-security-policy-builder": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.1.0.tgz",
+      "integrity": "sha512-/MtLWhJVvJNkA9dVLAp6fg9LxD2gfI6R2Fi1hPmfjYXSahJJzcfvoeDOxSyp4NvxMuwWv3WMssE9o31DoULHrQ=="
     },
-    "extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
       "dev": true,
       "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "safe-buffer": "~5.1.1"
       },
       "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
+        "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
+        }
+      }
+    },
+    "convict": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/convict/-/convict-4.4.1.tgz",
+      "integrity": "sha512-celpR4hOWWwb/S8azhzgQwDon6muAJlNe2LTLeOGyoSgH390TsaqoieAe9BLbAv7+9wNfG7DTA2q3IfFp2viKw==",
+      "requires": {
+        "depd": "1.1.2",
+        "json5": "1.0.1",
+        "lodash.clonedeep": "4.5.0",
+        "moment": "2.22.2",
+        "validator": "10.8.0",
+        "yargs-parser": "11.0.0"
+      },
+      "dependencies": {
+        "moment": {
+          "version": "2.22.2",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
+          "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
         },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
+        "yargs-parser": {
+          "version": "11.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.0.0.tgz",
+          "integrity": "sha512-dvsafRjM45h79WOTvS/dP35Sb31SlGAKz6tFjI97kGC4MJFBuzTZY6TTYHrz0QSMQdkyd8Y+RsOMLr+JY0nPFQ==",
           "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
         }
       }
     },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
     },
-    "faker": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/faker/-/faker-4.1.0.tgz",
-      "integrity": "sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=",
-      "dev": true
+    "cookie-parser": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.4.tgz",
+      "integrity": "sha512-lo13tqF3JEtFO7FyA49CqbhaFkskRJ0u/UAiINgrIXeRCY41c88/zxtrECl8AKH3B0hj9q10+h3Kt8I7KlW4tw==",
+      "requires": {
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6"
+      }
     },
-    "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
     },
-    "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    "cookiejar": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
+      "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==",
+      "dev": true
     },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+    "cookies": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.8.0.tgz",
+      "integrity": "sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==",
+      "requires": {
+        "depd": "~2.0.0",
+        "keygrip": "~1.1.0"
+      },
+      "dependencies": {
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
+        }
+      }
     },
-    "fastparse": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
-      "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
       "dev": true
     },
-    "faye-websocket": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+    "copy-webpack-plugin": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz",
+      "integrity": "sha512-YBuYGpSzoCHSSDGyHy6VJ7SHojKp6WHT4D7ItcQFNAYx2hrwkMe56e97xfVR0/ovDuMTrMffXUiltvQljtAGeg==",
       "dev": true,
       "requires": {
-        "websocket-driver": ">=0.5.1"
+        "cacache": "^11.3.3",
+        "find-cache-dir": "^2.1.0",
+        "glob-parent": "^3.1.0",
+        "globby": "^7.1.1",
+        "is-glob": "^4.0.1",
+        "loader-utils": "^1.2.3",
+        "minimatch": "^3.0.4",
+        "normalize-path": "^3.0.0",
+        "p-limit": "^2.2.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.7.0",
+        "webpack-log": "^2.0.0"
       }
     },
-    "feature-policy": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/feature-policy/-/feature-policy-0.3.0.tgz",
-      "integrity": "sha512-ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ=="
+    "core-js": {
+      "version": "2.6.11",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
     },
-    "figgy-pudding": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
-      "dev": true
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
-    "figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+    "cosmiconfig": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "^1.0.5"
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
       }
     },
-    "file-loader": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.1.0.tgz",
-      "integrity": "sha512-ajDk1nlByoalZAGR4b0H6oD+EGlWnyW1qbSxzaUc7RFiqmn+RbXQQRbTc72jsiUIlVusJ4Et58ltds8ZwTfnAw==",
+    "cp-file": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz",
+      "integrity": "sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.2.3",
-        "schema-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.1.0.tgz",
-          "integrity": "sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        }
+        "graceful-fs": "^4.1.2",
+        "make-dir": "^2.0.0",
+        "nested-error-stacks": "^2.0.0",
+        "pify": "^4.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
-    "file-saver": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.2.tgz",
-      "integrity": "sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw=="
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      }
     },
-    "fileset": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
-      "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
+    "create-error-class": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
       "dev": true,
       "requires": {
-        "glob": "^7.0.3",
-        "minimatch": "^3.0.3"
+        "capture-stack-trace": "^1.0.0"
       }
     },
-    "fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+    "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==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
+        "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==",
+      "dev": true,
+      "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"
       }
     },
-    "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+    "cross-env": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz",
+      "integrity": "sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
+        "cross-spawn": "^6.0.5"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         }
       }
     },
-    "find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-      "dev": true,
+    "cross-spawn": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
+      "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
       "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
+        "lru-cache": "^4.0.1",
+        "which": "^1.2.9"
       }
     },
-    "find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+    "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==",
+      "dev": true,
       "requires": {
-        "locate-path": "^3.0.0"
+        "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"
       }
     },
-    "flat": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
-      "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
-      "dev": true,
+    "crypto-random-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+      "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=",
+      "dev": true
+    },
+    "css": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/css/-/css-1.0.8.tgz",
+      "integrity": "sha1-k4aBHKgrzMnuf7WnMrHioxfIo+c=",
       "requires": {
-        "is-buffer": "~2.0.3"
+        "css-parse": "1.0.4",
+        "css-stringify": "1.0.5"
       }
     },
-    "flatted": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
-      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
-      "dev": true
+    "css-parse": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz",
+      "integrity": "sha1-OLBQP7+dqfVOnB29pg4UXHcRe90="
     },
-    "flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
+    "css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
       "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "~1.0.1"
       }
     },
-    "follow-redirects": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
-      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+    "css-selector-tokenizer": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz",
+      "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
+      "dev": true,
       "requires": {
-        "debug": "=3.1.0"
+        "cssesc": "^0.1.0",
+        "fastparse": "^1.1.1",
+        "regexpu-core": "^1.0.0"
       }
     },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
+    "css-stringify": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz",
+      "integrity": "sha1-sNBClG2ylTu50pKQCmy19tASIDE="
     },
-    "for-own": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+    "css-what": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="
+    },
+    "cssauron": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
+      "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=",
       "dev": true,
       "requires": {
-        "for-in": "^1.0.1"
+        "through": "X.X.X"
       }
     },
-    "foreachasync": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz",
-      "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY="
+    "cssesc": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
+      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
+      "dev": true
     },
-    "foreground-child": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz",
-      "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=",
+    "cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
+    },
+    "cssstyle": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz",
+      "integrity": "sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==",
       "requires": {
-        "cross-spawn": "^4",
-        "signal-exit": "^3.0.0"
+        "cssom": "~0.3.6"
+      },
+      "dependencies": {
+        "cssom": {
+          "version": "0.3.8",
+          "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+          "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+        }
       }
     },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+    "csvtojson": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/csvtojson/-/csvtojson-2.0.10.tgz",
+      "integrity": "sha512-lUWFxGKyhraKCW8Qghz6Z0f2l/PqB1W3AO0HKJzGIQ5JRSlR651ekJDiGJbBT4sRNNv5ddnSGVEnsxP9XRCVpQ==",
       "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
+        "bluebird": "^3.5.1",
+        "lodash": "^4.17.3",
+        "strip-bom": "^2.0.0"
+      },
+      "dependencies": {
+        "strip-bom": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+          "requires": {
+            "is-utf8": "^0.2.0"
+          }
+        }
       }
     },
-    "formidable": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz",
-      "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==",
+    "custom-event": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
+      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
       "dev": true
     },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+    "cyclist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
       "dev": true
     },
-    "fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
+    "damerau-levenshtein": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz",
+      "integrity": "sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug==",
+      "dev": true
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "requires": {
-        "map-cache": "^0.2.2"
+        "assert-plus": "^1.0.0"
       }
     },
-    "frameguard": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/frameguard/-/frameguard-3.1.0.tgz",
-      "integrity": "sha512-TxgSKM+7LTA6sidjOiSZK9wxY0ffMPY3Wta//MqwmX0nZuEHc8QrkV8Fh3ZhMJeiH+Uyh/tcaarImRy8u77O7g=="
+    "dasherize": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz",
+      "integrity": "sha1-bYCcnNDPe7iVLYD8hPoT1H3bEwg="
     },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+    "data-urls": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
+      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+      "requires": {
+        "abab": "^2.0.0",
+        "whatwg-mimetype": "^2.2.0",
+        "whatwg-url": "^7.0.0"
+      }
     },
-    "from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "dev": true,
+    "date-fns": {
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
+      "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="
+    },
+    "date-format": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
+      "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==",
+      "dev": true
+    },
+    "debug": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
       "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
+        "ms": "2.0.0"
       }
     },
-    "fs-access": {
+    "debuglog": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
-      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
-      "dev": true,
-      "requires": {
-        "null-check": "^1.0.0"
-      }
+      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
+      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
+      "dev": true
     },
-    "fs-extra": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
-    "fs-minipass": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz",
-      "integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==",
-      "dev": true,
-      "requires": {
-        "minipass": "^2.2.1"
-      }
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
     },
-    "fs-write-stream-atomic": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+    "deep-eql": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
+        "type-detect": "^4.0.0"
       }
     },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "fsevents": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
-      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nan": "^2.12.1",
-        "node-pre-gyp": "^0.12.0"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aproba": {
-          "version": "1.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
-          }
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "chownr": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "debug": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "deep-extend": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "fs-minipass": {
-          "version": "1.2.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.2.1"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
-        "ignore-walk": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimatch": "^3.0.4"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
+    "deep-equal": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
+      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+      "dev": true,
+      "requires": {
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.1",
+        "is-regex": "^1.0.4",
+        "object-is": "^1.0.1",
+        "object-keys": "^1.1.1",
+        "regexp.prototype.flags": "^1.2.0"
+      }
+    },
+    "deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "dev": true
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+    },
+    "default-gateway": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+      "dev": true,
+      "requires": {
+        "execa": "^1.0.0",
+        "ip-regex": "^2.1.0"
+      }
+    },
+    "default-require-extensions": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz",
+      "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=",
+      "dev": true,
+      "requires": {
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
           "version": "1.0.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "kind-of": "^6.0.0"
           }
         },
-        "isarray": {
+        "is-data-descriptor": {
           "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minipass": {
-          "version": "2.3.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
-          }
-        },
-        "minizlib": {
-          "version": "1.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.2.1"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "needle": {
-          "version": "2.3.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "^4.1.0",
-            "iconv-lite": "^0.4.4",
-            "sax": "^1.2.4"
-          }
-        },
-        "node-pre-gyp": {
-          "version": "0.12.0",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "detect-libc": "^1.0.2",
-            "mkdirp": "^0.5.1",
-            "needle": "^2.2.1",
-            "nopt": "^4.0.1",
-            "npm-packlist": "^1.1.6",
-            "npmlog": "^4.0.2",
-            "rc": "^1.2.7",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^4"
+            "kind-of": "^6.0.0"
           }
         },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         },
-        "npm-bundled": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "npm-packlist": {
-          "version": "1.4.1",
-          "bundled": true,
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
+      }
+    },
+    "del": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+      "dev": true,
+      "requires": {
+        "@types/glob": "^7.1.1",
+        "globby": "^6.1.0",
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
+      },
+      "dependencies": {
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
+            "array-union": "^1.0.1",
+            "glob": "^7.0.3",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+              "dev": true
+            }
           }
+        }
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    },
+    "dependency-graph": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.7.2.tgz",
+      "integrity": "sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==",
+      "dev": true
+    },
+    "des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+    },
+    "details-element-polyfill": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/details-element-polyfill/-/details-element-polyfill-2.4.0.tgz",
+      "integrity": "sha512-jnZ/m0+b1gz3EcooitqL7oDEkKHEro659dt8bWB/T/HjiILucoQhHvvi5MEOAIFJXxxO+rIYJ/t3qCgfUOSU5g=="
+    },
+    "detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "dev": true,
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
+    "detect-node": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "dev": true
+    },
+    "dezalgo": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
+      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
+      "dev": true,
+      "requires": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
+      },
+      "dependencies": {
+        "asap": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+          "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
+          "dev": true
+        }
+      }
+    },
+    "di": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
+      "dev": true
+    },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "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==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "dir-glob": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
+      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+      "dev": true,
+      "requires": {
+        "path-type": "^3.0.0"
+      }
+    },
+    "dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
+      "dev": true
+    },
+    "dns-packet": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "dev": true,
+      "requires": {
+        "ip": "^1.1.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "dns-prefetch-control": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.2.0.tgz",
+      "integrity": "sha512-hvSnros73+qyZXhHFjx2CMLwoj3Fe7eR9EJsFsqmcI1bB2OBWL/+0YzaEaKssCHnj/6crawNnUyw74Gm2EKe+Q=="
+    },
+    "dns-txt": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "dev": true,
+      "requires": {
+        "buffer-indexof": "^1.0.0"
+      }
+    },
+    "dom-serialize": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
+      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
+      "dev": true,
+      "requires": {
+        "custom-event": "~1.0.0",
+        "ent": "~2.2.0",
+        "extend": "^3.0.0",
+        "void-elements": "^2.0.0"
+      }
+    },
+    "dom-serializer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+      "requires": {
+        "domelementtype": "^1.3.0",
+        "entities": "^1.1.1"
+      }
+    },
+    "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==",
+      "dev": true
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
+    },
+    "domexception": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
+      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+      "requires": {
+        "webidl-conversions": "^4.0.2"
+      }
+    },
+    "domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "requires": {
+        "domelementtype": "1"
+      }
+    },
+    "domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "dont-sniff-mimetype": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz",
+      "integrity": "sha512-ZjI4zqTaxveH2/tTlzS1wFp+7ncxNZaIEWYg3lzZRHkKf5zPT/MnEG6WL0BhHMJUabkh8GeU5NL5j+rEUCb7Ug=="
+    },
+    "dot-prop": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+      "dev": true,
+      "requires": {
+        "is-obj": "^1.0.0"
+      }
+    },
+    "dottie": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.2.tgz",
+      "integrity": "sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg=="
+    },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+      "dev": true
+    },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    },
+    "electron-to-chromium": {
+      "version": "1.3.348",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.348.tgz",
+      "integrity": "sha512-6O0IInybavGdYtcbI4ryF/9e3Qi8/soi6C68ELRseJuTwQPKq39uGgVVeQHG28t69Sgsky09nXBRhUiFXsZyFQ==",
+      "dev": true
+    },
+    "elliptic": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
+      "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+    },
+    "encoding": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "dev": true,
+      "requires": {
+        "iconv-lite": "~0.4.13"
+      }
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "engine.io": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
+      "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.4",
+        "base64id": "1.0.0",
+        "cookie": "0.3.1",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.0",
+        "ws": "~3.3.1"
+      },
+      "dependencies": {
+        "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
         },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
+        "ws": {
+          "version": "3.3.3",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+          "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
+            "async-limiter": "~1.0.0",
+            "safe-buffer": "~5.1.0",
+            "ultron": "~1.1.0"
           }
+        }
+      }
+    },
+    "engine.io-client": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+      "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "component-inherit": "0.0.3",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.1",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "ws": "~3.3.1",
+        "xmlhttprequest-ssl": "~1.5.4",
+        "yeast": "0.1.2"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
         },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "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
         },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
+        "ws": {
+          "version": "3.3.3",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+          "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "wrappy": "1"
+            "async-limiter": "~1.0.0",
+            "safe-buffer": "~5.1.0",
+            "ultron": "~1.1.0"
           }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
+      "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
+      "dev": true,
+      "requires": {
+        "after": "0.8.2",
+        "arraybuffer.slice": "~0.0.7",
+        "base64-arraybuffer": "0.1.5",
+        "blob": "0.0.5",
+        "has-binary2": "~1.0.2"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
+      "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.4.0",
+        "tapable": "^1.0.0"
+      }
+    },
+    "ent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+      "dev": true
+    },
+    "entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+    },
+    "err-code": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
+      "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=",
+      "dev": true
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "dev": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.17.4",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
+      "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1",
+        "is-callable": "^1.1.5",
+        "is-regex": "^1.0.5",
+        "object-inspect": "^1.7.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.0",
+        "string.prototype.trimleft": "^2.1.1",
+        "string.prototype.trimright": "^2.1.1"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+      "dev": true
+    },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
+    "es6-promisify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "dev": true,
+      "requires": {
+        "es6-promise": "^4.0.3"
+      }
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+    },
+    "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="
+    },
+    "escodegen": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz",
+      "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==",
+      "requires": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "optional": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
+        }
+      }
+    },
+    "eslint-scope": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+    },
+    "esquery": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
+      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.1.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz",
+          "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==",
+          "dev": true
+        }
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+    },
+    "eventemitter3": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
+      "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==",
+      "dev": true
+    },
+    "events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+    },
+    "eventsource": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+      "dev": true,
+      "requires": {
+        "original": "^1.0.0"
+      }
+    },
+    "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==",
+      "dev": true,
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "requires": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.8",
-          "bundled": true,
+        }
+      }
+    },
+    "exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
+            "ms": "2.0.0"
           }
         },
-        "readable-stream": {
-          "version": "2.3.6",
-          "bundled": true,
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
-          "optional": true,
           "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"
+            "is-descriptor": "^0.1.0"
           }
         },
-        "rimraf": {
-          "version": "2.6.3",
-          "bundled": true,
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "glob": "^7.1.3"
+            "is-extendable": "^0.1.0"
           }
+        }
+      }
+    },
+    "expect-ct": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/expect-ct/-/expect-ct-0.2.0.tgz",
+      "integrity": "sha512-6SK3MG/Bbhm8MsgyJAylg+ucIOU71/FzyFalcfu5nY19dH8y/z0tBJU0wrNBXD4B27EoQtqPF/9wqH0iYAd04g=="
+    },
+    "express": {
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.7",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
+        "content-type": "~1.0.4",
+        "cookie": "0.4.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "~1.1.2",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.1.2",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "array-flatten": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+          "dev": true
         },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "cookie": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+          "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+          "dev": true
         },
-        "sax": {
-          "version": "1.2.4",
-          "bundled": true,
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
-          "optional": true
+          "requires": {
+            "ms": "2.0.0"
+          }
         },
-        "semver": {
-          "version": "5.7.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "path-to-regexp": {
+          "version": "0.1.7",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+          "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+          "dev": true
         },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+          "dev": true
         },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
+        "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
+        }
+      }
+    },
+    "express-http-proxy": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/express-http-proxy/-/express-http-proxy-1.6.0.tgz",
+      "integrity": "sha512-7Re6Lepg96NA2wiv7DC5csChAScn4K76/UgYnC71XiITCT1cgGTJUGK6GS0pIixudg3Fbx3Q6mmEW3mZv5tHFQ==",
+      "requires": {
+        "debug": "^3.0.1",
+        "es6-promise": "^4.1.1",
+        "raw-body": "^2.3.0"
+      }
+    },
+    "express-sanitizer": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/express-sanitizer/-/express-sanitizer-1.0.5.tgz",
+      "integrity": "sha512-48/Tf1DZ7JklRVTcXQLHAxhq4GNJTuHq2jjIYhyTmu0Bw+X06YPDD/e/tdn1QLYk706xw4N8JFxtjslRrDGb8g==",
+      "requires": {
+        "sanitizer": "0.1.3",
+        "underscore": "1.8.3"
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
-          "optional": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "dev": true,
+      "requires": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "is-descriptor": "^1.0.0"
           }
         },
-        "string_decoder": {
-          "version": "1.1.1",
-          "bundled": true,
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "is-extendable": "^0.1.0"
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "kind-of": "^6.0.0"
           }
         },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "4.4.8",
-          "bundled": true,
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.4",
-            "minizlib": "^1.1.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.2"
+            "kind-of": "^6.0.0"
           }
         },
-        "util-deprecate": {
+        "is-descriptor": {
           "version": "1.0.2",
-          "bundled": true,
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
-          "optional": true
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
         },
-        "wide-align": {
-          "version": "1.1.3",
-          "bundled": true,
+        "kind-of": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+          "dev": true
+        }
+      }
+    },
+    "extract-zip": {
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
+      "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
+      "dev": true,
+      "requires": {
+        "concat-stream": "1.6.2",
+        "debug": "2.6.9",
+        "mkdirp": "0.5.1",
+        "yauzl": "2.4.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "string-width": "^1.0.2 || 2"
+            "ms": "2.0.0"
           }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
+        }
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "faker": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/faker/-/faker-4.1.0.tgz",
+      "integrity": "sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+    },
+    "fastparse": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
+      "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
+      "dev": true
+    },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "dev": true,
+      "requires": {
+        "websocket-driver": ">=0.5.1"
+      }
+    },
+    "fd-slicer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+      "dev": true,
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
+    "feature-policy": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/feature-policy/-/feature-policy-0.3.0.tgz",
+      "integrity": "sha512-ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ=="
+    },
+    "figgy-pudding": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
+      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+      "dev": true
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-loader": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.1.0.tgz",
+      "integrity": "sha512-ajDk1nlByoalZAGR4b0H6oD+EGlWnyW1qbSxzaUc7RFiqmn+RbXQQRbTc72jsiUIlVusJ4Et58ltds8ZwTfnAw==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "2.6.4",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
+          "integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
           "dev": true,
-          "optional": true
-        },
-        "yallist": {
-          "version": "3.0.3",
-          "bundled": true,
+          "requires": {
+            "ajv": "^6.10.2",
+            "ajv-keywords": "^3.4.1"
+          }
+        }
+      }
+    },
+    "file-saver": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.2.tgz",
+      "integrity": "sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw=="
+    },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
+    "fileset": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
+      "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.3",
+        "minimatch": "^3.0.3"
+      }
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
-          "optional": true
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "find-cache-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+      "dev": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      }
+    },
+    "find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "requires": {
+        "locate-path": "^3.0.0"
+      }
+    },
+    "flat": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
+      "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
+      "dev": true,
+      "requires": {
+        "is-buffer": "~2.0.3"
+      },
+      "dependencies": {
+        "is-buffer": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
+          "dev": true
         }
       }
     },
+    "flatted": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
+      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
+      "dev": true
+    },
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "follow-redirects": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+      "requires": {
+        "debug": "=3.1.0"
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.1"
+      }
+    },
+    "foreachasync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz",
+      "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY="
+    },
+    "foreground-child": {
+      "version": "1.5.6",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz",
+      "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=",
+      "requires": {
+        "cross-spawn": "^4",
+        "signal-exit": "^3.0.0"
+      }
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "formidable": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz",
+      "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==",
+      "dev": true
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "frameguard": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/frameguard/-/frameguard-3.1.0.tgz",
+      "integrity": "sha512-TxgSKM+7LTA6sidjOiSZK9wxY0ffMPY3Wta//MqwmX0nZuEHc8QrkV8Fh3ZhMJeiH+Uyh/tcaarImRy8u77O7g=="
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "fs-access": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
+      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
+      "dev": true,
+      "requires": {
+        "null-check": "^1.0.0"
+      }
+    },
+    "fs-extra": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "fs-minipass": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+      "dev": true,
+      "requires": {
+        "minipass": "^2.6.0"
+      }
+    },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fsevents": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
+      "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
+      "dev": true,
+      "optional": true
+    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -5818,9 +5938,9 @@
       }
     },
     "glob": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -5921,9 +6041,9 @@
       "integrity": "sha512-6XDtTt5plSrPQvPgLFN4LCtb9ULuqoXCgkHy5c7XE/70/sVm47RPbLR11tYGPcmV8cOApBhW0wL8y8ryspHfpw=="
     },
     "graceful-fs": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz",
-      "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw=="
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
     },
     "graceful-readlink": {
       "version": "1.0.1",
@@ -5942,52 +6062,18 @@
       "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
       "dev": true
     },
-    "handlebars": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz",
-      "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==",
-      "requires": {
-        "neo-async": "^2.6.0",
-        "optimist": "^0.6.1",
-        "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4"
-      }
-    },
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
       "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
       "requires": {
-        "ajv": "^5.1.0",
+        "ajv": "^6.5.5",
         "har-schema": "^2.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "5.5.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-          "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
-        },
-        "json-schema-traverse": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
-        }
       }
     },
     "has": {
@@ -6045,9 +6131,9 @@
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
     "has-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
-      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
       "dev": true
     },
     "has-value": {
@@ -6071,11 +6157,25 @@
         "kind-of": "^4.0.0"
       },
       "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
         },
         "kind-of": {
           "version": "4.0.0",
@@ -6124,9 +6224,9 @@
       "dev": true
     },
     "helmet": {
-      "version": "3.20.0",
-      "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.20.0.tgz",
-      "integrity": "sha512-Ob+TqmQFZ5f7WgP8kBbAzNPsbf6p1lOj5r+327/ymw/IILWih3wcx9u/u/S8Mwv5wbBkO7Li6x5s23t3COhUKw==",
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.21.2.tgz",
+      "integrity": "sha512-okUo+MeWgg00cKB8Csblu8EXgcIoDyb5ZS/3u0W4spCimeVuCUvVZ6Vj3O2VJ1Sxpyb8jCDvzu0L1KKT11pkIg==",
       "requires": {
         "depd": "2.0.0",
         "dns-prefetch-control": "0.2.0",
@@ -6135,14 +6235,14 @@
         "feature-policy": "0.3.0",
         "frameguard": "3.1.0",
         "helmet-crossdomain": "0.4.0",
-        "helmet-csp": "2.8.0",
+        "helmet-csp": "2.9.4",
         "hide-powered-by": "1.1.0",
         "hpkp": "2.0.0",
         "hsts": "2.2.0",
         "ienoopen": "1.1.0",
         "nocache": "2.1.0",
         "referrer-policy": "1.2.0",
-        "x-xss-protection": "1.2.0"
+        "x-xss-protection": "1.3.0"
       },
       "dependencies": {
         "depd": {
@@ -6158,14 +6258,14 @@
       "integrity": "sha512-AB4DTykRw3HCOxovD1nPR16hllrVImeFp5VBV9/twj66lJ2nU75DP8FPL0/Jp4jj79JhTfG+pFI2MD02kWJ+fA=="
     },
     "helmet-csp": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.8.0.tgz",
-      "integrity": "sha512-MlCPeM0Sm3pS9RACRihx70VeTHmkQwa7sum9EK1tfw1VZyvFU0dBWym9nHh3CRkTRNlyNm/WFCMvuh9zXkOjNw==",
+      "version": "2.9.4",
+      "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.9.4.tgz",
+      "integrity": "sha512-qUgGx8+yk7Xl8XFEGI4MFu1oNmulxhQVTlV8HP8tV3tpfslCs30OZz/9uQqsWPvDISiu/NwrrCowsZBhFADYqg==",
       "requires": {
+        "bowser": "^2.7.0",
         "camelize": "1.0.0",
         "content-security-policy-builder": "2.1.0",
-        "dasherize": "2.0.0",
-        "platform": "1.3.5"
+        "dasherize": "2.0.0"
       }
     },
     "hide-powered-by": {
@@ -6185,27 +6285,9 @@
       }
     },
     "hosted-git-info": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz",
-      "integrity": "sha512-CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w==",
-      "requires": {
-        "lru-cache": "^5.1.1"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "yallist": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
-        }
-      }
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
+      "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg=="
     },
     "hpack.js": {
       "version": "2.1.6",
@@ -6253,6 +6335,36 @@
       "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
       "dev": true
     },
+    "html-escaper": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz",
+      "integrity": "sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig=="
+    },
+    "htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+      "requires": {
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz",
+          "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
     "http-cache-semantics": {
       "version": "3.8.1",
       "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
@@ -6284,12 +6396,12 @@
       "dev": true
     },
     "http-proxy": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
+      "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
       "dev": true,
       "requires": {
-        "eventemitter3": "^3.0.0",
+        "eventemitter3": "^4.0.0",
         "follow-redirects": "^1.0.0",
         "requires-port": "^1.0.0"
       }
@@ -6333,9 +6445,9 @@
       "dev": true
     },
     "https-proxy-agent": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz",
-      "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
       "dev": true,
       "requires": {
         "agent-base": "^4.3.0",
@@ -6360,9 +6472,9 @@
       }
     },
     "ieee754": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q="
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
     },
     "ienoopen": {
       "version": "1.1.0",
@@ -6388,9 +6500,9 @@
       "dev": true
     },
     "ignore-walk": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
-      "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
+      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
       "dev": true,
       "requires": {
         "minimatch": "^3.0.4"
@@ -6595,18 +6707,24 @@
         "kind-of": "^3.0.2"
       }
     },
+    "is-arguments": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
+      "dev": true
+    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
     },
     "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
       "requires": {
-        "binary-extensions": "^1.0.0"
+        "binary-extensions": "^2.0.0"
       }
     },
     "is-bluebird": {
@@ -6615,14 +6733,14 @@
       "integrity": "sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI="
     },
     "is-buffer": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
-      "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
     "is-callable": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+      "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
       "dev": true
     },
     "is-ci": {
@@ -6644,9 +6762,9 @@
       }
     },
     "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
       "dev": true
     },
     "is-descriptor": {
@@ -6687,13 +6805,10 @@
       "dev": true
     },
     "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+      "dev": true
     },
     "is-fullwidth-code-point": {
       "version": "2.0.0",
@@ -6717,6 +6832,17 @@
       "requires": {
         "global-dirs": "^0.1.0",
         "is-path-inside": "^1.0.0"
+      },
+      "dependencies": {
+        "is-path-inside": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+          "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+          "dev": true,
+          "requires": {
+            "path-is-inside": "^1.0.1"
+          }
+        }
       }
     },
     "is-npm": {
@@ -6726,13 +6852,10 @@
       "dev": true
     },
     "is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      }
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
     },
     "is-obj": {
       "version": "1.0.1",
@@ -6741,27 +6864,27 @@
       "dev": true
     },
     "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
       "dev": true
     },
     "is-path-in-cwd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
       "dev": true,
       "requires": {
-        "is-path-inside": "^1.0.0"
+        "is-path-inside": "^2.1.0"
       }
     },
     "is-path-inside": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
       "dev": true,
       "requires": {
-        "path-is-inside": "^1.0.1"
+        "path-is-inside": "^1.0.2"
       }
     },
     "is-plain-obj": {
@@ -6791,18 +6914,18 @@
       "dev": true
     },
     "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+      "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
       "dev": true,
       "requires": {
-        "has": "^1.0.1"
+        "has": "^1.0.3"
       }
     },
     "is-retry-allowed": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
       "dev": true
     },
     "is-stream": {
@@ -6811,12 +6934,12 @@
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
     },
     "is-symbol": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
-      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
       "dev": true,
       "requires": {
-        "has-symbols": "^1.0.0"
+        "has-symbols": "^1.0.1"
       }
     },
     "is-typedarray": {
@@ -6926,6 +7049,18 @@
         "schema-utils": "^0.3.0"
       },
       "dependencies": {
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "dev": true,
+          "requires": {
+            "co": "^4.6.0",
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0"
+          }
+        },
         "fast-deep-equal": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
@@ -6945,20 +7080,6 @@
           "dev": true,
           "requires": {
             "ajv": "^5.0.0"
-          },
-          "dependencies": {
-            "ajv": {
-              "version": "5.5.2",
-              "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-              "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-              "dev": true,
-              "requires": {
-                "co": "^4.6.0",
-                "fast-deep-equal": "^1.0.0",
-                "fast-json-stable-stringify": "^2.0.0",
-                "json-schema-traverse": "^0.3.0"
-              }
-            }
           }
         }
       }
@@ -7037,15 +7158,21 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
     "istanbul-reports": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz",
-      "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==",
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz",
+      "integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==",
       "requires": {
-        "handlebars": "^4.1.2"
+        "html-escaper": "^2.0.0"
       }
     },
     "jade": {
@@ -7063,59 +7190,6 @@
         "uglify-js": "^2.4.19",
         "void-elements": "~2.0.1",
         "with": "~4.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
-        },
-        "cliui": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-          "requires": {
-            "center-align": "^0.1.1",
-            "right-align": "^0.1.1",
-            "wordwrap": "0.0.2"
-          }
-        },
-        "commander": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
-          "integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0="
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "uglify-js": {
-          "version": "2.8.29",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
-          "requires": {
-            "source-map": "~0.5.1",
-            "uglify-to-browserify": "~1.0.0",
-            "yargs": "~3.10.0"
-          }
-        },
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
-        },
-        "yargs": {
-          "version": "3.10.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-          "requires": {
-            "camelcase": "^1.0.2",
-            "cliui": "^2.1.0",
-            "decamelize": "^1.0.0",
-            "window-size": "0.1.0"
-          }
-        }
       }
     },
     "jasmine": {
@@ -7184,21 +7258,21 @@
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
     "jsdom": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.1.1.tgz",
-      "integrity": "sha512-cQZRBB33arrDAeCrAEWn1U3SvrvC8XysBua9Oqg1yWrsY/gYcusloJC3RZJXuY5eehSCmws8f2YeliCqGSkrtQ==",
+      "version": "15.2.1",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz",
+      "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==",
       "requires": {
         "abab": "^2.0.0",
-        "acorn": "^6.1.1",
+        "acorn": "^7.1.0",
         "acorn-globals": "^4.3.2",
         "array-equal": "^1.0.0",
-        "cssom": "^0.3.6",
-        "cssstyle": "^1.2.2",
+        "cssom": "^0.4.1",
+        "cssstyle": "^2.0.0",
         "data-urls": "^1.1.0",
         "domexception": "^1.0.1",
         "escodegen": "^1.11.1",
         "html-encoding-sniffer": "^1.0.2",
-        "nwsapi": "^2.1.4",
+        "nwsapi": "^2.2.0",
         "parse5": "5.1.0",
         "pn": "^1.1.0",
         "request": "^2.88.0",
@@ -7217,121 +7291,30 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-          "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA=="
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
+          "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ=="
         },
         "acorn-globals": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz",
-          "integrity": "sha512-vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
+          "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
           "requires": {
             "acorn": "^6.0.1",
             "acorn-walk": "^6.0.1"
-          }
-        },
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
-        },
-        "har-validator": {
-          "version": "5.1.3",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-          "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-          "requires": {
-            "ajv": "^6.5.5",
-            "har-schema": "^2.0.0"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-        },
-        "oauth-sign": {
-          "version": "0.9.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-        },
-        "request": {
-          "version": "2.88.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-          "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.8.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.6",
-            "extend": "~3.0.2",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.2",
-            "har-validator": "~5.1.0",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.19",
-            "oauth-sign": "~0.9.0",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.2",
-            "safe-buffer": "^5.1.2",
-            "tough-cookie": "~2.4.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.3.2"
-          },
-          "dependencies": {
-            "tough-cookie": {
-              "version": "2.4.3",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-              "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-              "requires": {
-                "psl": "^1.1.24",
-                "punycode": "^1.4.1"
-              }
-            }
-          }
-        },
-        "tough-cookie": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-          "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
-          "requires": {
-            "ip-regex": "^2.1.0",
-            "psl": "^1.1.28",
-            "punycode": "^2.1.1"
           },
           "dependencies": {
-            "punycode": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-              "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+            "acorn": {
+              "version": "6.4.0",
+              "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
+              "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw=="
             }
           }
         },
-        "ws": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.1.2.tgz",
-          "integrity": "sha512-gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg==",
-          "requires": {
-            "async-limiter": "^1.0.0"
-          }
+        "parse5": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
+          "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="
         }
       }
     },
@@ -7373,13 +7356,6 @@
       "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "requires": {
         "minimist": "^1.2.0"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-        }
       }
     },
     "jsonfile": {
@@ -7391,12 +7367,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "jsonify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-      "dev": true
-    },
     "jsonparse": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
@@ -7484,9 +7454,9 @@
       }
     },
     "karma": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-4.2.0.tgz",
-      "integrity": "sha512-fmCuxN1rwJxTdZfOXK5LjlmS4Ana/OvzNMpkyLL/TLE8hmgSkpVpMYQ7RTVa8TNKRVQDZNl5W1oF5cfKfgIMlA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-4.4.1.tgz",
+      "integrity": "sha512-L5SIaXEYqzrh6b1wqYC42tNsFMx2PWuxky84pK9coK09MvmL7mxii3G3bZBh/0rvD27lqDd0le9jyhzvwif73A==",
       "dev": true,
       "requires": {
         "bluebird": "^3.3.0",
@@ -7495,7 +7465,6 @@
         "chokidar": "^3.0.0",
         "colors": "^1.1.0",
         "connect": "^3.6.0",
-        "core-js": "^3.1.3",
         "di": "^0.0.1",
         "dom-serialize": "^2.2.0",
         "flatted": "^2.0.0",
@@ -7503,7 +7472,7 @@
         "graceful-fs": "^4.1.2",
         "http-proxy": "^1.13.0",
         "isbinaryfile": "^3.0.0",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.14",
         "log4js": "^4.0.0",
         "mime": "^2.3.1",
         "minimatch": "^3.0.2",
@@ -7518,122 +7487,33 @@
         "useragent": "2.3.0"
       },
       "dependencies": {
-        "anymatch": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz",
-          "integrity": "sha512-c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==",
-          "dev": true,
-          "requires": {
-            "normalize-path": "^3.0.0",
-            "picomatch": "^2.0.4"
-          }
-        },
-        "binary-extensions": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
-          "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
-          "dev": true
-        },
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "chokidar": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz",
-          "integrity": "sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^3.0.1",
-            "braces": "^3.0.2",
-            "fsevents": "^2.0.6",
-            "glob-parent": "^5.0.0",
-            "is-binary-path": "^2.1.0",
-            "is-glob": "^4.0.1",
-            "normalize-path": "^3.0.0",
-            "readdirp": "^3.1.1"
-          }
-        },
-        "core-js": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz",
-          "integrity": "sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==",
-          "dev": true
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "fsevents": {
-          "version": "2.0.7",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz",
-          "integrity": "sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==",
-          "dev": true,
-          "optional": true
-        },
-        "glob-parent": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz",
-          "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        },
-        "is-binary-path": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-          "dev": true,
-          "requires": {
-            "binary-extensions": "^2.0.0"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
         "mime": {
           "version": "2.4.4",
           "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
           "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
           "dev": true
         },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+        "minimist": {
+          "version": "0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
           "dev": true
         },
-        "readdirp": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.1.tgz",
-          "integrity": "sha512-XXdSXZrQuvqoETj50+JAitxz1UPdt5dupjT6T5nVB+WvjMv2XKYj+s7hPeAVCXvmJrL36O4YYyWlIC3an2ePiQ==",
+        "optimist": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+          "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
           "dev": true,
           "requires": {
-            "picomatch": "^2.0.4"
+            "minimist": "~0.0.1",
+            "wordwrap": "~0.0.2"
           }
         },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
@@ -7691,9 +7571,12 @@
       }
     },
     "keygrip": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.0.3.tgz",
-      "integrity": "sha512-/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
+      "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==",
+      "requires": {
+        "tsscmp": "1.0.6"
+      }
     },
     "killable": {
       "version": "1.0.1",
@@ -7707,13 +7590,6 @@
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
       "requires": {
         "is-buffer": "^1.1.5"
-      },
-      "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-        }
       }
     },
     "latest-version": {
@@ -7771,6 +7647,13 @@
           "requires": {
             "asap": "~2.0.3"
           }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -7958,9 +7841,9 @@
       }
     },
     "loglevel": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.3.tgz",
-      "integrity": "sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==",
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz",
+      "integrity": "sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==",
       "dev": true
     },
     "lolex": {
@@ -8023,16 +7906,16 @@
       "dev": true
     },
     "make-fetch-happen": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz",
-      "integrity": "sha512-nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz",
+      "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==",
       "dev": true,
       "requires": {
         "agentkeepalive": "^3.4.1",
         "cacache": "^12.0.0",
         "http-cache-semantics": "^3.8.1",
         "http-proxy-agent": "^2.1.0",
-        "https-proxy-agent": "^2.2.1",
+        "https-proxy-agent": "^2.2.3",
         "lru-cache": "^5.1.1",
         "mississippi": "^3.0.0",
         "node-fetch-npm": "^2.0.2",
@@ -8073,37 +7956,10 @@
             "yallist": "^3.0.2"
           }
         },
-        "mississippi": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-          "dev": true,
-          "requires": {
-            "concat-stream": "^1.5.0",
-            "duplexify": "^3.4.2",
-            "end-of-stream": "^1.1.0",
-            "flush-write-stream": "^1.0.0",
-            "from2": "^2.1.0",
-            "parallel-transform": "^1.1.0",
-            "pump": "^3.0.0",
-            "pumpify": "^1.3.3",
-            "stream-each": "^1.1.0",
-            "through2": "^2.0.0"
-          }
-        },
-        "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-          "dev": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1"
-          }
-        },
         "yallist": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
           "dev": true
         }
       }
@@ -8193,6 +8049,14 @@
       "dev": true,
       "requires": {
         "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
     "methods": {
@@ -8222,11 +8086,93 @@
         "to-regex": "^3.0.2"
       },
       "dependencies": {
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
         "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "dev": true,
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
         }
       }
     },
@@ -8243,20 +8189,19 @@
     "mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
     },
     "mime-db": {
-      "version": "1.40.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+      "version": "1.43.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
+      "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="
     },
     "mime-types": {
-      "version": "2.1.24",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "version": "2.1.26",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
+      "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
       "requires": {
-        "mime-db": "1.40.0"
+        "mime-db": "1.43.0"
       }
     },
     "mimic-fn": {
@@ -8297,14 +8242,14 @@
       }
     },
     "minimist": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-      "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
     },
     "minipass": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
-      "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
       "dev": true,
       "requires": {
         "safe-buffer": "^5.1.2",
@@ -8312,20 +8257,20 @@
       },
       "dependencies": {
         "yallist": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
           "dev": true
         }
       }
     },
     "minizlib": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
-      "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
       "dev": true,
       "requires": {
-        "minipass": "^2.2.1"
+        "minipass": "^2.9.0"
       }
     },
     "mississippi": {
@@ -8493,9 +8438,9 @@
       "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
     },
     "moment-timezone": {
-      "version": "0.5.26",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz",
-      "integrity": "sha512-sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g==",
+      "version": "0.5.28",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.28.tgz",
+      "integrity": "sha512-TDJkZvAyKIVWg5EtVqRzU97w0Rb0YVbfpqyjgu6GwXCAohVRqwZjf4fOzDE6p1Ch98Sro/8hQQi65WDXW5STPw==",
       "requires": {
         "moment": ">= 2.9.0"
       }
@@ -8590,18 +8535,13 @@
       },
       "dependencies": {
         "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
     },
-    "natives": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz",
-      "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA=="
-    },
     "negotiator": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
@@ -8611,7 +8551,8 @@
     "neo-async": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
+      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
+      "dev": true
     },
     "nested-error-stacks": {
       "version": "2.1.0",
@@ -8620,9 +8561,9 @@
       "dev": true
     },
     "ngx-moment": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/ngx-moment/-/ngx-moment-3.4.0.tgz",
-      "integrity": "sha512-GEqzSsu12VsXXP35aerlQpuZ1ienEYQZxHmp+RH7EuJD7hWamKgLOpmbiDI9Ij3KLW/UApvonYzZvyRSv3ea/w==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/ngx-moment/-/ngx-moment-3.5.0.tgz",
+      "integrity": "sha512-QC/5XNC0BW6WkJkwZT4r2A29j/8sJAmhuQJrEnEdpW35GvkemccuxEUAwo/PwkzPB/CHaquR00E6P2HVEQ1iEg==",
       "requires": {
         "tslib": "^1.9.0"
       }
@@ -8633,15 +8574,15 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
     },
     "nise": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.2.tgz",
-      "integrity": "sha512-/6RhOUlicRCbE9s+94qCUsyE+pKlVJ5AhIv+jEE7ESKwnbXqulKZ1FYU+XAtHHWE9TinYvAxDUJAb912PwPoWA==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz",
+      "integrity": "sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==",
       "dev": true,
       "requires": {
         "@sinonjs/formatio": "^3.2.1",
         "@sinonjs/text-encoding": "^0.7.1",
         "just-extend": "^4.0.2",
-        "lolex": "^4.1.0",
+        "lolex": "^5.0.1",
         "path-to-regexp": "^1.7.0"
       },
       "dependencies": {
@@ -8651,141 +8592,820 @@
           "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
           "dev": true
         },
-        "path-to-regexp": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
-          "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
+        "lolex": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz",
+          "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==",
+          "dev": true,
+          "requires": {
+            "@sinonjs/commons": "^1.7.0"
+          }
+        },
+        "path-to-regexp": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
+          "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+          "dev": true,
+          "requires": {
+            "isarray": "0.0.1"
+          }
+        }
+      }
+    },
+    "nocache": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz",
+      "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="
+    },
+    "node-environment-flags": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz",
+      "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==",
+      "dev": true,
+      "requires": {
+        "object.getownpropertydescriptors": "^2.0.3",
+        "semver": "^5.7.0"
+      }
+    },
+    "node-fetch-npm": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz",
+      "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==",
+      "dev": true,
+      "requires": {
+        "encoding": "^0.1.11",
+        "json-parse-better-errors": "^1.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node-forge": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
+      "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
+      "dev": true
+    },
+    "node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "dev": true,
+      "requires": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      },
+      "dependencies": {
+        "events": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
+          "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==",
+          "dev": true
+        }
+      }
+    },
+    "node-releases": {
+      "version": "1.1.48",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.48.tgz",
+      "integrity": "sha512-Hr8BbmUl1ujAST0K0snItzEA5zkJTQup8VNTKNfT6Zw8vTJkIiagUPNfxHmgDOyfFYNfKAul40sD0UEYTvwebw==",
+      "dev": true,
+      "requires": {
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "nodemon": {
+      "version": "1.19.4",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.19.4.tgz",
+      "integrity": "sha512-VGPaqQBNk193lrJFotBU8nvWZPqEZY2eIzymy2jjY0fJ9qIsxA0sxQ8ATPl0gZC645gijYEc1jtZvpS8QWzJGQ==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^2.1.8",
+        "debug": "^3.2.6",
+        "ignore-by-default": "^1.0.1",
+        "minimatch": "^3.0.4",
+        "pstree.remy": "^1.1.7",
+        "semver": "^5.7.1",
+        "supports-color": "^5.5.0",
+        "touch": "^3.1.0",
+        "undefsafe": "^2.0.2",
+        "update-notifier": "^2.5.0"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "binary-extensions": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          }
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          }
+        },
+        "fsevents": {
+          "version": "1.2.11",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz",
+          "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1",
+            "node-pre-gyp": "*"
+          },
+          "dependencies": {
+            "abbrev": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "ansi-regex": {
+              "version": "2.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "are-we-there-yet": {
+              "version": "1.1.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "delegates": "^1.0.0",
+                "readable-stream": "^2.0.6"
+              }
+            },
+            "balanced-match": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "brace-expansion": {
+              "version": "1.1.11",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+              }
+            },
+            "chownr": {
+              "version": "1.1.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "code-point-at": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "concat-map": {
+              "version": "0.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "console-control-strings": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "core-util-is": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "debug": {
+              "version": "3.2.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ms": "^2.1.1"
+              }
+            },
+            "deep-extend": {
+              "version": "0.6.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "delegates": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "detect-libc": {
+              "version": "1.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "fs-minipass": {
+              "version": "1.2.7",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.6.0"
+              }
+            },
+            "fs.realpath": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "gauge": {
+              "version": "2.7.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "aproba": "^1.0.3",
+                "console-control-strings": "^1.0.0",
+                "has-unicode": "^2.0.0",
+                "object-assign": "^4.1.0",
+                "signal-exit": "^3.0.0",
+                "string-width": "^1.0.1",
+                "strip-ansi": "^3.0.1",
+                "wide-align": "^1.1.0"
+              }
+            },
+            "glob": {
+              "version": "7.1.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            },
+            "has-unicode": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "iconv-lite": {
+              "version": "0.4.24",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safer-buffer": ">= 2.1.2 < 3"
+              }
+            },
+            "ignore-walk": {
+              "version": "3.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimatch": "^3.0.4"
+              }
+            },
+            "inflight": {
+              "version": "1.0.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+              }
+            },
+            "inherits": {
+              "version": "2.0.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "ini": {
+              "version": "1.3.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "isarray": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "minimatch": {
+              "version": "3.0.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "brace-expansion": "^1.1.7"
+              }
+            },
+            "minimist": {
+              "version": "0.0.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "minipass": {
+              "version": "2.9.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            },
+            "minizlib": {
+              "version": "1.3.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.9.0"
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimist": "0.0.8"
+              }
+            },
+            "ms": {
+              "version": "2.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "needle": {
+              "version": "2.4.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "debug": "^3.2.6",
+                "iconv-lite": "^0.4.4",
+                "sax": "^1.2.4"
+              }
+            },
+            "node-pre-gyp": {
+              "version": "0.14.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "detect-libc": "^1.0.2",
+                "mkdirp": "^0.5.1",
+                "needle": "^2.2.1",
+                "nopt": "^4.0.1",
+                "npm-packlist": "^1.1.6",
+                "npmlog": "^4.0.2",
+                "rc": "^1.2.7",
+                "rimraf": "^2.6.1",
+                "semver": "^5.3.0",
+                "tar": "^4.4.2"
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "abbrev": "1",
+                "osenv": "^0.1.4"
+              }
+            },
+            "npm-bundled": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "npm-normalize-package-bin": "^1.0.1"
+              }
+            },
+            "npm-normalize-package-bin": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "npm-packlist": {
+              "version": "1.4.7",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ignore-walk": "^3.0.1",
+                "npm-bundled": "^1.0.1"
+              }
+            },
+            "npmlog": {
+              "version": "4.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "are-we-there-yet": "~1.1.2",
+                "console-control-strings": "~1.1.0",
+                "gauge": "~2.7.3",
+                "set-blocking": "~2.0.0"
+              }
+            },
+            "number-is-nan": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "object-assign": {
+              "version": "4.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "once": {
+              "version": "1.4.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "wrappy": "1"
+              }
+            },
+            "os-homedir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "os-tmpdir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "osenv": {
+              "version": "0.1.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "os-homedir": "^1.0.0",
+                "os-tmpdir": "^1.0.0"
+              }
+            },
+            "path-is-absolute": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "process-nextick-args": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "rc": {
+              "version": "1.2.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "deep-extend": "^0.6.0",
+                "ini": "~1.3.0",
+                "minimist": "^1.2.0",
+                "strip-json-comments": "~2.0.1"
+              },
+              "dependencies": {
+                "minimist": {
+                  "version": "1.2.0",
+                  "bundled": true,
+                  "dev": true,
+                  "optional": true
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "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"
+              }
+            },
+            "rimraf": {
+              "version": "2.7.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "glob": "^7.1.3"
+              }
+            },
+            "safe-buffer": {
+              "version": "5.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "safer-buffer": {
+              "version": "2.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "sax": {
+              "version": "1.2.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "semver": {
+              "version": "5.7.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "set-blocking": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "signal-exit": {
+              "version": "3.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ansi-regex": "^2.0.0"
+              }
+            },
+            "strip-json-comments": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "tar": {
+              "version": "4.4.13",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "chownr": "^1.1.1",
+                "fs-minipass": "^1.2.5",
+                "minipass": "^2.8.6",
+                "minizlib": "^1.2.1",
+                "mkdirp": "^0.5.0",
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.3"
+              }
+            },
+            "util-deprecate": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "wide-align": {
+              "version": "1.1.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "string-width": "^1.0.2 || 2"
+              }
+            },
+            "wrappy": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "yallist": {
+              "version": "3.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "is-binary-path": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
           "dev": true,
           "requires": {
-            "isarray": "0.0.1"
+            "binary-extensions": "^1.0.0"
           }
-        }
-      }
-    },
-    "nocache": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz",
-      "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="
-    },
-    "node-environment-flags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz",
-      "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==",
-      "dev": true,
-      "requires": {
-        "object.getownpropertydescriptors": "^2.0.3",
-        "semver": "^5.7.0"
-      }
-    },
-    "node-fetch-npm": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz",
-      "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==",
-      "dev": true,
-      "requires": {
-        "encoding": "^0.1.11",
-        "json-parse-better-errors": "^1.0.0",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "node-forge": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
-      "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==",
-      "dev": true
-    },
-    "node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
-      "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
-      },
-      "dependencies": {
-        "events": {
+        },
+        "is-number": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
-          "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
-          "dev": true
-        }
-      }
-    },
-    "node-releases": {
-      "version": "1.1.28",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.28.tgz",
-      "integrity": "sha512-AQw4emh6iSXnCpDiFe0phYcThiccmkNWMZnFZ+lDJjAP8J0m2fVd59duvUUyuTirQOhIAajTFkzG6FHCLBO59g==",
-      "dev": true,
-      "requires": {
-        "semver": "^5.3.0"
-      }
-    },
-    "nodemon": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.19.1.tgz",
-      "integrity": "sha512-/DXLzd/GhiaDXXbGId5BzxP1GlsqtMGM9zTmkWrgXtSqjKmGSbLicM/oAy4FR0YWm14jCHRwnR31AHS2dYFHrg==",
-      "dev": true,
-      "requires": {
-        "chokidar": "^2.1.5",
-        "debug": "^3.1.0",
-        "ignore-by-default": "^1.0.1",
-        "minimatch": "^3.0.4",
-        "pstree.remy": "^1.1.6",
-        "semver": "^5.5.0",
-        "supports-color": "^5.2.0",
-        "touch": "^3.1.0",
-        "undefsafe": "^2.0.2",
-        "update-notifier": "^2.5.0"
-      },
-      "dependencies": {
-        "chokidar": {
-          "version": "2.1.6",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
-          "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
+            "kind-of": "^3.0.2"
           }
         },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+        "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
         },
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        },
         "supports-color": {
           "version": "5.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -8794,9 +9414,28 @@
           "requires": {
             "has-flag": "^3.0.0"
           }
+        },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "dev": true,
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
         }
       }
     },
+    "nopt": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+      "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1"
+      }
+    },
     "normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -8809,13 +9448,10 @@
       }
     },
     "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "requires": {
-        "remove-trailing-separator": "^1.0.1"
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
     },
     "normalize-range": {
       "version": "0.1.2",
@@ -8836,9 +9472,9 @@
       }
     },
     "notifications-node-client": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/notifications-node-client/-/notifications-node-client-4.6.0.tgz",
-      "integrity": "sha512-O5aRzQc7rJxyrmlBHXbXsGJu3/mmTtoEYzuWawNA+gVx894dFoflGDN+QBiMuB9t0aDPdjpgCB081zIbDKc/Jw==",
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/notifications-node-client/-/notifications-node-client-4.7.2.tgz",
+      "integrity": "sha512-6dFYh3/kq6XlkwHFePSLSwF+zt5QhL0wD1XDB/UoDtE5ztlsAc7MHu6im+ecpZ/ZwSJ7L8hKpg0jy45I4jUXuw==",
       "requires": {
         "jsonwebtoken": "8.2.1",
         "request": "2.87.0",
@@ -8846,6 +9482,36 @@
         "underscore": "^1.9.0"
       },
       "dependencies": {
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "requires": {
+            "co": "^4.6.0",
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+        },
+        "har-validator": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+          "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+          "requires": {
+            "ajv": "^5.1.0",
+            "har-schema": "^2.0.0"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+        },
         "jsonwebtoken": {
           "version": "8.2.1",
           "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.2.1.tgz",
@@ -8868,17 +9534,62 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+          "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+        },
+        "request": {
+          "version": "2.87.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
+          "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
+          "requires": {
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.6.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.5",
+            "extend": "~3.0.1",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.1",
+            "har-validator": "~5.0.3",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.17",
+            "oauth-sign": "~0.8.2",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.1",
+            "safe-buffer": "^5.1.1",
+            "tough-cookie": "~2.3.3",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.1.0"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.4",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+          "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
+          "requires": {
+            "punycode": "^1.4.1"
+          }
+        },
         "underscore": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
-          "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+          "version": "1.9.2",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz",
+          "integrity": "sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ=="
         }
       }
     },
     "npm": {
-      "version": "6.11.1",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-6.11.1.tgz",
-      "integrity": "sha512-ckV89fITMaOMa1UAbOEvGHtepWhCrlG34fGvr/K4UbD6LiS8Vv85uftpNqK6bbvej9lsXg5MPuFfuq88W91qyA==",
+      "version": "6.13.7",
+      "resolved": "https://registry.npmjs.org/npm/-/npm-6.13.7.tgz",
+      "integrity": "sha512-X967EKTT407CvgrWFjXusnPh0VLERcmR9hZFSVgkEquOomZkvpwLJ5zrQ3qrG9SpPLKJE4bPLUu76exKQ4a3Cg==",
       "dev": true,
       "requires": {
         "JSONStream": "^1.3.5",
@@ -8887,16 +9598,16 @@
         "ansistyles": "~0.1.3",
         "aproba": "^2.0.0",
         "archy": "~1.0.0",
-        "bin-links": "^1.1.3",
+        "bin-links": "^1.1.7",
         "bluebird": "^3.5.5",
         "byte-size": "^5.0.1",
         "cacache": "^12.0.3",
         "call-limit": "^1.1.1",
-        "chownr": "^1.1.2",
+        "chownr": "^1.1.3",
         "ci-info": "^2.0.0",
         "cli-columns": "^3.1.2",
         "cli-table3": "^0.5.1",
-        "cmd-shim": "^3.0.2",
+        "cmd-shim": "^3.0.3",
         "columnify": "~1.5.4",
         "config-chain": "^1.1.12",
         "debuglog": "*",
@@ -8908,11 +9619,11 @@
         "find-npm-prefix": "^1.0.2",
         "fs-vacuum": "~1.2.10",
         "fs-write-stream-atomic": "~1.0.10",
-        "gentle-fs": "^2.2.1",
+        "gentle-fs": "^2.3.0",
         "glob": "^7.1.4",
-        "graceful-fs": "^4.2.2",
+        "graceful-fs": "^4.2.3",
         "has-unicode": "~2.0.1",
-        "hosted-git-info": "^2.8.2",
+        "hosted-git-info": "^2.8.5",
         "iferr": "^1.0.2",
         "imurmurhash": "*",
         "infer-owner": "^1.0.4",
@@ -8923,14 +9634,14 @@
         "is-cidr": "^3.0.0",
         "json-parse-better-errors": "^1.0.2",
         "lazy-property": "~1.0.0",
-        "libcipm": "^4.0.3",
+        "libcipm": "^4.0.7",
         "libnpm": "^3.0.1",
         "libnpmaccess": "^3.0.2",
         "libnpmhook": "^5.0.3",
         "libnpmorg": "^1.0.1",
         "libnpmsearch": "^2.0.2",
         "libnpmteam": "^1.0.2",
-        "libnpx": "^10.2.0",
+        "libnpx": "^10.2.2",
         "lock-verify": "^2.1.0",
         "lockfile": "^1.0.4",
         "lodash._baseindexof": "*",
@@ -8949,33 +9660,33 @@
         "mississippi": "^3.0.0",
         "mkdirp": "~0.5.1",
         "move-concurrently": "^1.0.1",
-        "node-gyp": "^5.0.3",
+        "node-gyp": "^5.0.7",
         "nopt": "~4.0.1",
         "normalize-package-data": "^2.5.0",
         "npm-audit-report": "^1.3.2",
         "npm-cache-filename": "~1.0.2",
-        "npm-install-checks": "~3.0.0",
-        "npm-lifecycle": "^3.1.3",
-        "npm-package-arg": "^6.1.0",
-        "npm-packlist": "^1.4.4",
-        "npm-pick-manifest": "^3.0.0",
+        "npm-install-checks": "^3.0.2",
+        "npm-lifecycle": "^3.1.4",
+        "npm-package-arg": "^6.1.1",
+        "npm-packlist": "^1.4.7",
+        "npm-pick-manifest": "^3.0.2",
         "npm-profile": "^4.0.2",
-        "npm-registry-fetch": "^4.0.0",
+        "npm-registry-fetch": "^4.0.2",
         "npm-user-validate": "~1.0.0",
         "npmlog": "~4.1.2",
         "once": "~1.4.0",
         "opener": "^1.5.1",
         "osenv": "^0.1.5",
-        "pacote": "^9.5.8",
+        "pacote": "^9.5.12",
         "path-is-inside": "~1.0.2",
         "promise-inflight": "~1.0.1",
         "qrcode-terminal": "^0.12.0",
         "query-string": "^6.8.2",
         "qw": "~1.0.1",
         "read": "~1.0.7",
-        "read-cmd-shim": "^1.0.3",
+        "read-cmd-shim": "^1.0.5",
         "read-installed": "~4.0.3",
-        "read-package-json": "^2.1.0",
+        "read-package-json": "^2.1.1",
         "read-package-tree": "^5.3.1",
         "readable-stream": "^3.4.0",
         "readdir-scoped-modules": "^1.1.0",
@@ -8989,8 +9700,8 @@
         "sorted-object": "~2.0.1",
         "sorted-union-stream": "~2.1.3",
         "ssri": "^6.0.1",
-        "stringify-package": "^1.0.0",
-        "tar": "^4.4.10",
+        "stringify-package": "^1.0.1",
+        "tar": "^4.4.13",
         "text-table": "~0.2.0",
         "tiny-relative-date": "^1.3.0",
         "uid-number": "0.0.6",
@@ -8998,7 +9709,7 @@
         "unique-filename": "^1.1.1",
         "unpipe": "~1.0.0",
         "update-notifier": "^2.5.0",
-        "uuid": "^3.3.2",
+        "uuid": "^3.3.3",
         "validate-npm-package-license": "^3.0.4",
         "validate-npm-package-name": "~3.0.0",
         "which": "^1.3.1",
@@ -9169,14 +9880,15 @@
           }
         },
         "bin-links": {
-          "version": "1.1.3",
+          "version": "1.1.7",
           "bundled": true,
           "dev": true,
           "requires": {
             "bluebird": "^3.5.3",
             "cmd-shim": "^3.0.0",
-            "gentle-fs": "^2.0.1",
+            "gentle-fs": "^2.3.0",
             "graceful-fs": "^4.1.15",
+            "npm-normalize-package-bin": "^1.0.0",
             "write-file-atomic": "^2.3.0"
           }
         },
@@ -9281,7 +9993,7 @@
           }
         },
         "chownr": {
-          "version": "1.1.2",
+          "version": "1.1.3",
           "bundled": true,
           "dev": true
         },
@@ -9353,7 +10065,7 @@
           "dev": true
         },
         "cmd-shim": {
-          "version": "3.0.2",
+          "version": "3.0.3",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -9721,7 +10433,7 @@
           }
         },
         "env-paths": {
-          "version": "1.0.0",
+          "version": "2.2.0",
           "bundled": true,
           "dev": true
         },
@@ -9919,11 +10631,22 @@
           }
         },
         "fs-minipass": {
-          "version": "1.2.6",
+          "version": "1.2.7",
           "bundled": true,
           "dev": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "^2.6.0"
+          },
+          "dependencies": {
+            "minipass": {
+              "version": "2.9.0",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            }
           }
         },
         "fs-vacuum": {
@@ -10024,12 +10747,13 @@
           "dev": true
         },
         "gentle-fs": {
-          "version": "2.2.1",
+          "version": "2.3.0",
           "bundled": true,
           "dev": true,
           "requires": {
             "aproba": "^1.1.2",
             "chownr": "^1.1.2",
+            "cmd-shim": "^3.0.3",
             "fs-vacuum": "^1.2.10",
             "graceful-fs": "^4.1.11",
             "iferr": "^0.1.5",
@@ -10053,7 +10777,7 @@
           }
         },
         "get-caller-file": {
-          "version": "1.0.2",
+          "version": "1.0.3",
           "bundled": true,
           "dev": true
         },
@@ -10120,7 +10844,7 @@
           }
         },
         "graceful-fs": {
-          "version": "4.2.2",
+          "version": "4.2.3",
           "bundled": true,
           "dev": true
         },
@@ -10162,12 +10886,9 @@
           "dev": true
         },
         "hosted-git-info": {
-          "version": "2.8.2",
+          "version": "2.8.5",
           "bundled": true,
-          "dev": true,
-          "requires": {
-            "lru-cache": "^5.1.1"
-          }
+          "dev": true
         },
         "http-cache-semantics": {
           "version": "3.8.1",
@@ -10194,7 +10915,7 @@
           }
         },
         "https-proxy-agent": {
-          "version": "2.2.2",
+          "version": "2.2.4",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -10224,7 +10945,7 @@
           "dev": true
         },
         "ignore-walk": {
-          "version": "3.0.1",
+          "version": "3.0.3",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -10281,7 +11002,7 @@
           }
         },
         "invert-kv": {
-          "version": "1.0.0",
+          "version": "2.0.0",
           "bundled": true,
           "dev": true
         },
@@ -10470,15 +11191,15 @@
           "dev": true
         },
         "lcid": {
-          "version": "1.0.0",
+          "version": "2.0.0",
           "bundled": true,
           "dev": true,
           "requires": {
-            "invert-kv": "^1.0.0"
+            "invert-kv": "^2.0.0"
           }
         },
         "libcipm": {
-          "version": "4.0.3",
+          "version": "4.0.7",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -10647,7 +11368,7 @@
           }
         },
         "libnpx": {
-          "version": "10.2.0",
+          "version": "10.2.2",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -10781,7 +11502,7 @@
           }
         },
         "make-fetch-happen": {
-          "version": "5.0.0",
+          "version": "5.0.2",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -10789,7 +11510,7 @@
             "cacache": "^12.0.0",
             "http-cache-semantics": "^3.8.1",
             "http-proxy-agent": "^2.1.0",
-            "https-proxy-agent": "^2.2.1",
+            "https-proxy-agent": "^2.2.3",
             "lru-cache": "^5.1.1",
             "mississippi": "^3.0.0",
             "node-fetch-npm": "^2.0.2",
@@ -10798,17 +11519,34 @@
             "ssri": "^6.0.0"
           }
         },
+        "map-age-cleaner": {
+          "version": "0.1.3",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "p-defer": "^1.0.0"
+          }
+        },
         "meant": {
           "version": "1.0.1",
           "bundled": true,
           "dev": true
         },
         "mem": {
-          "version": "1.1.0",
+          "version": "4.3.0",
           "bundled": true,
           "dev": true,
           "requires": {
-            "mimic-fn": "^1.0.0"
+            "map-age-cleaner": "^0.1.1",
+            "mimic-fn": "^2.0.0",
+            "p-is-promise": "^2.0.0"
+          },
+          "dependencies": {
+            "mimic-fn": {
+              "version": "2.1.0",
+              "bundled": true,
+              "dev": true
+            }
           }
         },
         "mime-db": {
@@ -10824,11 +11562,6 @@
             "mime-db": "~1.35.0"
           }
         },
-        "mimic-fn": {
-          "version": "1.2.0",
-          "bundled": true,
-          "dev": true
-        },
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
@@ -10842,30 +11575,25 @@
           "bundled": true,
           "dev": true
         },
-        "minipass": {
-          "version": "2.3.3",
+        "minizlib": {
+          "version": "1.3.3",
           "bundled": true,
           "dev": true,
           "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
+            "minipass": "^2.9.0"
           },
           "dependencies": {
-            "yallist": {
-              "version": "3.0.2",
+            "minipass": {
+              "version": "2.9.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
             }
           }
         },
-        "minizlib": {
-          "version": "1.2.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "minipass": "^2.2.1"
-          }
-        },
         "mississippi": {
           "version": "3.0.0",
           "bundled": true,
@@ -10921,6 +11649,11 @@
           "bundled": true,
           "dev": true
         },
+        "nice-try": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true
+        },
         "node-fetch-npm": {
           "version": "2.0.2",
           "bundled": true,
@@ -10932,36 +11665,21 @@
           }
         },
         "node-gyp": {
-          "version": "5.0.3",
+          "version": "5.0.7",
           "bundled": true,
           "dev": true,
           "requires": {
-            "env-paths": "^1.0.0",
-            "glob": "^7.0.3",
-            "graceful-fs": "^4.1.2",
-            "mkdirp": "^0.5.0",
-            "nopt": "2 || 3",
-            "npmlog": "0 || 1 || 2 || 3 || 4",
-            "request": "^2.87.0",
-            "rimraf": "2",
-            "semver": "~5.3.0",
-            "tar": "^4.4.8",
-            "which": "1"
-          },
-          "dependencies": {
-            "nopt": {
-              "version": "3.0.6",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "abbrev": "1"
-              }
-            },
-            "semver": {
-              "version": "5.3.0",
-              "bundled": true,
-              "dev": true
-            }
+            "env-paths": "^2.2.0",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.2.2",
+            "mkdirp": "^0.5.1",
+            "nopt": "^4.0.1",
+            "npmlog": "^4.1.2",
+            "request": "^2.88.0",
+            "rimraf": "^2.6.3",
+            "semver": "^5.7.1",
+            "tar": "^4.4.12",
+            "which": "^1.3.1"
           }
         },
         "nopt": {
@@ -11004,9 +11722,12 @@
           }
         },
         "npm-bundled": {
-          "version": "1.0.6",
+          "version": "1.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "requires": {
+            "npm-normalize-package-bin": "^1.0.1"
+          }
         },
         "npm-cache-filename": {
           "version": "1.0.2",
@@ -11014,7 +11735,7 @@
           "dev": true
         },
         "npm-install-checks": {
-          "version": "3.0.0",
+          "version": "3.0.2",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -11022,7 +11743,7 @@
           }
         },
         "npm-lifecycle": {
-          "version": "3.1.3",
+          "version": "3.1.4",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -11041,19 +11762,24 @@
           "bundled": true,
           "dev": true
         },
+        "npm-normalize-package-bin": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
         "npm-package-arg": {
-          "version": "6.1.0",
+          "version": "6.1.1",
           "bundled": true,
           "dev": true,
           "requires": {
-            "hosted-git-info": "^2.6.0",
+            "hosted-git-info": "^2.7.1",
             "osenv": "^0.1.5",
-            "semver": "^5.5.0",
+            "semver": "^5.6.0",
             "validate-npm-package-name": "^3.0.0"
           }
         },
         "npm-packlist": {
-          "version": "1.4.4",
+          "version": "1.4.7",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -11062,7 +11788,7 @@
           }
         },
         "npm-pick-manifest": {
-          "version": "3.0.0",
+          "version": "3.0.2",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -11082,7 +11808,7 @@
           }
         },
         "npm-registry-fetch": {
-          "version": "4.0.0",
+          "version": "4.0.2",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -11091,7 +11817,15 @@
             "figgy-pudding": "^3.4.1",
             "lru-cache": "^5.1.1",
             "make-fetch-happen": "^5.0.0",
-            "npm-package-arg": "^6.1.0"
+            "npm-package-arg": "^6.1.0",
+            "safe-buffer": "^5.2.0"
+          },
+          "dependencies": {
+            "safe-buffer": {
+              "version": "5.2.0",
+              "bundled": true,
+              "dev": true
+            }
           }
         },
         "npm-run-path": {
@@ -11166,13 +11900,41 @@
           "dev": true
         },
         "os-locale": {
-          "version": "2.1.0",
+          "version": "3.1.0",
           "bundled": true,
           "dev": true,
           "requires": {
-            "execa": "^0.7.0",
-            "lcid": "^1.0.0",
-            "mem": "^1.1.0"
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
+          },
+          "dependencies": {
+            "cross-spawn": {
+              "version": "6.0.5",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "nice-try": "^1.0.4",
+                "path-key": "^2.0.1",
+                "semver": "^5.5.0",
+                "shebang-command": "^1.2.0",
+                "which": "^1.2.9"
+              }
+            },
+            "execa": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "cross-spawn": "^6.0.0",
+                "get-stream": "^4.0.0",
+                "is-stream": "^1.1.0",
+                "npm-run-path": "^2.0.0",
+                "p-finally": "^1.0.0",
+                "signal-exit": "^3.0.0",
+                "strip-eof": "^1.0.0"
+              }
+            }
           }
         },
         "os-tmpdir": {
@@ -11189,11 +11951,21 @@
             "os-tmpdir": "^1.0.0"
           }
         },
+        "p-defer": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
         "p-finally": {
           "version": "1.0.0",
           "bundled": true,
           "dev": true
         },
+        "p-is-promise": {
+          "version": "2.1.0",
+          "bundled": true,
+          "dev": true
+        },
         "p-limit": {
           "version": "1.2.0",
           "bundled": true,
@@ -11227,7 +11999,7 @@
           }
         },
         "pacote": {
-          "version": "9.5.8",
+          "version": "9.5.12",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -11245,6 +12017,7 @@
             "mississippi": "^3.0.0",
             "mkdirp": "^0.5.1",
             "normalize-package-data": "^2.4.0",
+            "npm-normalize-package-bin": "^1.0.0",
             "npm-package-arg": "^6.1.0",
             "npm-packlist": "^1.1.12",
             "npm-pick-manifest": "^3.0.0",
@@ -11263,7 +12036,7 @@
           },
           "dependencies": {
             "minipass": {
-              "version": "2.3.5",
+              "version": "2.9.0",
               "bundled": true,
               "dev": true,
               "requires": {
@@ -11496,7 +12269,7 @@
           }
         },
         "read-cmd-shim": {
-          "version": "1.0.3",
+          "version": "1.0.5",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -11518,7 +12291,7 @@
           }
         },
         "read-package-json": {
-          "version": "2.1.0",
+          "version": "2.1.1",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -11526,7 +12299,7 @@
             "graceful-fs": "^4.1.2",
             "json-parse-better-errors": "^1.0.1",
             "normalize-package-data": "^2.0.0",
-            "slash": "^1.0.0"
+            "npm-normalize-package-bin": "^1.0.0"
           }
         },
         "read-package-tree": {
@@ -11701,28 +12474,23 @@
           "bundled": true,
           "dev": true
         },
-        "slash": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
         "slide": {
           "version": "1.1.6",
           "bundled": true,
           "dev": true
         },
         "smart-buffer": {
-          "version": "4.0.2",
+          "version": "4.1.0",
           "bundled": true,
           "dev": true
         },
         "socks": {
-          "version": "2.3.2",
+          "version": "2.3.3",
           "bundled": true,
           "dev": true,
           "requires": {
-            "ip": "^1.1.5",
-            "smart-buffer": "4.0.2"
+            "ip": "1.1.5",
+            "smart-buffer": "^4.1.0"
           }
         },
         "socks-proxy-agent": {
@@ -11937,7 +12705,7 @@
           }
         },
         "stringify-package": {
-          "version": "1.0.0",
+          "version": "1.0.1",
           "bundled": true,
           "dev": true
         },
@@ -11968,13 +12736,13 @@
           }
         },
         "tar": {
-          "version": "4.4.10",
+          "version": "4.4.13",
           "bundled": true,
           "dev": true,
           "requires": {
             "chownr": "^1.1.1",
             "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.5",
+            "minipass": "^2.8.6",
             "minizlib": "^1.2.1",
             "mkdirp": "^0.5.0",
             "safe-buffer": "^5.1.2",
@@ -11982,18 +12750,13 @@
           },
           "dependencies": {
             "minipass": {
-              "version": "2.3.5",
+              "version": "2.9.0",
               "bundled": true,
               "dev": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
               }
-            },
-            "yallist": {
-              "version": "3.0.3",
-              "bundled": true,
-              "dev": true
             }
           }
         },
@@ -12174,7 +12937,7 @@
           }
         },
         "uuid": {
-          "version": "3.3.2",
+          "version": "3.3.3",
           "bundled": true,
           "dev": true
         },
@@ -12319,7 +13082,7 @@
           "dev": true
         },
         "yargs": {
-          "version": "11.0.0",
+          "version": "11.1.1",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -12327,7 +13090,7 @@
             "decamelize": "^1.1.1",
             "find-up": "^2.1.0",
             "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
+            "os-locale": "^3.1.0",
             "require-directory": "^2.1.1",
             "require-main-filename": "^1.0.1",
             "set-blocking": "^2.0.0",
@@ -12355,9 +13118,18 @@
       }
     },
     "npm-bundled": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
-      "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
+      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+      "dev": true,
+      "requires": {
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "npm-normalize-package-bin": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
+      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
       "dev": true
     },
     "npm-package-arg": {
@@ -12373,13 +13145,14 @@
       }
     },
     "npm-packlist": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.4.tgz",
-      "integrity": "sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==",
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
+      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
       "dev": true,
       "requires": {
         "ignore-walk": "^3.0.1",
-        "npm-bundled": "^1.0.1"
+        "npm-bundled": "^1.0.1",
+        "npm-normalize-package-bin": "^1.0.1"
       }
     },
     "npm-pick-manifest": {
@@ -12394,9 +13167,9 @@
       }
     },
     "npm-registry-fetch": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz",
-      "integrity": "sha512-Jllq35Jag8dtv0M17ue74XtdQTyqKzuAYGiX9mAjOhkmNjib3bBUgK6mUY61+AHnXeSRobQkpY3/xIOS/omptw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.2.tgz",
+      "integrity": "sha512-Z0IFtPEozNdeZRPh3aHHxdG+ZRpzcbQaJLthsm3VhNf6DScicTFRHZzK82u8RsJUsUHkX+QH/zcB/5pmd20H4A==",
       "dev": true,
       "requires": {
         "JSONStream": "^1.3.4",
@@ -12404,7 +13177,8 @@
         "figgy-pudding": "^3.4.1",
         "lru-cache": "^5.1.1",
         "make-fetch-happen": "^5.0.0",
-        "npm-package-arg": "^6.1.0"
+        "npm-package-arg": "^6.1.0",
+        "safe-buffer": "^5.2.0"
       },
       "dependencies": {
         "lru-cache": {
@@ -12417,9 +13191,9 @@
           }
         },
         "yallist": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
           "dev": true
         }
       }
@@ -12464,6 +13238,14 @@
         "path-key": "^2.0.0"
       }
     },
+    "nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "requires": {
+        "boolbase": "~1.0.0"
+      }
+    },
     "null-check": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
@@ -12482,9 +13264,9 @@
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
     "nwsapi": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz",
-      "integrity": "sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
     },
     "nyc": {
       "version": "14.1.1",
@@ -12559,9 +13341,9 @@
       }
     },
     "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
     },
     "object-assign": {
       "version": "4.1.1",
@@ -12597,6 +13379,18 @@
         }
       }
     },
+    "object-inspect": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
+      "dev": true
+    },
+    "object-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz",
+      "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==",
+      "dev": true
+    },
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -12625,13 +13419,13 @@
       }
     },
     "object.getownpropertydescriptors": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
-      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
+      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
       }
     },
     "object.pick": {
@@ -12712,32 +13506,24 @@
       }
     },
     "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+      "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
       "requires": {
-        "minimist": "~0.0.1",
         "wordwrap": "~0.0.2"
       }
     },
     "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
       "requires": {
         "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
+        "fast-levenshtein": "~2.0.6",
         "levn": "~0.3.0",
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
-        }
+        "word-wrap": "~1.2.3"
       }
     },
     "original": {
@@ -12803,9 +13589,9 @@
       "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
     },
     "p-limit": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-      "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
+      "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
       "requires": {
         "p-try": "^2.0.0"
       }
@@ -12831,14 +13617,6 @@
       "dev": true,
       "requires": {
         "retry": "^0.12.0"
-      },
-      "dependencies": {
-        "retry": {
-          "version": "0.12.0",
-          "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-          "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
-          "dev": true
-        }
       }
     },
     "p-try": {
@@ -12942,76 +13720,34 @@
             "yallist": "^3.0.2"
           }
         },
-        "mississippi": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-          "dev": true,
-          "requires": {
-            "concat-stream": "^1.5.0",
-            "duplexify": "^3.4.2",
-            "end-of-stream": "^1.1.0",
-            "flush-write-stream": "^1.0.0",
-            "from2": "^2.1.0",
-            "parallel-transform": "^1.1.0",
-            "pump": "^3.0.0",
-            "pumpify": "^1.3.3",
-            "stream-each": "^1.1.0",
-            "through2": "^2.0.0"
-          }
-        },
-        "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-          "dev": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1"
-          }
-        },
-        "tar": {
-          "version": "4.4.10",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz",
-          "integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==",
-          "dev": true,
-          "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.5",
-            "minizlib": "^1.2.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.3"
-          }
-        },
         "yallist": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
           "dev": true
         }
       }
     },
     "pako": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
-      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
     },
     "parallel-transform": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
-      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
       "dev": true,
       "requires": {
-        "cyclist": "~0.2.2",
+        "cyclist": "^1.0.1",
         "inherits": "^2.0.3",
         "readable-stream": "^2.1.5"
       }
     },
     "parse-asn1": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
-      "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
+      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
       "dev": true,
       "requires": {
         "asn1.js": "^4.0.0",
@@ -13032,9 +13768,10 @@
       }
     },
     "parse5": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
-      "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+      "optional": true
     },
     "parseqs": {
       "version": "0.0.5",
@@ -13066,9 +13803,9 @@
       "dev": true
     },
     "passport": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/passport/-/passport-0.4.0.tgz",
-      "integrity": "sha1-xQlWkTR71a07XhgCOMORTRbwWBE=",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/passport/-/passport-0.4.1.tgz",
+      "integrity": "sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==",
       "requires": {
         "passport-strategy": "1.x.x",
         "pause": "0.0.1"
@@ -13127,9 +13864,9 @@
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
     },
     "path-to-regexp": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.4.0.tgz",
-      "integrity": "sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w=="
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.1.0.tgz",
+      "integrity": "sha512-h9DqehX3zZZDCEm+xbfU0ZmwCGFCAAraPJWMXJ4+v32NjZJilVg3k1TcKsRgIb8IQ/izZSaydDc1OhJCZvs2Dw=="
     },
     "path-type": {
       "version": "3.0.0",
@@ -13170,20 +13907,27 @@
         "sha.js": "^2.4.8"
       }
     },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pg": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-7.12.1.tgz",
-      "integrity": "sha512-l1UuyfEvoswYfcUe6k+JaxiN+5vkOgYcVSbSuw3FvdLqDbaoa2RJo1zfJKfPsSYPFVERd4GHvX3s2PjG1asSDA==",
+      "version": "7.18.1",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-7.18.1.tgz",
+      "integrity": "sha512-1KtKBKg/zWrjEEv//klBbVOPGucuc7HHeJf6OEMueVcUeyF3yueHf+DvhVwBjIAe9/97RAydO/lWjkcMwssuEw==",
       "requires": {
         "buffer-writer": "2.0.0",
         "packet-reader": "1.0.0",
         "pg-connection-string": "0.1.3",
-        "pg-pool": "^2.0.4",
+        "pg-packet-stream": "^1.1.0",
+        "pg-pool": "^2.0.10",
         "pg-types": "^2.1.0",
         "pgpass": "1.x",
         "semver": "4.3.2"
@@ -13214,10 +13958,15 @@
       "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
       "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="
     },
+    "pg-packet-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz",
+      "integrity": "sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg=="
+    },
     "pg-pool": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.7.tgz",
-      "integrity": "sha512-UiJyO5B9zZpu32GSlP0tXy8J2NsJ9EFGFfz5v6PSbdz/1hBLX1rNiiy5+mAm5iJJYwfCv4A0EBcQLGWwjbpzZw=="
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.10.tgz",
+      "integrity": "sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg=="
     },
     "pg-types": {
       "version": "2.2.0",
@@ -13240,9 +13989,9 @@
       }
     },
     "picomatch": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz",
-      "integrity": "sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz",
+      "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==",
       "dev": true
     },
     "pidtree": {
@@ -13280,41 +14029,36 @@
         "find-up": "^3.0.0"
       }
     },
-    "platform": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz",
-      "integrity": "sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q=="
-    },
     "pn": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
       "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="
     },
     "portfinder": {
-      "version": "1.0.23",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.23.tgz",
-      "integrity": "sha512-B729mL/uLklxtxuiJKfQ84WPxNw5a7Yhx3geQZdcA4GjNjZSTSSMMWyoennMVnTWSmAR0lMdzWYN0JLnHrg1KQ==",
+      "version": "1.0.25",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz",
+      "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==",
       "dev": true,
       "requires": {
-        "async": "^1.5.2",
-        "debug": "^2.2.0",
-        "mkdirp": "0.5.x"
+        "async": "^2.6.2",
+        "debug": "^3.1.1",
+        "mkdirp": "^0.5.1"
       },
       "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "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
         }
       }
     },
@@ -13333,6 +14077,14 @@
         "chalk": "^2.4.2",
         "source-map": "^0.6.1",
         "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
     "postcss-import": {
@@ -13417,6 +14169,18 @@
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
       "dev": true
     },
+    "pretty-format": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
+      "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^24.9.0",
+        "ansi-regex": "^4.0.0",
+        "ansi-styles": "^3.2.0",
+        "react-is": "^16.8.4"
+      }
+    },
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -13428,6 +14192,12 @@
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
+    },
     "prom-client": {
       "version": "11.5.3",
       "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-11.5.3.tgz",
@@ -13458,6 +14228,14 @@
       "requires": {
         "err-code": "^1.0.0",
         "retry": "^0.10.0"
+      },
+      "dependencies": {
+        "retry": {
+          "version": "0.10.1",
+          "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
+          "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
+          "dev": true
+        }
       }
     },
     "protoduck": {
@@ -13470,9 +14248,9 @@
       }
     },
     "protractor": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.2.tgz",
-      "integrity": "sha512-zlIj64Cr6IOWP7RwxVeD8O4UskLYPoyIcg0HboWJL9T79F1F0VWtKkGTr/9GN6BKL+/Q/GmM7C9kFVCfDbP5sA==",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.3.tgz",
+      "integrity": "sha512-7pMAolv8Ah1yJIqaorDTzACtn3gk7BamVKPTeO5lqIGOrfosjPgXFx/z1dqSI+m5EeZc2GMJHPr5DYlodujDNA==",
       "dev": true,
       "requires": {
         "@types/q": "^0.0.32",
@@ -13546,12 +14324,46 @@
             "pinkie-promise": "^2.0.0"
           }
         },
+        "is-path-cwd": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+          "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+          "dev": true
+        },
+        "is-path-in-cwd": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+          "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+          "dev": true,
+          "requires": {
+            "is-path-inside": "^1.0.0"
+          }
+        },
+        "is-path-inside": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+          "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+          "dev": true,
+          "requires": {
+            "path-is-inside": "^1.0.1"
+          }
+        },
         "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "version": "0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
           "dev": true
         },
+        "optimist": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+          "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+          "dev": true,
+          "requires": {
+            "minimist": "~0.0.1",
+            "wordwrap": "~0.0.2"
+          }
+        },
         "pify": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -13589,9 +14401,9 @@
           "dev": true
         },
         "webdriver-manager": {
-          "version": "12.1.6",
-          "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.6.tgz",
-          "integrity": "sha512-B1mOycNCrbk7xODw7Jgq/mdD3qzPxMaTsnKIQDy2nXlQoyjTrJTTD0vRpEZI9b8RibPEyQvh9zIZ0M1mpOxS3w==",
+          "version": "12.1.7",
+          "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.7.tgz",
+          "integrity": "sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==",
           "dev": true,
           "requires": {
             "adm-zip": "^0.4.9",
@@ -13605,6 +14417,14 @@
             "rimraf": "^2.5.2",
             "semver": "^5.3.0",
             "xml2js": "^0.4.17"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+              "dev": true
+            }
           }
         }
       }
@@ -13619,6 +14439,12 @@
         "ipaddr.js": "1.9.0"
       }
     },
+    "proxy-from-env": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
+      "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=",
+      "dev": true
+    },
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -13631,9 +14457,9 @@
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "psl": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz",
-      "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag=="
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz",
+      "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="
     },
     "pstree.remy": {
       "version": "1.1.7",
@@ -13692,6 +14518,72 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
       "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
     },
+    "puppeteer": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-2.1.1.tgz",
+      "integrity": "sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg==",
+      "dev": true,
+      "requires": {
+        "@types/mime-types": "^2.1.0",
+        "debug": "^4.1.0",
+        "extract-zip": "^1.6.6",
+        "https-proxy-agent": "^4.0.0",
+        "mime": "^2.0.3",
+        "mime-types": "^2.1.25",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.0.0",
+        "rimraf": "^2.6.1",
+        "ws": "^6.1.0"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
+          "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
+          "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+          "dev": true,
+          "requires": {
+            "agent-base": "5",
+            "debug": "4"
+          }
+        },
+        "mime": {
+          "version": "2.4.4",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+          "dev": true
+        },
+        "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
+        },
+        "ws": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+          "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+          "dev": true,
+          "requires": {
+            "async-limiter": "~1.0.0"
+          }
+        }
+      }
+    },
     "q": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
@@ -13757,8 +14649,12 @@
     "range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
+    },
+    "rate-limiter-flexible": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-1.3.2.tgz",
+      "integrity": "sha512-f+xNvGn+52G4nZVok9VB3LTE1kfDmqbnWKRayX5n2k/LEQ7doWrYvzmzFVh7ltmLgwEdEzoYwxGaXlfCjFg4Ag=="
     },
     "raw-body": {
       "version": "2.4.1",
@@ -13791,16 +14687,14 @@
         "ini": "~1.3.0",
         "minimist": "^1.2.0",
         "strip-json-comments": "~2.0.1"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        }
       }
     },
+    "react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true
+    },
     "read-cache": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -13819,16 +14713,16 @@
       }
     },
     "read-package-json": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz",
-      "integrity": "sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.1.tgz",
+      "integrity": "sha512-dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A==",
       "dev": true,
       "requires": {
         "glob": "^7.1.1",
         "graceful-fs": "^4.1.2",
         "json-parse-better-errors": "^1.0.1",
         "normalize-package-data": "^2.0.0",
-        "slash": "^1.0.0"
+        "npm-normalize-package-bin": "^1.0.0"
       }
     },
     "read-package-tree": {
@@ -13862,9 +14756,9 @@
       }
     },
     "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
       "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -13895,14 +14789,12 @@
       }
     },
     "readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz",
+      "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
+        "picomatch": "^2.0.7"
       }
     },
     "referrer-policy": {
@@ -13938,6 +14830,16 @@
         "safe-regex": "^1.1.0"
       }
     },
+    "regexp.prototype.flags": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
+      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      }
+    },
     "regexpu-core": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
@@ -14027,30 +14929,46 @@
       }
     },
     "request": {
-      "version": "2.87.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
-      "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
       "requires": {
         "aws-sign2": "~0.7.0",
-        "aws4": "^1.6.0",
+        "aws4": "^1.8.0",
         "caseless": "~0.12.0",
-        "combined-stream": "~1.0.5",
-        "extend": "~3.0.1",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
-        "form-data": "~2.3.1",
-        "har-validator": "~5.0.3",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
         "http-signature": "~1.2.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
         "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.17",
-        "oauth-sign": "~0.8.2",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
         "performance-now": "^2.1.0",
-        "qs": "~6.5.1",
-        "safe-buffer": "^5.1.1",
-        "tough-cookie": "~2.3.3",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
         "tunnel-agent": "^0.6.0",
-        "uuid": "^3.1.0"
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+        },
+        "tough-cookie": {
+          "version": "2.4.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+          "requires": {
+            "psl": "^1.1.24",
+            "punycode": "^1.4.1"
+          }
+        }
       }
     },
     "request-promise": {
@@ -14062,32 +14980,48 @@
         "request-promise-core": "1.1.1",
         "stealthy-require": "^1.1.0",
         "tough-cookie": ">=2.3.3"
+      },
+      "dependencies": {
+        "request-promise-core": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz",
+          "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
+          "requires": {
+            "lodash": "^4.13.1"
+          }
+        }
       }
     },
     "request-promise-core": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz",
-      "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
+      "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
       "requires": {
-        "lodash": "^4.13.1"
+        "lodash": "^4.17.15"
       }
     },
     "request-promise-native": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz",
-      "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
+      "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
       "requires": {
-        "request-promise-core": "1.1.2",
+        "request-promise-core": "1.1.3",
         "stealthy-require": "^1.1.1",
         "tough-cookie": "^2.3.3"
       },
       "dependencies": {
-        "request-promise-core": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz",
-          "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+        },
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
           "requires": {
-            "lodash": "^4.17.11"
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
           }
         }
       }
@@ -14120,9 +15054,9 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
     "resolve": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
+      "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
       "requires": {
         "path-parse": "^1.0.6"
       }
@@ -14165,9 +15099,9 @@
       "dev": true
     },
     "retry": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
-      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
       "dev": true
     },
     "retry-as-promised": {
@@ -14195,6 +15129,11 @@
       "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==",
       "dev": true
     },
+    "rfr": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/rfr/-/rfr-1.2.3.tgz",
+      "integrity": "sha1-57txkzft6XcJH68S6si2zS26kBE="
+    },
     "right-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
@@ -14240,17 +15179,17 @@
       }
     },
     "rxjs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
-      "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
+      "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "rxjs-compat": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.5.2.tgz",
-      "integrity": "sha512-TRMkTp4FgSxE2HtGvxmgRukh3JqdFM7ejAj1Ti/VdodbPGfWvZR5+KdLKRV9jVDFyu2SknM8RD+PR54KGnoLjg=="
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.5.4.tgz",
+      "integrity": "sha512-rkn+lbOHUQOurdd74J/hjmDsG9nFx0z66fvnbs8M95nrtKvNqCKdk7iZqdY51CGmDemTQk+kUPy4s8HVOHtkfA=="
     },
     "safe-buffer": {
       "version": "5.2.0",
@@ -14348,32 +15287,6 @@
         "ajv": "^6.1.0",
         "ajv-errors": "^1.0.0",
         "ajv-keywords": "^3.1.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        }
       }
     },
     "select-hose": {
@@ -14406,18 +15319,18 @@
       }
     },
     "selfsigned": {
-      "version": "1.10.4",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",
-      "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==",
+      "version": "1.10.7",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz",
+      "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==",
       "dev": true,
       "requires": {
-        "node-forge": "0.7.5"
+        "node-forge": "0.9.0"
       }
     },
     "semver": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-      "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
     },
     "semver-diff": {
       "version": "2.1.0",
@@ -14450,7 +15363,6 @@
       "version": "0.17.1",
       "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
       "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-      "dev": true,
       "requires": {
         "debug": "2.6.9",
         "depd": "~1.1.2",
@@ -14471,7 +15383,6 @@
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
           "requires": {
             "ms": "2.0.0"
           },
@@ -14479,16 +15390,14 @@
             "ms": {
               "version": "2.0.0",
               "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-              "dev": true
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
             }
           }
         },
         "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==",
-          "dev": true
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
         }
       }
     },
@@ -14517,9 +15426,9 @@
       }
     },
     "serialize-javascript": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.8.0.tgz",
-      "integrity": "sha512-3tHgtF4OzDmeKYj6V9nSyceRS0UJ3C7VqyD2Yj28vC/z2j6jG5FmFGahOKMD9CrglxTm3tETr87jEypaYV8DUg==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
+      "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
       "dev": true
     },
     "serve-favicon": {
@@ -14695,16 +15604,10 @@
       "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
     },
     "shell-quote": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
-      "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
-      "dev": true,
-      "requires": {
-        "array-filter": "~0.0.0",
-        "array-map": "~0.0.0",
-        "array-reduce": "~0.0.0",
-        "jsonify": "~0.0.0"
-      }
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
+      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
+      "dev": true
     },
     "shimmer": {
       "version": "1.2.1",
@@ -14757,14 +15660,14 @@
       "dev": true
     },
     "slugify": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.3.4.tgz",
-      "integrity": "sha512-KP0ZYk5hJNBS8/eIjGkFDCzGQIoZ1mnfQRYS5WM3273z+fxGWXeN0fkwf2ebEweydv9tioZIHGZKoF21U07/nw=="
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.3.6.tgz",
+      "integrity": "sha512-wA9XS475ZmGNlEnYYLPReSfuz/c3VQsEMoU43mi6OnKMCdbnFXd4/Yg7J0lBv8jkPolacMpOrWEaoYxuE1+hoQ=="
     },
     "smart-buffer": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.2.tgz",
-      "integrity": "sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
+      "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==",
       "dev": true
     },
     "snapdragon": {
@@ -14868,9 +15771,9 @@
           }
         },
         "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
@@ -14899,9 +15802,9 @@
       }
     },
     "socket.io-adapter": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
-      "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz",
+      "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==",
       "dev": true
     },
     "socket.io-client": {
@@ -15010,13 +15913,13 @@
       }
     },
     "socks": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz",
-      "integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
+      "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
       "dev": true,
       "requires": {
-        "ip": "^1.1.5",
-        "smart-buffer": "4.0.2"
+        "ip": "1.1.5",
+        "smart-buffer": "^4.1.0"
       }
     },
     "socks-proxy-agent": {
@@ -15056,9 +15959,12 @@
       "dev": true
     },
     "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+      "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+      "requires": {
+        "amdefine": ">=0.0.4"
+      }
     },
     "source-map-loader": {
       "version": "0.2.4",
@@ -15071,12 +15977,12 @@
       }
     },
     "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
       "dev": true,
       "requires": {
-        "atob": "^2.1.1",
+        "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
         "resolve-url": "^0.2.1",
         "source-map-url": "^0.4.0",
@@ -15084,13 +15990,21 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
-      "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
+      "version": "0.5.12",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
     "source-map-url": {
@@ -15100,9 +16014,9 @@
       "dev": true
     },
     "sourcemap-codec": {
-      "version": "1.4.6",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz",
-      "integrity": "sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg==",
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
       "dev": true
     },
     "spawn-command": {
@@ -15124,51 +16038,255 @@
         "which": "^1.3.0"
       }
     },
-    "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+    "spdx-correct": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="
+    },
+    "spdy": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz",
+      "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      },
+      "dependencies": {
+        "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
+        }
+      }
+    },
+    "spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      },
+      "dependencies": {
+        "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
+        },
+        "readable-stream": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz",
+          "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
+    "speed-measure-webpack-plugin": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz",
+      "integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.1"
+      }
+    },
+    "split": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
+      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
+      "requires": {
+        "through": "2"
+      }
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "dev": true,
+      "requires": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "stack-trace": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
+      "integrity": "sha1-qPbq7KkGdMMz58Q5U/J1tFFRBpU=",
+      "dev": true
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+    },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
+    },
+    "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==",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
       "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
       }
     },
-    "spdx-exceptions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
       "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
       }
     },
-    "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="
+    "stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "dev": true
     },
-    "spdy": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz",
-      "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==",
+    "streamroller": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz",
+      "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==",
       "dev": true,
       "requires": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
+        "async": "^2.6.2",
+        "date-format": "^2.0.0",
+        "debug": "^3.2.6",
+        "fs-extra": "^7.0.1",
+        "lodash": "^4.17.14"
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -15182,1360 +16300,1837 @@
         }
       }
     },
-    "spdy-transport": {
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "requires": {
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      }
+    },
+    "string.prototype.padend": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz",
+      "integrity": "sha512-3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      }
+    },
+    "string.prototype.trimleft": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
+      "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string.prototype.trimright": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
+      "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "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"
+      },
+      "dependencies": {
+        "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=="
+        }
+      }
+    },
+    "strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "requires": {
+        "ansi-regex": "^4.1.0"
+      }
+    },
+    "strip-bom": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
+    "style-loader": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
+      "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
       "dev": true,
       "requires": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^1.0.0"
+      }
+    },
+    "stylus": {
+      "version": "0.54.5",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
+      "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
+      "dev": true,
+      "requires": {
+        "css-parse": "1.7.x",
+        "debug": "*",
+        "glob": "7.0.x",
+        "mkdirp": "0.5.x",
+        "sax": "0.5.x",
+        "source-map": "0.1.x"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "css-parse": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz",
+          "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=",
+          "dev": true
+        },
+        "glob": {
+          "version": "7.0.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.2",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "sax": {
+          "version": "0.5.8",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
+          "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=",
           "dev": true
         },
-        "readable-stream": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
-          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
           "dev": true,
           "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
+            "amdefine": ">=0.0.4"
           }
         }
       }
     },
-    "speed-measure-webpack-plugin": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz",
-      "integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.0.1"
-      }
-    },
-    "split": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-      "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-      "requires": {
-        "through": "2"
-      }
-    },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+    "stylus-loader": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
+      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^3.0.0"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-    },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
+        "loader-utils": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "when": "~3.6.x"
       }
     },
-    "ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+    "superagent": {
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz",
+      "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==",
       "dev": true,
       "requires": {
-        "figgy-pudding": "^3.5.1"
+        "component-emitter": "^1.2.0",
+        "cookiejar": "^2.1.0",
+        "debug": "^3.1.0",
+        "extend": "^3.0.0",
+        "form-data": "^2.3.1",
+        "formidable": "^1.2.0",
+        "methods": "^1.1.1",
+        "mime": "^1.4.1",
+        "qs": "^6.5.1",
+        "readable-stream": "^2.3.5"
       }
     },
-    "stack-trace": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz",
-      "integrity": "sha1-qPbq7KkGdMMz58Q5U/J1tFFRBpU=",
-      "dev": true
-    },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+    "supertest": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/supertest/-/supertest-4.0.2.tgz",
+      "integrity": "sha512-1BAbvrOZsGA3YTCWqbmh14L0YEq0EGICX/nBnfkfVJn7SrxQV1I3pMYjSzG9y/7ZU2V9dWqyqk2POwxlb09duQ==",
       "dev": true,
       "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
+        "methods": "^1.1.2",
+        "superagent": "^3.8.3"
+      }
+    },
+    "supports-color": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "swagger-stats": {
+      "version": "0.95.16",
+      "resolved": "https://registry.npmjs.org/swagger-stats/-/swagger-stats-0.95.16.tgz",
+      "integrity": "sha512-HRcz3hGPA0fcONocwjeRC5NV47gSgY786LqPUQC4nNQh0nTHz7sqTES83rGXOQ1b6ZR8y9D3OS+dyEIFB4gwJw==",
+      "requires": {
+        "basic-auth": "^2.0.1",
+        "cookies": "^0.8.0",
+        "debug": "^4.1.1",
+        "moment": "^2.24.0",
+        "path-to-regexp": "^6.1.0",
+        "prom-client": "^11.5.3",
+        "qs": "^6.9.1",
+        "request": "^2.88.0",
+        "send": "^0.17.1",
+        "uuid": "^3.4.0"
       },
       "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "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=="
+        },
+        "qs": {
+          "version": "6.9.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz",
+          "integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA=="
         }
       }
     },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+    "symbol-observable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
+      "dev": true
     },
-    "stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
+    "symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
-    "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==",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
+    "tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "dev": true
     },
-    "stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+    "tar": {
+      "version": "4.4.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
       "dev": true,
       "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.8.6",
+        "minizlib": "^1.2.1",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.3"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
       }
     },
-    "stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
+    "tdigest": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz",
+      "integrity": "sha1-Ljyyw56kSeVdHmzZEReszKRYgCE=",
       "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
+        "bintrees": "1.0.1"
       }
     },
-    "stream-shift": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-      "dev": true
-    },
-    "streamroller": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz",
-      "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==",
+    "term-size": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
+      "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
       "dev": true,
       "requires": {
-        "async": "^2.6.2",
-        "date-format": "^2.0.0",
-        "debug": "^3.2.6",
-        "fs-extra": "^7.0.1",
-        "lodash": "^4.17.14"
+        "execa": "^0.7.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "execa": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^5.0.1",
+            "get-stream": "^3.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
           "dev": true
         }
       }
     },
-    "strict-uri-encode": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
-      "dev": true
+    "terraformer": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.10.tgz",
+      "integrity": "sha512-5c6cAfKTZHAeRdT8sIRRidhN1w+vsmf3RmQn+PKksFhTUnsBtjQdbJG2vaxM6T47IU2EeR1S8t8UjTYY9Q1yJA==",
+      "requires": {
+        "@types/geojson": "^7946.0.0 || ^1.0.0"
+      }
     },
-    "string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+    "terraformer-wkt-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.2.1.tgz",
+      "integrity": "sha512-+CJyNLWb3lJ9RsZMTM66BY0MT3yIo4l4l22Jd9CrZuwzk54fsu4Sc7zejuS9fCITTuTQy3p06d4MZMVI7v5wSg==",
       "requires": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
+        "@types/geojson": "^1.0.0",
+        "terraformer": "~1.0.5"
       }
     },
-    "string.prototype.padend": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz",
-      "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=",
+    "terser": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.3.tgz",
+      "integrity": "sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.4.3",
-        "function-bind": "^1.0.2"
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
-    "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==",
+    "terser-webpack-plugin": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz",
+      "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==",
+      "dev": true,
       "requires": {
-        "safe-buffer": "~5.1.0"
+        "cacache": "^11.3.2",
+        "find-cache-dir": "^2.0.0",
+        "is-wsl": "^1.1.0",
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.7.0",
+        "source-map": "^0.6.1",
+        "terser": "^4.0.0",
+        "webpack-sources": "^1.3.0",
+        "worker-farm": "^1.7.0"
       },
       "dependencies": {
-        "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=="
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
-    "strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+    "test-exclude": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz",
+      "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==",
+      "requires": {
+        "glob": "^7.1.3",
+        "minimatch": "^3.0.4",
+        "read-pkg-up": "^4.0.0",
+        "require-main-filename": "^2.0.0"
+      }
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
       "requires": {
-        "ansi-regex": "^4.1.0"
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
       }
     },
-    "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+    "thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+      "dev": true
     },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+    "timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
       "dev": true
     },
-    "style-loader": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
-      "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
+    "timers-browserify": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^1.0.0"
+        "setimmediate": "^1.0.4"
       }
     },
-    "stylus": {
-      "version": "0.54.5",
-      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
-      "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
+    "tiny-json-http": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/tiny-json-http/-/tiny-json-http-7.1.2.tgz",
+      "integrity": "sha512-XB9Bu+ohdQso6ziPFNVqK+pcTt0l8BSRkW/CCBq0pUVlLxcYDsorpo7ae5yPhu2CF1xYgJuKVLF7cfOGeLCTlA=="
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "requires": {
-        "css-parse": "1.7.x",
-        "debug": "*",
-        "glob": "7.0.x",
-        "mkdirp": "0.5.x",
-        "sax": "0.5.x",
-        "source-map": "0.1.x"
-      },
-      "dependencies": {
-        "css-parse": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz",
-          "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=",
-          "dev": true
-        },
-        "glob": {
-          "version": "7.0.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
-          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.2",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "sax": {
-          "version": "0.5.8",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
-          "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.1.43",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
+        "os-tmpdir": "~1.0.2"
       }
     },
-    "stylus-loader": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
-      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+    "to-array": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
+      "dev": true
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.0.2",
-        "lodash.clonedeep": "^4.5.0",
-        "when": "~3.6.x"
+        "kind-of": "^3.0.2"
       }
     },
-    "superagent": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz",
-      "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==",
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
       "requires": {
-        "component-emitter": "^1.2.0",
-        "cookiejar": "^2.1.0",
-        "debug": "^3.1.0",
-        "extend": "^3.0.0",
-        "form-data": "^2.3.1",
-        "formidable": "^1.2.0",
-        "methods": "^1.1.1",
-        "mime": "^1.4.1",
-        "qs": "^6.5.1",
-        "readable-stream": "^2.3.5"
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
       }
     },
-    "supertest": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/supertest/-/supertest-4.0.2.tgz",
-      "integrity": "sha512-1BAbvrOZsGA3YTCWqbmh14L0YEq0EGICX/nBnfkfVJn7SrxQV1I3pMYjSzG9y/7ZU2V9dWqyqk2POwxlb09duQ==",
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
       "requires": {
-        "methods": "^1.1.2",
-        "superagent": "^3.8.3"
+        "is-number": "^7.0.0"
       }
     },
-    "supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+    },
+    "toposort-class": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz",
+      "integrity": "sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg="
+    },
+    "touch": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
+      "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
+      "dev": true,
       "requires": {
-        "has-flag": "^3.0.0"
+        "nopt": "~1.0.10"
       }
     },
-    "swagger-stats": {
-      "version": "0.95.7",
-      "resolved": "https://registry.npmjs.org/swagger-stats/-/swagger-stats-0.95.7.tgz",
-      "integrity": "sha512-HGt3sZ8pcMEZCLpuAbISyuyiwYJMAjmNDI+8IPGnd+glrIeGdEEyqPBsxi0+2UT1SYjnrmjxtjPvBf/aHz51Og==",
+    "tough-cookie": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
+      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
       "requires": {
-        "basic-auth": "^2.0.0",
-        "cookies": "^0.7.1",
-        "debug": "^3.1.0",
-        "moment": "^2.19.3",
-        "natives": "^1.1.6",
-        "path-to-regexp": "^2.1.0",
-        "prom-client": "^11.0.0",
-        "request": "^2.85.0",
-        "uuid": "^3.1.0"
+        "ip-regex": "^2.1.0",
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+        }
       }
     },
-    "symbol-observable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
-      "dev": true
-    },
-    "symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
-    },
-    "tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-      "dev": true
-    },
-    "tdigest": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz",
-      "integrity": "sha1-Ljyyw56kSeVdHmzZEReszKRYgCE=",
+    "tr46": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
       "requires": {
-        "bintrees": "1.0.1"
+        "punycode": "^2.1.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+        }
       }
     },
-    "term-size": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
-      "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
-      "dev": true,
+    "transformers": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz",
+      "integrity": "sha1-XSPLNVYd2F3Gf7hIIwm0fVPM6ac=",
       "requires": {
-        "execa": "^0.7.0"
+        "css": "~1.0.8",
+        "promise": "~2.0",
+        "uglify-js": "~2.2.5"
       },
       "dependencies": {
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
+        "is-promise": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz",
+          "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU="
+        },
+        "promise": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz",
+          "integrity": "sha1-RmSKqdYFr10ucMMCS/WUNtoCuA4=",
           "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "is-promise": "~1"
           }
         },
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-          "dev": true,
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
           "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
+            "amdefine": ">=0.0.4"
           }
         },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true
+        "uglify-js": {
+          "version": "2.2.5",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz",
+          "integrity": "sha1-puAqcNg5eSuXgEiLe4sYTAlcmcc=",
+          "requires": {
+            "optimist": "~0.3.5",
+            "source-map": "~0.1.7"
+          }
         }
       }
     },
-    "terraformer": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.9.tgz",
-      "integrity": "sha512-YlmQ1fsMWTkKGDGibCRWgmLzrpDRUr63Q025LJ/taYQ6j1Yb8q9McKF7NBi6ACAyUXO6F/bl9w6v4MY307y5Ag==",
-      "requires": {
-        "@types/geojson": "^1.0.0"
-      }
+    "traverse": {
+      "version": "0.6.6",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
+      "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=",
+      "dev": true
     },
-    "terraformer-wkt-parser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.2.0.tgz",
-      "integrity": "sha512-QU3iA54St5lF8Za1jg1oj4NYc8sn5tCZ08aNSWDeGzrsaV48eZk1iAVWasxhNspYBoCqdHuoot1pUTUrE1AJ4w==",
+    "tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true
+    },
+    "ts-node": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz",
+      "integrity": "sha512-BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw==",
+      "dev": true,
       "requires": {
-        "@types/geojson": "^1.0.0",
-        "terraformer": "~1.0.5"
+        "arrify": "^1.0.0",
+        "buffer-from": "^1.1.0",
+        "diff": "^3.1.0",
+        "make-error": "^1.1.1",
+        "minimist": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.5.6",
+        "yn": "^2.0.0"
       }
     },
-    "terser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.2.0.tgz",
-      "integrity": "sha512-6lPt7lZdZ/13icQJp8XasFOwZjFJkxFFIb/N1fhYEQNoNI3Ilo3KABZ9OocZvZoB39r6SiIk/0+v/bt8nZoSeA==",
+    "tslib": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
+    },
+    "tslint": {
+      "version": "5.11.0",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.11.0.tgz",
+      "integrity": "sha1-mPMMAurjzecAYgHkwzywi0hYHu0=",
       "dev": true,
       "requires": {
-        "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
+        "babel-code-frame": "^6.22.0",
+        "builtin-modules": "^1.1.1",
+        "chalk": "^2.3.0",
+        "commander": "^2.12.1",
+        "diff": "^3.2.0",
+        "glob": "^7.1.1",
+        "js-yaml": "^3.7.0",
+        "minimatch": "^3.0.4",
+        "resolve": "^1.3.2",
+        "semver": "^5.3.0",
+        "tslib": "^1.8.0",
+        "tsutils": "^2.27.2"
       },
       "dependencies": {
-        "source-map-support": {
-          "version": "0.5.13",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-          "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-          "dev": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
-          }
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true
         }
       }
     },
-    "terser-webpack-plugin": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz",
-      "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==",
+    "tsscmp": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
+      "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA=="
+    },
+    "tsutils": {
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
       "dev": true,
       "requires": {
-        "cacache": "^11.3.2",
-        "find-cache-dir": "^2.0.0",
-        "is-wsl": "^1.1.0",
-        "loader-utils": "^1.2.3",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.7.0",
-        "source-map": "^0.6.1",
-        "terser": "^4.0.0",
-        "webpack-sources": "^1.3.0",
-        "worker-farm": "^1.7.0"
+        "tslib": "^1.8.1"
       }
     },
-    "test-exclude": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz",
-      "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==",
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "requires": {
-        "glob": "^7.1.3",
-        "minimatch": "^3.0.4",
-        "read-pkg-up": "^4.0.0",
-        "require-main-filename": "^2.0.0"
+        "safe-buffer": "^5.0.1"
       }
     },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
     },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
+    },
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "dev": true,
       "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
       }
     },
-    "thunky": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
-      "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
-    "timed-out": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
-      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
+    "typescript": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz",
+      "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==",
       "dev": true
     },
-    "timers-browserify": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
-      "dev": true,
+    "ua-parser-js": {
+      "version": "0.7.21",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz",
+      "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ=="
+    },
+    "uglify-js": {
+      "version": "2.8.29",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+      "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
       "requires": {
-        "setimmediate": "^1.0.4"
+        "source-map": "~0.5.1",
+        "uglify-to-browserify": "~1.0.0",
+        "yargs": "~3.10.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "requires": {
+            "center-align": "^0.1.1",
+            "right-align": "^0.1.1",
+            "wordwrap": "0.0.2"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "requires": {
+            "camelcase": "^1.0.2",
+            "cliui": "^2.1.0",
+            "decamelize": "^1.0.0",
+            "window-size": "0.1.0"
+          }
+        }
       }
     },
-    "tiny-json-http": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/tiny-json-http/-/tiny-json-http-7.1.2.tgz",
-      "integrity": "sha512-XB9Bu+ohdQso6ziPFNVqK+pcTt0l8BSRkW/CCBq0pUVlLxcYDsorpo7ae5yPhu2CF1xYgJuKVLF7cfOGeLCTlA=="
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+      "optional": true
     },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+    "ultron": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+      "dev": true
+    },
+    "undefsafe": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz",
+      "integrity": "sha1-Il9rngM3Zj4Njnz9aG/Cg2zKznY=",
       "dev": true,
       "requires": {
-        "os-tmpdir": "~1.0.2"
+        "debug": "^2.2.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
       }
     },
-    "to-array": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
-      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
-      "dev": true
+    "underscore": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
     },
-    "to-arraybuffer": {
+    "union-value": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-      "dev": true
-    },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "requires": {
-        "kind-of": "^3.0.2"
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
       }
     },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+    "unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
       "dev": true,
       "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
+        "unique-slug": "^2.0.0"
       }
     },
-    "to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+    "unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
       "dev": true,
       "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
+        "imurmurhash": "^0.1.4"
       }
     },
-    "toidentifier": {
+    "unique-string": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
-    },
-    "toposort-class": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz",
-      "integrity": "sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg="
-    },
-    "touch": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
-      "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+      "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
       "dev": true,
       "requires": {
-        "nopt": "~1.0.10"
-      },
-      "dependencies": {
-        "nopt": {
-          "version": "1.0.10",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
-          "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
-          "dev": true,
-          "requires": {
-            "abbrev": "1"
-          }
-        }
+        "crypto-random-string": "^1.0.0"
       }
     },
-    "tough-cookie": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
-      "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
+    "universal-analytics": {
+      "version": "0.4.20",
+      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz",
+      "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==",
+      "dev": true,
       "requires": {
-        "punycode": "^1.4.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-        }
+        "debug": "^3.0.0",
+        "request": "^2.88.0",
+        "uuid": "^3.0.0"
       }
     },
-    "tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
-      "requires": {
-        "punycode": "^2.1.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-        }
-      }
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true
     },
-    "transformers": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz",
-      "integrity": "sha1-XSPLNVYd2F3Gf7hIIwm0fVPM6ac=",
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
       "requires": {
-        "css": "~1.0.8",
-        "promise": "~2.0",
-        "uglify-js": "~2.2.5"
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
       },
       "dependencies": {
-        "is-promise": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz",
-          "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU="
-        },
-        "optimist": {
-          "version": "0.3.7",
-          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
-          "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
-          "requires": {
-            "wordwrap": "~0.0.2"
-          }
-        },
-        "promise": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz",
-          "integrity": "sha1-RmSKqdYFr10ucMMCS/WUNtoCuA4=",
-          "requires": {
-            "is-promise": "~1"
-          }
-        },
-        "source-map": {
-          "version": "0.1.43",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
           }
         },
-        "uglify-js": {
-          "version": "2.2.5",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz",
-          "integrity": "sha1-puAqcNg5eSuXgEiLe4sYTAlcmcc=",
-          "requires": {
-            "optimist": "~0.3.5",
-            "source-map": "~0.1.7"
-          }
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
         }
       }
     },
-    "tree-kill": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
-      "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q=="
+    "unzip-response": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+      "dev": true
     },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+    "upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
       "dev": true
     },
-    "ts-node": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz",
-      "integrity": "sha512-BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw==",
+    "update-notifier": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
+      "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
       "dev": true,
       "requires": {
-        "arrify": "^1.0.0",
-        "buffer-from": "^1.1.0",
-        "diff": "^3.1.0",
-        "make-error": "^1.1.1",
-        "minimist": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "source-map-support": "^0.5.6",
-        "yn": "^2.0.0"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
+        "boxen": "^1.2.1",
+        "chalk": "^2.0.1",
+        "configstore": "^3.0.0",
+        "import-lazy": "^2.1.0",
+        "is-ci": "^1.0.10",
+        "is-installed-globally": "^0.1.0",
+        "is-npm": "^1.0.0",
+        "latest-version": "^3.0.0",
+        "semver-diff": "^2.0.0",
+        "xdg-basedir": "^3.0.0"
+      }
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "requires": {
+        "punycode": "^2.1.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
         }
       }
     },
-    "tslib": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
     },
-    "tslint": {
-      "version": "5.11.0",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.11.0.tgz",
-      "integrity": "sha1-mPMMAurjzecAYgHkwzywi0hYHu0=",
-      "dev": true,
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
       "requires": {
-        "babel-code-frame": "^6.22.0",
-        "builtin-modules": "^1.1.1",
-        "chalk": "^2.3.0",
-        "commander": "^2.12.1",
-        "diff": "^3.2.0",
-        "glob": "^7.1.1",
-        "js-yaml": "^3.7.0",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.3.2",
-        "semver": "^5.3.0",
-        "tslib": "^1.8.0",
-        "tsutils": "^2.27.2"
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
       }
     },
-    "tsutils": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
+    "url-parse": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "dev": true,
       "requires": {
-        "tslib": "^1.8.1"
+        "prepend-http": "^1.0.1"
       }
     },
-    "tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+    "useragent": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
+      "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+      "dev": true,
       "requires": {
-        "safe-buffer": "^5.0.1"
+        "lru-cache": "4.1.x",
+        "tmp": "0.0.x"
       }
     },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+    "util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
       "requires": {
-        "prelude-ls": "~1.1.2"
+        "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        }
       }
     },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+    "util-promisify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz",
+      "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
       "dev": true,
       "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
+        "object.getownpropertydescriptors": "^2.0.3"
       }
     },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
       "dev": true
     },
-    "typescript": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz",
-      "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==",
-      "dev": true
+    "uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
     },
-    "ua-parser-js": {
-      "version": "0.7.20",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.20.tgz",
-      "integrity": "sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw=="
+    "v8-to-istanbul": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-2.1.0.tgz",
+      "integrity": "sha512-3XHoQH/BjY5vO26v2puZ4hs54z5O4s5R8AfKH5ktu0hANWNtYDOFwB1iBstkGISgEpohs/U81vY8B0KbQz3N2A=="
     },
-    "uglify-js": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz",
-      "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==",
-      "optional": true,
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "requires": {
-        "commander": "~2.20.0",
-        "source-map": "~0.6.1"
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
       }
     },
-    "uglify-to-browserify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-      "optional": true
+    "validate-npm-package-name": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
+      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+      "dev": true,
+      "requires": {
+        "builtins": "^1.0.3"
+      }
     },
-    "ultron": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+    "validator": {
+      "version": "10.8.0",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-10.8.0.tgz",
+      "integrity": "sha512-mXqMxfCh5NLsVgYVKl9WvnHNDPCcbNppHSPPowu0VjtSsGWVY+z8hJF44edLR1nbLNzi3jYoYsIl8KZpioIk6g=="
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
       "dev": true
     },
-    "undefsafe": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz",
-      "integrity": "sha1-Il9rngM3Zj4Njnz9aG/Cg2zKznY=",
-      "dev": true,
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "requires": {
-        "debug": "^2.2.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
       }
     },
-    "underscore": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
+    "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==",
+      "dev": true
     },
-    "union-value": {
+    "void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w="
+    },
+    "w3c-hr-time": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
+      "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
       "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
+        "browser-process-hrtime": "^0.1.2"
       }
     },
-    "unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dev": true,
+    "w3c-xmlserializer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
+      "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
       "requires": {
-        "unique-slug": "^2.0.0"
+        "domexception": "^1.0.1",
+        "webidl-conversions": "^4.0.2",
+        "xml-name-validator": "^3.0.0"
       }
     },
-    "unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "dev": true,
-      "requires": {
-        "imurmurhash": "^0.1.4"
-      }
+    "wait-for-expect": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/wait-for-expect/-/wait-for-expect-1.3.0.tgz",
+      "integrity": "sha512-8fJU7jiA96HfGPt+P/UilelSAZfhMBJ52YhKzlmZQvKEZU2EcD1GQ0yqGB6liLdHjYtYAoGVigYwdxr5rktvzA==",
+      "dev": true
     },
-    "unique-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-      "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-      "dev": true,
+    "walk": {
+      "version": "2.3.14",
+      "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz",
+      "integrity": "sha512-5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==",
       "requires": {
-        "crypto-random-string": "^1.0.0"
+        "foreachasync": "^3.0.0"
       }
     },
-    "universal-analytics": {
-      "version": "0.4.20",
-      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz",
-      "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==",
+    "watchpack": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
       "dev": true,
       "requires": {
-        "debug": "^3.0.0",
-        "request": "^2.88.0",
-        "uuid": "^3.0.0"
+        "chokidar": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
           }
         },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+        "binary-extensions": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
           "dev": true
         },
-        "har-validator": {
-          "version": "5.1.3",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-          "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
           "dev": true,
           "requires": {
-            "ajv": "^6.5.5",
-            "har-schema": "^2.0.0"
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
           }
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
         },
-        "oauth-sign": {
-          "version": "0.9.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-          "dev": true
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
         },
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          }
         },
-        "request": {
-          "version": "2.88.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+        "fsevents": {
+          "version": "1.2.11",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz",
+          "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "aws-sign2": "~0.7.0",
-            "aws4": "^1.8.0",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.6",
-            "extend": "~3.0.2",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.3.2",
-            "har-validator": "~5.1.0",
-            "http-signature": "~1.2.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.19",
-            "oauth-sign": "~0.9.0",
-            "performance-now": "^2.1.0",
-            "qs": "~6.5.2",
-            "safe-buffer": "^5.1.2",
-            "tough-cookie": "~2.4.3",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.3.2"
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1",
+            "node-pre-gyp": "*"
+          },
+          "dependencies": {
+            "abbrev": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "ansi-regex": {
+              "version": "2.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "are-we-there-yet": {
+              "version": "1.1.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "delegates": "^1.0.0",
+                "readable-stream": "^2.0.6"
+              }
+            },
+            "balanced-match": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "brace-expansion": {
+              "version": "1.1.11",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+              }
+            },
+            "chownr": {
+              "version": "1.1.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "code-point-at": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "concat-map": {
+              "version": "0.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "console-control-strings": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "core-util-is": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "debug": {
+              "version": "3.2.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ms": "^2.1.1"
+              }
+            },
+            "deep-extend": {
+              "version": "0.6.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "delegates": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "detect-libc": {
+              "version": "1.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "fs-minipass": {
+              "version": "1.2.7",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.6.0"
+              }
+            },
+            "fs.realpath": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "gauge": {
+              "version": "2.7.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "aproba": "^1.0.3",
+                "console-control-strings": "^1.0.0",
+                "has-unicode": "^2.0.0",
+                "object-assign": "^4.1.0",
+                "signal-exit": "^3.0.0",
+                "string-width": "^1.0.1",
+                "strip-ansi": "^3.0.1",
+                "wide-align": "^1.1.0"
+              }
+            },
+            "glob": {
+              "version": "7.1.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            },
+            "has-unicode": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "iconv-lite": {
+              "version": "0.4.24",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safer-buffer": ">= 2.1.2 < 3"
+              }
+            },
+            "ignore-walk": {
+              "version": "3.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimatch": "^3.0.4"
+              }
+            },
+            "inflight": {
+              "version": "1.0.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+              }
+            },
+            "inherits": {
+              "version": "2.0.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "ini": {
+              "version": "1.3.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "isarray": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "minimatch": {
+              "version": "3.0.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "brace-expansion": "^1.1.7"
+              }
+            },
+            "minimist": {
+              "version": "0.0.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "minipass": {
+              "version": "2.9.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            },
+            "minizlib": {
+              "version": "1.3.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.9.0"
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimist": "0.0.8"
+              }
+            },
+            "ms": {
+              "version": "2.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "needle": {
+              "version": "2.4.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "debug": "^3.2.6",
+                "iconv-lite": "^0.4.4",
+                "sax": "^1.2.4"
+              }
+            },
+            "node-pre-gyp": {
+              "version": "0.14.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "detect-libc": "^1.0.2",
+                "mkdirp": "^0.5.1",
+                "needle": "^2.2.1",
+                "nopt": "^4.0.1",
+                "npm-packlist": "^1.1.6",
+                "npmlog": "^4.0.2",
+                "rc": "^1.2.7",
+                "rimraf": "^2.6.1",
+                "semver": "^5.3.0",
+                "tar": "^4.4.2"
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "abbrev": "1",
+                "osenv": "^0.1.4"
+              }
+            },
+            "npm-bundled": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "npm-normalize-package-bin": "^1.0.1"
+              }
+            },
+            "npm-normalize-package-bin": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "npm-packlist": {
+              "version": "1.4.7",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ignore-walk": "^3.0.1",
+                "npm-bundled": "^1.0.1"
+              }
+            },
+            "npmlog": {
+              "version": "4.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "are-we-there-yet": "~1.1.2",
+                "console-control-strings": "~1.1.0",
+                "gauge": "~2.7.3",
+                "set-blocking": "~2.0.0"
+              }
+            },
+            "number-is-nan": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "object-assign": {
+              "version": "4.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "once": {
+              "version": "1.4.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "wrappy": "1"
+              }
+            },
+            "os-homedir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "os-tmpdir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "osenv": {
+              "version": "0.1.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "os-homedir": "^1.0.0",
+                "os-tmpdir": "^1.0.0"
+              }
+            },
+            "path-is-absolute": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "process-nextick-args": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "rc": {
+              "version": "1.2.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "deep-extend": "^0.6.0",
+                "ini": "~1.3.0",
+                "minimist": "^1.2.0",
+                "strip-json-comments": "~2.0.1"
+              },
+              "dependencies": {
+                "minimist": {
+                  "version": "1.2.0",
+                  "bundled": true,
+                  "dev": true,
+                  "optional": true
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "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"
+              }
+            },
+            "rimraf": {
+              "version": "2.7.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "glob": "^7.1.3"
+              }
+            },
+            "safe-buffer": {
+              "version": "5.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "safer-buffer": {
+              "version": "2.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "sax": {
+              "version": "1.2.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "semver": {
+              "version": "5.7.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "set-blocking": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "signal-exit": {
+              "version": "3.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ansi-regex": "^2.0.0"
+              }
+            },
+            "strip-json-comments": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "tar": {
+              "version": "4.4.13",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "chownr": "^1.1.1",
+                "fs-minipass": "^1.2.5",
+                "minipass": "^2.8.6",
+                "minizlib": "^1.2.1",
+                "mkdirp": "^0.5.0",
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.3"
+              }
+            },
+            "util-deprecate": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "wide-align": {
+              "version": "1.1.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "string-width": "^1.0.2 || 2"
+              }
+            },
+            "wrappy": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "yallist": {
+              "version": "3.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
           }
         },
-        "tough-cookie": {
-          "version": "2.4.3",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+        "is-binary-path": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
           "dev": true,
           "requires": {
-            "psl": "^1.1.24",
-            "punycode": "^1.4.1"
+            "binary-extensions": "^1.0.0"
           }
-        }
-      }
-    },
-    "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
-    },
-    "unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
           }
         },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
-        }
-      }
-    },
-    "unzip-response": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
-      "dev": true
-    },
-    "upath": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
-      "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
-      "dev": true
-    },
-    "update-notifier": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
-      "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
-      "dev": true,
-      "requires": {
-        "boxen": "^1.2.1",
-        "chalk": "^2.0.1",
-        "configstore": "^3.0.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^1.0.10",
-        "is-installed-globally": "^0.1.0",
-        "is-npm": "^1.0.0",
-        "latest-version": "^3.0.0",
-        "semver-diff": "^2.0.0",
-        "xdg-basedir": "^3.0.0"
-      }
-    },
-    "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "requires": {
-        "punycode": "^2.1.0"
-      },
-      "dependencies": {
-        "punycode": {
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        },
+        "to-regex-range": {
           "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-        }
-      }
-    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
-      "requires": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "url-parse-lax": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-      "dev": true,
-      "requires": {
-        "prepend-http": "^1.0.1"
-      }
-    },
-    "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
-    },
-    "useragent": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
-      "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
-      "dev": true,
-      "requires": {
-        "lru-cache": "4.1.x",
-        "tmp": "0.0.x"
-      }
-    },
-    "util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "requires": {
-        "inherits": "2.0.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        }
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "util-promisify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz",
-      "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
-      "dev": true,
-      "requires": {
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true
-    },
-    "uuid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
-    },
-    "v8-to-istanbul": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-2.1.0.tgz",
-      "integrity": "sha512-3XHoQH/BjY5vO26v2puZ4hs54z5O4s5R8AfKH5ktu0hANWNtYDOFwB1iBstkGISgEpohs/U81vY8B0KbQz3N2A=="
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "validate-npm-package-name": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
-      "dev": true,
-      "requires": {
-        "builtins": "^1.0.3"
-      }
-    },
-    "validator": {
-      "version": "10.8.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-10.8.0.tgz",
-      "integrity": "sha512-mXqMxfCh5NLsVgYVKl9WvnHNDPCcbNppHSPPowu0VjtSsGWVY+z8hJF44edLR1nbLNzi3jYoYsIl8KZpioIk6g=="
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-      "dev": true
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "vm-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
-      "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==",
-      "dev": true
-    },
-    "void-elements": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w="
-    },
-    "w3c-hr-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
-      "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
-      "requires": {
-        "browser-process-hrtime": "^0.1.2"
-      }
-    },
-    "w3c-xmlserializer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz",
-      "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
-      "requires": {
-        "domexception": "^1.0.1",
-        "webidl-conversions": "^4.0.2",
-        "xml-name-validator": "^3.0.0"
-      }
-    },
-    "walk": {
-      "version": "2.3.14",
-      "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz",
-      "integrity": "sha512-5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==",
-      "requires": {
-        "foreachasync": "^3.0.0"
-      }
-    },
-    "watchpack": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
-      "dev": true,
-      "requires": {
-        "chokidar": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
-      },
-      "dependencies": {
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
           "dev": true,
           "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
           }
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
         }
       }
     },
@@ -16595,33 +18190,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-          "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
-          "dev": true
-        },
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
+          "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
           "dev": true
         }
       }
@@ -16641,15 +18212,6 @@
           "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
           "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
           "dev": true
-        },
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
         }
       }
     },
@@ -16718,6 +18280,51 @@
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "binary-extensions": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          }
+        },
         "chokidar": {
           "version": "2.1.8",
           "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -16756,42 +18363,644 @@
               "dev": true
             },
             "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.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"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          }
+        },
+        "fsevents": {
+          "version": "1.2.11",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz",
+          "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1",
+            "node-pre-gyp": "*"
+          },
+          "dependencies": {
+            "abbrev": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "ansi-regex": {
+              "version": "2.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "are-we-there-yet": {
+              "version": "1.1.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "delegates": "^1.0.0",
+                "readable-stream": "^2.0.6"
+              }
+            },
+            "balanced-match": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "brace-expansion": {
+              "version": "1.1.11",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+              }
+            },
+            "chownr": {
+              "version": "1.1.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "code-point-at": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "concat-map": {
+              "version": "0.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "console-control-strings": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "core-util-is": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "debug": {
+              "version": "3.2.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ms": "^2.1.1"
+              }
+            },
+            "deep-extend": {
+              "version": "0.6.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "delegates": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "detect-libc": {
+              "version": "1.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "fs-minipass": {
+              "version": "1.2.7",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.6.0"
+              }
+            },
+            "fs.realpath": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "gauge": {
+              "version": "2.7.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "aproba": "^1.0.3",
+                "console-control-strings": "^1.0.0",
+                "has-unicode": "^2.0.0",
+                "object-assign": "^4.1.0",
+                "signal-exit": "^3.0.0",
+                "string-width": "^1.0.1",
+                "strip-ansi": "^3.0.1",
+                "wide-align": "^1.1.0"
+              }
+            },
+            "glob": {
+              "version": "7.1.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            },
+            "has-unicode": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "iconv-lite": {
+              "version": "0.4.24",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safer-buffer": ">= 2.1.2 < 3"
+              }
+            },
+            "ignore-walk": {
+              "version": "3.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimatch": "^3.0.4"
+              }
+            },
+            "inflight": {
+              "version": "1.0.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+              }
+            },
+            "inherits": {
+              "version": "2.0.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "ini": {
+              "version": "1.3.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "isarray": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "minimatch": {
+              "version": "3.0.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "brace-expansion": "^1.1.7"
+              }
+            },
+            "minimist": {
+              "version": "0.0.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "minipass": {
+              "version": "2.9.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            },
+            "minizlib": {
+              "version": "1.3.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.9.0"
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimist": "0.0.8"
+              }
+            },
+            "ms": {
+              "version": "2.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "needle": {
+              "version": "2.4.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "debug": "^3.2.6",
+                "iconv-lite": "^0.4.4",
+                "sax": "^1.2.4"
+              }
+            },
+            "node-pre-gyp": {
+              "version": "0.14.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "detect-libc": "^1.0.2",
+                "mkdirp": "^0.5.1",
+                "needle": "^2.2.1",
+                "nopt": "^4.0.1",
+                "npm-packlist": "^1.1.6",
+                "npmlog": "^4.0.2",
+                "rc": "^1.2.7",
+                "rimraf": "^2.6.1",
+                "semver": "^5.3.0",
+                "tar": "^4.4.2"
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "abbrev": "1",
+                "osenv": "^0.1.4"
+              }
+            },
+            "npm-bundled": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "npm-normalize-package-bin": "^1.0.1"
+              }
+            },
+            "npm-normalize-package-bin": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "npm-packlist": {
+              "version": "1.4.7",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ignore-walk": "^3.0.1",
+                "npm-bundled": "^1.0.1"
+              }
+            },
+            "npmlog": {
+              "version": "4.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "are-we-there-yet": "~1.1.2",
+                "console-control-strings": "~1.1.0",
+                "gauge": "~2.7.3",
+                "set-blocking": "~2.0.0"
+              }
+            },
+            "number-is-nan": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "object-assign": {
+              "version": "4.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "once": {
+              "version": "1.4.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "wrappy": "1"
+              }
+            },
+            "os-homedir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "os-tmpdir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "osenv": {
+              "version": "0.1.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "os-homedir": "^1.0.0",
+                "os-tmpdir": "^1.0.0"
+              }
+            },
+            "path-is-absolute": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "process-nextick-args": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "rc": {
+              "version": "1.2.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "deep-extend": "^0.6.0",
+                "ini": "~1.3.0",
+                "minimist": "^1.2.0",
+                "strip-json-comments": "~2.0.1"
+              },
+              "dependencies": {
+                "minimist": {
+                  "version": "1.2.0",
+                  "bundled": true,
+                  "dev": true,
+                  "optional": true
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "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"
+              }
+            },
+            "rimraf": {
+              "version": "2.7.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "glob": "^7.1.3"
+              }
+            },
+            "safe-buffer": {
+              "version": "5.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "safer-buffer": {
+              "version": "2.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "sax": {
+              "version": "1.2.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "semver": {
+              "version": "5.7.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "set-blocking": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "signal-exit": {
+              "version": "3.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ansi-regex": "^2.0.0"
+              }
+            },
+            "strip-json-comments": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "tar": {
+              "version": "4.4.13",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "chownr": "^1.1.1",
+                "fs-minipass": "^1.2.5",
+                "minipass": "^2.8.6",
+                "minizlib": "^1.2.1",
+                "mkdirp": "^0.5.0",
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.3"
+              }
+            },
+            "util-deprecate": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "wide-align": {
+              "version": "1.1.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "string-width": "^1.0.2 || 2"
               }
+            },
+            "wrappy": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "yallist": {
+              "version": "3.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
             }
           }
         },
-        "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"
-          }
-        },
         "get-caller-file": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
           "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
           "dev": true
         },
+        "is-binary-path": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+          "dev": true,
+          "requires": {
+            "binary-extensions": "^1.0.0"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        },
         "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
         },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
         },
         "require-main-filename": {
           "version": "1.0.1",
@@ -16841,6 +19050,16 @@
             "ansi-regex": "^2.0.0"
           }
         },
+        "to-regex-range": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+          "dev": true,
+          "requires": {
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1"
+          }
+        },
         "wrap-ansi": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
@@ -16932,6 +19151,14 @@
       "requires": {
         "source-list-map": "^2.0.0",
         "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
     "webpack-subresource-integrity": {
@@ -16974,9 +19201,9 @@
       "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
     },
     "whatwg-url": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
-      "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
+      "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
       "requires": {
         "lodash.sortby": "^4.7.0",
         "tr46": "^1.0.1",
@@ -17103,6 +19330,11 @@
         "@types/node": "*"
       }
     },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+    },
     "wordwrap": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
@@ -17153,28 +19385,14 @@
       }
     },
     "ws": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-      "dev": true,
-      "requires": {
-        "async-limiter": "~1.0.0",
-        "safe-buffer": "~5.1.0",
-        "ultron": "~1.1.0"
-      },
-      "dependencies": {
-        "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
-        }
-      }
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz",
+      "integrity": "sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A=="
     },
     "x-xss-protection": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.2.0.tgz",
-      "integrity": "sha512-xN0kV+8XfOQM2OPPBdEbGtbvJNNP1pvZR7sE6d44cjJFQG4OiGDdienPg5iOUGswBTiGbBvtYDURd30BMJwwqg=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.3.0.tgz",
+      "integrity": "sha512-kpyBI9TlVipZO4diReZMAHWtS0MMa/7Kgx8hwG/EuZLiA6sg4Ah/4TRdASHhRRN3boobzcYgFRUFSgHRge6Qhg=="
     },
     "xdg-basedir": {
       "version": "3.0.0",
@@ -17202,9 +19420,9 @@
       "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
     },
     "xmlchars": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.1.1.tgz",
-      "integrity": "sha512-7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
     },
     "xmlhttprequest-ssl": {
       "version": "1.5.5",
@@ -17294,6 +19512,15 @@
         "yargs": "^13.3.0"
       }
     },
+    "yauzl": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
+      "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
+      "dev": true,
+      "requires": {
+        "fd-slicer": "~1.0.1"
+      }
+    },
     "yeast": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
diff --git a/package.json b/package.json
index 3aaebf8ac4..e37b76b705 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "axios": "^0.19.0",
     "bcrypt-nodejs": "0.0.3",
     "c8": "^3.2.1",
+    "cheerio": "^1.0.0-rc.3",
     "concurrently": "^4.1.2",
     "convict": "^4.4.1",
     "cookie-parser": "^1.4.3",
@@ -62,6 +63,7 @@
     "jszip": "^3.2.2",
     "lodash": "^4.17.15",
     "moment": "^2.24.0",
+    "moment-timezone": "^0.5.28",
     "morgan": "^1.9.1",
     "ngx-moment": "^3.4.0",
     "notifications-node-client": "^4.6.0",
@@ -69,6 +71,7 @@
     "passport-jwt": "^4.0.0",
     "pg": "^7.12.1",
     "pg-hstore": "^2.3.2",
+    "rate-limiter-flexible": "^1.3.2",
     "rfr": "^1.2.3",
     "rxjs": "^6.5.2",
     "rxjs-compat": "^6.5.2",
@@ -90,6 +93,9 @@
     "@angular/cli": "~8.2.2",
     "@angular/compiler-cli": "^8.2.3",
     "@angular/language-service": "~8.2.3",
+    "@jackfranklin/test-data-bot": "^1.1.0",
+    "@testing-library/angular": "^8.2.0",
+    "@types/faker": "^4.1.11",
     "@types/file-saver": "^2.0.1",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
diff --git a/server/config/config.js b/server/config/config.js
index ebded91856..d54b9bfc96 100644
--- a/server/config/config.js
+++ b/server/config/config.js
@@ -421,6 +421,28 @@ const config = convict({
         env: 'TEST_ADMINPASSWORD'
       }
     }
+  },
+  rateLimiting: {
+    points: {
+      doc: 'How many times you want allow a user to visit sensitive endpoints',
+      format: 'int',
+      default: 60
+    },
+    duration: {
+      doc: 'How long a peroid you want to monitor a user visiting endpoints',
+      format: 'int',
+      default: 1 * 60 * 60 // 1 hour
+    },
+    table: {
+      doc: 'The table name you want to create/update to log user requests',
+      format: String,
+      default: 'SensitiveSessions'
+    }
+  },
+  timezone: {
+    doc: 'What timezone is the service running in?',
+    format: String,
+    default: 'Europe/London'
   }
 });
 
diff --git a/server/data/bulkUploadLock.js b/server/data/bulkUploadLock.js
index fa5cd146bd..626ab5feb1 100644
--- a/server/data/bulkUploadLock.js
+++ b/server/data/bulkUploadLock.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const rfr = require('rfr');
+
 const db = rfr('server/utils/datastore');
 
 module.exports = {
@@ -87,4 +89,4 @@ module.exports = {
       type: db.QueryTypes.UPDATE
     });
   }
-};
+};
diff --git a/server/data/parentWDFReport.js b/server/data/parentWDFReport.js
index 1ec4a18fc9..331ebaee9b 100644
--- a/server/data/parentWDFReport.js
+++ b/server/data/parentWDFReport.js
@@ -14,7 +14,7 @@ SELECT
   "DataPermissions",
   "EmployerTypeValue",
   "EmployerTypeSavedAt",
-  CASE WHEN "OverallWdfEligibility" > :effectiveDate THEN "OverallWdfEligibility" ELSE NULL END AS "CurrentWdfEligibilityStatus",
+  CASE WHEN "OverallWdfEligibility" > :effectiveDate THEN true ELSE NULL END AS "CurrentWdfEligibilityStatus",
   CASE WHEN "OverallWdfEligibility" > :effectiveDate THEN to_char("OverallWdfEligibility", :timeFormat) ELSE NULL END AS "DateEligibilityAchieved",
   MainService.name AS "MainService",
   "MainServiceFKValue",
@@ -32,10 +32,36 @@ SELECT
       COUNT(:zero)
     FROM
       cqc."Worker"
+      LEFT JOIN
+        cqc."Job"
+      ON
+        "Worker"."MainJobFKValue" = "Job"."JobID"
+    LEFT JOIN
+        cqc."Nationality"
+      ON
+        cqc."Worker"."NationalityOtherFK" = "Nationality"."ID"
+	  LEFT JOIN
+        cqc."Qualification"
+      ON
+        "Worker"."SocialCareQualificationFKValue" = "Qualification"."ID"
     WHERE
       "EstablishmentFK" = "Establishment"."EstablishmentID" AND
-      "LastWdfEligibility" IS NOT NULL AND
+      ("GenderValue" IS NOT NULL)  AND
+      ("DateOfBirthValue" IS NOT NULL)  AND
+      (("NationalityValue" = :British OR "NationalityValue" = :Dont) OR ("NationalityValue" = :Other AND "Nationality"."Nationality" IS NOT NULL)) AND
+      ("Job"."JobName" IS NOT NULL OR "Job"."JobName" != :emptyValue)  AND
+      ("MainJobStartDateValue" IS NOT NULL)  AND
+      ("RecruitedFromValue" IS NOT NULL)  AND
+      ("ContractValue" IS NOT NULL)  AND
+      ("WeeklyHoursContractedValue" IS NOT NULL OR "WeeklyHoursAverageValue" IS NOT NULL) AND
+      ("ZeroHoursContractValue" IS NOT NULL) AND
+      ("DaysSickValue" IS NOT NULL) AND
+      (("AnnualHourlyPayValue" IS NOT NULL OR ("AnnualHourlyPayRate" IS NOT NULL OR "AnnualHourlyPayValue" = :Dont))) AND
+      ("CareCertificateValue" IS NOT NULL) AND
+      ("QualificationInSocialCareValue" IS NOT NULL OR ("QualificationInSocialCareValue" = :No OR "QualificationInSocialCareValue" = :Dont) OR ("Qualification"."Level" IS NOT NULL OR "Qualification"."Level" != :emptyValue))  AND
+      ("OtherQualificationsValue" IS NOT NULL) AND
       "LastWdfEligibility" > :effectiveDate AND
+      ("DataOwner" = :Parent OR "DataPermissions" = :WorkplaceStaff) AND
       "Archived" = :falseFlag
   ) AS "CompletedWorkerRecords",
   array_to_string(array(
@@ -97,9 +123,8 @@ SELECT
   "StartersValue",
   "LeaversValue",
   "NumberOfStaffValue",
-
-  updated,
-  CASE WHEN updated > :effectiveDate THEN to_char(updated, :timeFormat) ELSE NULL END AS "LastUpdatedDate",
+  to_char(updated, :timeFormat) updated,
+  CASE WHEN updated > :effectiveDate THEN true ELSE NULL END AS "LastUpdatedDate",
   "ShareDataWithCQC",
   "ShareDataWithLA",
   (select count("LeaveReasonFK") from cqc."Worker" where "EstablishmentFK" = "Establishment"."EstablishmentID") as "ReasonsForLeaving",
@@ -148,6 +173,13 @@ exports.getEstablishmentData = async establishmentId =>
       Vacancies: 'Vacancies',
       Starters: 'Starters',
       Leavers: 'Leavers',
+      Dont: 'Don\'t know',
+      Other: 'Other',
+      No: 'No',
+      emptyValue: '',
+      WorkplaceStaff: 'Workplace and Staff',
+      Parent: 'Parent',
+      British: 'British'
     },
     type: db.QueryTypes.SELECT
   });
diff --git a/server/data/trainingReport.js b/server/data/trainingReport.js
index 0a411cc91f..34ee42b235 100644
--- a/server/data/trainingReport.js
+++ b/server/data/trainingReport.js
@@ -5,7 +5,7 @@ const db = rfr('server/utils/datastore');
 const getTrainingDataQuery =
 `
 SELECT
-  a."NameOrIdValue", a."ID",  c."Category", b."Title", to_char(b."Completed", :timeFormat) as "Completed",
+  a."NameOrIdValue", a."ID", c."Category", c."ID" AS "CategoryID", b."Title", to_char(b."Completed", :timeFormat) as "Completed",
   to_char(b."Expires", :timeFormat) as "ExpiredOn", b."Accredited", b."Expires", a."MainJobFKValue"
 FROM
   cqc."Worker" a
@@ -22,6 +22,13 @@ WHERE
   a."Archived" = :falseValue;
 `;
 
+const getMndatoryTrainingDetailsQuery =
+`SELECT count(:zero)
+FROM cqc."MandatoryTraining"
+WHERE "EstablishmentFK" = :establishmentId
+AND "TrainingCategoryFK" = :categoryId
+AND "JobFK" = :jobId`
+
 const getJobNameQuery =
 `
 select "JobName" from cqc."Job" where "JobID" = :jobId
@@ -37,6 +44,17 @@ exports.getTrainingData = async establishmentId =>
     type: db.QueryTypes.SELECT
   });
 
+exports.getMndatoryTrainingDetails = async (trainingData, establishmentId) =>
+  db.query(getMndatoryTrainingDetailsQuery, {
+    replacements: {
+      establishmentId,
+      jobId: trainingData.MainJobFKValue,
+      categoryId: trainingData.CategoryID,
+      zero: 0
+    },
+    type: db.QueryTypes.SELECT
+  });
+
 exports.getJobName = async jobId =>
   db.query(getJobNameQuery, {
     replacements: {
diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js
index ac6e596a2b..679cd4231a 100644
--- a/server/models/BulkImport/csv/establishments.js
+++ b/server/models/BulkImport/csv/establishments.js
@@ -3,13 +3,14 @@ const hasProp = (obj, prop) =>
   Object.prototype.hasOwnProperty.bind(obj)(prop);
 
 const BUDI = require('../BUDI').BUDI;
+const models = require('../../index');
 
 const STOP_VALIDATING_ON = ['UNCHECKED', 'DELETE', 'NOCHANGE'];
 
 const localAuthorityEmployerTypes = [1, 3];
 const nonDirectCareJobRoles = [1, 2, 4, 5, 7, 8, 9, 13, 14, 15, 17, 18, 19, 21, 22, 23, 24, 26, 27, 28];
 const employedContractStatusIds = [1, 2];
-const dbNotCqcRegulatedServiceCodes = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18];
+const cqcRegulatedServiceCodes = [24, 25, 20, 22, 21, 23, 19, 27, 28, 26, 29, 30, 32, 31, 33, 34];
 
 const csvQuote = toCsv => {
   if (toCsv && toCsv.replace(/ /g, '').match(/[\s,"]/)) {
@@ -91,6 +92,7 @@ class Establishment {
     this._reasonsForLeaving = null;
 
     this._id = null;
+    this._ignore = false;
 
     // console.log(`WA DEBUG - current establishment (${this._lineNumber}:`, this._currentLine);
   }
@@ -456,18 +458,26 @@ class Establishment {
     }
   }
 
-  _validateAddress () {
+  async _validateAddress () {
     const myAddress1 = this._currentLine.ADDRESS1;
     const myAddress2 = this._currentLine.ADDRESS2;
     const myAddress3 = this._currentLine.ADDRESS3;
     const myTown = this._currentLine.POSTTOWN;
     const myPostcode = this._currentLine.POSTCODE;
+    let ignorePostcode = false;
 
     // TODO - if town is empty, match against PAF
-    // TODO - validate postcode against PAF
 
     // adddress 1 is mandatory and no more than 40 characters
     const MAX_LENGTH = 40;
+    const postcodeExists = await models.pcodedata.findAll({
+      where: {
+        postcode: myPostcode
+      },
+      order: [
+        ['uprn', 'ASC']
+      ]
+    });
 
     const localValidationErrors = [];
     if (!myAddress1 || myAddress1.length === 0) {
@@ -521,7 +531,6 @@ class Establishment {
         name: this._currentLine.LOCALESTID
       });
     }
-
     // TODO - registration/establishment APIs do not validate postcode (relies on the frontend - this must be fixed)
     const postcodeRegex = /^[A-Za-z]{1,2}[0-9]{1,2}\s{1}[0-9][A-Za-z]{2}$/;
     const POSTCODE_MAX_LENGTH = 10;
@@ -552,6 +561,26 @@ class Establishment {
         source: myPostcode,
         name: this._currentLine.LOCALESTID
       });
+    } else if (this._status === 'NEW' && !postcodeExists.length) {
+      localValidationErrors.push({
+        lineNumber: this._lineNumber,
+        errCode: Establishment.ADDRESS_ERROR,
+        errType: 'ADDRESS_ERROR',
+        error: 'The Postcode for this workplace cannot be found in our database and must be registered manually.',
+        source: myPostcode,
+        name: this._currentLine.LOCALESTID
+      });
+      this._ignore = true;
+    } else if (this._status === 'UPDATE' && !postcodeExists.length) {
+      localValidationErrors.push({
+        lineNumber: this._lineNumber,
+        warnCode: Establishment.ADDRESS_ERROR,
+        warnType: 'ADDRESS_ERROR',
+        warning: 'The POSTCODE cannot be found in our database and will be ignored.',
+        source: myPostcode,
+        name: this._currentLine.LOCALESTID
+      });
+      ignorePostcode = true;
     }
 
     if (localValidationErrors.length > 0) {
@@ -564,7 +593,9 @@ class Establishment {
     this._address2 = myAddress2;
     this._address3 = myAddress3;
     this._town = myTown;
-    this._postcode = myPostcode;
+    if (!ignorePostcode) {
+      this._postcode = myPostcode;
+    }
 
     return true;
   }
@@ -785,9 +816,8 @@ class Establishment {
         name: this._currentLine.LOCALESTID
       });
       return false;
-    } else if(
-      false &&
-      myRegType === 2 && dbNotCqcRegulatedServiceCodes.includes(dbServiceCode) && dbServiceCode !== dbMainServiceCode) {
+    } else if(myRegType === 2 &&
+      !cqcRegulatedServiceCodes.includes(dbServiceCode) && (dbServiceCode !== dbMainServiceCode)) {
       this._validationErrors.push({
         lineNumber: this._lineNumber,
         errCode: Establishment.REGTYPE_ERROR,
@@ -844,52 +874,76 @@ class Establishment {
     }
   }
 
-  _validateLocationID () {
-    // must be given if "share with CQC" - but if given must be in the format "n-nnnnnnnnn"
-    const locationIDRegex = /^[0-9]{1}-[0-9]{8,10}$/;
-    const myLocationID = this._currentLine.LOCATIONID;
-
-    // do not use
-    const mainServiceIsHeadOffice = parseInt(this._currentLine.MAINSERVICE, 10) === 72;
+  async _validateLocationID () {
+    try {
+      // must be given if "share with CQC" - but if given must be in the format "n-nnnnnnnnn"
+      const locationIDRegex = /^[0-9]{1}-[0-9]{8,10}$/;
+      const myLocationID = this._currentLine.LOCATIONID;
 
-    if (this._regType === 2) {
-      // ignore location i
-      if (!mainServiceIsHeadOffice) {
-        if (!myLocationID || myLocationID.length === 0) {
-          this._validationErrors.push({
-            lineNumber: this._lineNumber,
-            errCode: Establishment.LOCATION_ID_ERROR,
-            errType: 'LOCATION_ID_ERROR',
-            error: 'LOCATIONID has not been supplied',
-            source: myLocationID,
-            name: this._currentLine.LOCALESTID
-          });
-          return false;
-        } else if (!locationIDRegex.test(myLocationID)) {
+      // do not use
+      const mainServiceIsHeadOffice = parseInt(this._currentLine.MAINSERVICE, 10) === 72;
+      const locationExists = await models.establishment.findAll({
+        where: {
+          locationId: myLocationID
+        },
+        attributes: ['id', 'locationId']
+      });
+      let existingEstablishment = false;
+      await locationExists.map(async (establishment) => {
+        if (establishment.id === this._id) existingEstablishment = true;
+      });
+      if (this._regType === 2) {
+        // ignore location i
+        if (!mainServiceIsHeadOffice) {
+          if (!myLocationID || myLocationID.length === 0) {
+            this._validationErrors.push({
+              lineNumber: this._lineNumber,
+              errCode: Establishment.LOCATION_ID_ERROR,
+              errType: 'LOCATION_ID_ERROR',
+              error: 'LOCATIONID has not been supplied',
+              source: myLocationID,
+              name: this._currentLine.LOCALESTID
+            });
+            return false;
+          } else if (!locationIDRegex.test(myLocationID)) {
+            this._validationErrors.push({
+              lineNumber: this._lineNumber,
+              errCode: Establishment.LOCATION_ID_ERROR,
+              errType: 'LOCATION_ID_ERROR',
+              error: 'LOCATIONID is incorrectly formatted',
+              source: myLocationID,
+              name: this._currentLine.LOCALESTID
+            });
+            return false;
+          }
+        }
+        if (locationExists.length > 0 && !existingEstablishment) {
           this._validationErrors.push({
             lineNumber: this._lineNumber,
             errCode: Establishment.LOCATION_ID_ERROR,
             errType: 'LOCATION_ID_ERROR',
-            error: 'LOCATIONID is incorrectly formatted',
+            error: 'LOCATIONID already exists in ASC-WDS please contact Support on 0113 241 0969',
             source: myLocationID,
             name: this._currentLine.LOCALESTID
           });
           return false;
         }
-      }
 
-      this._locationID = myLocationID;
-      return true;
-    } else if (this._regType === 0 && myLocationID && myLocationID.length > 0) {
-      this._validationErrors.push({
-        lineNumber: this._lineNumber,
-        warnCode: Establishment.LOCATION_ID_WARNING,
-        warnType: 'LOCATION_ID_WARNING',
-        warning: 'LOCATIONID will be ignored as not required for this REGTYPE',
-        source: myLocationID,
-        name: this._currentLine.LOCALESTID
-      });
-      return false;
+        this._locationID = myLocationID;
+        return true;
+      } else if (this._regType === 0 && myLocationID && myLocationID.length > 0) {
+        this._validationErrors.push({
+          lineNumber: this._lineNumber,
+          warnCode: Establishment.LOCATION_ID_WARNING,
+          warnType: 'LOCATION_ID_WARNING',
+          warning: 'LOCATIONID will be ignored as not required for this REGTYPE',
+          source: myLocationID,
+          name: this._currentLine.LOCALESTID
+        });
+        return false;
+      }
+    } catch (error) {
+      throw new Error(error);
     }
   }
 
@@ -1013,6 +1067,7 @@ class Establishment {
 
     const localValidationErrors = [];
     if (this._currentLine.SERVICEUSERS && this._currentLine.SERVICEUSERS.length > 0) {
+      // which is not valid
       const isValid = this._currentLine.SERVICEUSERS.length ? listOfServiceUsers.every(thisService => !Number.isNaN(parseInt(thisService, 10))) : true;
       if (!isValid) {
         localValidationErrors.push({
@@ -1203,22 +1258,22 @@ class Establishment {
     const myTotalPermTemp = parseInt(this._currentLine.TOTALPERMTEMP, 10);
     const HEAD_OFFICE_MAIN_SERVICE = 72;
 
-    if (Number.isNaN(myTotalPermTemp)) {
+    if (myTotalPermTemp.length === 0) {
       this._validationErrors.push({
         lineNumber: this._lineNumber,
         errCode: Establishment.TOTAL_PERM_TEMP_ERROR,
         errType: 'TOTAL_PERM_TEMP_ERROR',
-        error: 'Total Permanent and Temporary (TOTALPERMTEMP) must be an whole number',
+        error: 'TOTALPERMTEMP is missing',
         source: this._currentLine.PERMCQC,
         name: this._currentLine.LOCALESTID
       });
       return false;
-    } else if (myTotalPermTemp < 0 || myTotalPermTemp > MAX_TOTAL) {
+    } else if (myTotalPermTemp < 0 || myTotalPermTemp > MAX_TOTAL || Number.isNaN(myTotalPermTemp)) {
       this._validationErrors.push({
         lineNumber: this._lineNumber,
         errCode: Establishment.TOTAL_PERM_TEMP_ERROR,
         errType: 'TOTAL_PERM_TEMP_ERROR',
-        error: `Total Permanent and Temporary (TOTALPERMTEMP) must be 0 or more, but less than ${MAX_TOTAL}`,
+        error: `TOTALPERMTEMP must be a number from 0 to ${MAX_TOTAL} if this is correct call support on 0113 241 0969`,
         source: myTotalPermTemp,
         name: this._currentLine.LOCALESTID
       });
@@ -1239,6 +1294,18 @@ class Establishment {
     }
   }
 
+  getDuplicateLocationError() {
+    return {
+      origin: 'Establishments',
+      lineNumber: this._lineNumber,
+      errCode: Establishment.DUPLICATE_ERROR,
+      errType: 'DUPLICATE_ERROR',
+      error: 'LOCATIONID is not unique',
+      source: this._currentLine.LOCATIONID,
+      name: this._currentLine.LOCALESTID
+    };
+  }
+
   _crossValidateTotalPermTemp (
     csvEstablishmentSchemaErrors,
     {
@@ -1310,6 +1377,18 @@ class Establishment {
     const vacancies = this._currentLine.VACANCIES.split(';');
     const starters = this._currentLine.STARTERS.split(';');
     const leavers = this._currentLine.LEAVERS.split(';');
+    const myRegType = parseInt(this._currentLine.REGTYPE, 10);
+
+    const regManager = 4;
+    const isCQCRegulated = myRegType === 2;
+
+    const hasRegisteredManagerVacancy =() => {
+      let regManagerVacancies = 0;
+      allJobs.map((job, index) => {
+        if (parseInt(job, 10) === regManager && parseInt(vacancies[index], 10) > 0) regManagerVacancies++;
+      });
+      return regManagerVacancies > 0;
+    };
 
     // allJobs can only be empty, if TOTALPERMTEMP is 0
     if (!this._currentLine.ALLJOBROLES || this._currentLine.ALLJOBROLES.length === 0) {
@@ -1356,8 +1435,29 @@ class Establishment {
           name: this._currentLine.LOCALESTID
         });
       }
+      if (!isCQCRegulated && hasRegisteredManagerVacancy()) {
+        localValidationErrors.push({
+          lineNumber: this._lineNumber,
+          warnCode: Establishment.ALL_JOBS_WARNING,
+          warnType: 'ALL_JOBS_WARNING',
+          warning: 'Vacancy for Registered Manager should not be included for this service and will be ignored',
+          source: this._currentLine.ALLJOBROLES,
+          name: this._currentLine.LOCALESTID
+        });
+      }
     }
 
+    // Need to add if they currently have a registered manager
+    // if (this._currentLine.ALLJOBROLES && this._currentLine.ALLJOBROLES.length > 0 && isCQCRegulated && !hasRegisteredManagerVacancy()) {
+    //   localValidationErrors.push({
+    //     lineNumber: this._lineNumber,
+    //     errCode: Establishment.ALL_JOBS_ERROR,
+    //     errType: 'ALL_JOBS_ERROR',
+    //     error: 'You do not have a staff record for a Registered Manager therefore must record a vacancy for one',
+    //     source: this._currentLine.ALLJOBROLES,
+    //     name: this._currentLine.LOCALESTID
+    //   });
+    // }
     if (localValidationErrors.length > 0) {
       localValidationErrors.forEach(thisValidation => this._validationErrors.push(thisValidation));
       return false;
@@ -1368,6 +1468,41 @@ class Establishment {
     return true;
   }
 
+  _crossValidateAllJobRoles (
+    csvEstablishmentSchemaErrors,
+    registeredManager
+    )
+    {
+    const template = {
+      origin: 'Establishments',
+      lineNumber: this._lineNumber,
+      errCode: Establishment.ALL_JOBS_ERROR,
+      errType: 'ALL_JOBS_ERROR',
+      source: this._currentLine.ALLJOBROLES,
+      name: this._currentLine.LOCALESTID
+    };
+    const allJobs = this._currentLine.ALLJOBROLES.split(';');
+    const vacancies = this._currentLine.VACANCIES.split(';');
+    const myRegType = parseInt(this._currentLine.REGTYPE, 10);
+
+    const regManager = 4;
+    const isCQCRegulated = myRegType === 2;
+
+    const hasRegisteredManagerVacancy =() => {
+      let regManagerVacancies = 0;
+      allJobs.map((job, index) => {
+        if (parseInt(job, 10) === regManager && parseInt(vacancies[index], 10) > 0) regManagerVacancies++;
+      });
+      return regManagerVacancies > 0;
+    };
+
+    if(isCQCRegulated && !hasRegisteredManagerVacancy() && registeredManager === 0) {
+      csvEstablishmentSchemaErrors.unshift(Object.assign(template, {
+        error: 'You do not have a staff record for a Registered Manager therefore must record a vacancy for one'
+      }));
+    }
+  }
+
   // includes perm, temp, pool, agency, student, voluntary and other counts
   // includes vacancies, starters and leavers, total vacancies, total starters and total leavers
   _validateJobRoleTotals () {
@@ -1467,6 +1602,13 @@ class Establishment {
     this._starters = starters.map(thisCount => parseInt(thisCount, 10));
     this._leavers = leavers.map(thisCount => parseInt(thisCount, 10));
 
+    // remove RM vacancy
+    if (this._allJobs && this._allJobs.length) {
+      this._allJobs.map((job, index) => {
+        if (job === regManager && this._vacancies[index] > 0) this._vacancies[index] = 0;
+      });
+    }
+
     if (localValidationErrors.length > 0) {
       localValidationErrors.forEach(thisValidation => this._validationErrors.push(thisValidation));
       return false;
@@ -1632,9 +1774,9 @@ class Establishment {
         } else {
           this._validationErrors.push({
             lineNumber: this._lineNumber,
-            errCode: Establishment.SERVICE_USERS_ERROR,
-            errType: 'SERVICE_USERS_ERROR',
-            error: `Service Users (SERVICEUSERS): ${thisService} is unknown`,
+            warnCode: Establishment.SERVICE_USERS_ERROR,
+            warnType: 'SERVICE_USERS_ERROR',
+            warning: `Entry for code ${thisService} in SERVICEUSERS will be ignored as this is invalid`,
             source: this._currentLine.SERVICEUSERS,
             name: this._currentLine.LOCALESTID
           });
@@ -1960,7 +2102,7 @@ class Establishment {
   }
 
   // returns true on success, false is any attribute of Establishment fails
-  validate () {
+  async validate () {
     let status = true;
 
     status = !this._validateLocalisedId() ? false : status;
@@ -1969,7 +2111,7 @@ class Establishment {
 
     // if the status is unchecked or deleted, then don't continue validation
     if (!STOP_VALIDATING_ON.includes(this._status)) {
-      status = !this._validateAddress() ? false : status;
+      status = await this._validateAddress() ? false : status;
       status = !this._validateEstablishmentType() ? false : status;
 
       status = !this._validateShareWithCQC() ? false : status;
@@ -1979,7 +2121,7 @@ class Establishment {
       status = !this._validateMainService() ? false : status;
       status = !this._validateRegType() ? false : status;
       status = !this._validateProvID() ? false : status;
-      status = !this._validateLocationID() ? false : status;
+      status = await this._validateLocationID() ? false : status;
 
       status = !this._validateAllServices() ? false : status;
       status = !this._validateServiceUsers() ? false : status;
@@ -2014,6 +2156,8 @@ class Establishment {
       nonEmployedWorkers: 0
     };
 
+    let registeredManagers = 0;
+
     // ignoreDBWorkers is used as a hashmap of workers that are being modified
     // as part of this bulk upload process. It allows us to prevent a worker's
     // details
@@ -2021,7 +2165,6 @@ class Establishment {
     // the establishment
     // i.e. ignore the worker record that comes back from the database result set.
     const ignoreDBWorkers = Object.create(null);
-
     myWorkers.forEach(worker => {
       if (this.key === worker.establishmentKey) {
         switch (worker.status) {
@@ -2029,6 +2172,13 @@ class Establishment {
           case 'UPDATE': {
             /* update totals */
             updateWorkerTotals(totals, worker);
+            if (worker.mainJobRoleId === 4) {
+              registeredManagers++;
+            } else {
+              worker.otherJobIds.map(otherJobId => {
+                otherJobId === 4 ? registeredManagers++ : null;
+              });
+            }
           }
           /* fall through */
 
@@ -2040,6 +2190,7 @@ class Establishment {
     });
 
     // get all the other records that may already exist in the db but aren't being updated or deleted
+    // and check how many registered managers there is
     (await fetchMyEstablishmentsWorkers(this.id, this._key))
       .forEach(worker => {
         worker.contractTypeId = BUDI.contractType(BUDI.FROM_ASC, worker.contractTypeId);
@@ -2052,8 +2203,11 @@ class Establishment {
         }
       });
 
+
+
     // ensure worker jobs tally up on TOTALPERMTEMP field, but only do it for new or updated establishments
     this._crossValidateTotalPermTemp(csvEstablishmentSchemaErrors, totals);
+    this._crossValidateAllJobRoles(csvEstablishmentSchemaErrors, registeredManagers);
   }
 
   // returns true on success, false is any attribute of Establishment fails
diff --git a/server/models/BulkImport/csv/workers.js b/server/models/BulkImport/csv/workers.js
index 6cbd6e1e97..92ed576655 100644
--- a/server/models/BulkImport/csv/workers.js
+++ b/server/models/BulkImport/csv/workers.js
@@ -1414,6 +1414,23 @@ class Worker {
     }
   }
 
+  async _crossValidateMainJobRole(csvWorkerSchemaErrors, cqcRegEstablishment) {
+    const template = {
+      worker: this._currentLine.UNIQUEWORKERID,
+      name: this._currentLine.LOCALESTID,
+      lineNumber: this._lineNumber,
+      errCode: Worker.MAIN_JOB_ROLE_ERROR,
+      errType: 'MAIN_JOB_ROLE_ERROR',
+      source: this._currentLine.MAINJOBROLE
+    };
+
+    if (!cqcRegEstablishment && this.mainJobRoleId === 4) {
+      csvWorkerSchemaErrors.unshift(Object.assign(template, {
+        error: 'Workers MAINJOBROLE is Registered Manager but you are not providing a CQC regulated service. Please change to another Job Role'
+      }));
+    }
+  }
+
   _validateMainJobDesc () {
     const myMainJobDesc = this._currentLine.MAINJRDESC;
     const MAX_LENGTH = 120;
@@ -2489,13 +2506,13 @@ class Worker {
   }
 
   // add a duplicate validation error to the current set
-  addDuplicate (originalLineNumber) {
+  addDuplicate (UNIQUEWORKERID) {
     return {
       origin: 'Workers',
       lineNumber: this._lineNumber,
       errCode: Worker.DUPLICATE_ERROR,
       errType: 'DUPLICATE_ERROR',
-      error: 'UNIQUEWORKERID is not unique',
+      error: `UNIQUEWORKERID ${UNIQUEWORKERID} is not unique`,
       source: this._currentLine.UNIQUEWORKERID,
       worker: this._currentLine.UNIQUEWORKERID,
       name: this._currentLine.LOCALESTID
@@ -2503,13 +2520,13 @@ class Worker {
   }
 
   // add a duplicate validation error to the current set
-  addChgDuplicate (originalLineNumber) {
+  addChgDuplicate (CHGUNIQUEWORKERID) {
     return {
       origin: 'Workers',
       lineNumber: this._lineNumber,
       errCode: Worker.DUPLICATE_ERROR,
       errType: 'DUPLICATE_ERROR',
-      error: 'CHGUNIQUEWORKERID is not unique',
+      error: `CHGUNIQUEWORKERID ${CHGUNIQUEWORKERID} is not unique`,
       source: this._currentLine.UNIQUEWORKERID,
       worker: this._currentLine.UNIQUEWORKERID,
       name: this._currentLine.LOCALESTID
@@ -2611,6 +2628,35 @@ class Worker {
     return true;
   }
 
+  async crossValidate ({
+    csvWorkerSchemaErrors,
+    myEstablishments
+  }) {
+    // if worker isn't being added or updated then exit early
+    if (!(['NEW', 'UPDATE'].includes(this._status))) {
+      return;
+    }
+    let cqcRegEstablishment = false;
+
+    myEstablishments.forEach(establishment => {
+      if (this.establishmentKey === establishment.key) {
+        switch (establishment.status) {
+          case 'NEW':
+          case 'UPDATE': {
+            cqcRegEstablishment = establishment.regType === 2;
+          }
+          /* fall through */
+
+          case 'DELETE':
+            break;
+        }
+      }
+    });
+
+    // ensure worker jobs tally up on TOTALPERMTEMP field, but only do it for new or updated establishments
+    this._crossValidateMainJobRole(csvWorkerSchemaErrors, cqcRegEstablishment);
+  }
+
   // returns true on success, false is any attribute of Worker fails
   validate () {
     let status = true;
@@ -2621,7 +2667,7 @@ class Worker {
     status = !this._validateDisplayId() ? false : status;
     status = !this._validateStatus() ? false : status;
 
-    // only continue to process validation, if the status is not UNCHECKED or DELETED
+    // only continue to process validation, if the status is not UNCHECKED, DELETED OR UNCHANGED
     if (!STOP_VALIDATING_ON.includes(this._status)) {
       status = !this._validateContractType() ? false : status;
       status = !this._validateNINumber() ? false : status;
diff --git a/server/models/cache/singletons/permissions.js b/server/models/cache/singletons/permissions.js
index 563fef3e41..4a2f1e9157 100644
--- a/server/models/cache/singletons/permissions.js
+++ b/server/models/cache/singletons/permissions.js
@@ -37,7 +37,7 @@ let ALL_PERMISSIONS = [
     code: 'canChangePermissionsForSubsidiary',
     description: 'change permissions for subsidiary views',
     role: ['Edit'],
-    subOwnedByWorkplaceAccessByParent: [],
+    subOwnedByWorkplaceAccessByParent: ['Workplace and Staff', 'Workplace'],
     subOwnedByParentAccessBySub: ['Workplace and Staff','Workplace'],
     isAdmin: false,
   },
@@ -57,6 +57,14 @@ let ALL_PERMISSIONS = [
     subOwnedByParentAccessBySub: [],
     isAdmin: false,
   },
+  {
+    code: 'canDeleteAllEstablishments',
+    description: 'delete an establishment',
+    role: [],
+    subOwnedByWorkplaceAccessByParent: [],
+    subOwnedByParentAccessBySub: [],
+    isAdmin: true,
+  },
   {
     code: 'canDeleteUser',
     description: 'delete an user',
@@ -256,6 +264,14 @@ let ALL_PERMISSIONS = [
     subOwnedByWorkplaceAccessByParent: [],
     subOwnedByParentAccessBySub: ['Workplace and Staff', 'Workplace', 'None'],
     isAdmin: false,
+  },
+  {
+    code: 'canDownloadWdfReport',
+    description: 'download wdf report',
+    role: ['Edit','Read'],
+    subOwnedByWorkplaceAccessByParent: [],
+    subOwnedByParentAccessBySub: [],
+    isAdmin: false,
   }
 ];
 
@@ -274,7 +290,7 @@ class PermissionCache {
     if (requestData.role === 'Admin') {
       // console.log("0")
       permissions = this.filterForAdminRole();
-    } else if (estabType == "Standalone") {
+    } else if (estabType === "Standalone") {
       // console.log("1")
       permissions = this.filterByRole(this.getRoleEnum(requestData.role));
     } else if (!isLoggedInAsParent && estabType == "Subsidiary" && this.getParentOwnerStatus(requestData.parentIsOwner) === 'Workplace') {
@@ -302,6 +318,10 @@ class PermissionCache {
       }
     }
 
+    if(estabType !== 'Subsidiary') {
+      permissions = permissions.filter(perm => perm.code !== 'canDeleteEstablishment');
+    }
+
     const theirPermissions = permissions.map(thisPerm => {
             return {
                 code: thisPerm.code,
diff --git a/server/models/classes/establishment.js b/server/models/classes/establishment.js
index b96283d965..1ad22d1443 100644
--- a/server/models/classes/establishment.js
+++ b/server/models/classes/establishment.js
@@ -6,6 +6,8 @@
  *
  * Also includes representation as JSON, in one or more presentations.
  */
+const moment = require('moment');
+
 const uuid = require('uuid');
 
 // Shorthand for hasOwnProperty that also works with bare objects
@@ -914,9 +916,13 @@ class Establishment extends EntityValidator {
           // the saving of an Establishment can be initiated within
           //  an external transaction
           const thisTransaction = externalTransaction || t;
-
+          const buChanged = this._status === 'NOCHANGE';
           // now append the extendable properties
-          const modifedUpdateDocument = this._properties.save(savedBy.toLowerCase(), {});
+          const modifedUpdateDocument = this._properties.save(savedBy.toLowerCase(), {}, buChanged);
+          if(modifedUpdateDocument && !modifedUpdateDocument.ShareDataValue){
+            modifedUpdateDocument.shareWithCQC = false;
+            modifedUpdateDocument.shareWithLA = false;
+          }
 
           // note - if the establishment was created online, but then updated via bulk upload, the source become bulk and vice-versa.
           const updateDocument = {
@@ -1849,11 +1855,30 @@ class Establishment extends EntityValidator {
     return allExistAndValid;
   }
 
+  async canConfirm (effectiveFrom, lastEligibility, wdfPropertyValues) {
+    const hasEligibleProperties = wdfPropertyValues.every(thisWdfProperty => (thisWdfProperty.isEligible !== 'No'));
+
+    if (!hasEligibleProperties) {
+      return false;
+    }
+
+    effectiveFrom = moment(effectiveFrom);
+    lastEligibility = moment(lastEligibility);
+
+    if (lastEligibility.isAfter(effectiveFrom)) {
+      return false;
+    }
+
+    return true;
+  }
+
   // returns true if this establishment is WDF eligible as referenced from the
   //  given effective date; otherwise returns false
   async isWdfEligible(effectiveFrom) {
     const wdfByProperty = await this.wdf(effectiveFrom);
     const wdfPropertyValues = Object.values(wdfByProperty);
+    const lastEligibility = this._lastWdfEligibility ? this._lastWdfEligibility.toISOString() : null;
+    const canConfirm = await this.canConfirm(effectiveFrom, lastEligibility, wdfPropertyValues);
 
     // This establishment is eligible only if the overall eligible date is later than the effective date
     // The WDF by property will show the current eligibility of each property
@@ -1867,9 +1892,10 @@ class Establishment extends EntityValidator {
           (thisWdfProperty.isEligible === 'Yes' && thisWdfProperty.updatedSinceEffectiveDate) ||
           thisWdfProperty.isEligible === 'Not relevant'
       ),
-
+      // Can the Establishment confirm their up-to-date information?
+      canConfirm: canConfirm,
       // The date just the establishment fields were last wdf valid
-      lastEligibility: this._lastWdfEligibility ? this._lastWdfEligibility.toISOString() : null,
+      lastEligibility: lastEligibility,
       ...wdfByProperty,
     };
   }
diff --git a/server/models/classes/mandatoryTraining.js b/server/models/classes/mandatoryTraining.js
new file mode 100644
index 0000000000..c0ac29ea1f
--- /dev/null
+++ b/server/models/classes/mandatoryTraining.js
@@ -0,0 +1,421 @@
+/*
+ * mandatoryTraining.js
+ *
+ * The encapsulation of a establishment's Mandatory Training record, including all properties, all specific validation (not API, but object validation),
+ * saving & restoring of data to database (via sequelize model), construction and deletion.
+ *
+ * Also includes representation as JSON, in one or more presentations.
+ *
+ */
+
+ // database models
+ const models = require('../index');
+ const EntityValidator = require('./validations/entityValidator').EntityValidator;
+ const Training = require('../../models/classes/training').Training;
+ class MandatoryTraining extends EntityValidator {
+   constructor(establishmentId) {
+     super();
+     this._establishmentId = establishmentId;
+     this._id = null;
+     this._trainingId = null;
+     this._jobId = null;
+     this._created = null;
+     this._updated = null;
+     this._createdBy = null;
+     this._updatedBy = null;
+   }
+
+   // private logging
+   static get LOG_ERROR() { return 100; }
+   static get LOG_WARN() { return 200; }
+   static get LOG_INFO() { return 300; }
+   static get LOG_TRACE() { return 400; }
+   static get LOG_DEBUG() { return 500; }
+
+   set logLevel(logLevel) {
+       this._logLevel = logLevel;
+   }
+
+   _log(level, msg) {
+       if (this._logLevel >= level) {
+           console.log(`TODO: (${level}) - Mandatory Training class: `, msg);
+       }
+   }
+
+   set mandatorytrainingDetails(obj) {
+     this._mandatorytrainingDetails = obj;
+   }
+
+   get mandatorytrainingDetails() {
+     return this._mandatorytrainingDetails;
+   }
+
+   set establishmentId(newId) {
+       this._establishmentId = newId;
+   }
+
+   get establishmentId() {
+     return this._establishmentId;
+   }
+
+   get id() {
+     return this._id;
+   }
+
+   get created() {
+     return this._created;
+   }
+   get updated() {
+       return this._updated;
+   }
+   get createdBy() {
+       return this._createdBy;
+   }
+   get updatedBy() {
+       return this._updatedBy;
+   }
+
+   // used by save to initialise a new Mandatory Trainign Record; returns true if having initialised this Training Record
+   _initialise() {
+     if (this._id === null) {
+         this._isNew = true;
+         return true;
+     } else {
+         return false;
+     }
+   }
+
+   // validates a given mandatory training record; returns the training record if valid
+   async validateMandatoryTrainingRecord(document) {
+     let validatedMandatoryTrainingRecord = [];
+     let returnStatus = true;
+     //validate all posted training ids
+     if(document && Array.isArray(document)){
+       for(let i = 0; i < document.length; i++){
+         let doc = document[i];
+         if(!doc.trainingCategoryId){
+           console.error('POST:: create mandatoryTraining - Failed Validation - Training Category ID missing');
+           this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Training Category ID missing');
+           return false;
+         }
+         // get training details
+         const trainingCategoryDetails = await models.workerTrainingCategories.findOne({
+           where: {
+             id: doc.trainingCategoryId
+           },
+           attributes: ['id']
+         });
+
+         if (trainingCategoryDetails && trainingCategoryDetails.id) {
+           // get job details if doc.allJobRoles === false
+           if(!doc.allJobRoles){
+             let foundJobRoles = true;
+             if(!doc.allJobRoles && Array.isArray(doc.jobs) && doc.jobs.length > 0){
+
+               for(let j = 0; j < doc.jobs.length; j++){
+                 let job = doc.jobs[j];
+                 const jobDetails = await models.job.findOne({
+                   where: {
+                    id: job.id
+                   },
+                   attributes: ['id']
+                 });
+
+                 if (!jobDetails || !jobDetails.id) {
+                   foundJobRoles = false;
+                   console.error('POST:: create mandatoryTraining - Failed Validation - Job role record not found');
+                   this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Job role record not found');
+                   returnStatus = false;
+                 }
+               }
+             }else{
+               console.error('POST:: create mandatoryTraining - Failed Validation - Selected job roles record not found');
+               this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Selected job roles record not found');
+               returnStatus = false;
+             }
+
+             if(foundJobRoles){
+               validatedMandatoryTrainingRecord.push(doc);
+             }
+           }else{
+             validatedMandatoryTrainingRecord.push(doc);
+           }
+         }else{
+           console.error('POST:: create mandatoryTraining - Failed Validation - Training Category record not found');
+           this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Training record not found');
+           return false;
+         }
+       }
+     }else{
+       console.error('POST:: create mandatoryTraining - Failed Validation - Invalid Input');
+       this._log(MandatoryTraining.LOG_ERROR, 'Invalid Input');
+       return false;
+     }
+
+     if (returnStatus === false) {
+       return false;
+     } else {
+         return validatedMandatoryTrainingRecord;
+     }
+   }
+
+   // takes the given JSON document and updates self (internal properties)
+   // Thows "Error" on error.
+   async load(document) {
+     try {
+         const validatedTrainingRecord = await this.validateMandatoryTrainingRecord(document);
+
+         if (validatedTrainingRecord !== false) {
+             return this.mandatorytrainingDetails = validatedTrainingRecord;
+         } else {
+             this._log(MandatoryTraining.LOG_ERROR, `Failed Validation::load - failed`);
+             return false
+         }
+     } catch (err) {
+         console.error(`POST:: create mandatoryTraining - Failed Validation::load - error: ${err}`);
+         this._log(MandatoryTraining.LOG_ERROR, `Failed Validation::load - error: ${err}`);
+         throw new Error('Failed Validation');
+     }
+   }
+
+   // saves the Training record to DB. Returns true if saved; false is not.
+   // Throws "Error" on error
+   async save(savedBy, externalTransaction=null) {
+     let returnSavedResponse = [];
+     let failedWhileSave = false;
+     let initializedRecords = this._initialise();
+     if(initializedRecords && this._isNew){
+       // create new Mandatory Training Record
+       try{
+
+         //find already existing mandatory details, if found delete them
+         const fetchQuery = {
+           where: {
+             establishmentFK: this.establishmentId
+           }
+         };
+         await models.MandatoryTraining.destroy(fetchQuery);
+
+         // save new mandatory training details
+         for(let i = 0; i < this.mandatorytrainingDetails.length; i++){
+           let row = this.mandatorytrainingDetails[i];
+           if(row.allJobRoles){
+             // fetch all job roles
+             let allJobRoles = await models.job.findAll({
+               attributes: ['id'],
+             });
+             if (allJobRoles && Array.isArray(allJobRoles) && allJobRoles.length > 0) {
+               row.jobs = allJobRoles;
+             } else {
+               failedWhileSave = true;
+               throw new Error('No Job roles found');
+             }
+           }
+
+           if(Array.isArray(row.jobs) && row.jobs.length > 0){
+             for(let j = 0; j < row.jobs.length; j++){
+               let job = row.jobs[j];
+               const now = new Date();
+               let creationDocument = {
+                 establishmentFK: this.establishmentId,
+                 trainingCategoryFK: row.trainingCategoryId,
+                 jobFK: job.id,
+                 created: now,
+                 updated: now,
+                 createdBy: savedBy.toLowerCase(),
+                 updatedBy: savedBy.toLowerCase()
+               }
+
+               // need to create the Training record only
+               //  in one transaction
+               await models.sequelize.transaction(async t => {
+                 // the saving of an Mandatory Training record can be initiated within
+                 //  an external transaction
+                 const thisTransaction = externalTransaction ? externalTransaction : t;
+
+                 // now save the document
+                 let creation = await models.MandatoryTraining.create(creationDocument, {transaction: thisTransaction});
+
+                 const sanitisedResults = creation.get({plain: true});
+                 returnSavedResponse.push({
+                   id: sanitisedResults.ID,
+                   created: sanitisedResults.created,
+                   updated: sanitisedResults.updated,
+                   createdBy: savedBy.toLowerCase(),
+                   updatedBy: savedBy.toLowerCase()
+                 });
+                 this._isNew = false;
+
+                 this._log(MandatoryTraining.LOG_INFO, `Created Mandatory Training Record with id (${sanitisedResults.ID})`);
+               });
+             }
+           }
+         }
+         if(!failedWhileSave){
+           return returnSavedResponse;
+         }
+       }
+       catch (err) {
+         console.error(`POST:: create mandatoryTraining - Failed to save new Mandatory training record: ${err}`);
+         this._log(MandatoryTraining.LOG_ERROR, `Failed to save new Mandatory training record: ${err}`);
+         throw new Error('Failed to save new Mandatory Training record');
+       }
+     }else{
+       // we are updating an existing Mandatory Training Record
+       try{
+
+       }
+       catch (err) {
+         console.error(`POST:: create mandatoryTraining - Failed to update Mandatory Training record with id (${this._id})`);
+         this._log(MandatoryTraining.LOG_ERROR, `Failed to update Mandatory Training record with id (${this._id})`);
+         throw new Error('Failed to update Mandatory Training record');
+       }
+     }
+   }
+
+   /**
+    * This gets all the MandatoryTraining for a specific Worker
+    */
+   static async fetchMandatoryTrainingForWorker(workerUid){
+     const fetchWorker = await models.worker.findOne({
+      attributes:["establishmentFk","MainJobFkValue"],
+       where:{
+         WorkerUID: workerUid
+       }
+     });
+     if (!fetchWorker){
+       throw new Error("Worker "+ workerUid +" doesnt exist");
+     }
+     const fetchMandatoryTrainingResults = await models.MandatoryTraining.findAll({
+       include: [
+         {
+           model: models.workerTrainingCategories,
+           as: 'workerTrainingCategories',
+           attributes: ['id', 'category']
+         }],
+       where: {
+         establishmentFK: fetchWorker.establishmentFk,
+         jobFK: (fetchWorker.MainJobFkValue)
+       }
+     });
+      return fetchMandatoryTrainingResults;
+   }
+
+   /**
+    * Returns all saved mandatory training list including training category name, job name and establishment id
+    */
+   static async fetch(establishmentId){
+     const allMandatoryTrainingRecords = [];
+     const fetchResults = await models.MandatoryTraining.findAll({
+       include: [
+         {
+           model: models.workerTrainingCategories,
+           as: 'workerTrainingCategories',
+           attributes: ['id', 'category']
+         },
+         {
+           model: models.job,
+           as: 'job',
+           attributes: ['id', 'title']
+         }
+       ],
+       order: [
+           ['updated', 'DESC']
+       ],
+       where: {
+         establishmentFK: establishmentId
+       }
+     });
+
+     if(fetchResults){
+       fetchResults.forEach(result => {
+         if(allMandatoryTrainingRecords.length > 0){
+           const foundCategory = allMandatoryTrainingRecords.filter(el => el.trainingCategoryId === result.trainingCategoryFK);
+           if (foundCategory.length === 0){
+             allMandatoryTrainingRecords.push({
+               establishmentId: result.establishmentFK,
+               trainingCategoryId: result.trainingCategoryFK,
+               category: result.workerTrainingCategories.category,
+               jobs: [{id: result.jobFK, title: result.job.title}]
+             });
+           }else{
+             foundCategory[0].jobs.push({id: result.jobFK, title: result.job.title});
+           }
+         }else{
+           allMandatoryTrainingRecords.push({
+             establishmentId: result.establishmentFK,
+             trainingCategoryId: result.trainingCategoryFK,
+             category: result.workerTrainingCategories.category,
+             jobs: [{id: result.jobFK, title: result.job.title}]
+           });
+         }
+       });
+     }
+
+     let lastUpdated = null;
+     if (fetchResults && fetchResults.length === 1) {
+         lastUpdated = fetchResults[0];
+     } else if (fetchResults && fetchResults.length > 1) {
+         lastUpdated = fetchResults.reduce((a, b) => { return a.updated > b.updated ? a : b; });
+     }
+
+     const allJobRoles = await models.job.findAll();
+     if(allJobRoles){
+       const response = {
+         mandatoryTrainingCount: allMandatoryTrainingRecords.length,
+         allJobRolesCount: allJobRoles.length,
+         lastUpdated: lastUpdated ? lastUpdated.updated.toISOString() : undefined,
+         mandatoryTraining: allMandatoryTrainingRecords
+       };
+
+       return response;
+     }
+   }
+
+   /**
+    * Returns all saved mandatory training list including worker details
+    * Calculate missing mandatory training counts if not available on those worker records
+    */
+   static async fetchAllMandatoryTrainings(establishmentId){
+     // Fetch all saved mandatory training
+     const mandatoryTrainingDetails = await MandatoryTraining.fetch(establishmentId);
+     if(mandatoryTrainingDetails && mandatoryTrainingDetails.mandatoryTraining.length > 0){
+       let mandatoryTraining = mandatoryTrainingDetails.mandatoryTraining;
+       for(let i = 0; i < mandatoryTraining.length; i++){
+         let tempWorkers = [];
+         let jobs = mandatoryTraining[i].jobs;
+         for(let j = 0; j < jobs.length; j++){
+           const thisWorker = await models.worker.findAll({
+             attributes: ['id', 'uid', 'NameOrIdValue'],
+             where:{
+               establishmentFk: establishmentId,
+               archived: false,
+               MainJobFkValue: jobs[j].id
+             }
+           });
+           if(thisWorker && thisWorker.length > 0){
+             thisWorker.forEach(async worker => {
+               tempWorkers.push({
+                 id: worker.id,
+                 uid: worker.uid,
+                 NameOrIdValue: worker.NameOrIdValue,
+                 mainJob:{jobId: jobs[j].id, title: jobs[j].title}
+               });
+             });
+           }
+         }
+         delete mandatoryTraining[i].jobs;
+         mandatoryTraining[i].workers = [];
+         if(tempWorkers.length > 0){
+           mandatoryTraining[i].workers = await Training.getAllRequiredCounts(establishmentId, tempWorkers, mandatoryTraining[i].trainingCategoryId);
+         }
+       }
+     }
+     delete mandatoryTrainingDetails.mandatoryTrainingCount;
+     delete mandatoryTrainingDetails.allJobRolesCount;
+     return mandatoryTrainingDetails;
+   }
+
+ }
+
+ module.exports.MandatoryTraining = MandatoryTraining;
diff --git a/server/models/classes/properties/manager.js b/server/models/classes/properties/manager.js
index 900a0fb547..9395fdbfad 100644
--- a/server/models/classes/properties/manager.js
+++ b/server/models/classes/properties/manager.js
@@ -151,7 +151,7 @@ class PropertyManager {
     // runs through all known properties, adding them to the given
     //  document to save (using sequelize), only if they have been modified.
     // Returns modified save document.
-    save (username, document) {
+    save (username, document,buChanged = false) {
         // resets all audit events; to build a new set from current properties
         this._auditEvents = [];
         this._modifiedProperties = [];
@@ -163,7 +163,7 @@ class PropertyManager {
         allProperties.forEach(thisPropertyType => {
             const thisProperty = this._properties[thisPropertyType];
 
-            if (thisProperty.modified) {
+            if (thisProperty.modified || (buChanged && thisProperty.property !== null)) {
                 const { properties:saveProperties, audit: propertyAudit, additionalModels} = thisProperty.save(username);
 
                 // cache the set of properties that have been modified
diff --git a/server/models/classes/training.js b/server/models/classes/training.js
index 367ff4a8f5..81c1962636 100644
--- a/server/models/classes/training.js
+++ b/server/models/classes/training.js
@@ -713,11 +713,13 @@ class Training extends EntityValidator {
     };
 
     // returns a set of Workers' Training Records based on given filter criteria (all if no filters defined) - restricted to the given Worker
-    static async fetch(establishmentId, workerId, filters=null) {
+    static async fetch(establishmentId, workerId, categoryId = null, filters=null) {
         if (filters) throw new Error("Filters not implemented");
 
         const allTrainingRecords = [];
-        const fetchResults = await models.workerTraining.findAll({
+        let fetchResults;
+        if(categoryId === null){
+          fetchResults = await models.workerTraining.findAll({
             include: [
                 {
                     model: models.worker,
@@ -737,7 +739,33 @@ class Training extends EntityValidator {
                 //['completed', 'DESC'],
                 ['updated', 'DESC']
             ]
+         });
+        }else{
+          fetchResults = await models.workerTraining.findAll({
+            include: [
+                {
+                    model: models.worker,
+                    as: 'worker',
+                    attributes: ['id', 'uid'],
+                    where: {
+                        uid: workerId
+                    }
+                },
+                {
+                    model: models.workerTrainingCategories,
+                    as: 'category',
+                    attributes: ['id', 'category']
+                }
+            ],
+            order: [
+                //['completed', 'DESC'],
+                ['updated', 'DESC']
+            ],
+            where:{
+              categoryFk: categoryId
+            }
         });
+        }
 
         if (fetchResults) {
             fetchResults.forEach(thisRecord => {
@@ -755,7 +783,7 @@ class Training extends EntityValidator {
                     created:  thisRecord.created.toISOString(),
                     updated: thisRecord.updated.toISOString(),
                     updatedBy: thisRecord.updatedBy,
-                })
+                });
             });
         }
 
@@ -812,20 +840,22 @@ class Training extends EntityValidator {
      * Function used to get all training expired and expiring soon counts for a worker id
      * @param {number} establishmentId
      * @param {object} workerRecords
-     * @return {array} Modified worker records while adding training counts for each worker object
+     * @return {array} Modified worker records while adding training counts & missing mandatory training counts for each worker object
      */
-    static async getExpiringAndExpiredTrainingCounts(establishmentId, workerRecords){
+    static async getAllRequiredCounts(establishmentId, workerRecords, categoryId = null){
       if(workerRecords.length !== 0){
         let currentDate = moment();
         for(let i = 0; i < workerRecords.length; i++){
-          const allTrainingRecords = await Training.fetch(establishmentId, workerRecords[i].uid);
+          const allTrainingRecords = await Training.fetch(establishmentId, workerRecords[i].uid, categoryId);
+          workerRecords[i].trainingCount = 0;
+          workerRecords[i].expiredTrainingCount = 0;
+          workerRecords[i].expiringTrainingCount = 0;
+          workerRecords[i].missingMandatoryTrainingCount = 0;
           if(allTrainingRecords && allTrainingRecords.training.length > 0){
-            workerRecords[i].trainingCount = allTrainingRecords.training.length;
-            workerRecords[i].expiredTrainingCount = 0;
-            workerRecords[i].expiringTrainingCount = 0;
-            //calculate all expired and expiring soon trainings count
-            let trainings = allTrainingRecords.training.length;
-            for(let j = 0; j < trainings; j++){
+            //calculate all expired and expiring soon training count
+            let trainings = allTrainingRecords.training;
+            workerRecords[i].trainingCount = trainings.length;
+            for(let j = 0; j < trainings.length; j++){
               if(allTrainingRecords.training[j].expires){
                 let expiringDate = moment(allTrainingRecords.training[j].expires);
                 let daysDiffrence = expiringDate.diff(currentDate, 'days');
@@ -837,14 +867,56 @@ class Training extends EntityValidator {
               }
             }
           }else{
-            workerRecords[i].trainingCount = 0;
-            workerRecords[i].expiredTrainingCount = 0;
-            workerRecords[i].expiringTrainingCount = 0;
+            if(categoryId !== null){
+              workerRecords[i].missingMandatoryTrainingCount++;
+            }
+          }
+          if(categoryId === null){
+            workerRecords[i].missingMandatoryTrainingCount = await Training.getAllMissingMandatoryTrainingCounts(establishmentId, workerRecords[i], allTrainingRecords.training);
           }
         }
         return workerRecords;
       }
     }
+
+    /**
+     * Function used to get all missing mandatory training counts for a worker id
+     * @param {number} establishmentId
+     * @param {object} workerRecords
+     * @param {array} trainingLists
+     * @return {array} Modified worker records while adding training counts & missing mandatory training counts for each worker object
+     */
+    static async getAllMissingMandatoryTrainingCounts(establishmentId, workerRecords, trainingLists){
+        // check for missing mandatory training
+        const fetchMandatoryTrainingResults = await models.MandatoryTraining.findAll({
+            where: {
+                establishmentFK: establishmentId,
+                jobFK: (workerRecords.mainJob.jobId)? workerRecords.mainJob.jobId: workerRecords.mainJob.id
+            }
+        });
+        let mandatoryTrainingLength = fetchMandatoryTrainingResults ? fetchMandatoryTrainingResults.length: 0;
+        let trainingLength = trainingLists.length;
+        if(mandatoryTrainingLength > 0){
+            if(trainingLength === 0){
+                return mandatoryTrainingLength;
+            }
+            let missingMandatoryTrainingCount = 0;
+            for(let i = 0; i < mandatoryTrainingLength; i++){
+              let foundMandatoryTraining = false;
+              for(let j = 0; j < trainingLength; j++){
+                if(fetchMandatoryTrainingResults[i].trainingCategoryFK === trainingLists[j].trainingCategory.id){
+                  foundMandatoryTraining = true;
+                }
+              }
+              if(!foundMandatoryTraining){
+                missingMandatoryTrainingCount++;
+              }
+            }
+            return missingMandatoryTrainingCount;
+        }else{
+            return 0;
+        }
+    }
 };
 
 module.exports.Training = Training;
diff --git a/server/models/classes/user.js b/server/models/classes/user.js
index e085e3431c..48f913c6f8 100644
--- a/server/models/classes/user.js
+++ b/server/models/classes/user.js
@@ -952,7 +952,7 @@ class User {
       include: [
         {
           model: models.login,
-          attributes: ['username', 'lastLogin'],
+          attributes: ['username', 'lastLogin', 'status'],
         },
       ],
       attributes: [
@@ -981,11 +981,12 @@ class User {
           updated: thisUser.updated.toJSON(),
           updatedBy: thisUser.updatedBy,
           isPrimary: thisUser.isPrimary ? true : false,
+          status: thisUser.login && thisUser.login.status ? thisUser.login.status : null
         });
       });
 
       allUsers = allUsers.map(user => {
-        return Object.assign(user, { status: user.username == null ? 'Pending' : 'Active' });
+        return Object.assign(user, { status: user.username == null ? 'Pending' : (user.status !== null)? user.status: 'Active' });
       });
 
       allUsers.sort((a, b) => {
diff --git a/server/models/classes/worker.js b/server/models/classes/worker.js
index a713e5e2cc..154e1e0d19 100644
--- a/server/models/classes/worker.js
+++ b/server/models/classes/worker.js
@@ -306,17 +306,26 @@ class Worker extends EntityValidator {
         this._status = document.status;
       }
 
-
       // Consequential updates when one value means another should be empty or null
 
       // If their job isn't a registered nurse, remove their specialism and category
-      if (document.mainJob) {
-        if (document.mainJob.jobId !== 23) {
+      if (document.mainJob || document.otherJobs) {
+        let otherRegNurse = false;
+        let otherSocialWorker = false;
+        const mainJob = document.mainJob ? document.mainJob : this.mainJob;
+        const otherJobs = document.otherJobs ? document.otherJobs : this.otherJobs;
+        if (otherJobs && otherJobs.jobs) {
+          otherJobs.jobs.map(otherJob => {
+            if (otherJob.jobId === 23) otherRegNurse = true;
+            if (otherJob.jobId === 27) otherSocialWorker = true;
+          });
+        }
+        if (mainJob && mainJob.jobId !== 23 && !otherRegNurse) {
           document.registeredNurse = null;
           document.nurseSpecialism = { id: null, specialism: null };
         }
         // If their job isn't a social worker - remove the approved mental health worker
-        if (document.mainJob.jobId !== 27) {
+        if (mainJob && mainJob.jobId !== 27 && !otherSocialWorker) {
           document.approvedMentalHealthWorker = null;
         }
       }
@@ -333,9 +342,9 @@ class Worker extends EntityValidator {
           document.yearArrived = { value: null, year: null };
         }
       }
-
+      const notContract = ['Agency', 'Pool/Bank']
       // Remove contracted hours If on a zero hour contract
-      if (document.zeroHoursContract === 'Yes' || document.contract === 'Agency') {
+      if (document.zeroHoursContract === 'Yes' || notContract.includes(document.contract)) {
         document.weeklyHoursContracted = { value: null, hours: null };
       }
 
@@ -526,6 +535,7 @@ class Worker extends EntityValidator {
       // create new Worker
       try {
         const creationDate = new Date();
+        const updatedTimestamp = new Date();
         const creationDocument = {
           establishmentFk: this._establishmentId,
           uid: this.uid,
@@ -550,6 +560,32 @@ class Worker extends EntityValidator {
           //   why we cannot create a Worker record with more properties
           const modifedCreationDocument = this._properties.save(savedBy.toLowerCase(), creationDocument);
 
+          // always recalculate WDF - if not bulk upload (this._status)
+          if (this._status === null) {
+            await WdfCalculator.calculate(savedBy, this._establishmentId, null, thisTransaction, WdfCalculator.WORKER_ADD, false);
+          }
+
+          // every time the worker is saved, need to calculate
+          //  it's current WDF Eligibility, and if it is eligible, update
+          //  the last WDF Eligibility status
+          const currentWdfEligibiity = await this.isWdfEligible(WdfCalculator.effectiveDate);
+
+          const effectiveDateTime = WdfCalculator.effectiveTime;
+
+          let wdfAudit = null;
+          console.log('Current WDF Eligibility: ', JSON.stringify(currentWdfEligibiity));
+          console.log('Last WDF Eligibility: ', this._lastWdfEligibility);
+          console.log('WorkerID: ', this._id);
+          console.log('Effective Time: ', new Date(effectiveDateTime).toISOString());
+          if (currentWdfEligibiity.isEligible && (this._lastWdfEligibility === null || this._lastWdfEligibility.getTime() < effectiveDateTime)) {
+            console.log('Worker is WDF Eligible. Updating lastEligibilityDate and adding to Audit table.');
+            modifedCreationDocument.lastWdfEligibility = updatedTimestamp;
+            wdfAudit = {
+              username: savedBy.toLowerCase(),
+              type: 'wdfEligible'
+            };
+          }
+
           // now save the document
           const creation = await models.worker.create(modifedCreationDocument, { transaction: thisTransaction });
 
@@ -561,6 +597,10 @@ class Worker extends EntityValidator {
           this._updatedBy = savedBy.toLowerCase();
           this._isNew = false;
 
+          if (associatedEntities) {
+            await this.saveAssociatedEntities(savedBy, bulkUploaded, thisTransaction);
+          }
+
           // having the worker id we can now create the audit record; inserting the workerFk
           const allAuditEvents = [{
             workerFk: this._id,
@@ -572,16 +612,11 @@ class Worker extends EntityValidator {
               workerFk: this._id
             };
           }));
-          await models.workerAudit.bulkCreate(allAuditEvents, { transaction: thisTransaction });
-
-          if (associatedEntities) {
-            await this.saveAssociatedEntities(savedBy, bulkUploaded, thisTransaction);
-          }
-
-          // always recalculate WDF - if not bulk upload (this._status)
-          if (this._status === null) {
-            await WdfCalculator.calculate(savedBy, this._establishmentId, null, thisTransaction, WdfCalculator.WORKER_ADD, false);
+          if (wdfAudit) {
+            wdfAudit.workerFk = this._id;
+            allAuditEvents.push(wdfAudit);
           }
+          await models.workerAudit.bulkCreate(allAuditEvents, { transaction: thisTransaction });
 
           // this is an async method - don't wait for it to return
           AWSKinesis.workerPump(AWSKinesis.CREATED, this.toJSON());
@@ -616,8 +651,9 @@ class Worker extends EntityValidator {
           //  an external transaction
           const thisTransaction = externalTransaction || t;
 
+          const buChanged = this._status === 'NOCHANGE';
           // now append the extendable properties
-          const modifedUpdateDocument = this._properties.save(savedBy.toLowerCase(), {});
+          const modifedUpdateDocument = this._properties.save(savedBy.toLowerCase(), {},buChanged);
 
           // note - if the worker was created online, but then updated via bulk upload, the source become bulk and vice-versa.
           const updateDocument = {
@@ -640,7 +676,12 @@ class Worker extends EntityValidator {
           const effectiveDateTime = WdfCalculator.effectiveTime;
 
           let wdfAudit = null;
+          console.log('Current WDF Eligibility: ', JSON.stringify(currentWdfEligibiity));
+          console.log('Last WDF Eligibility: ', this._lastWdfEligibility);
+          console.log('WorkerID: ', this._id);
+          console.log('Effective Time: ', new Date(effectiveDateTime).toISOString());
           if (currentWdfEligibiity.isEligible && (this._lastWdfEligibility === null || this._lastWdfEligibility.getTime() < effectiveDateTime)) {
+            console.log('Worker is WDF Eligible. Updating lastEligibilityDate and adding to Audit table.');
             updateDocument.lastWdfEligibility = updatedTimestamp;
             wdfAudit = {
               username: savedBy.toLowerCase(),
@@ -1335,6 +1376,7 @@ class Worker extends EntityValidator {
     const wdfPropertyValues = Object.values(wdfByProperty);
 
     // NOTE - the worker does not have to be completed before it can be eligible for WDF
+    console.log('WDF Properties: ', JSON.stringify(wdfByProperty));
     return {
       lastEligibility: this._lastWdfEligibility ? this._lastWdfEligibility.toISOString() : null,
       isEligible: wdfPropertyValues.every(thisWdfProperty => {
diff --git a/server/models/mandatoryTraining.js b/server/models/mandatoryTraining.js
new file mode 100644
index 0000000000..0ed2f3e657
--- /dev/null
+++ b/server/models/mandatoryTraining.js
@@ -0,0 +1,71 @@
+module.exports = function(sequelize, DataTypes) {
+  const MandatoryTraining =  sequelize.define('MandatoryTraining', {
+    id: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      primaryKey: true,
+      autoIncrement: true,
+      field: '"ID"'
+    },
+    establishmentFK : {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      field: '"EstablishmentFK"'
+    },
+    trainingCategoryFK : {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      field: '"TrainingCategoryFK"'
+    },
+    jobFK : {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      field: '"JobFK"'
+    },
+    created: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      field: 'created'
+    },
+    updated: {
+      type: DataTypes.DATE,
+      allowNull: false,
+      field: 'updated'
+    },
+    createdBy: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      field: '"CreatedByUserUID"'
+    },
+    updatedBy: {
+      type: DataTypes.UUID,
+      allowNull: false,
+      field: '"UpdatedByUserUID"'
+    },
+  }, {
+    tableName: 'MandatoryTraining',
+    schema: 'cqc',
+    createdAt: false,
+    updatedAt: false
+  });
+
+  MandatoryTraining.associate = (models) => {
+    MandatoryTraining.belongsTo(models.establishment, {
+      foreignKey: 'establishmentFK',
+      targetKey: 'id',
+      as: 'establishment'
+    });
+    MandatoryTraining.belongsTo(models.workerTrainingCategories, {
+      foreignKey: 'trainingCategoryFK',
+      targetKey: 'id',
+      as: 'workerTrainingCategories'
+    });
+    MandatoryTraining.belongsTo(models.job, {
+      foreignKey: 'jobFK',
+      targetKey: 'id',
+      as: 'job'
+    });
+  };
+
+  return MandatoryTraining;
+};
diff --git a/server/routes/admin/approval/index.js b/server/routes/admin/approval/index.js
index c6000bba3c..b75ac1c509 100644
--- a/server/routes/admin/approval/index.js
+++ b/server/routes/admin/approval/index.js
@@ -2,122 +2,213 @@
 const express = require('express');
 const router = express.Router();
 const models = require('../../../models');
+const Sequelize = require('sequelize');
+const util = require('util');
+
+const userApprovalConfirmation = 'User has been set as active';
+const userRejectionConfirmation = 'User has been removed';
+const workplaceApprovalConfirmation = 'Workplace has been set as active';
+const workplaceRejectionConfirmation = 'Workplace has been removed';
 
 router.route('/').post(async (req, res) => {
-  // parse input - escaped to prevent SQL injection
-
-  // Sanatize username
-  if(req.body.username){
-    const username = escape(req.body.username.toLowerCase());
-
-    try {
-      // Find the user matching the username
-      const login = await models.login.findOne({
-        where: {
-            username: {
-              [models.Sequelize.Op.iLike] : username
-            }
-        },
-        attributes: ['id', 'username'],
-        include: [{
-          model: models.user,
-          attributes: ['id'],
-          include: [{
-            model: models.establishment,
-            attributes: ['id']
-          }]
-        }]
-      });
-      // Make sure we have the matching user
-      if ((login && login.id) && (username === login.username)) {
-        const establishment = await models.establishment.findOne({
-          where: {
-              id: login.user.establishment.id
-          },
-          attributes: ['id']
-        });
-        const user = await models.user.findOne({
-          where: {
-              id: login.user.id
-          },
-          attributes: ['id']
+  await adminApproval(req, res);
+});
+
+const adminApproval = async (req, res) => {
+  if (req.body.username) {
+    await _approveOrRejectNewUser(req, res);
+  } else {
+    await _approveOrRejectNewWorkplace(req, res);
+  }
+};
+
+const _approveOrRejectNewUser = async (req, res) => {
+  const username = _parseEscapedInputAndSanitizeUsername(req.body.username);
+  
+  try {
+    const login = await _findLoginMatchingUsername(username);
+
+    // Make sure we have the matching user
+    if ((login && login.id) && (username === login.username)) {
+      const workplace = await _findWorkplace(login.user.establishment.id);
+      const user = await _findUser(login.user.id);
+      
+      var workplaceIsUnique = await _workplaceIsUnique(login.user.establishment.id, req.body.nmdsId);
+      if (!workplaceIsUnique) {
+        return res.status(400).json({
+          nmdsId: `This workplace ID (${req.body.nmdsId}) belongs to another workplace. Enter a different workplace ID.`,
         });
-        // If approving user
-        if (req.body.approve && establishment) {
-          // TODO: Email saying they've been accepted
-          // Update their active status to true
-          try {
-            const updateduser = await login.update({
-                isActive: true,
-                status: null
-            });
-            const updatedestablishment = await establishment.update({
-              ustatus: null
-            });
-            if (updateduser && updatedestablishment) {
-              return res.status(200).json({status: '0', message: 'User has been set as active'})
-            } else {
-              return res.status(503).send();
-            }
-          } catch(error) {
-            console.error(error);
-            return res.status(503).send();
-          }
-        } else {
-          // TODO: Email saying they've been rejected
-          // Remove the user
-          try{
-            const deleteduser = await user.destroy();
-            const deletedestablishment = await establishment.destroy();
-            if (deleteduser && deletedestablishment) {
-              return res.status(200).json({status: '0', message: 'User has been removed'});
-            }
-          } catch(error) {
-            console.error(error);
-            return res.status(503).send();
-          }
-        }
+      }
+
+      if (req.body.approve && workplace) {
+        await _approveNewUser(login, workplace, req.body.nmdsId, res);
       } else {
-        return res.status(400).send();
+        await _rejectNewUser(user, workplace, res);
       }
-    } catch (error) {
-      console.log(error);
+    } else {
+      return res.status(400).send();
     }
-  }else{
-    const establishment = await models.establishment.findOne({
-      where: {
-          id: req.body.establishmentId
-      },
-      attributes: ['id']
+  } catch (error) {
+    console.log(error);
+  }
+};
+
+const _approveOrRejectNewWorkplace = async (req, res) => {
+  const nmdsId = req.body.nmdsId;
+
+  var workplaceIsUnique = await _workplaceIsUnique(req.body.establishmentId, req.body.nmdsId);
+  if (!workplaceIsUnique) {
+    return res.status(400).json({
+      nmdsId: `This workplace ID (${nmdsId}) belongs to another workplace. Enter a different workplace ID.`,
     });
-    if (req.body.approve && req.body.establishmentId) {
-      // Establishment:: Update their ustatus to null
-      try {
-        const updatedestablishment = await establishment.update({
-          ustatus: null
-        });
-        if (updatedestablishment) {
-          return res.status(200).json({status: '0', message: 'Workplace has been set as active'})
-        } else {
-          return res.status(503).send();
-        }
-      } catch(error) {
-        console.error(error);
-        return res.status(503).send();
+  }
+  
+  const workplace = await _findWorkplace(req.body.establishmentId);
+
+  if (req.body.approve && req.body.establishmentId) {
+    await _approveNewWorkplace(workplace, nmdsId, res);
+  } else {
+    await _rejectNewWorkplace(workplace, res);
+  }
+};
+
+const _workplaceIsUnique = async (establishmentId, nmdsId) => {
+  const workplaceWithDuplicateId = await models.establishment.findOne({
+    where: {
+      id: {
+        [Sequelize.Op.ne]: establishmentId
+      },
+      nmdsId: nmdsId,
+    },
+    attributes: ['id']
+  });
+  return (workplaceWithDuplicateId === null);
+};
+
+const _parseEscapedInputAndSanitizeUsername = (username) => {
+  return escape(username.toLowerCase());
+};
+
+const _findLoginMatchingUsername = async (username) => {
+  return await models.login.findOne({
+    where: {
+      username: {
+        [models.Sequelize.Op.iLike]: username
       }
+    },
+    attributes: ['id', 'username'],
+    include: [
+      {
+        model: models.user,
+        attributes: ['id'],
+        include: [
+          {
+            model: models.establishment,
+            attributes: ['id']
+          }
+        ]
+      }
+    ]
+  });
+};
+
+const _findWorkplace = async (establishmentId) => {
+  return await models.establishment.findOne({
+    where: {
+      id: establishmentId
+    },
+    attributes: ['id']
+  });
+};
+
+const _findUser = async (loginId) => {
+  return await models.user.findOne({
+    where: {
+      id: loginId
+    },
+    attributes: ['id']
+  });
+};
+
+const _approveNewUser = async (login, workplace, nmdsId, res) => {
+  // TODO: Email saying they've been accepted
+  // Update their active status to true
+  try {
+    const updatedLogin = await login.update({
+      isActive: true,
+      status: null
+    });
+    const updatedworkplace = await workplace.update({
+      nmdsId: nmdsId,
+      ustatus: null
+    });
+    if (updatedLogin && updatedworkplace) {
+      return res.status(200).json({ status: '0', message: userApprovalConfirmation })
     } else {
-      // Remove the establishment
-      try{
-        const deletedestablishment = await establishment.destroy();
-        if (deletedestablishment) {
-          return res.status(200).json({status: '0', message: 'Workplace has been removed'});
-        }
-      } catch(error) {
-        console.error(error);
+      return res.status(503).send();
+    }
+  } catch (error) {
+    console.error(error);
+    return res.status(503).send();
+  }
+};
+
+const _rejectNewUser = async (user, workplace, res) => {
+  // TODO: Email saying they've been rejected
+  // Remove the user
+  try {
+    if (user && workplace) {
+      const deleteduser = await user.destroy();
+      const deletedworkplace = await workplace.destroy();
+      if (deleteduser && deletedworkplace) {
+        return res.status(200).json({ status: '0', message: userRejectionConfirmation });
+      } else {
         return res.status(503).send();
       }
+    } else {
+      return res.status(503).send();
     }
+  } catch (error) {
+    console.error(error);
+    return res.status(503).send();
   }
-});
+};
+
+const _approveNewWorkplace = async (workplace, nmdsId, res) => {
+  try {
+    const updatedworkplace = await workplace.update({
+      nmdsId: nmdsId,
+      ustatus: null
+    });
+    if (updatedworkplace) {
+      return res.status(200).json({ status: '0', message: workplaceApprovalConfirmation })
+    } else {
+      return res.status(503).send();
+    }
+  } catch (error) {
+    console.error(error);
+    return res.status(503).send();
+  }
+};
+
+const _rejectNewWorkplace = async (workplace, res) => {
+  try {
+    const deletedworkplace = await workplace.destroy();
+    if (deletedworkplace) {
+      return res.status(200).json({ status: '0', message: workplaceRejectionConfirmation });
+    } else {
+      return res.status(503).send();
+    }
+  } catch (error) {
+    console.error(error);
+    return res.status(503).send();
+  }
+};
 
 module.exports = router;
+module.exports.adminApproval = adminApproval;
+
+module.exports.userApprovalConfirmation = userApprovalConfirmation;
+module.exports.userRejectionConfirmation = userRejectionConfirmation;
+module.exports.workplaceApprovalConfirmation = workplaceApprovalConfirmation;
+module.exports.workplaceRejectionConfirmation = workplaceRejectionConfirmation;
diff --git a/server/routes/admin/index.js b/server/routes/admin/index.js
index 3c2b37b0aa..4cd1be83c0 100644
--- a/server/routes/admin/index.js
+++ b/server/routes/admin/index.js
@@ -7,6 +7,7 @@ const search = require('./search');
 const recalcWdf = require('./recalcWdf');
 const registrations = require('./registrations');
 const approval = require('./approval');
+const unlockAccount = require('./unlock-account');
 
 // middleware authentication - only role=Admin from here on in
 router.use('/', isAdmin);
@@ -15,6 +16,7 @@ router.use('/search', search);
 router.use('/recalcWdf', recalcWdf);
 router.use('/registrations', registrations);
 router.use('/approval', approval);
+router.use('/unlock-account', unlockAccount);
 
 router.route('/').post(async function (req, res) {
   return res.status(200).send({success: "from admin"});
diff --git a/server/routes/admin/registrations/index.js b/server/routes/admin/registrations/index.js
index b51ced4c08..8807898b06 100644
--- a/server/routes/admin/registrations/index.js
+++ b/server/routes/admin/registrations/index.js
@@ -1,8 +1,11 @@
 // default route for admin/registrations
 const express = require('express');
-const router = express.Router();
+const moment = require('moment-timezone');
+
 const models = require('../../../models');
-const moment = require('moment');
+const config = require('../../../config/config');
+
+const router = express.Router();
 
 router.route('/').get(async (req, res) => {
   try {
@@ -117,7 +120,7 @@ router.route('/').get(async (req, res) => {
       });
 
       for(let i = 0; i < arrToReturn.length; i++){
-        arrToReturn[i].created = moment(arrToReturn[i].created).format('D/M/YYYY h:mma');
+        arrToReturn[i].created = moment.utc(arrToReturn[i].created).tz(config.get('timezone')).format('D/M/YYYY h:mma');
         //get parent establishment details
         if(!arrToReturn[i].email){
           let fetchQuery = {
@@ -134,12 +137,12 @@ router.route('/').get(async (req, res) => {
       res.status(200).send(arrToReturn);
     }else if(loginReturnArr && !workplaceReturnArr){
       loginReturnArr.map(registration => {
-        registration.created = moment(registration.created).format('D/M/YYYY h:mma');
+        registration.created = moment.utc(registration.created).tz(config.get('timezone')).format('D/M/YYYY h:mma');
       });
       res.status(200).send(loginReturnArr);
     }else if(!loginReturnArr && workplaceReturnArr){
       workplaceReturnArr.map(registration => {
-        registration.created = moment(registration.created).format('D/M/YYYY h:mma');
+        registration.created = moment.utc(registration.created).tz(config.get('timezone')).format('D/M/YYYY h:mma');
       });
       res.status(200).send(workplaceReturnArr);
     }else{
diff --git a/server/routes/admin/unlock-account/index.js b/server/routes/admin/unlock-account/index.js
new file mode 100644
index 0000000000..6048c0c279
--- /dev/null
+++ b/server/routes/admin/unlock-account/index.js
@@ -0,0 +1,59 @@
+// default route for admin/approval
+const express = require('express');
+const router = express.Router();
+const models = require('../../../models');
+
+router.route('/').post(async (req, res) => {
+  await unlockAccount(req, res);
+});
+
+const unlockAccount = async (req, res) => {
+    // parse input - escaped to prevent SQL injection
+
+  // Sanitize username
+  if(req.body.username){
+    const username = escape(req.body.username.toLowerCase());
+
+    try {
+      // Find the user matching the username
+      const login = await models.login.findOne({
+        where: {
+            username: username
+        },
+        attributes: ['id', 'username'],
+      });
+      // Make sure we have the matching user
+      if ((login && login.id) && (username === login.username)) {
+          try {
+            const updateduser = await login.update({
+                isActive: true,
+                invalidAttempt: 9,
+                status: null
+            });
+            if (updateduser) {
+              res.status(200);
+              return res.json({status: '0', message: 'User has been set as active'})
+            } else {
+              res.status(503)
+              return res.send();
+            }
+          } catch(error) {
+            console.error(error);
+            res.status(503)
+            return res.send();
+          }
+        } else {
+          res.status(400);
+          return res.send();
+        }
+    } catch (error) {
+      console.log(error);
+    }
+  } else {
+    res.status(400)
+    return res.send();
+  }
+};
+
+module.exports = router;
+module.exports.unlockAccount = unlockAccount;
diff --git a/server/routes/establishments/bulkUpload.js b/server/routes/establishments/bulkUpload.js
index 3574dff668..928f01020a 100644
--- a/server/routes/establishments/bulkUpload.js
+++ b/server/routes/establishments/bulkUpload.js
@@ -3,6 +3,7 @@
 const moment = require('moment');
 const csv = require('csvtojson');
 const uuid = require('uuid');
+const rfr = require('rfr');
 
 const config = rfr('server/config/config');
 const dbModels = rfr('server/models');
@@ -819,53 +820,58 @@ const validateEstablishmentCsv = async (
   const lineValidator = new EstablishmentCsvValidator(thisLine, currentLineNumber, myCurrentEstablishments);
 
   // the parsing/validation needs to be forgiving in that it needs to return as many errors in one pass as possible
-  lineValidator.validate();
-  lineValidator.transform();
+  await lineValidator.validate();
+  if (!lineValidator._ignore) {
+    lineValidator.transform();
 
-  const thisEstablishmentAsAPI = lineValidator.toAPI();
+    const thisEstablishmentAsAPI = lineValidator.toAPI();
 
-  try {
-    const thisApiEstablishment = new Establishment();
-    thisApiEstablishment.initialise(
-      thisEstablishmentAsAPI.Address1,
-      thisEstablishmentAsAPI.Address2,
-      thisEstablishmentAsAPI.Address3,
-      thisEstablishmentAsAPI.Town,
-      null,
-      thisEstablishmentAsAPI.LocationId,
-      thisEstablishmentAsAPI.ProvId,
-      thisEstablishmentAsAPI.Postcode,
-      thisEstablishmentAsAPI.IsCQCRegulated
-    );
+    try {
+        const thisApiEstablishment = new Establishment();
+        thisApiEstablishment.initialise(
+          thisEstablishmentAsAPI.Address1,
+          thisEstablishmentAsAPI.Address2,
+          thisEstablishmentAsAPI.Address3,
+          thisEstablishmentAsAPI.Town,
+          null,
+          thisEstablishmentAsAPI.LocationId,
+          thisEstablishmentAsAPI.ProvId,
+          thisEstablishmentAsAPI.Postcode,
+          thisEstablishmentAsAPI.IsCQCRegulated
+        );
 
-    await thisApiEstablishment.load(thisEstablishmentAsAPI);
+        await thisApiEstablishment.load(thisEstablishmentAsAPI);
 
-    keepAlive('establishment loaded', currentLineNumber);
+        keepAlive('establishment loaded', currentLineNumber);
 
-    if (thisApiEstablishment.validate()) {
-      // No validation errors in the entity itself, so add it ready for completion
-      myAPIEstablishments[thisApiEstablishment.key] = thisApiEstablishment;
-    } else {
-      const errors = thisApiEstablishment.errors;
+        if (thisApiEstablishment.validate()) {
+          // No validation errors in the entity itself, so add it ready for completion
+          myAPIEstablishments[thisApiEstablishment.key] = thisApiEstablishment;
+        } else {
+          const errors = thisApiEstablishment.errors;
 
-      if (errors.length === 0) {
-        myAPIEstablishments[thisApiEstablishment.key] = thisApiEstablishment;
-      } else {
-        // TODO: Remove this when capacities and services are fixed; temporarily adding establishments
-        // even though they're in error (because service/capacity validations put all in error)
-        myAPIEstablishments[thisApiEstablishment.key] = thisApiEstablishment;
-      }
+          if (errors.length === 0) {
+            myAPIEstablishments[thisApiEstablishment.key] = thisApiEstablishment;
+          } else {
+            // TODO: Remove this when capacities and services are fixed; temporarily adding establishments
+            // even though they're in error (because service/capacity validations put all in error)
+            myAPIEstablishments[thisApiEstablishment.key] = thisApiEstablishment;
+          }
+        }
+    } catch (err) {
+      console.error('WA - localised validate establishment error until validation card', err);
     }
-  } catch (err) {
-    console.error('WA - localised validate establishment error until validation card', err);
+  } else {
+    console.log('Ignoring', lineValidator._name);
   }
-
   // collate all bulk upload validation errors/warnings
   if (lineValidator.validationErrors.length > 0) {
     lineValidator.validationErrors.forEach(thisError => csvEstablishmentSchemaErrors.push(thisError));
   }
+  if (!lineValidator._ignore) {
+    myEstablishments.push(lineValidator);
+  }
 
-  myEstablishments.push(lineValidator);
 };
 
 const loadWorkerQualifications = async (
@@ -1080,6 +1086,8 @@ const validateBulkUploadFiles = async (
         allEstablishmentsByKey[keyNoWhitespace] = thisEstablishment.lineNumber;
       }
     });
+
+    await checkDuplicateLocations(myEstablishments, csvEstablishmentSchemaErrors);
   } else {
     console.info('API bulkupload - validateBulkUploadFiles: no establishment records');
   }
@@ -1114,7 +1122,7 @@ const validateBulkUploadFiles = async (
 
       if (allWorkersByKey[keyNoWhitespace]) {
         // this worker is a duplicate
-        csvWorkerSchemaErrors.push(thisWorker.addDuplicate(allWorkersByKey[keyNoWhitespace]));
+        csvWorkerSchemaErrors.push(thisWorker.addDuplicate(thisWorker.uniqueWorker));
 
         // remove the entity
         delete myAPIWorkers[thisWorker.lineNumber];
@@ -1122,7 +1130,7 @@ const validateBulkUploadFiles = async (
       // the worker will be known by LOCALSTID and UNIQUEWORKERID, but if CHGUNIQUEWORKERID is given, then it's combination of LOCALESTID and CHGUNIQUEWORKERID must be unique
       } else if (changeKeyNoWhitespace && allWorkersByKey[changeKeyNoWhitespace]) {
         // this worker is a duplicate
-        csvWorkerSchemaErrors.push(thisWorker.addChgDuplicate(allWorkersByKey[keyNoWhitespace]));
+        csvWorkerSchemaErrors.push(thisWorker.addChgDuplicate(thisWorker.changeUniqueWorker));
 
         // remove the entity
         delete myAPIWorkers[thisWorker.lineNumber];
@@ -1315,6 +1323,14 @@ const validateBulkUploadFiles = async (
     });
   }));
 
+  // Run validations that require information about establishments
+  await Promise.all(myWorkers.map(async worker => {
+    await worker.crossValidate({
+      csvWorkerSchemaErrors,
+      myEstablishments
+    });
+  }));
+
   // /////////////////////////
   // Prepare validation results
 
@@ -2402,6 +2418,30 @@ const downloadGet = async (req, res) => {
   }
 };
 
+const checkDuplicateLocations = async (
+  myEstablishments,
+  csvEstablishmentSchemaErrors,
+) => {
+  const locations = [];
+
+  myEstablishments
+    .filter((thisEstablishment) => thisEstablishment._currentLine.LOCATIONID)
+    .forEach((thisEstablishment) => {
+      const locationId = thisEstablishment._currentLine.LOCATIONID;
+      const exists = locations[locationId] !== undefined;
+
+      if (exists) {
+        csvEstablishmentSchemaErrors.push(
+          thisEstablishment.getDuplicateLocationError(),
+        );
+
+        return;
+      }
+
+      locations[locationId] = thisEstablishment.lineNumber;
+    });
+};
+
 const router = require('express').Router();
 
 router.route('/signedUrl').get(acquireLock.bind(null, signedUrlGet, buStates.DOWNLOADING));
@@ -2422,3 +2462,5 @@ router.route('/unlock').get(releaseLock);
 router.route('/response/:buRequestId').get(responseGet);
 
 module.exports = router;
+module.exports.checkDuplicateLocations = checkDuplicateLocations;
+module.exports.validateEstablishmentCsv = validateEstablishmentCsv;
diff --git a/server/routes/establishments/index.js b/server/routes/establishments/index.js
index d51945c587..b6868cd151 100644
--- a/server/routes/establishments/index.js
+++ b/server/routes/establishments/index.js
@@ -28,6 +28,7 @@ const OwnershipChange = require('./ownershipChange');
 const LinkToParent = require('./linkToParent')
 const DataPermissions = require('./dataPermissions');
 const LocationDetails = require('./locationdetails');
+const MandatoryTraining = require('./mandatoryTraining');
 
 const Approve = require('./approve');
 const Reject = require('./reject');
@@ -83,6 +84,7 @@ router.use('/:id/ownershipChange', OwnershipChange);
 router.use('/:id/linkToParent', LinkToParent);
 router.use('/:id/dataPermissions', DataPermissions);
 router.use('/:id/locationDetails', LocationDetails);
+router.use('/:id/mandatoryTraining', MandatoryTraining);
 
 router.route('/:id').post(async (req, res) => {
   if (!req.body.isRegulated) {
diff --git a/server/routes/establishments/mandatoryTraining/index.js b/server/routes/establishments/mandatoryTraining/index.js
new file mode 100644
index 0000000000..6c5d9c982a
--- /dev/null
+++ b/server/routes/establishments/mandatoryTraining/index.js
@@ -0,0 +1,64 @@
+/**
+ * Default route file for manage mandatory training
+ */
+const express = require('express');
+const router = express.Router({mergeParams: true});
+
+const MandatoryTraining = require('../../../models/classes/mandatoryTraining').MandatoryTraining;
+
+
+/**
+ * Handle GET request for getting all saved mandatory training
+ */
+router.route('/').get(async (req, res) => {
+  const establishmentId = req.establishmentId;
+  try{
+    const allMandatoryTrainingRecords = await MandatoryTraining.fetch(establishmentId);
+    return res.status(200).json(allMandatoryTrainingRecords);
+  }catch(err){
+    console.error(err);
+    return res.status(503).send();
+  }
+});
+
+/**
+ * Handle GET request for getting all saved mandatory training for view all mandatory training
+ */
+router.route('/all').get(async (req, res) => {
+  const establishmentId = req.establishmentId;
+  try{
+    const allMandatoryTrainingRecords = await MandatoryTraining.fetchAllMandatoryTrainings(establishmentId);
+    return res.status(200).json(allMandatoryTrainingRecords);
+  }catch(err){
+    console.error(err);
+    return res.status(503).send();
+  }
+});
+
+
+/**
+ * Handle POST request for creating new mandatory training
+ */
+router.route('/').post(async (req, res) => {
+  const establishmentId = req.establishmentId;
+
+  const thisMandatoryTrainingRecord = new MandatoryTraining(establishmentId);
+
+  try{
+    //validate posted records
+    const isValidRecord = await thisMandatoryTrainingRecord.load(req.body);
+    // records validated
+    if (isValidRecord) {
+      const saveRecords = await thisMandatoryTrainingRecord.save(req.userUid);
+
+      return res.status(200).json(saveRecords);
+    } else {
+        return res.status(400).send('Unexpected Input.');
+    }
+  }catch(err){
+    console.error(err);
+    return res.status(503).send();
+  }
+});
+
+module.exports = router;
diff --git a/server/routes/establishments/permissions.js b/server/routes/establishments/permissions.js
index 90422f49d1..caf0d24c90 100644
--- a/server/routes/establishments/permissions.js
+++ b/server/routes/establishments/permissions.js
@@ -1,15 +1,17 @@
 const express = require('express');
 const router = express.Router({mergeParams: true});
 const Establishment = require('../../models/classes/establishment');
-
+const User = require('../../models/classes/user');
 const PermissionCache = require('../../models/cache/singletons/permissions').PermissionCache;
 
 router.route('/').get(async (req, res) => {
   const establishmentId = req.establishmentId;
   const thisEstablishment = new Establishment.Establishment(req.username);
-
+  const thisUser = new User.User(establishmentId);
   try {
         if (await thisEstablishment.restore(establishmentId)) {
+          if(await thisUser.restore(null,thisEstablishment.username, null)) {
+            let userData = thisUser.toJSON();
           const permissions = await PermissionCache.myPermissions(req).map(item => {
             if (item.code === 'canChangeDataOwner' && thisEstablishment.dataOwnershipRequested !== null) {
               return { [item.code]: false };
@@ -24,7 +26,13 @@ router.route('/').get(async (req, res) => {
             }
             if (permission.canRemoveParentAssociation) {
               permission.canRemoveParentAssociation =
-                permission.canRemoveParentAssociation && !thisEstablishment.isParent && thisEstablishment.parentId
+                permission.canRemoveParentAssociation && !thisEstablishment.isParent && thisEstablishment.parentId && userData.role !== 'Read'
+                  ? true
+                  : false;
+            }
+            if (permission.canDownloadWdfReport) {
+              permission.canDownloadWdfReport =
+                (permission.canDownloadWdfReport && thisEstablishment.isParent && userData.role === 'Edit')
                   ? true
                   : false;
             }
@@ -34,6 +42,7 @@ router.route('/').get(async (req, res) => {
             uid: thisEstablishment.uid,
             permissions: Object.assign({}, ...permissions),
           });
+        }
         } else {
           return res.status(404).send('Not Found');
         }
diff --git a/server/routes/establishments/training/index.js b/server/routes/establishments/training/index.js
index f4b008d28d..0d63223b7d 100644
--- a/server/routes/establishments/training/index.js
+++ b/server/routes/establishments/training/index.js
@@ -1,9 +1,10 @@
 // default route for Workers' training endpoint
 const express = require('express');
-const router = express.Router({mergeParams: true});
+const router = express.Router({ mergeParams: true });
 
 // all user functionality is encapsulated
 const Training = require('../../../models/classes/training').Training;
+const MandatoryTraining = require('../../../models/classes/mandatoryTraining').MandatoryTraining;
 
 // NOTE - the Worker route uses middleware to validate the given worker id against the known establishment
 //        prior to all training endpoints, thus ensuring we this necessary rigidity on Establishment/Worker relationship
@@ -13,142 +14,182 @@ const Training = require('../../../models/classes/training').Training;
 // Inherits the security middleware declared in the Worker route for training.
 // Inheirts the "workerUid" parameter declared in the Worker route for training.
 router.route('/').get(async (req, res) => {
-    // although the establishment id is passed as a parameter, get the authenticated  establishment id from the req
-    const establishmentId = req.establishmentId;
-    const workerUid = req.params.workerId;
-
-    try {
-        const allTrainingRecords = await Training.fetch(establishmentId, workerUid);
-        return res.status(200).json(allTrainingRecords);
-    } catch (err) {
-        console.error('Training::root - failed', err);
-        return res.status(503).send(`Failed to get Training Records for Worker having uid: ${workerUid}`);
-    }
+  await getTrainingListWithMissingMandatoryTraining(req, res);
 });
 
+
 // gets requested training record using the training uid
 router.route('/:trainingUid').get(async (req, res) => {
-    const establishmentId = req.establishmentId;
-    const trainingUid = req.params.trainingUid;
-    const workerUid = req.params.workerId;
-
-    const thisTrainingRecord = new Training(establishmentId, workerUid);
-
-    try {
-        if (await thisTrainingRecord.restore(trainingUid)) {
-            return res.status(200).json(thisTrainingRecord.toJSON());
-        } else {
-            // not found training record
-            return res.status(404).send('Not Found');
-        }
-
-    } catch (err) {
-        console.error(err);
-        return res.status(503).send();
+  const establishmentId = req.establishmentId;
+  const trainingUid = req.params.trainingUid;
+  const workerUid = req.params.workerId;
+
+  const thisTrainingRecord = new Training(establishmentId, workerUid);
+
+  try {
+    if (await thisTrainingRecord.restore(trainingUid)) {
+      return res.status(200).json(thisTrainingRecord.toJSON());
+    } else {
+      // not found training record
+      return res.status(404).send('Not Found');
     }
+
+  } catch (err) {
+    console.error(err);
+    return res.status(503).send();
+  }
 });
 
 // creates given training record for the 'given' worker by UID
 router.route('/').post(async (req, res) => {
-    const establishmentId = req.establishmentId;
-    const workerUid = req.params.workerId;
-
-    const thisTrainingRecord = new Training(establishmentId, workerUid);
+  const establishmentId = req.establishmentId;
+  const workerUid = req.params.workerId;
 
-    try {
-        // by loading after the restore, only those properties defined in the
-        //  PUT body will be updated (peristed)
-        const isValidRecord = await thisTrainingRecord.load(req.body);
+  const thisTrainingRecord = new Training(establishmentId, workerUid);
 
-        // this is an update to an existing User, so no mandatory properties!
-        if (isValidRecord) {
-            await thisTrainingRecord.save(req.username);
+  try {
+    // by loading after the restore, only those properties defined in the
+    //  PUT body will be updated (peristed)
+    const isValidRecord = await thisTrainingRecord.load(req.body);
 
-            return res.status(200).json(thisTrainingRecord.toJSON());
-        } else {
-            return res.status(400).send('Unexpected Input.');
-        }
+    // this is an update to an existing User, so no mandatory properties!
+    if (isValidRecord) {
+      await thisTrainingRecord.save(req.username);
 
-    } catch (err) {
-        console.error(err);
-        return res.status(503).send();
+      return res.status(200).json(thisTrainingRecord.toJSON());
+    } else {
+      return res.status(400).send('Unexpected Input.');
     }
+
+  } catch (err) {
+    console.error(err);
+    return res.status(503).send();
+  }
 });
 
 
 // updates requested training record using the training uid
 router.route('/:trainingUid').put(async (req, res) => {
-    const establishmentId = req.establishmentId;
-    const trainingUid = req.params.trainingUid;
-    const workerUid = req.params.workerId;
-
-    const thisTrainingRecord = new Training(establishmentId, workerUid);
-
-    try {
-        // before updating a Worker, we need to be sure the Worker is
-        //  available to the given establishment. The best way of doing that
-        //  is to restore from given UID
-        if (await thisTrainingRecord.restore(trainingUid)) {
-            // TODO: JSON validation
-
-            // by loading after the restore, only those properties defined in the
-            //  PUT body will be updated (peristed)
-            const isValidRecord = await thisTrainingRecord.load(req.body);
-
-            // this is an update to an existing User, so no mandatory properties!
-            if (isValidRecord) {
-                await thisTrainingRecord.save(req.username);
-
-                return res.status(200).json(thisTrainingRecord.toJSON());
-            } else {
-                return res.status(400).send('Unexpected Input.');
-            }
-
-        } else {
-            // not found worker
-            return res.status(404).send('Not Found');
-        }
-
-    } catch (err) {
-        console.error(err);
-        return res.status(503).send();
+  const establishmentId = req.establishmentId;
+  const trainingUid = req.params.trainingUid;
+  const workerUid = req.params.workerId;
+
+  const thisTrainingRecord = new Training(establishmentId, workerUid);
+
+  try {
+    // before updating a Worker, we need to be sure the Worker is
+    //  available to the given establishment. The best way of doing that
+    //  is to restore from given UID
+    if (await thisTrainingRecord.restore(trainingUid)) {
+      // TODO: JSON validation
+
+      // by loading after the restore, only those properties defined in the
+      //  PUT body will be updated (peristed)
+      const isValidRecord = await thisTrainingRecord.load(req.body);
+
+      // this is an update to an existing User, so no mandatory properties!
+      if (isValidRecord) {
+        await thisTrainingRecord.save(req.username);
+
+        return res.status(200).json(thisTrainingRecord.toJSON());
+      } else {
+        return res.status(400).send('Unexpected Input.');
+      }
+
+    } else {
+      // not found worker
+      return res.status(404).send('Not Found');
     }
+
+  } catch (err) {
+    console.error(err);
+    return res.status(503).send();
+  }
 });
 
 
 // deletes requested training record using the training uid
 router.route('/:trainingUid').delete(async (req, res) => {
-    const establishmentId = req.establishmentId;
-    const trainingUid = req.params.trainingUid;
-    const workerUid = req.params.workerId;
-
-    const thisTrainingRecord = new Training(establishmentId, workerUid);
-
-    try {
-        // before updating a Worker, we need to be sure the Worker is
-        //  available to the given establishment. The best way of doing that
-        //  is to restore from given UID
-        if (await thisTrainingRecord.restore(trainingUid)) {
-            // TODO: JSON validation
-
-            // by deleting after the restore we can be sure this training record belongs to the given worker
-            const deleteSuccess = await thisTrainingRecord.delete();
-
-            if (deleteSuccess) {
-                return res.status(204).json();
-            } else {
-                return res.status(404).json('Not Found');
-            }
-
-        } else {
-            // not found worker
-            return res.status(404).send('Not Found');
-        }
-
-    } catch (err) {
-        console.error(err);
-        return res.status(503).send();
+  const establishmentId = req.establishmentId;
+  const trainingUid = req.params.trainingUid;
+  const workerUid = req.params.workerId;
+
+  const thisTrainingRecord = new Training(establishmentId, workerUid);
+
+  try {
+    // before updating a Worker, we need to be sure the Worker is
+    //  available to the given establishment. The best way of doing that
+    //  is to restore from given UID
+    if (await thisTrainingRecord.restore(trainingUid)) {
+      // TODO: JSON validation
+
+      // by deleting after the restore we can be sure this training record belongs to the given worker
+      const deleteSuccess = await thisTrainingRecord.delete();
+
+      if (deleteSuccess) {
+        return res.status(204).json();
+      } else {
+        return res.status(404).json('Not Found');
+      }
+
+    } else {
+      // not found worker
+      return res.status(404).send('Not Found');
     }
+
+  } catch (err) {
+    console.error(err);
+    return res.status(503).send();
+  }
 });
 
+const getTrainingListWithMissingMandatoryTraining = async (req, res) => {
+  const establishmentId = req.establishmentId;
+  const workerUid = req.params.workerId;
+  let missingMandatoryTraining = [];
+  try {
+    let allTrainingRecords = await Training.fetch(establishmentId, workerUid);
+    const mandatoryTrainingforWorker = await MandatoryTraining.fetchMandatoryTrainingForWorker(workerUid);
+    if (allTrainingRecords.count === 0) {
+      missingMandatoryTraining = mandatoryTrainingforWorker;
+    }else if (mandatoryTrainingforWorker.length > 0){
+      mandatoryTrainingforWorker.forEach(mandatoryTraining => {
+        mantrainingDone = false;
+        allTrainingRecords.training.forEach(training => {
+          if (mandatoryTraining.trainingCategoryFK === training.trainingCategory.id) {
+            mantrainingDone = true;
+          }
+        });
+        if (mantrainingDone === false) {
+          missingMandatoryTraining.push(mandatoryTraining);
+        }
+      });
+    }
+    missingMandatoryTraining.forEach(thisRecord => {
+      allTrainingRecords.training.unshift({
+        uid: thisRecord.id,
+        trainingCategory: {
+          id: thisRecord.workerTrainingCategories.id,
+          category: thisRecord.workerTrainingCategories.category
+        },
+        title: undefined,
+        missing: true,
+        accredited: undefined,
+        completed: undefined,
+        expires: undefined,
+        notes: undefined,
+        created: thisRecord.created.toISOString(),
+        updated: thisRecord.updated.toISOString(),
+        updatedBy: thisRecord.updatedBy
+      });
+    });
+    res.status(200);
+    return res.json(allTrainingRecords);
+  } catch (err) {
+    console.error('Training::root - failed', err);
+    res.status(503);
+    return res.send(`Failed to get Training Records for Worker having uid: ${workerUid}`);
+  }
+};
 module.exports = router;
+module.exports.getTrainingListWithMissingMandatoryTraining = getTrainingListWithMissingMandatoryTraining;
diff --git a/server/routes/establishments/worker.js b/server/routes/establishments/worker.js
index 725f021c95..81adb217f2 100644
--- a/server/routes/establishments/worker.js
+++ b/server/routes/establishments/worker.js
@@ -20,6 +20,8 @@ const Qualification = require('../../models/classes/qualification').Qualificatio
 // child routes
 const TrainingRoutes = require('./training');
 const QualificationRoutes = require('./qualification');
+const MandatoryTrainingRoutes = require('./mandatoryTraining');
+
 
 // this middleware validates a worker against known establishment ID
 const validateWorker = async (req, res, next) => {
@@ -90,6 +92,8 @@ router.route('/total').get(async (req, res) => {
 
 router.use('/:workerId/training', [validateWorker, TrainingRoutes]);
 router.use('/:workerId/qualification', [validateWorker, QualificationRoutes]);
+router.use('/:workerId/mandatoryTraining', [validateWorker, MandatoryTrainingRoutes]);
+
 router.use('/:workerId', validateWorker);
 router.use('/', validateWorker);
 
@@ -98,22 +102,32 @@ router.route('/').get(async (req, res) => {
     const establishmentId = req.establishmentId;
 
     try {
+        let trainingAlert;
         let allTheseWorkers = await Workers.Worker.fetch(establishmentId);
         if(allTheseWorkers && allTheseWorkers.length){
-          const updateTrainingRecords = await Training.getExpiringAndExpiredTrainingCounts(establishmentId, allTheseWorkers);
+          const updateTrainingRecords = await Training.getAllRequiredCounts(establishmentId, allTheseWorkers);
           if(updateTrainingRecords){
             const updateQualsRecords = await Qualification.getQualsCounts(establishmentId, updateTrainingRecords);
             if(updateQualsRecords){
-              //Sort workers record first by expired count then by expiring training count
-              updateQualsRecords.sort((a, b) => {
-                if(b.expiredTrainingCount > a.expiredTrainingCount){return 1;}
-                if(b.expiredTrainingCount < a.expiredTrainingCount){return -1;}
-                if(b.expiringTrainingCount > a.expiringTrainingCount){return 1;}
-                if(b.expiringTrainingCount < a.expiringTrainingCount){return -1;}
-                return 0;
-              })
+              if(updateQualsRecords.length > 0 ) {
+                const expiriedTrainingCountFlag = updateQualsRecords.filter(worker => worker.expiredTrainingCount > 0).length || 0;
+                const expiringTrainingCountFlag = updateQualsRecords.filter(worker => worker.expiringTrainingCount > 0).length || 0;
+                const missingMandatoryTrainingCountFlag = updateQualsRecords.filter(worker => worker.missingMandatoryTrainingCount > 0).length || 0;
+                if (expiriedTrainingCountFlag > 0 || missingMandatoryTrainingCountFlag > 0) {
+                    trainingAlert = 2;
+                } else if (expiringTrainingCountFlag > 0) {
+                    trainingAlert = 1;
+                } else {
+                    trainingAlert = 0;
+                }
+              } else {
+                trainingAlert = 0;
+              }
+              if(updateQualsRecords.length > 0 ) {
+                updateQualsRecords[0].trainingAlert = trainingAlert;
+              }
               return res.status(200).json({
-                workers: updateQualsRecords
+                workers: updateQualsRecords,
               });
             }
           }
diff --git a/server/routes/login.js b/server/routes/login.js
index 183b34442a..86d4623060 100644
--- a/server/routes/login.js
+++ b/server/routes/login.js
@@ -38,10 +38,9 @@ router.post('/', async (req, res) => {
   try {
     let establishmentUser = givenEstablishmentUid === null ? await models.login.findOne({
       where: {
-        username: givenUsername,
-        isActive:true
+        username: givenUsername
       },
-      attributes: ['id', 'username', 'isActive', 'invalidAttempt', 'registrationId', 'firstLogin', 'Hash', 'lastLogin', 'tribalHash', 'tribalSalt', 'agreedUpdatedTerms'],
+      attributes: ['id', 'username', 'isActive', 'invalidAttempt', 'registrationId', 'firstLogin', 'Hash', 'lastLogin', 'tribalHash', 'tribalSalt', 'agreedUpdatedTerms', 'status'],
       include: [ {
         model: models.user,
         attributes: ['id', 'uid', 'FullNameValue', 'EmailValue', 'isPrimary', 'establishmentId', "UserRoleValue", 'tribalId'],
@@ -61,10 +60,9 @@ router.post('/', async (req, res) => {
       // before returning error, check to see if this is a superadmin user with a given establishment UID, to be assumed as their "logged in session" primary establishment
       establishmentUser = await models.login.findOne({
         where: {
-          username: givenUsername,
-          isActive:true,
+          username: givenUsername
         },
-        attributes: ['id', 'username', 'isActive', 'invalidAttempt', 'registrationId', 'firstLogin', 'Hash', 'lastLogin', 'tribalHash', 'tribalSalt', 'agreedUpdatedTerms'],
+        attributes: ['id', 'username', 'isActive', 'invalidAttempt', 'registrationId', 'firstLogin', 'Hash', 'lastLogin', 'tribalHash', 'tribalSalt', 'agreedUpdatedTerms', 'status'],
         include: [ {
           model: models.user,
           attributes: ['id', 'uid',  'FullNameValue', 'EmailValue', 'isPrimary', 'establishmentId', "UserRoleValue", 'tribalId'],
@@ -109,6 +107,23 @@ router.post('/', async (req, res) => {
       }
     }
 
+    //check weather posted user is locked or pending
+    if(establishmentUser){
+      if(!establishmentUser.isActive && establishmentUser.status === 'Locked'){
+        //check for locked status, if locked then return with 409 error
+        console.error(`POST .../login failed: User status is locked`);
+        return res.status(409).send({
+          message: 'Authentication failed.',
+        });
+      } else if(!establishmentUser.isActive && establishmentUser.status === 'PENDING'){
+        //check for Pending status, if Pending then return with 403 error
+        console.error(`POST .../login failed: User status is pending`);
+        return res.status(405).send({
+          message: 'Authentication failed.',
+        });
+      }
+    }
+
     // if this found login account is a migrated tribal account, and there is no current hash, then
     //  we need to first validate password using tribal hashing
     let tribalErr = null;
@@ -218,7 +233,8 @@ router.post('/', async (req, res) => {
           if (establishmentUser.invalidAttempt === (maxNumberOfFailedAttempts+1)) {
             // lock the account
             const loginUpdate = {
-              isActive: false
+              isActive: false,
+              status: 'Locked'
             };
             await establishmentUser.update(loginUpdate, {transaction: t});
 
@@ -238,9 +254,11 @@ router.post('/', async (req, res) => {
 
             const resetLink = `${req.protocol}://${req.get('host')}/api/registration/validateResetPassword?reset=${requestUuid}`;
 
-            // send email to recipient with the reset UUID
+            // send email to recipient with the reset UUID if user is not locked
             try {
-              await sendMail(establishmentUser.user.EmailValue, establishmentUser.user.FullNameValue, requestUuid);
+              if(establishmentUser.isActive && establishmentUser.status !== 'Locked'){
+                await sendMail(establishmentUser.user.EmailValue, establishmentUser.user.FullNameValue, requestUuid);
+              }
             } catch (err) {
               console.error(err);
             }
diff --git a/server/routes/registration.js b/server/routes/registration.js
index 4380ad60ba..b2ce842867 100644
--- a/server/routes/registration.js
+++ b/server/routes/registration.js
@@ -22,6 +22,7 @@ const generateJWT = require('../utils/security/generateJWT');
 const passwordCheck = require('../utils/security/passwordValidation').isPasswordValid;
 const usernameCheck = require('../utils/security/usernameValidation').isUsernameValid;
 const sendMail = require('../utils/email/notify-email').sendPasswordReset;
+// const rateLimiting = require('../utils/middleware/rateLimiting').rateLimiting;
 // const pCodeCheck = require('../utils/postcodeSanitizer');
 
 class RegistrationException {
@@ -73,6 +74,8 @@ router.get('/username', (req, res) => {
     message: 'Username not found',
   });
 });
+
+//router.use('/username/:username', rateLimiting);
 router.get('/username/:username', async (req, res) => {
   const requestedUsername = req.params.username.toLowerCase();
   try {
@@ -419,7 +422,9 @@ router.route('/')
             serviceResults = await models.services.findOne({
               where: {
                 name: Estblistmentdata.MainService,
-                iscqcregistered: false,
+                iscqcregistered: {
+                  [models.Sequelize.Op.or]: [false, null],
+                },
                 isMain: true
               }
             });
diff --git a/server/routes/reports/trainingReport/template/xl/sharedStrings.xml b/server/routes/reports/trainingReport/template/xl/sharedStrings.xml
index ae82868503..11b84d49a2 100644
--- a/server/routes/reports/trainingReport/template/xl/sharedStrings.xml
+++ b/server/routes/reports/trainingReport/template/xl/sharedStrings.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="27" uniqueCount="27">
     <si>
-        <t>Training Expiring soon</t>
+        <t>Missing</t>
     </si>
     <si>
-        <t>Training records summary</t>
+        <t>All training records</t>
     </si>
     <si>
         <t>Mandatory</t>
@@ -16,7 +16,7 @@
         <t>Total</t>
     </si>
     <si>
-        <t>Expired training records</t>
+        <t>Expired</t>
     </si>
     <si>
         <t>Expiring soon</t>
diff --git a/server/routes/reports/trainingReport/template/xl/styles.xml b/server/routes/reports/trainingReport/template/xl/styles.xml
index fc944ba7ee..b54f4d2728 100644
--- a/server/routes/reports/trainingReport/template/xl/styles.xml
+++ b/server/routes/reports/trainingReport/template/xl/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac x16r2 xr" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac" xmlns:x16r2="http://schemas.microsoft.com/office/spreadsheetml/2015/02/main" xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision">
-    <fonts count="10" x14ac:knownFonts="1">
+    <fonts count="11" x14ac:knownFonts="1">
         <font>
             <sz val="12" />
             <name val="Arial" />
@@ -8,7 +8,7 @@
         <font>
             <b />
             <sz val="12" />
-            <color indexed="0" />
+            <color indexed="1" />
             <name val="Arial" />
             <charset val="1" />
         </font>
@@ -65,8 +65,15 @@
             <name val="Arial" />
             <charset val="1" />
         </font>
+        <font>
+            <b />
+            <sz val="12" />
+            <color indexed="0" />
+            <name val="Arial" />
+            <charset val="1" />
+        </font>
     </fonts>
-    <fills count="6">
+    <fills count="7">
         <fill>
             <patternFill patternType="none" />
         </fill>
@@ -75,7 +82,7 @@
         </fill>
         <fill>
             <patternFill patternType="solid">
-                <fgColor indexed="11" />
+                <fgColor indexed="0" />
                 <bgColor indexed="0" />
             </patternFill>
         </fill>
@@ -97,6 +104,12 @@
                 <bgColor indexed="0" />
             </patternFill>
         </fill>
+        <fill>
+            <patternFill patternType="solid">
+                <fgColor indexed="11" />
+                <bgColor indexed="0" />
+            </patternFill>
+        </fill>
     </fills>
     <borders count="14">
         <border>
@@ -265,7 +278,7 @@
     <cellStyleXfs count="1">
         <xf numFmtId="0" fontId="0" fillId="0" borderId="0" />
     </cellStyleXfs>
-    <cellXfs count="38">
+    <cellXfs count="39">
         <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0" />
         <xf numFmtId="0" fontId="9" fillId="0" borderId="7" xfId="0" applyFont="1" applyFill="1" applyBorder="1" applyAlignment="1" applyProtection="1">
             <alignment horizontal="left" vertical="top" wrapText="1" readingOrder="1" />
@@ -415,6 +428,10 @@
             <alignment horizontal="left" vertical="top" wrapText="1" />
             <protection locked="0" />
         </xf>
+        <xf numFmtId="0" fontId="10" fillId="6" borderId="0" xfId="0" applyFont="1" applyFill="1" applyAlignment="1" applyProtection="1">
+            <alignment horizontal="center" vertical="top" wrapText="1" />
+            <protection locked="0" />
+        </xf>
     </cellXfs>
     <cellStyles count="1">
         <cellStyle name="Normal" xfId="0" builtinId="0" />
diff --git a/server/routes/reports/trainingReport/template/xl/workbook.xml b/server/routes/reports/trainingReport/template/xl/workbook.xml
index 4ececde618..e1fabc366e 100644
--- a/server/routes/reports/trainingReport/template/xl/workbook.xml
+++ b/server/routes/reports/trainingReport/template/xl/workbook.xml
@@ -6,15 +6,15 @@
 		<workbookView xWindow="0" yWindow="0" windowWidth="19200" windowHeight="7050" activeTab="0" />
 	</bookViews>
 	<sheets>
-		<sheet name="Overview" sheetId="2" r:id="rId1" />
-		<sheet name="Training View" sheetId="3" r:id="rId2" />
+		<sheet name="Training summary" sheetId="2" r:id="rId1" />
+		<sheet name="Training detail" sheetId="3" r:id="rId2" />
 	</sheets>
 	<definedNames>
 		<definedName name="_xlnm.Print_Titles" localSheetId="1">
-			'Training View'!$1:$3
+			'Training detail'!$1:$3
 		</definedName>
 		<definedName name="_xlnm.Print_Titles" localSheetId="0">
-			Overview!$1:$3
+			'Training summary'!$1:$3
 		</definedName>
 	</definedNames>
 	<calcPr calcId="80000" fullCalcOnLoad="1" />
diff --git a/server/routes/reports/trainingReport/template/xl/worksheets/sheet1.xml b/server/routes/reports/trainingReport/template/xl/worksheets/sheet1.xml
index 5e82518404..82ad3803c5 100644
--- a/server/routes/reports/trainingReport/template/xl/worksheets/sheet1.xml
+++ b/server/routes/reports/trainingReport/template/xl/worksheets/sheet1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac xr xr2 xr3" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac" xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision" xmlns:xr2="http://schemas.microsoft.com/office/spreadsheetml/2015/revision2" xmlns:xr3="http://schemas.microsoft.com/office/spreadsheetml/2016/revision3" xr:uid="{00000000-0001-0000-0000-000000000000}">
-    <dimension ref="A1:J19"/>
+    <dimension ref="A1:D17"/>
     <sheetViews>
         <sheetView showGridLines="0" workbookViewId="0">
             <pane ySplit="1" topLeftCell="A2" activePane="bottomLeft" state="frozenSplit"/>
@@ -9,224 +9,190 @@
     </sheetViews>
     <sheetFormatPr defaultRowHeight="12.5" x14ac:dyDescent="0.25"/>
     <cols>
-        <col min="1" max="2" width="13.453125" customWidth="1"/>
-        <col min="3" max="3" width="53.453125" customWidth="1"/>
-        <col min="4" max="14" width="13.453125" customWidth="1"/>
+        <col min="1" max="10" width="23.453125" customWidth="1"/>
+        <col min="2" max="10" width="13.453125" customWidth="1"/>
+        <col min="3" max="10" width="15.453125" customWidth="1"/>
     </cols>
     <sheetData>
-        <row r="1" spans="1:10" ht="1.4" customHeight="1" x14ac:dyDescent="0.25"/>
-        <row r="2" spans="1:10" ht="18.399999999999999" customHeight="1" x14ac:dyDescent="0.25"/>
-        <row r="3" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25">
-            <c r="A3" s="16"/>
-            <c r="B3" s="16"/>
-            <c r="C3" s="22" t="s">
+        <row r="1" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25">
+            <c r="A1" s="22" t="s">
                 <v>1</v>
             </c>
-            <c r="D3" s="23"/>
-            <c r="E3" s="16"/>
-            <c r="F3" s="16"/>
-            <c r="G3" s="16"/>
-            <c r="H3" s="16"/>
-            <c r="I3" s="16"/>
-            <c r="J3" s="16"/>
-        </row>
-        <row r="4" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25">
-            <c r="A4" s="16"/>
-            <c r="B4" s="16"/>
-            <c r="C4" s="2"/>
-            <c r="D4" s="2" t="s">
+            <c r="B1" s="22" t="s">
+                <v>2</v>
+            </c>
+            <c r="C1" s="22" t="s">
+                <v>3</v>
+            </c>
+            <c r="D1" s="22" t="s">
                 <v>4</v>
             </c>
-            <c r="E4" s="16"/>
-            <c r="F4" s="16"/>
-            <c r="G4" s="16"/>
-            <c r="H4" s="16"/>
-            <c r="I4" s="16"/>
-            <c r="J4" s="16"/>
         </row>
-        <row r="5" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
-            <c r="A5" s="16"/>
-            <c r="B5" s="16"/>
-            <c r="C5" s="31" t="s">
+        <row r="2" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
+            <c r="A2" s="31" t="s">
                 <v>26</v>
             </c>
-            <c r="D5" s="2" t="s">
+            <c r="B2" s="2" t="s">
+                <v>20</v>
+            </c>
+            <c r="C2" s="2" t="s">
                 <v>20</v>
             </c>
-            <c r="E5" s="16"/>
-            <c r="F5" s="16"/>
-            <c r="G5" s="32" t="s">
-                <v>21</v>
+            <c r="D2" s="2" t="s">
+                <v>20</v>
             </c>
-            <c r="H5" s="32"/>
-            <c r="I5" s="32"/>
-            <c r="J5" s="32"/>
         </row>
-        <row r="6" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
-            <c r="A6" s="16"/>
-            <c r="B6" s="16"/>
-            <c r="C6" s="32" t="s">
+        <row r="3" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
+            <c r="A3" s="32" t="s">
                 <v>5</v>
             </c>
-            <c r="D6" s="2" t="s">
+            <c r="B3" s="2" t="s">
+                <v>20</v>
+            </c>
+            <c r="C3" s="2" t="s">
+                <v>20</v>
+            </c>
+            <c r="D3" s="2" t="s">
                 <v>20</v>
             </c>
-            <c r="E6" s="16"/>
-            <c r="F6" s="16"/>
-            <c r="G6" s="1"/>
-            <c r="H6" s="16"/>
-            <c r="I6" s="16"/>
-            <c r="J6" s="29"/>
         </row>
-        <row r="7" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
-            <c r="A7" s="16"/>
-            <c r="B7" s="16"/>
-            <c r="C7" s="33" t="s">
+        <row r="4" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
+            <c r="A4" s="33" t="s">
                 <v>6</v>
             </c>
-            <c r="D7" s="2" t="s">
+            <c r="B4" s="2" t="s">
+                <v>20</v>
+            </c>
+            <c r="C4" s="2" t="s">
+                <v>20</v>
+            </c>
+            <c r="D4" s="2" t="s">
+                <v>20</v>
+            </c>
+        </row>
+        <row r="5" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
+            <c r="A5" s="32" t="s">
+                <v>0</v>
+            </c>
+            <c r="B5" s="2" t="s">
+                <v>20</v>
+            </c>
+            <c r="C5" s="2" t="s">
                 <v>20</v>
             </c>
-            <c r="E7" s="16"/>
-            <c r="F7" s="16"/>
-            <c r="G7" s="33" t="s">
-                <v>22</v>
+            <c r="D5" s="2" t="s">
+                <v>20</v>
             </c>
-            <c r="H7" s="33" />
-            <c r="I7" s="33" />
-            <c r="J7" s="33" />
         </row>
-        <row r="8" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
-            <c r="A8" s="16"/>
-            <c r="B8" s="16"/>
-            <c r="C8" s="2" t="s">
+        <row r="6" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
+            <c r="A6" s="2" t="s">
                 <v>4</v>
             </c>
-            <c r="D8" s="2" t="s">
+            <c r="B6" s="2" t="s">
+                <v>20</v>
+            </c>
+            <c r="C6" s="2" t="s">
+                <v>20</v>
+            </c>
+            <c r="D6" s="2" t="s">
                 <v>20</v>
             </c>
-            <c r="E8" s="16"/>
-            <c r="F8" s="16"/>
-            <c r="G8" s="1" />
-            <c r="H8" s="28" />
-            <c r="I8" s="28" />
-            <c r="J8" s="29" />
         </row>
-        <row r="9" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
-            <c r="A9" s="16" />
-            <c r="B9" s="16" />
-            <c r="C9" s="16" />
-            <c r="D9" s="16" />
-            <c r="E9" s="16" />
-            <c r="F9" s="16" />
-            <c r="G9" s="34" />
-            <c r="H9" s="34" />
-            <c r="I9" s="34" />
-            <c r="J9" s="36" />
+        <row r="7" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
+            <c r="A7" s="16" />
+            <c r="B7" s="16" />
+            <c r="C7" s="16" />
+            <c r="D7" s="16" />
         </row>
-        <row r="10" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
-            <c r="A10" s="16"/>
-            <c r="B10" s="16"/>
-            <c r="D10" s="16"/>
-            <c r="E10" s="16"/>
-            <c r="F10" s="16"/>
-            <c r="G10" s="35" t="s">
-                <v>23</v>
-            </c>
-            <c r="H10" s="35"/>
-            <c r="I10" s="35"/>
-            <c r="J10" s="37"/>
+        <row r="8" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
+            <c r="A8" s="16" />
+            <c r="B8" s="16" />
+            <c r="C8" s="16" />
+            <c r="D8" s="16" />
         </row>
-        <row r="11" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
-            <c r="A11" s="16"/>
-            <c r="B11" s="16"/>
-            <c r="C11" s="17" t="s">
-                <v>7</v>
-            </c>
-            <c r="D11" s="17"/>
-            <c r="E11" s="16"/>
-            <c r="F11" s="16"/>
-            <c r="G11" s="1" />
-            <c r="H11" s="28"/>
-            <c r="I11" s="28"/>
-            <c r="J11" s="29"/>
+        <row r="9" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
+            <c r="A9" s="17" t="s">
+                <v>5</v>
+            </c>
+            <c r="B9" s="17" t="s">
+                <v>2</v>
+            </c>
+            <c r="C9" s="17" t="s">
+                <v>3</v>
+            </c>
+            <c r="D9" s="17" t="s">
+                <v>4</v>
+            </c>
+        </row>
+        <row r="10" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25">
+            <c r="A10" s="16" />
+            <c r="B10" s="2" t="s">
+                <v>20</v>
+            </c>
+            <c r="C10" s="2" t="s">
+                <v>20</v>
+            </c>
+            <c r="D10" s="2" t="s">
+                <v>20</v>
+            </c>
         </row>
-        <row r="12" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.3">
-            <c r="A12" s="16"/>
-            <c r="B12" s="16"/>
-            <c r="C12" s="2"/>
-            <c r="D12" s="2" t="s">
+        <row r="11" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25" />
+        <row r="12" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25" />
+        <row r="13" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25">
+            <c r="A13" s="18" t="s">
+                <v>6</v>
+            </c>
+            <c r="B13" s="18" t="s">
+                <v>2</v>
+            </c>
+            <c r="C13" s="18" t="s">
+                <v>3</v>
+            </c>
+            <c r="D13" s="18" t="s">
                 <v>4</v>
             </c>
-            <c r="E12" s="16"/>
-            <c r="F12" s="16"/>
-            <c r="G12" s="3"/>
-            <c r="H12" s="4"/>
-            <c r="I12" s="4"/>
-            <c r="J12" s="5"/>
         </row>
-        <row r="13" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25">
-            <c r="A13" s="16"/>
-            <c r="B13" s="16"/>
-            <c r="C13" s="2" />
-            <c r="D13" s="2" />
-            <c r="E13" s="16"/>
-            <c r="F13" s="16"/>
-            <c r="G13" s="16"/>
-            <c r="H13" s="16"/>
-            <c r="I13" s="16"/>
-            <c r="J13" s="16"/>
+        <row r="14" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25">
+            <c r="A14" s="16" />
+            <c r="B14" s="2" t="s">
+                <v>20</v>
+            </c>
+            <c r="C14" s="2" t="s">
+                <v>20</v>
+            </c>
+            <c r="D14" s="2" t="s">
+                <v>20</v>
+            </c>
         </row>
-        <row r="14" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25"/>
-        <row r="15" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25"/>
-        <row r="16" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25">
-            <c r="A16" s="16"/>
-            <c r="B16" s="16"/>
-            <c r="C16" s="18" t="s">
+        <row r="15" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25" />
+        <row r="16" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25" />
+        <row r="17" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25">
+            <c r="A17" s="17" t="s">
                 <v>0</v>
             </c>
-            <c r="D16" s="18"/>
-            <c r="E16" s="16"/>
-            <c r="F16" s="16"/>
-            <c r="G16" s="16"/>
-            <c r="H16" s="16"/>
-            <c r="I16" s="16"/>
-            <c r="J16" s="16"/>
-        </row>
-        <row r="17" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25">
-            <c r="A17" s="16"/>
-            <c r="B17" s="16"/>
-            <c r="C17" s="2"/>
-            <c r="D17" s="2" t="s">
+            <c r="B17" s="17" t="s">
+                <v>2</v>
+            </c>
+            <c r="C17" s="17" t="s">
+                <v>3</v>
+            </c>
+            <c r="D17" s="17" t="s">
                 <v>4</v>
             </c>
-            <c r="E17" s="16"/>
-            <c r="F17" s="16"/>
-            <c r="G17" s="16"/>
-            <c r="H17" s="16"/>
-            <c r="I17" s="16"/>
-            <c r="J17" s="16"/>
         </row>
-        <row r="18" spans="1:10" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25">
-            <c r="A18" s="16"/>
-            <c r="B18" s="16"/>
-            <c r="C18" s="2" />
-            <c r="D18" s="2" />
-            <c r="E18" s="16"/>
-            <c r="F18" s="16"/>
-            <c r="G18" s="16"/>
-            <c r="H18" s="16"/>
-            <c r="I18" s="16"/>
-            <c r="J18" s="16"/>
+        <row r="18" spans="1:4" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25">
+            <c r="A18" s="16" />
+            <c r="B18" s="2" t="s">
+                <v>20</v>
+            </c>
+            <c r="C18" s="2" t="s">
+                <v>20</v>
+            </c>
+            <c r="D18" s="2" t="s">
+                <v>20</v>
+            </c>
         </row>
     </sheetData>
-    <mergeCells count="5">
-        <mergeCell ref="C3:D3"/>
-        <mergeCell ref="G5:J5"/>
-        <mergeCell ref="G7:J7"/>
-        <mergeCell ref="G9:J9"/>
-        <mergeCell ref="G10:J10"/>
-    </mergeCells>
     <phoneticPr fontId="0" type="noConversion"/>
     <pageMargins left="0.19685039370078741" right="0.19685039370078741" top="0.19685039370078741" bottom="0.63900393700787406" header="0.19685039370078741" footer="0.19685039370078741"/>
     <pageSetup paperSize="9" orientation="landscape" horizontalDpi="0" verticalDpi="0"/>
diff --git a/server/routes/reports/trainingReport/template/xl/worksheets/sheet2.xml b/server/routes/reports/trainingReport/template/xl/worksheets/sheet2.xml
index 5d5a125b8a..bdeb5c2c92 100644
--- a/server/routes/reports/trainingReport/template/xl/worksheets/sheet2.xml
+++ b/server/routes/reports/trainingReport/template/xl/worksheets/sheet2.xml
@@ -15,42 +15,42 @@
 	</cols>
 	<sheetData>
 		<row r="1" spans="1:8" ht="17.149999999999999" customHeight="1" x14ac:dyDescent="0.25">
-			<c r="A1" s="15" t="s">
+			<c r="A1" s="38" t="s">
 				<v>
 					9
 				</v>
 			</c>
-			<c r="B1" s="15" t="s">
+			<c r="B1" s="38" t="s">
 				<v>
 					10
 				</v>
 			</c>
-			<c r="C1" s="15" t="s">
+			<c r="C1" s="38" t="s">
 				<v>
 					11
 				</v>
 			</c>
-			<c r="D1" s="15" t="s">
+			<c r="D1" s="38" t="s">
 				<v>
 					12
 				</v>
 			</c>
-			<c r="E1" s="15" t="s">
+			<c r="E1" s="38" t="s">
 				<v>
 					13
 				</v>
 			</c>
-			<c r="F1" s="15" t="s">
+			<c r="F1" s="38" t="s">
 				<v>
 					15
 				</v>
 			</c>
-			<c r="G1" s="15" t="s">
+			<c r="G1" s="38" t="s">
 				<v>
 					16
 				</v>
 			</c>
-			<c r="H1" s="15" t="s">
+			<c r="H1" s="38" t="s">
 				<v>
 					17
 				</v>
diff --git a/server/routes/reports/trainingReport/training.js b/server/routes/reports/trainingReport/training.js
index 7e37cd607c..1d3f15e5b6 100644
--- a/server/routes/reports/trainingReport/training.js
+++ b/server/routes/reports/trainingReport/training.js
@@ -13,13 +13,15 @@ const config = require('../../../../server/config/config');
 const models = require('../../../../server/models');
 const uuid = require('uuid');
 const AWS = require('aws-sdk');
+const cheerio = require('cheerio');
+
 const s3 = new AWS.S3({
   region: String(config.get('bulkupload.region')),
 });
 const Bucket = String(config.get('bulkupload.bucketname'));
 
-const { Establishment } = require('../../../models/classes/establishment');
-const { getTrainingData, getJobName } = rfr('server/data/trainingReport');
+const Training = require('../../../models/classes/training').Training;
+const { getTrainingData, getJobName, getMndatoryTrainingDetails } = rfr('server/data/trainingReport');
 const { attemptToAcquireLock, updateLockState, lockStatus, releaseLockQuery } = rfr('server/data/trainingReportLock');
 
 // Constants string needed by this file in several places
@@ -40,22 +42,26 @@ const buStates = ['READY', 'DOWNLOADING', 'FAILED', 'WARNINGS', 'PASSED', 'COMPL
 const trainingCounts = {
   expiredTrainingCount: 0,
   expiringTrainingCount: 0,
-  missingMandatoryTrainingCount: 0,
-  missingExpiringMandatoryTrainingCount: 0,
-  upToDateTrainingCount: 0
+  expiredMandatoryTrainingCount: 0,
+  expiredNonMandatoryTrainingCount: 0,
+  expiringMandatoryTrainingCount: 0,
+  expiringNonMandatoryTrainingCount: 0,
+  upToDateTrainingCount: 0,
+  upToDateMandatoryTrainingCount: 0,
+  upToDateNonMandatoryTrainingCount: 0
 };
 
 let expiredWorkerTrainings = [];
 let expiringWorkerTrainings = [];
+let missingMandatoryTrainingRecords = [];
 let expiredOrExpiringWorkerRecords = [];
 
-// XML DOM manipulation helper functions
-const { DOMParser, XMLSerializer } = new (require('jsdom').JSDOM)().window;
-
-const parseXML = fileContent => new DOMParser().parseFromString(fileContent.toString('utf8'), 'application/xml');
-
-const serializeXML = dom =>
-  '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n' + new XMLSerializer().serializeToString(dom);
+const parseXML = fileContent =>
+  cheerio.load(fileContent, {
+    xml: {
+      normalizeWhitespace: true,
+    }
+  });
 
 /**
  * Helper function to set a spreadsheet cell's value
@@ -68,31 +74,37 @@ const serializeXML = dom =>
  * @param {String} value
  */
 const putStringTemplate = (sheetDoc, stringsDoc, sst, sharedStringsUniqueCount, sharedStringsCount, element, value) => {
-  let vTag = element.querySelector('v');
-  const hasVTag = vTag !== null;
+  let vTag = element.children('v').first();
+  let hasVTag = true;
+  if (element.children('v').length === 0) {
+    hasVTag = false;
+  }
+
   const textValue = String(value);
   const isNumber = isNumberRegex.test(textValue);
 
   if (!hasVTag) {
-    vTag = sheetDoc.createElementNS(schema, 'v');
+    vTag = sheetDoc('<v></v>');
+    vTag.text(sharedStringsUniqueCount[0]);
 
-    element.appendChild(vTag);
+    element.append(vTag);
+  } else {
+    vTag.text(sharedStringsUniqueCount[0]);
   }
 
   if (isNumber) {
-    element.removeAttribute('t');
-    vTag.textContent = textValue;
+    element.attr('t', '');
+    vTag.text(textValue);
   } else {
-    element.setAttribute('t', 's');
+    element.attr('t', 's');
 
-    const si = stringsDoc.createElementNS(schema, 'si');
-    const t = stringsDoc.createElementNS(schema, 't');
+    const si = stringsDoc('<si></si>');
+    const t = stringsDoc('<t></t>');
+    t.text(textValue);
 
-    sst.appendChild(si);
-    si.appendChild(t);
+    sst.append(si);
+    si.append(t);
 
-    t.textContent = textValue;
-    vTag.textContent = sharedStringsUniqueCount[0];
     sharedStringsCount[0] += 1;
     sharedStringsUniqueCount[0] += 1;
   }
@@ -120,26 +132,23 @@ const updateProps = 'JobName,Category,Title,Expires'.split(',');
  * Helper Function used to create expired/expiring traing data
  *
  * @param {Object} trainingData
- * @param {Object} All customized expired/expiring training report data
+ * @return {Object} All workers with training
  */
-const createExpireExpiringData = async (trainingData, reportData) => {
-  if (trainingData.length && trainingData.length > 0) {
-    trainingData.forEach(async value => {
-      if (reportData.length === 0) {
-        reportData.push({ ID: value.ID, NameOrIdValue: value.NameOrIdValue, Count: 0 });
-      } else {
-        let foundTrn = false;
-        reportData.forEach(async (worker, key) => {
-          if (worker.ID === value.ID) {
-            foundTrn = true;
-          }
-        });
-        if (!foundTrn) {
-          reportData.push({ ID: value.ID, NameOrIdValue: value.NameOrIdValue, Count: 0 });
-        }
+const createExpireExpiringData = async (trainingData) => {
+  return trainingData.filter(
+    (trainingWorker, index, self) =>
+      self.findIndex(t => trainingWorker.ID === t.ID) === index
+    ).map(training => {
+      return {
+        ID: training.ID,
+        NameOrIdValue: training.NameOrIdValue,
+        MandatoryCount: 0,
+        NonMandatoryCount: 0,
+        Count: 0
       }
-    });
-  }
+    }
+  );
+
 };
 
 /**
@@ -149,17 +158,51 @@ const createExpireExpiringData = async (trainingData, reportData) => {
  * @return {Object} All customized training report data
  */
 const getTrainingReportData = async establishmentId => {
-  expiredWorkerTrainings = [];
-  expiringWorkerTrainings = [];
+  missingMandatoryTrainingRecords = [];
   const trainingData = await getTrainingData(establishmentId);
-  await createExpireExpiringData(trainingData, expiredWorkerTrainings);
-  await createExpireExpiringData(trainingData, expiringWorkerTrainings);
+  expiredWorkerTrainings = await createExpireExpiringData(trainingData);
+  expiringWorkerTrainings = await createExpireExpiringData(trainingData);
+  const allWorkers = await models.worker.findAll({
+    attributes: ['id', 'uid', 'NameOrIdValue'],
+    where:{
+      establishmentFk: establishmentId,
+      archived: false
+    },
+    include: [
+      {
+        model: models.job,
+        as: 'mainJob',
+        attributes: ['id', 'title']
+      }
+    ]
+  });
+  if(allWorkers && allWorkers.length > 0){
+    for(let i = 0; i < allWorkers.length; i++){
+      const allTrainingRecords = await Training.fetch(establishmentId, allWorkers[i].uid, null);
+      if(allTrainingRecords){
+        allWorkers[i].missingMandatoryTrainingCount = await Training.getAllMissingMandatoryTrainingCounts(establishmentId, allWorkers[i], allTrainingRecords.training);
+      }
+    }
+  }
+  missingMandatoryTrainingRecords = allWorkers;
   trainingCounts.expiredTrainingCount = 0;
   trainingCounts.expiringTrainingCount = 0;
   trainingCounts.upToDateTrainingCount = 0;
+  trainingCounts.expiredMandatoryTrainingCount = 0;
+  trainingCounts.expiredNonMandatoryTrainingCount = 0;
+  trainingCounts.expiringMandatoryTrainingCount = 0;
+  trainingCounts.expiringNonMandatoryTrainingCount = 0;
+  trainingCounts.upToDateMandatoryTrainingCount = 0;
+  trainingCounts.upToDateNonMandatoryTrainingCount = 0;
   if (expiredWorkerTrainings.length > 0 && expiringWorkerTrainings.length > 0) {
     for(let i = 0; i < trainingData.length; i++){
-      trainingData[i].Title = (trainingData[i].Title === null)? '': decodeURIComponent(trainingData[i].Title);
+      let mandatoryTrainingDetails = await getMndatoryTrainingDetails(trainingData[i], establishmentId);
+      if(mandatoryTrainingDetails && +mandatoryTrainingDetails[0].count !== 0){
+        trainingData[i].MandatoryTraining = 'Yes';
+      }else{
+        trainingData[i].MandatoryTraining = 'No';
+      }
+      trainingData[i].Title = (trainingData[i].Title === null)? '': unescape(trainingData[i].Title);
       trainingData[i].Completed = trainingData[i].Completed === null? '': trainingData[i].Completed;
       trainingData[i].Accredited = trainingData[i].Accredited === null? '': trainingData[i].Accredited;
       let jobNameResult = await getJobName(trainingData[i].MainJobFKValue);
@@ -171,31 +214,61 @@ const getTrainingReportData = async establishmentId => {
       if (trainingData[i].Expires && trainingData[i].Expires !== null) {
         let expiringDate = moment(trainingData[i].Expires);
         let currentDate = moment();
-        if (currentDate > expiringDate) {
+        if (currentDate.isAfter(expiringDate, 'day')) {
+          if(trainingData[i].MandatoryTraining === 'Yes'){
+            trainingCounts.expiredMandatoryTrainingCount++;
+          }else{
+            trainingCounts.expiredNonMandatoryTrainingCount++;
+          }
           trainingCounts.expiredTrainingCount++;
           trainingData[i].Status = 'Expired';
           //create expired workers data
           expiredWorkerTrainings.forEach(async worker => {
             if (worker.ID === trainingData[i].ID) {
+              if(trainingData[i].MandatoryTraining === 'Yes'){
+                worker.MandatoryCount++;
+              }else{
+                worker.NonMandatoryCount++;
+              }
               worker.Count++;
             }
           });
         } else if (expiringDate.diff(currentDate, 'days') <= 90) {
+          if(trainingData[i].MandatoryTraining === 'Yes'){
+            trainingCounts.expiringMandatoryTrainingCount++;
+          }else{
+            trainingCounts.expiringNonMandatoryTrainingCount++;
+          }
           trainingCounts.expiringTrainingCount++;
           trainingData[i].Status = 'Expiring soon';
           //create expiring workers data
           expiringWorkerTrainings.forEach(worker => {
             if (worker.ID === trainingData[i].ID) {
+              if(trainingData[i].MandatoryTraining === 'Yes'){
+                worker.MandatoryCount++;
+              }else{
+                worker.NonMandatoryCount++;
+              }
               worker.Count++;
             }
           });
         } else {
           trainingData[i].Status = 'Up-to-date';
           trainingCounts.upToDateTrainingCount++;
+          if(trainingData[i].MandatoryTraining === 'Yes'){
+            trainingCounts.upToDateMandatoryTrainingCount++;
+          }else{
+            trainingCounts.upToDateNonMandatoryTrainingCount++;
+          }
         }
       } else {
         trainingData[i].Status = 'Up-to-date';
         trainingCounts.upToDateTrainingCount++;
+        if(trainingData[i].MandatoryTraining === 'Yes'){
+          trainingCounts.upToDateMandatoryTrainingCount++;
+        }else{
+          trainingCounts.upToDateNonMandatoryTrainingCount++;
+        }
         trainingData[i].ExpiredOn = '';
       }
       updateProps.forEach(prop => {
@@ -204,8 +277,10 @@ const getTrainingReportData = async establishmentId => {
         }
       });
     }
+
     expiredWorkerTrainings = expiredWorkerTrainings.filter(item => item.Count !==0);
     expiringWorkerTrainings = expiringWorkerTrainings.filter(item => item.Count !==0);
+    missingMandatoryTrainingRecords = missingMandatoryTrainingRecords.filter(item => item.missingMandatoryTrainingCount !==0);
     let expiredOrExpiringWorkerIds = new Set(expiredWorkerTrainings.map(d => d.ID));
     expiredOrExpiringWorkerRecords = [...expiredWorkerTrainings, ...expiringWorkerTrainings.filter(d => !expiredOrExpiringWorkerIds.has(d.ID))];
   }else{
@@ -221,31 +296,33 @@ const styleLookup = {
   BLACK: {
     OVRREGULAR: {
       A: 2,
-      B: 6,
+      B: 2,
       C: 2,
-      // D: 2,
-      // E: 2,
       D: 2,
       E: 2,
-      F: 11,
+      F: 2,
+      G: 2,
+      H: 11,
       // G: 1,
-      H: 12,
       I: 12,
       J: 12,
+      K: 12,
+      L: 12,
     },
     OVRLAST: {
       A: 2,
-      B: 16,
+      B: 2,
       C: 2,
-      // D: 2,
-      // E: 2,
       D: 2,
       E: 2,
-      F: 21,
+      F: 2,
+      G: 2,
+      H: 21,
       //G: 22,
-      H: 22,
       I: 22,
       J: 22,
+      K: 22,
+      L: 22,
     },
     TRNREGULAR: {
       A: 8,
@@ -273,31 +350,31 @@ const styleLookup = {
   RED: {
     OVRREGULAR: {
       A: 2,
-      B: 6,
-      C: 7,
-      // D: 67,
-      // E: 9,
-      D: 67,
+      B: 2,
+      C: 2,
+      D: 2,
       E: 9,
-      F: 65,
-      G: 11,
-      H: 21,
-      I: 12,
-      J: 66,
+      F: 67,
+      G: 9,
+      H: 65,
+      I: 11,
+      J: 21,
+      K: 12,
+      L: 66,
     },
     OVRLAST: {
       A: 2,
-      B: 16,
-      C: 17,
-      // D: 67,
-      // E: 19,
-      D: 67,
+      B: 2,
+      C: 2,
+      D: 2,
       E: 19,
-      F: 66,
-      G: 22,
-      H: 22,
-      I: 66,
-      J: 66,
+      F: 67,
+      G: 19,
+      H: 66,
+      I: 22,
+      J: 22,
+      K: 66,
+      L: 66,
     },
     TRNREGULAR: {
       A: 10,
@@ -332,7 +409,7 @@ const styleLookup = {
  * @param {Boolean} isRed
  */
 const setStyle = (cellToChange, columnText, rowType, isRed) => {
-  cellToChange.setAttribute('s', styleLookup[isRed ? 'RED' : 'BLACK'][rowType][columnText]);
+  cellToChange.attr('s', styleLookup[isRed ? 'RED' : 'BLACK'][rowType][columnText]);
 };
 /**
  * Helper function used to set column's font style according to column value
@@ -382,80 +459,205 @@ const updateOverviewSheet = (
     sharedStringsUniqueCount,
     sharedStringsCount
   );
+
+  //insert total sum records in all three tables data
+  let expiringMandatoryCounts = 0;
+  let expiringNonMandatoryCounts = 0;
+  let expiringTotalCounts = 0;
+  for(let i = 0; i < expiringWorkerTrainings.length; i++){
+    expiringMandatoryCounts = expiringMandatoryCounts + expiringWorkerTrainings[i].MandatoryCount;
+    expiringNonMandatoryCounts = expiringNonMandatoryCounts + expiringWorkerTrainings[i].NonMandatoryCount;
+    expiringTotalCounts = expiringTotalCounts + expiringWorkerTrainings[i].Count;
+  }
+  expiringWorkerTrainings.push({ ID: -1, NameOrIdValue: 'Total', MandatoryCount: expiringMandatoryCounts, NonMandatoryCount: expiringNonMandatoryCounts, Count: expiringTotalCounts});
+  let expiredMandatoryCounts = 0;
+  let expiredNonMandatoryCounts = 0;
+  let expiredTotalCounts = 0;
+  for(let i = 0; i < expiredWorkerTrainings.length; i++){
+    expiredMandatoryCounts = expiredMandatoryCounts + expiredWorkerTrainings[i].MandatoryCount;
+    expiredNonMandatoryCounts = expiredNonMandatoryCounts + expiredWorkerTrainings[i].NonMandatoryCount;
+    expiredTotalCounts = expiredTotalCounts + expiredWorkerTrainings[i].Count;
+  }
+  expiredWorkerTrainings.push({ ID: -1, NameOrIdValue: 'Total', MandatoryCount: expiredMandatoryCounts, NonMandatoryCount: expiredNonMandatoryCounts, Count: expiredTotalCounts});
+
+  let totalMissingMandatoryTrainingCount = 0;
+  for(let i = 0; i < missingMandatoryTrainingRecords.length; i++){
+    missingMandatoryTrainingRecords[i].count = 'Non applicable';
+    totalMissingMandatoryTrainingCount = totalMissingMandatoryTrainingCount + missingMandatoryTrainingRecords[i].missingMandatoryTrainingCount;
+  }
+  missingMandatoryTrainingRecords.push({ ID: -1, NameOrIdValue: 'Total', missingMandatoryTrainingCount: totalMissingMandatoryTrainingCount, count: 0});
+  // put total expired mandatory training count
+  putString(overviewSheet("c[r='B3']"), trainingCounts.expiredMandatoryTrainingCount);
+  // put total expired non mandatory training count
+  putString(overviewSheet("c[r='C3']"), trainingCounts.expiredNonMandatoryTrainingCount);
   // put total expired training count
-  putString(overviewSheet.querySelector("c[r='D6']"), trainingCounts.expiredTrainingCount);
+  putString(overviewSheet("c[r='D3']"), trainingCounts.expiredTrainingCount);
+  // put total up-to-date mandatory training count
+  putString(overviewSheet("c[r='B2']"), trainingCounts.upToDateMandatoryTrainingCount);
+  // put total up-to-date non mandatory training count
+  putString(overviewSheet("c[r='C2']"), trainingCounts.upToDateNonMandatoryTrainingCount);
   // put total up-to-date training count
-  putString(overviewSheet.querySelector("c[r='D5']"), trainingCounts.upToDateTrainingCount);
+  putString(overviewSheet("c[r='D2']"), trainingCounts.upToDateTrainingCount);
+
+  // put total expiring soon mandatory training count
+  putString(overviewSheet("c[r='B4']"), trainingCounts.expiringMandatoryTrainingCount);
+  // put total expiring soon non mandatory training count
+  putString(overviewSheet("c[r='C4']"), trainingCounts.expiringNonMandatoryTrainingCount);
+  // put total expiring soon training count
+  putString(overviewSheet("c[r='D4']"), trainingCounts.expiringTrainingCount);
+
+  // put total missing mandatory training count
+  putString(overviewSheet("c[r='B5']"), totalMissingMandatoryTrainingCount);
+  // put total missing non mandatory training count
+  putString(overviewSheet("c[r='C5']"), 'Non applicable');
+  // put total missing training count
+  putString(overviewSheet("c[r='D5']"), totalMissingMandatoryTrainingCount);
 
+  // put total expiring soon/expired mandatory training count
   putString(
-    overviewSheet.querySelector("c[r='G5']"),
-    `You have ${trainingCounts.expiredTrainingCount} expired training records`
+    overviewSheet("c[r='B6']"),
+    `${trainingCounts.expiredMandatoryTrainingCount + trainingCounts.expiringMandatoryTrainingCount + trainingCounts.upToDateMandatoryTrainingCount + totalMissingMandatoryTrainingCount}`
   );
-  overviewSheet.querySelector("c[r='G5']").setAttribute('s', 32);
 
-  // put total expiring soon training count
-  putString(overviewSheet.querySelector("c[r='D7']"), trainingCounts.expiringTrainingCount);
+  // put total expiring soon/expired non mandatory training count
   putString(
-    overviewSheet.querySelector("c[r='G7']"),
-    `You have ${trainingCounts.expiringTrainingCount} records expiring soon`
+    overviewSheet("c[r='C6']"),
+    `${trainingCounts.expiredNonMandatoryTrainingCount + trainingCounts.expiringNonMandatoryTrainingCount + trainingCounts.upToDateNonMandatoryTrainingCount}`
   );
-  overviewSheet.querySelector("c[r='G7']").setAttribute('s', 33);
 
   // put total expiring soon/expired training count
   putString(
-    overviewSheet.querySelector("c[r='D8']"),
-    `${trainingCounts.expiredTrainingCount + trainingCounts.expiringTrainingCount + trainingCounts.upToDateTrainingCount}`
+    overviewSheet("c[r='D6']"),
+    `${trainingCounts.expiredTrainingCount + trainingCounts.expiringTrainingCount + trainingCounts.upToDateTrainingCount + totalMissingMandatoryTrainingCount}`
   );
 
-  putString(
-    overviewSheet.querySelector("c[r='G9']"),
-    `You have ${expiredOrExpiringWorkerRecords.length} staff members with expired or`
-  );
-  overviewSheet.querySelector("c[r='G9']").setAttribute('s', 34);
+  //put all missing mandatory traing details
+  let currentRowMandatory = overviewSheet("row[r='18']");
+  let rowIndexMandatory = 18;
+  let updateMandatoryRowIndex = rowIndexMandatory + (expiredWorkerTrainings.length - 1) + (expiringWorkerTrainings.length-1);
+  for (; rowIndexMandatory >= 15; rowIndexMandatory--, updateMandatoryRowIndex--) {
 
-  putString(overviewSheet.querySelector("c[r='G10']"), `expiring training records`);
-  overviewSheet.querySelector("c[r='G10']").setAttribute('s', 35);
+    if (currentRowMandatory.children('c').length) {
+      currentRowMandatory.children('c').each((index, element) => {
+        overviewSheet(element).attr('r', String(overviewSheet(element).attr('r')).replace(/\d+$/, '') + updateMandatoryRowIndex);
+      });
+    }
 
-  //put all expiring traing details
-  let currentRowBottom = overviewSheet.querySelector("row[r='18']");
-  let rowIndexBottom = 18;
-  let updateRowIndex = rowIndexBottom + expiredWorkerTrainings.length - 1;
-  for (; rowIndexBottom >= 14; rowIndexBottom--, updateRowIndex--) {
-    if (rowIndexBottom === 18) {
-      // fix the dimensions tag value
-      const dimension = overviewSheet.querySelector('dimension');
-      dimension.setAttribute('ref', String(dimension.getAttribute('ref')).replace(/\d+$/, '') + updateRowIndex);
+    currentRowMandatory.attr('r', updateMandatoryRowIndex);
+
+    if (currentRowMandatory.prev().length !== 0) {
+      currentRowMandatory = currentRowMandatory.prev();
+      if(currentRowMandatory.name === 'row') {
+        break;
+      }
     }
+  }
 
-    currentRowBottom.querySelectorAll('c').forEach(elem => {
-      elem.setAttribute('r', String(elem.getAttribute('r')).replace(/\d+$/, '') + updateRowIndex);
-    });
+  let bottomMandatoryRowIndex = 18 + (expiredWorkerTrainings.length - 1) + (expiringWorkerTrainings.length-1);
+  const templateRowMissing = overviewSheet(`row[r='${bottomMandatoryRowIndex}']`);
+  let currentRowMissing = templateRowMissing;
+  let rowIndexMissing = bottomMandatoryRowIndex + 1;
+  if (missingMandatoryTrainingRecords.length > 0) {
+    for (let i = 0; i < missingMandatoryTrainingRecords.length - 1; i++) {
+      const tempRowBottomMissing = templateRowMissing.clone(true);
+
+      tempRowBottomMissing.attr('r', rowIndexMissing);
+
+      tempRowBottomMissing.children('c').each((index, element) => {
+        overviewSheet(element).attr('r', String(overviewSheet(element).attr('r')).replace(/\d+$/, '') + rowIndexMissing);
+      });
+
+      currentRowMissing.after(tempRowBottomMissing);
+
+      currentRowMissing = tempRowBottomMissing;
+      rowIndexMissing++;
+    }
+
+    currentRowMissing = templateRowMissing;
+  }
+
+  // fix the dimensions tag value
+  const dimension = overviewSheet('dimension');
+  dimension.attr('ref', String(dimension.attr('ref')).replace(/\d+$/, '') + rowIndexMissing);
+
+  // update the cell values
+  for (let row = 0; row < missingMandatoryTrainingRecords.length; row++) {
+    debuglog('updating training sheet', row);
+    const rowType = row === missingMandatoryTrainingRecords.length - 1 ? 'OVRLAST' : 'OVRREGULAR';
+    let nextSibling = {};
 
-    currentRowBottom.setAttribute('r', updateRowIndex);
+    for (let column = 0; column < 4; column++) {
+      const columnText = String.fromCharCode(column + 65);
+      const cellToChange = currentRowMissing.children(`c[r='${columnText}${bottomMandatoryRowIndex + row}']`);
+      switch (columnText) {
+        case 'A':
+          {
+            basicValidationUpdate(
+              putString,
+              cellToChange,
+              missingMandatoryTrainingRecords[row].NameOrIdValue,
+              columnText,
+              rowType
+            );
+          }
+          break;
+        case 'B':
+          {
+            basicValidationUpdate(putString, cellToChange, missingMandatoryTrainingRecords[row].missingMandatoryTrainingCount, columnText, rowType);
+          }
+          break;
+        case 'C':
+          {
+            basicValidationUpdate(putString, cellToChange, missingMandatoryTrainingRecords[row].count, columnText, rowType);
+          }
+          break;
+        case 'D':
+          {
+            basicValidationUpdate(putString, cellToChange, missingMandatoryTrainingRecords[row].missingMandatoryTrainingCount, columnText, rowType);
+          }
+          break;
+      }
+    }
 
-    while (currentRowBottom.previousSibling !== null) {
-      currentRowBottom = currentRowBottom.previousSibling;
+    currentRowMissing = currentRowMissing.next();
+  }
 
-      if (currentRowBottom.nodeName === 'row') {
+  //put all expiring traing details
+  let currentRowBottom = overviewSheet("row[r='14']");
+  let rowIndexBottom = 14;
+  let updateRowIndex = rowIndexBottom + expiredWorkerTrainings.length - 1;
+  for (; rowIndexBottom >= 11; rowIndexBottom--, updateRowIndex--) {
+
+    if (currentRowBottom.children('c').length) {
+      currentRowBottom.children('c').each((index, element) => {
+        overviewSheet(element).attr('r', String(overviewSheet(element).attr('r')).replace(/\d+$/, '') + updateRowIndex);
+      });
+    }
+
+    currentRowBottom.attr('r', updateRowIndex);
+
+    if (currentRowBottom.prev().length !== 0) {
+      currentRowBottom = currentRowBottom.prev();
+      if(currentRowBottom.name === 'row') {
         break;
       }
     }
   }
 
-  let bottomRowIndex = 18 + expiredWorkerTrainings.length - 1;
-  const templateRowExpiring = overviewSheet.querySelector(`row[r='${bottomRowIndex}']`);
+  let bottomRowIndex = 14 + expiredWorkerTrainings.length - 1;
+  const templateRowExpiring = overviewSheet(`row[r='${bottomRowIndex}']`);
   let currentRowExpiring = templateRowExpiring;
   let rowIndexExpiring = bottomRowIndex + 1;
   if (expiringWorkerTrainings.length > 0) {
     for (let i = 0; i < expiringWorkerTrainings.length - 1; i++) {
-      const tempRowBottom = templateRowExpiring.cloneNode(true);
-      tempRowBottom.setAttribute('r', rowIndexExpiring);
+      const tempRowBottom = templateRowExpiring.clone(true);
+      tempRowBottom.attr('r', rowIndexExpiring);
 
-      tempRowBottom.querySelectorAll('c').forEach(elem => {
-        elem.setAttribute('r', String(elem.getAttribute('r')).replace(/\d+$/, '') + rowIndexExpiring);
+      tempRowBottom.children('c').each((index, element) => {
+        overviewSheet(element).attr('r', String(overviewSheet(element).attr('r')).replace(/\d+$/, '') + rowIndexExpiring);
       });
 
-      templateRowExpiring.parentNode.insertBefore(tempRowBottom, currentRowExpiring.nextSibling);
+      currentRowExpiring.after(tempRowBottom);
       currentRowExpiring = tempRowBottom;
       rowIndexExpiring++;
     }
@@ -463,25 +665,17 @@ const updateOverviewSheet = (
     currentRowExpiring = templateRowExpiring;
   }
 
-  // fix the dimensions tag value
-  const dimension = overviewSheet.querySelector('dimension');
-  dimension.setAttribute('ref', String(dimension.getAttribute('ref')).replace(/\d+$/, '') + rowIndexExpiring);
-
   // update the cell values
   for (let row = 0; row < expiringWorkerTrainings.length; row++) {
     debuglog('updating training sheet', row);
     const rowType = row === expiringWorkerTrainings.length - 1 ? 'OVRLAST' : 'OVRREGULAR';
     let nextSibling = {};
 
-    for (let column = 0; column < 8; column++) {
+    for (let column = 0; column < 4; column++) {
       const columnText = String.fromCharCode(column + 65);
-
-      const cellToChange =
-        typeof nextSibling.querySelector === 'function'
-          ? nextSibling
-          : currentRowExpiring.querySelector(`c[r='${columnText}${row + bottomRowIndex}']`);
+      const cellToChange = currentRowExpiring.children(`c[r='${columnText}${row + bottomRowIndex}']`);
       switch (columnText) {
-        case 'C':
+        case 'A':
           {
             basicValidationUpdate(
               putString,
@@ -492,34 +686,42 @@ const updateOverviewSheet = (
             );
           }
           break;
+        case 'B':
+          {
+            basicValidationUpdate(putString, cellToChange, expiringWorkerTrainings[row].MandatoryCount, columnText, rowType);
+          }
+          break;
+        case 'C':
+          {
+            basicValidationUpdate(putString, cellToChange, expiringWorkerTrainings[row].NonMandatoryCount, columnText, rowType);
+          }
+          break;
         case 'D':
           {
             basicValidationUpdate(putString, cellToChange, expiringWorkerTrainings[row].Count, columnText, rowType);
           }
           break;
       }
-
-      nextSibling = cellToChange ? cellToChange.nextSibling : {};
     }
 
-    currentRowExpiring = currentRowExpiring.nextSibling;
+    currentRowExpiring = currentRowExpiring.next();
   }
 
   //put all expired training details
   // clone the row the apropriate number of times
-  const templateRow = overviewSheet.querySelector("row[r='13']");
+  const templateRow = overviewSheet("row[r='10']");
   let currentRow = templateRow;
-  let rowIndex = 14;
+  let rowIndex = 11;
   if (expiredWorkerTrainings.length > 0) {
     for (let i = 0; i < expiredWorkerTrainings.length - 1; i++) {
-      const tempRow = templateRow.cloneNode(true);
-      tempRow.setAttribute('r', rowIndex);
+      const tempRow = templateRow.clone(true);
+      tempRow.attr('r', rowIndex);
 
-      tempRow.querySelectorAll('c').forEach(elem => {
-        elem.setAttribute('r', String(elem.getAttribute('r')).replace(/\d+$/, '') + rowIndex);
+      tempRow.children('c').each((index, element) => {
+        overviewSheet(element).attr('r', String(overviewSheet(element).attr('r')).replace(/\d+$/, '') + rowIndex);
       });
 
-      templateRow.parentNode.insertBefore(tempRow, currentRow.nextSibling);
+      currentRow.after(tempRow);
       currentRow = tempRow;
       rowIndex++;
     }
@@ -535,13 +737,9 @@ const updateOverviewSheet = (
 
     for (let column = 0; column < 10; column++) {
       const columnText = String.fromCharCode(column + 65);
-
-      const cellToChange =
-        typeof nextSibling.querySelector === 'function'
-          ? nextSibling
-          : currentRow.querySelector(`c[r='${columnText}${row + 13}']`);
+      const cellToChange = currentRow.children(`c[r='${columnText}${row + 10}']`);
       switch (columnText) {
-        case 'C':
+        case 'A':
           {
             basicValidationUpdate(
               putString,
@@ -552,17 +750,24 @@ const updateOverviewSheet = (
             );
           }
           break;
+        case 'B':
+          {
+            basicValidationUpdate(putString, cellToChange, expiredWorkerTrainings[row].MandatoryCount, columnText, rowType);
+          }
+          break;
+        case 'C':
+          {
+            basicValidationUpdate(putString, cellToChange, expiredWorkerTrainings[row].NonMandatoryCount, columnText, rowType);
+          }
+          break;
         case 'D':
           {
             basicValidationUpdate(putString, cellToChange, expiredWorkerTrainings[row].Count, columnText, rowType);
           }
           break;
       }
-
-      nextSibling = cellToChange ? cellToChange.nextSibling : {};
     }
-
-    currentRow = currentRow.nextSibling;
+    currentRow = currentRow.next();
   }
 
   debuglog('overview updated');
@@ -599,21 +804,22 @@ const updateTrainingsSheet = (
   );
 
   // clone the row the apropriate number of times
-  const templateRow = trainingsSheet.querySelector("row[r='2']");
+  const templateRow = trainingsSheet("row[r='2']");
   let currentRow = templateRow;
   let rowIndex = 3;
   let trainingArray = reportData.trainings;
   if (trainingArray.length > 1) {
     for (let i = 0; i < trainingArray.length - 1; i++) {
-      const tempRow = templateRow.cloneNode(true);
+      const tempRow = templateRow.clone(true);
 
-      tempRow.setAttribute('r', rowIndex);
+      tempRow.attr('r', rowIndex);
 
-      tempRow.querySelectorAll('c').forEach(elem => {
-        elem.setAttribute('r', String(elem.getAttribute('r')).replace(/\d+$/, '') + rowIndex);
+      tempRow.children('c').each((index, element) => {
+        trainingsSheet(element).attr('r', String(trainingsSheet(element).attr('r')).replace(/\d+$/, '') + rowIndex);
       });
 
-      templateRow.parentNode.insertBefore(tempRow, currentRow.nextSibling);
+      currentRow.after(tempRow);
+
       currentRow = tempRow;
       rowIndex++;
     }
@@ -622,11 +828,11 @@ const updateTrainingsSheet = (
   }
 
   // fix the last row in the table
-  trainingsSheet.querySelector('sheetData row:last-child').setAttribute('r', rowIndex);
+  trainingsSheet('sheetData row:last-child').attr('r', rowIndex);
 
   // fix the dimensions tag value
-  const dimension = trainingsSheet.querySelector('dimension');
-  dimension.setAttribute('ref', String(dimension.getAttribute('ref')).replace(/\d+$/, '') + rowIndex);
+  const dimension = trainingsSheet('dimension');
+  dimension.attr('ref', String(dimension.attr('ref')).replace(/\d+$/, '') + rowIndex);
 
   // update the cell values
   for (let row = 0; row < trainingArray.length; row++) {
@@ -639,10 +845,7 @@ const updateTrainingsSheet = (
       const columnText = String.fromCharCode(column + 65);
       const isRed = false;
 
-      const cellToChange =
-        typeof nextSibling.querySelector === 'function'
-          ? nextSibling
-          : currentRow.querySelector(`c[r='${columnText}${row + 2}']`);
+      const cellToChange = currentRow.children(`c[r='${columnText}${row + 2}']`);
       switch (columnText) {
         case 'A':
           {
@@ -670,7 +873,7 @@ const updateTrainingsSheet = (
 
         case 'E':
           {
-            putString(trainingsSheet.querySelector(`c[r='${columnText}${row + 2}']`), trainingArray[row].Status);
+            putString(trainingsSheet(`c[r='${columnText}${row + 2}']`), trainingArray[row].Status);
             let styleCol;
             if (trainingArray[row].Status === 'Up-to-date') {
               styleCol = 19;
@@ -681,33 +884,30 @@ const updateTrainingsSheet = (
             } else {
               styleCol = 20;
             }
-            trainingsSheet.querySelector(`c[r='${columnText}${row + 2}']`).setAttribute('s', styleCol);
+            trainingsSheet(`c[r='${columnText}${row + 2}']`).attr('s', styleCol);
           }
           break;
 
-        case 'F':
-          {
-            basicValidationUpdate(putString, cellToChange, trainingArray[row].ExpiredOn, columnText, rowType);
-          }
-          break;
+          case 'F':
+            {
+              basicValidationUpdate(putString, cellToChange, trainingArray[row].ExpiredOn, columnText, rowType);
+            }
+            break;
 
-        case 'G':
-          {
-            basicValidationUpdate(putString, cellToChange, trainingArray[row].Completed, columnText, rowType);
-          }
-          break;
+          case 'G':
+            {
+              basicValidationUpdate(putString, cellToChange, trainingArray[row].Completed, columnText, rowType);
+            }
+            break;
 
-        case 'H':
-          {
-            basicValidationUpdate(putString, cellToChange, trainingArray[row].Accredited, columnText, rowType);
-          }
-          break;
+          case 'H':
+            {
+              basicValidationUpdate(putString, cellToChange, trainingArray[row].Accredited, columnText, rowType);
+            }
+            break
       }
-
-      nextSibling = cellToChange ? cellToChange.nextSibling : {};
     }
-
-    currentRow = currentRow.nextSibling;
+    currentRow = currentRow.next();
   }
 
   debuglog('trainings updated');
@@ -785,49 +985,36 @@ const getReport = async (date, thisEstablishment) => {
       debuglog('all files read');
 
       if (sharedStrings) {
-        const sst = sharedStrings.querySelector('sst');
+        const sst = sharedStrings('sst');
 
-        const sharedStringsUniqueCount = [parseInt(sst.getAttribute('uniqueCount'), 10)];
-        const sharedStringsCount = [parseInt(sst.getAttribute('count'), 10)];
+        const sharedStringsUniqueCount = [parseInt(sst.attr('uniqueCount'), 10)];
+        const sharedStringsCount = [parseInt(sst.attr('count'), 10)];
 
         // update the overview sheet with the report data and add it to the zip
-        outputZip.file(
-          overviewSheetName,
-          serializeXML(
-            updateOverviewSheet(
-              overviewSheet,
-              sharedStrings,
-              sst,
-              sharedStringsUniqueCount, // pass unique count by reference rather than by value
-              sharedStringsCount
-            )
-          )
-        );
-
-        //outputZip.file(establishmentsSheetName, serializeXML(establishmentsSheet));
-        //outputZip.file(trainingsSheetName, serializeXML(updateTrainingsSheet));
+        outputZip.file(overviewSheetName, updateOverviewSheet(
+          overviewSheet,
+          sharedStrings,
+          sst,
+          sharedStringsUniqueCount, // pass unique count by reference rather than by value
+          sharedStringsCount
+        ).xml());
 
         // update the trainings sheet with the report data and add it to the zip
-        outputZip.file(
-          trainingsSheetName,
-          serializeXML(
-            updateTrainingsSheet(
-              trainingsSheet,
-              reportData,
-              sharedStrings,
-              sst,
-              sharedStringsUniqueCount, // pass unique count by reference rather than by value
-              sharedStringsCount
-            )
-          )
-        );
+        outputZip.file(trainingsSheetName, updateTrainingsSheet(
+          trainingsSheet,
+          reportData,
+          sharedStrings,
+          sst,
+          sharedStringsUniqueCount, // pass unique count by reference rather than by value
+          sharedStringsCount
+        ).xml());
 
         // update the shared strings counts we've been keeping track of
-        sst.setAttribute('uniqueCount', sharedStringsUniqueCount[0]);
-        sst.setAttribute('count', sharedStringsCount[0]);
+        sst.attr('uniqueCount', sharedStringsUniqueCount[0]);
+        sst.attr('count', sharedStringsCount[0]);
 
         // add the updated shared strings to the zip
-        outputZip.file(sharedStringsName, serializeXML(sharedStrings));
+        outputZip.file(sharedStringsName, sharedStrings.xml());
       }
 
       debuglog('training report: creating zip file');
diff --git a/server/routes/reports/wdf/parent.js b/server/routes/reports/wdf/parent.js
index e11f3e8f7b..77ba65610f 100644
--- a/server/routes/reports/wdf/parent.js
+++ b/server/routes/reports/wdf/parent.js
@@ -9,7 +9,9 @@ const walk = require('walk');
 const JsZip = require('jszip');
 const config = require('../../../../server/config/config');
 const uuid = require('uuid');
-const AWS = require('aws-sdk')
+const AWS = require('aws-sdk');
+const cheerio = require('cheerio');
+
 const s3 = new AWS.S3({
   region: String(config.get('bulkupload.region'))
 });
@@ -27,7 +29,7 @@ const workersSheetName = path.join('xl', 'worksheets', 'sheet3.xml');
 const sharedStringsName = path.join('xl', 'sharedStrings.xml');
 const schema = 'http://schemas.openxmlformats.org/spreadsheetml/2006/main';
 const isNumberRegex = /^[0-9]+(\.[0-9]+)?$/;
-//const debuglog = console.log.bind(console);
+// const debuglog = console.log.bind(console);
 const debuglog = () => {};
 
 const buStates = [
@@ -47,11 +49,11 @@ const buStates = [
 const { DOMParser, XMLSerializer } = new (require('jsdom').JSDOM)().window;
 
 const parseXML = fileContent =>
-  (new DOMParser()).parseFromString(fileContent.toString('utf8'), 'application/xml');
-
-const serializeXML = dom =>
-  '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n' +
-  (new XMLSerializer()).serializeToString(dom);
+  cheerio.load(fileContent, {
+    xml: {
+      normalizeWhitespace: true,
+    }
+  });
 
 // helper function to set a spreadsheet cell's value
 const putStringTemplate = (
@@ -62,31 +64,36 @@ const putStringTemplate = (
   element,
   value
 ) => {
-  let vTag = element.querySelector('v');
-  const hasVTag = vTag !== null;
+  let vTag = element.children('v').first();
+  let hasVTag = true;
+  if (element.children('v').length === 0) {
+    hasVTag = false;
+  }
+
   const textValue = String(value);
   const isNumber = isNumberRegex.test(textValue);
 
   if (!hasVTag) {
-    vTag = sheetDoc.createElementNS(schema, 'v');
+    vTag = sheetDoc('<v></v>');
+    vTag.text(sharedStringsUniqueCount[0]);
 
-    element.appendChild(vTag);
+    element.append(vTag);
+  } else {
+    vTag.text(sharedStringsUniqueCount[0]);
   }
 
   if (isNumber) {
-    element.removeAttribute('t');
-    vTag.textContent = textValue;
+    element.attr('t', '');
+    vTag.text(textValue);
   } else {
-    element.setAttribute('t', 's');
-
-    const si = stringsDoc.createElementNS(schema, 'si');
-    const t = stringsDoc.createElementNS(schema, 't');
+    element.attr('t', 's');
 
-    sst.appendChild(si);
-    si.appendChild(t);
+    const si = stringsDoc('<si></si>');
+    const t = stringsDoc('<t></t>');
+    t.text(textValue);
 
-    t.textContent = textValue;
-    vTag.textContent = sharedStringsUniqueCount[0];
+    sst.append(si);
+    si.append(t);
 
     sharedStringsUniqueCount[0] += 1;
   }
@@ -103,8 +110,7 @@ const getReportData = async (date, thisEstablishment) => {
   };
 };
 
-const propsNeededToComplete = ('MainService,EmployerTypeValue,Capacities,ServiceUsers,' +
-'NumberOfStaffValue').split(',');
+const propsNeededToComplete = ('MainService,EmployerTypeValue,Capacities,Utilisations,ServiceUsers,NumberOfStaffValue,Vacancies,Starters,Leavers').split(',');
 
 const getEstablishmentReportData = async establishmentId => {
   const establishmentReturnData = await getEstablishmentData(establishmentId);
@@ -162,14 +168,6 @@ const getEstablishmentReportData = async establishmentId => {
       value.SubsidiarySharingPermissions = 'None';
     }
 
-    value.EstablishmentDataFullyCompleted = 'Yes';
-
-    propsNeededToComplete.forEach(prop => {
-      if (value[prop] === null) {
-        value.EstablishmentDataFullyCompleted = 'No';
-      }
-    });
-
     value.CurrentWdfEligibilityStatus = value.CurrentWdfEligibilityStatus === null ? 'Not Eligible' : 'Eligible';
 
     if (value.DateEligibilityAchieved === null) {
@@ -186,8 +184,9 @@ const getEstablishmentReportData = async establishmentId => {
     } else {
       value.PercentageOfWorkerRecords = '0.0%';
     }
-
-    if(value.VacanciesValue === 'None' || value.VacanciesValue === null){
+    if (value.VacanciesValue === null) {
+      value.Vacancies = 'Missing';
+    }else if(value.VacanciesValue === 'None'){
       value.Vacancies = 0;
     }else if(value.VacanciesValue === "Don't know"){
       value.Vacancies =  "Don't know";
@@ -195,15 +194,18 @@ const getEstablishmentReportData = async establishmentId => {
       value.Vacancies = (value.VacanciesCount === null)? 'Missing':  value.VacanciesCount;
     }
 
-    if(value.StartersValue === 'None' || value.StartersValue === null){
+    if (value.StartersValue === null) {
+      value.Starters = 'Missing';
+    }else if(value.StartersValue === 'None'){
       value.Starters = 0;
     }else if(value.StartersValue === "Don't know"){
       value.Starters =  "Don't know";
     }else if(value.StartersValue === "With Jobs"){
       value.Starters = (value.StartersCount === null)? 'Missing':  value.StartersCount;
     }
-
-    if(value.LeaversValue === 'None' || value.LeaversValue === null){
+    if (value.LeaversValue === null) {
+      value.Leavers = 'Missing';
+    }else if(value.LeaversValue === 'None'){
       value.Leavers = 0;
     }else if(value.LeaversValue === "Don't know"){
       value.Leavers =  "Don't know";
@@ -230,6 +232,14 @@ const getEstablishmentReportData = async establishmentId => {
       (value.CompletedWorkerRecords === 0 || value.NumberOfStaffValue === 0 || value.NumberOfStaffValue === null)
         ? '0.0%'
         : `${parseFloat(+value.CompletedWorkerRecords / +value.NumberOfStaffValue * 100).toFixed(1)}%`;
+
+    value.EstablishmentDataFullyCompleted = 'Yes';
+
+    propsNeededToComplete.forEach(prop => {
+      if (value[prop] === null || value[prop] === '' || value[prop] === 'Missing') {
+        value.EstablishmentDataFullyCompleted = 'No';
+      }
+    });
   }
 
   return establishmentData;
@@ -292,6 +302,10 @@ const getWorkersReportData = async establishmentId => {
       }
     }
 
+    if(value.ContractValue === 'Agency' || value.ContractValue === 'Pool/Bank'){
+      value.DaysSickValue = 'N/A';
+    }
+
     updateProps.forEach(prop => {
       if (value[prop] === null) {
         value[prop] = 'Missing';
@@ -522,7 +536,7 @@ const styleLookup = {
 };
 
 const setStyle = (cellToChange, columnText, rowType, isRed) => {
-  cellToChange.setAttribute('s', styleLookup[isRed ? 'RED' : 'BLACK'][rowType][columnText]);
+  cellToChange.attr('s', styleLookup[isRed ? 'RED' : 'BLACK'][rowType][columnText]);
 };
 
 const basicValidationUpdate = (putString, cellToChange, value, columnText, rowType, percentColumn = false) => {
@@ -561,48 +575,44 @@ const updateOverviewSheet = (
 
   // set headers
   putString(
-    overviewSheet.querySelector("c[r='B6']"),
+    overviewSheet("c[r='B6']"),
     `Parent name : ${reportData.parentName}`
   );
 
   putString(
-    overviewSheet.querySelector("c[r='B7']"),
+    overviewSheet("c[r='B7']"),
     `Date: ${moment(reportData.date).format('DD/MM/YYYY')}`
   );
 
-  const templateRow = overviewSheet.querySelector("row[r='11']");
+  const templateRow = overviewSheet("row[r='11']");
 
-  // move the footer rows down appropriately
-  //no rows = -1
-  //one row = 0
-  //two rows = 1
-  let currentRow = overviewSheet.querySelector("row[r='16']");
+  let currentRow = overviewSheet("row[r='16']");
   let rowIndex = 16;
   let updateRowIndex = 16 + reportData.establishments.length - 1;
-
+  // Move the information at the bottom to the correct place
   for(; rowIndex > 11; rowIndex--, updateRowIndex--) {
     if(rowIndex === 16) {
       // fix the dimensions tag value
-      const dimension = overviewSheet.querySelector('dimension');
-      dimension.setAttribute('ref', String(dimension.getAttribute('ref')).replace(/\d+$/, '') + updateRowIndex);
+      const dimension = overviewSheet('dimension');
+      dimension.attr('ref', String(dimension.attr('ref')).replace(/\d+$/, '') + updateRowIndex);
+    }
+    if (currentRow.children('c').length) {
+      currentRow.children('c').each((index, element) => {
+        overviewSheet(element).attr('r', String(overviewSheet(element).attr('r')).replace(/\d+$/, '') + updateRowIndex);
+      });
     }
 
-    currentRow.querySelectorAll('c').forEach(elem => {
-      elem.setAttribute('r', String(elem.getAttribute('r')).replace(/\d+$/, '') + updateRowIndex);
-    });
-
-    currentRow.setAttribute('r', updateRowIndex);
+    currentRow.attr('r', updateRowIndex);
 
-    const mergeCell = overviewSheet.querySelector(`mergeCell[ref='B${rowIndex}:L${rowIndex}']`);
+    const mergeCell = overviewSheet(`mergeCell[ref='B${rowIndex}:L${rowIndex}']`);
 
     if(mergeCell !== null) {
-      mergeCell.setAttribute('ref', `B${updateRowIndex}:L${updateRowIndex}`);
+      mergeCell.attr('ref', `B${updateRowIndex}:L${updateRowIndex}`);
     }
 
-    while(currentRow.previousSibling !== null) {
-      currentRow = currentRow.previousSibling;
-
-      if(currentRow.nodeName === 'row') {
+    if (currentRow.prev().length !== 0) {
+      currentRow = currentRow.prev();
+      if(currentRow.name === 'row') {
         break;
       }
     }
@@ -616,15 +626,15 @@ const updateOverviewSheet = (
 
   if (reportData.establishments.length > 1) {
     for (let i = 0; i < (reportData.establishments.length - 1); i++) {
-      const tempRow = templateRow.cloneNode(true);
+      const tempRow = templateRow.clone(true);
 
-      tempRow.setAttribute('r', rowIndex);
+      tempRow.attr('r', rowIndex);
 
-      tempRow.querySelectorAll('c').forEach(elem => {
-        elem.setAttribute('r', String(elem.getAttribute('r')).replace(/\d+$/, '') + rowIndex);
+      tempRow.children('c').each((index, element) => {
+        overviewSheet(element).attr('r', String(overviewSheet(element).attr('r')).replace(/\d+$/, '') + rowIndex);
       });
 
-      templateRow.parentNode.insertBefore(tempRow, currentRow.nextSibling);
+      currentRow.after(tempRow);
 
       currentRow = tempRow;
       rowIndex++;
@@ -638,13 +648,12 @@ const updateOverviewSheet = (
     debuglog('updating overview', row);
 
     const rowType = row === reportData.establishments.length - 1 ? 'OVRLAST' : 'OVRREGULAR';
-    let nextSibling = {};
+    // let nextSibling = {};
 
     for (let column = 0; column < 10; column++) {
       const columnText = String.fromCharCode(column + 66);
       const isRed = false;
-
-      const cellToChange = (typeof nextSibling.querySelector === 'function') ? nextSibling : currentRow.querySelector(`c[r='${columnText}${row + 11}']`);
+      const cellToChange = currentRow.children(`c[r='${columnText}${row + 11}']`);
       switch (columnText) {
         case 'B': {
           putString(
@@ -735,10 +744,9 @@ const updateOverviewSheet = (
       // TODO: duplicate the hyperlinked fields
       // //////////////////////////////////////
 
-      nextSibling = cellToChange ? cellToChange.nextSibling : {};
     }
 
-    currentRow = currentRow.nextSibling;
+    currentRow = currentRow.next();
   }
 
   debuglog('overview updated');
@@ -760,17 +768,17 @@ const updateEstablishmentsSheet = (
 
   // set headers
   putString(
-    establishmentsSheet.querySelector("c[r='B6']"),
+    establishmentsSheet("c[r='B6']"),
     `Parent name : ${reportData.parentName}`
   );
 
   putString(
-    establishmentsSheet.querySelector("c[r='B7']"),
+    establishmentsSheet("c[r='B7']"),
     `Date: ${moment(reportData.date).format('DD/MM/YYYY')}`
   );
 
   // clone the row the apropriate number of times
-  const templateRow = establishmentsSheet.querySelector("row[r='11']");
+  const templateRow = establishmentsSheet("row[r='11']");
   let currentRow = templateRow;
   let rowIndex = 12;
   let establishmentReportData = [...reportData.establishments];
@@ -784,15 +792,15 @@ const updateEstablishmentsSheet = (
       });
   if (establishmentArray.length > 1) {
     for (let i = 0; i < establishmentArray.length - 1; i++) {
-      const tempRow = templateRow.cloneNode(true);
+      const tempRow = templateRow.clone(true);
 
-      tempRow.setAttribute('r', rowIndex);
+      tempRow.attr('r', rowIndex);
 
-      tempRow.querySelectorAll('c').forEach(elem => {
-        elem.setAttribute('r', String(elem.getAttribute('r')).replace(/\d+$/, '') + rowIndex);
+      tempRow.children('c').each((index, element) => {
+        establishmentsSheet(element).attr('r', String(establishmentsSheet(element).attr('r')).replace(/\d+$/, '') + rowIndex);
       });
 
-      templateRow.parentNode.insertBefore(tempRow, currentRow.nextSibling);
+      currentRow.after(tempRow);
 
       currentRow = tempRow;
       rowIndex++;
@@ -802,24 +810,23 @@ const updateEstablishmentsSheet = (
   }
 
   // fix the last row in the table
-  establishmentsSheet.querySelector('sheetData row:last-child').setAttribute('r', rowIndex);
+  establishmentsSheet('sheetData row:last-child').attr('r', rowIndex);
 
   // fix the dimensions tag value
-  const dimension = establishmentsSheet.querySelector('dimension');
-  dimension.setAttribute('ref', String(dimension.getAttribute('ref')).replace(/\d+$/, '') + rowIndex);
+  const dimension = establishmentsSheet('dimension');
+  dimension.attr('ref', String(dimension.attr('ref')).replace(/\d+$/, '') + rowIndex);
 
   // update the cell values
   for (let row = 0; row < establishmentArray.length; row++) {
     debuglog('updating establishment', row);
 
     const rowType = row === establishmentArray.length - 1 ? 'ESTLAST' : 'ESTREGULAR';
-    let nextSibling = {};
 
     for (let column = 0; column < 17; column++) {
       const columnText = String.fromCharCode(column + 65);
       const isRed = false;
 
-      const cellToChange = (typeof nextSibling.querySelector === 'function') ? nextSibling : currentRow.querySelector(`c[r='${columnText}${row + 11}']`);
+      const cellToChange = currentRow.children(`c[r='${columnText}${row + 11}']`);
 
       switch (columnText) {
         case 'B': {
@@ -903,7 +910,7 @@ const updateEstablishmentsSheet = (
         case 'K': {
           putString(
             cellToChange,
-            establishmentArray[row].LastUpdatedDate
+            establishmentArray[row].updated
           );
           setStyle(cellToChange, columnText, rowType, isRed);
         } break;
@@ -965,11 +972,8 @@ const updateEstablishmentsSheet = (
           );
         } break;
       }
-
-      nextSibling = cellToChange ? cellToChange.nextSibling : {};
     }
-
-    currentRow = currentRow.nextSibling;
+    currentRow = currentRow.next();
   }
 
   debuglog('establishments updated');
@@ -990,31 +994,31 @@ const updateWorkersSheet = (
 
   // set headers
   putString(
-    workersSheet.querySelector("c[r='B6']"),
+    workersSheet("c[r='B6']"),
     `Parent name : ${reportData.parentName}`
   );
 
   putString(
-    workersSheet.querySelector("c[r='B7']"),
+    workersSheet("c[r='B7']"),
     `Date: ${moment(reportData.date).format('DD/MM/YYYY')}`
   );
 
   // clone the row the apropriate number of times
-  const templateRow = workersSheet.querySelector("row[r='10']");
+  const templateRow = workersSheet("row[r='10']");
   let currentRow = templateRow;
   let rowIndex = 11;
 
   if (reportData.workers.length > 1) {
     for (let i = 0; i < reportData.workers.length - 1; i++) {
-      const tempRow = templateRow.cloneNode(true);
+      const tempRow = templateRow.clone(true);
 
-      tempRow.setAttribute('r', rowIndex);
+      tempRow.attr('r', rowIndex);
 
-      tempRow.querySelectorAll('c').forEach(elem => {
-        elem.setAttribute('r', String(elem.getAttribute('r')).replace(/\d+$/, '') + rowIndex);
+      tempRow.children('c').each((index, element) => {
+        workersSheet(element).attr('r', String(workersSheet(element).attr('r')).replace(/\d+$/, '') + rowIndex);
       });
 
-      templateRow.parentNode.insertBefore(tempRow, currentRow.nextSibling);
+      currentRow.after(tempRow);
 
       currentRow = tempRow;
       rowIndex++;
@@ -1024,21 +1028,19 @@ const updateWorkersSheet = (
   }
 
   // fix the dimensions tag value
-  const dimension = workersSheet.querySelector('dimension');
-  dimension.setAttribute('ref', String(dimension.getAttribute('ref')).replace(/\d+$/, '') + (rowIndex - 1));
+  const dimension = workersSheet('dimension');
+  dimension.attr('ref', String(dimension.attr('ref')).replace(/\d+$/, '') + (rowIndex - 1));
 
   // update the cell values
   for (let row = 0; row < reportData.workers.length; row++) {
     debuglog('updating worker', row);
 
     const rowType = row === reportData.workers.length - 1 ? 'WKRLAST' : 'WKRREGULAR';
-    let nextSibling = {};
 
     for (let column = 0; column < 19; column++) {
       const columnText = String.fromCharCode(column + 65);
       let isRed = false;
-
-      const cellToChange = (typeof nextSibling.querySelector === 'function') ? nextSibling : currentRow.querySelector(`c[r='${columnText}${row + 10}']`);
+      const cellToChange = currentRow.children(`c[r='${columnText}${row + 10}']`);
 
       switch (columnText) {
         case 'B': {
@@ -1227,11 +1229,9 @@ const updateWorkersSheet = (
           setStyle(cellToChange, columnText, rowType, isRed);
         } break;
       }
-
-      nextSibling = cellToChange ? cellToChange.nextSibling : {};
     }
 
-    currentRow = currentRow.nextSibling;
+    currentRow = currentRow.next();
   }
 
   debuglog('workers updated');
@@ -1292,50 +1292,50 @@ const getReport = async (date, thisEstablishment) => {
       });
     });
 
-    walker.on('end', () => {
+    walker.on('end', async () => {
       debuglog('all files read');
 
       if (sharedStrings) {
-        const sst = sharedStrings.querySelector('sst');
+        const sst = sharedStrings('sst');
 
-        const sharedStringsUniqueCount = [parseInt(sst.getAttribute('uniqueCount'), 10)];
+        const sharedStringsUniqueCount = [parseInt(sst.attr('uniqueCount'), 10)];
 
         // update the overview sheet with the report data and add it to the zip
-        outputZip.file(overviewSheetName, serializeXML(updateOverviewSheet(
+        outputZip.file(overviewSheetName, updateOverviewSheet(
           overviewSheet,
           reportData,
           sharedStrings,
           sst,
           sharedStringsUniqueCount // pass unique count by reference rather than by value
-        )));
+        ).xml());
 
         //outputZip.file(establishmentsSheetName, serializeXML(establishmentsSheet));
         //outputZip.file(workersSheetName, serializeXML(workersSheet));
 
         // update the establishments sheet with the report data and add it to the zip
-        outputZip.file(establishmentsSheetName, serializeXML(updateEstablishmentsSheet(
+        outputZip.file(establishmentsSheetName, updateEstablishmentsSheet(
           establishmentsSheet,
           reportData,
           sharedStrings,
           sst,
           sharedStringsUniqueCount, // pass unique count by reference rather than by value
           thisEstablishment
-        )));
+        ).xml());
 
         // update the workplaces sheet with the report data and add it to the zip
-        outputZip.file(workersSheetName, serializeXML(updateWorkersSheet(
+        outputZip.file(workersSheetName, updateWorkersSheet(
           workersSheet,
           reportData,
           sharedStrings,
           sst,
           sharedStringsUniqueCount // pass unique count by reference rather than by value
-        )));
+        ).xml())
 
         // update the shared strings counts we've been keeping track of
-        sst.setAttribute('uniqueCount', sharedStringsUniqueCount[0]);
+        sst.attr('uniqueCount', sharedStringsUniqueCount[0]);
 
         // add the updated shared strings to the zip
-        outputZip.file(sharedStringsName, serializeXML(sharedStrings));
+        outputZip.file(sharedStringsName, sharedStrings.xml());
       }
 
       debuglog('wdf parent report: creating zip file');
diff --git a/server/routes/services.js b/server/routes/services.js
index 84c3da20d0..4fb42fef10 100644
--- a/server/routes/services.js
+++ b/server/routes/services.js
@@ -43,7 +43,9 @@ router.route('/byCategory')
       if (filterByCqc) {
         results = await models.services.findAll({
           where: {
-            iscqcregistered: true,
+            iscqcregistered: {
+              [models.Sequelize.Op.or]: [true, null],
+            },
             isMain: true
           },
           order: [
@@ -54,18 +56,20 @@ router.route('/byCategory')
       } else {
         results = await models.services.findAll({
           where: {
-            iscqcregistered: false,
+            iscqcregistered: {
+              [models.Sequelize.Op.or]: [false, null],
+            },
             isMain: true
           },
           order: [
             ['category', 'ASC'],
             ['name', 'ASC']
           ]
-        });  
+        });
       }
-  
+
       let servicesData = ServiceFormatters.createServicesByCategoryJSON(results);
-  
+
       if (servicesData.length === 0) {
         return res.sendStatus(404);
       } else {
@@ -132,7 +136,7 @@ function createServicesJSON(results){
       serviceId: data.id,
       category: data.category,
       name: data.name,
-      other: data.other ? true : undefined      
+      other: data.other ? true : undefined
       // cqcRegistered: data.iscqcregistered,
       // capacityQuestion: data.capacityquestion,
       // currentUptakeQuestion: data.currentuptakequestion
diff --git a/server/test/factories/establishment/csv.js b/server/test/factories/establishment/csv.js
new file mode 100644
index 0000000000..59b16f0a08
--- /dev/null
+++ b/server/test/factories/establishment/csv.js
@@ -0,0 +1,36 @@
+const { build, fake } = require('@jackfranklin/test-data-bot');
+
+module.exports = build('EstablishmentCSV', {
+  fields: {
+    LOCALESTID: fake(f => f.random.uuid()),
+    STATUS: 'NEW',
+    ESTNAME: fake(f => f.company.companyName()),
+    ADDRESS1: fake(f => f.address.streetAddress()),
+    ADDRESS2: fake(f => f.address.secondaryAddress()),
+    ADDRESS3: '',
+    POSTTOWN: fake(f => f.address.city()),
+    POSTCODE: fake(f => f.address.zipCode('??# #??')),
+    ESTTYPE: '6',
+    OTHERTYPE: '',
+    PERMCQC: '1',
+    PERMLA: '1',
+    SHARELA: '708;721;720',
+    REGTYPE: '2',
+    PROVNUM: fake(f => f.helpers.replaceSymbolWithNumber('#-########')),
+    LOCATIONID: fake(f => f.helpers.replaceSymbolWithNumber('#-########')),
+    MAINSERVICE: '8',
+    ALLSERVICES: '12;13',
+    CAPACITY: '0;0',
+    UTILISATION: '0;0',
+    SERVICEDESC: '1;1',
+    SERVICEUSERS: '',
+    OTHERUSERDESC: '',
+    TOTALPERMTEMP: '1',
+    ALLJOBROLES: '34;8;4',
+    STARTERS: '0;0;0',
+    LEAVERS: '999;0;0',
+    VACANCIES: '999;333;1',
+    REASONS: '',
+    REASONNOS: '',
+  },
+});
diff --git a/server/test/integration/routes/admin/approval/index.spec.js b/server/test/integration/routes/admin/approval/index.spec.js
new file mode 100644
index 0000000000..2bc6c72877
--- /dev/null
+++ b/server/test/integration/routes/admin/approval/index.spec.js
@@ -0,0 +1,94 @@
+const supertest = require('supertest');
+const baseEndpoint = require('../../../utils/baseUrl').baseurl;
+const apiEndpoint = supertest(baseEndpoint);
+const expect = require('chai').expect;
+
+// mocked real postcode/location data
+// http://localhost:3000/api/test/locations/random?limit=5
+const postcodes = require('../../../mockdata/postcodes').data;
+const registrationUtils = require('../../../utils/registration');
+const admin = require('../../../utils/admin').admin;
+
+var adminLogin = null;
+
+describe('Admin/Approval', () => {
+  let nonCqcServices = null;
+  let nonCQCSite = null;
+
+  before(async() => {
+
+    // Find a valid service (eg "Carers Support")
+    const nonCqcServicesResults = await apiEndpoint
+      .get('/services/byCategory?cqc=false')
+      .expect('Content-Type', /json/)
+      .expect(200);
+    nonCqcServices = nonCqcServicesResults.body;
+
+    // Set up the data to register a new user with a new establishment
+    nonCQCSite = registrationUtils.newNonCqcSite(postcodes[2], nonCqcServices);
+
+    // Register the new user / establishment
+    const registration = await apiEndpoint
+      .post('/registration')
+      .send([nonCQCSite])
+      .expect('Content-Type', /json/)
+      .expect(200);
+
+    // Login as an admin user to access approvals (would normally be accessed via "Registrations").
+    if (registration) {
+      adminLogin = await apiEndpoint
+        .post('/login')
+        .send(admin)
+        .expect('Content-Type', /json/)
+        .expect(200);
+    }
+  });
+
+  beforeEach(async() => {});
+
+  describe('/admin/approval', () => {
+    it('should return a confirmation message and status 200 when a new user is approved', async () => {
+      // Arrange
+      const approve = true; 
+      if (adminLogin.headers.authorization) {
+        const approval = await apiEndpoint
+
+          // Act
+          .post('/admin/approval')
+          .set({ Authorization: adminLogin.headers.authorization })
+          .send({
+            username: nonCQCSite.user.username.toLowerCase(),
+            nmdsId: 'W1234567',
+            approve: approve,
+          })
+
+          // Assert
+          .expect('Content-Type', /json/)
+          .expect(200);
+        expect(approval.body.message).to.equal('User has been set as active');
+      }
+    });
+    
+    it('should return a confirmation message and status 200 when a new user is removed because the user is rejected', async () => {
+      // Arrange
+      const approve = false; 
+      if (adminLogin.headers.authorization) {
+        const approval = await apiEndpoint
+
+          // Act
+          .post('/admin/approval')
+          .set({ Authorization: adminLogin.headers.authorization })
+          .send({
+            username: nonCQCSite.user.username.toLowerCase(),
+            nmdsId: 'W1234567',
+            approve: approve,
+          })
+
+          // Assert
+          .expect('Content-Type', /json/)
+          .expect(200);
+        expect(approval.body.message).to.equal('User has been removed');
+      }
+    })
+  })
+});
diff --git a/server/test/integration/utils/registration.js b/server/test/integration/utils/registration.js
index 91dc7432fb..9bd94b02ba 100644
--- a/server/test/integration/utils/registration.js
+++ b/server/test/integration/utils/registration.js
@@ -33,7 +33,7 @@ exports.newNonCqcSite = (postcode, nonCqcServices) => {
         "townCity": postcode.townAndCity,
         "county": postcode.county,
         "postalCode": postcode.postcode,
-        "mainService": servicesUtils.lookupRandomService(nonCqcServices).name,
+        "mainService": servicesUtils.lookupRandomService(nonCqcServices).name, // eg "Carers Support"
         "isRegulated": false,
         "user": {
             "fullname": faker.name.findName(),
diff --git a/server/test/unit/models/Bulkimport/csv/establishments.spec.js b/server/test/unit/models/Bulkimport/csv/establishments.spec.js
index 94c68335d5..15cbbeeba2 100644
--- a/server/test/unit/models/Bulkimport/csv/establishments.spec.js
+++ b/server/test/unit/models/Bulkimport/csv/establishments.spec.js
@@ -10,7 +10,35 @@ const filename = 'server/models/BulkImport/csv/establishments.js';
 const ALL_CAPACITIES = null;
 const ALL_UTILISATIONS = null;
 const BUDI_TO_ASC = 100;
-const BUSI_FROM_ASC = 200;
+
+const establishment = [{
+  locationId: '1-123456780',
+  id: 123
+}];
+const postcode = [{
+  postcode: 'AB13 4NJ'
+}];
+
+const models = {
+  establishment: {
+    async findAll(args) {
+      if (args.where.locationId === establishment[0].locationId) {
+        return establishment;
+      } else {
+        return [];
+      }
+    }
+  },
+  pcodedata: {
+    async findAll(args) {
+      if (args.where.postcode === postcode[0].postcode) {
+        return [];
+      } else {
+        return postcode;
+      }
+    }
+  }
+};
 
 const BUDI = {
   contractType (direction, originalCode) {
@@ -212,6 +240,9 @@ const getUnitInstance = () => {
         require: testUtils.wrapRequire({
           '../BUDI': {
             BUDI
+          },
+          '../../index': {
+            models
           }
         })
       }
@@ -222,6 +253,10 @@ const getUnitInstance = () => {
 
   expect(bulkUpload.Establishment).to.be.a('function');
 
+  expect(BUDI.contractType).to.be.a('function');
+
+  expect(models.establishment.findAll).to.be.a('function');
+
   return new (bulkUpload.Establishment)();
 };
 
@@ -445,6 +480,10 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
             require: testUtils.wrapRequire({
               '../BUDI': {
                 BUDI
+              },
+              '../../index': {
+                establishment: models.establishment,
+                pcodedata: models.pcodedata
               }
             })
           }
@@ -475,10 +514,10 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
           SERVICEUSERS: '',
           OTHERUSERDESC: '',
           TOTALPERMTEMP: '1',
-          ALLJOBROLES: '34;8',
-          STARTERS: '0;0',
-          LEAVERS: '999',
-          VACANCIES: '999;333',
+          ALLJOBROLES: '34;8;4',
+          STARTERS: '0;0;0',
+          LEAVERS: '999;0;0',
+          VACANCIES: '999;333;1',
           REASONS: '',
           REASONNOS: ''
         },
@@ -501,7 +540,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
             _town: 'My Town',
             _county: '',
             _locationId: 'A-328849599',
-            _provId: null,
+            _provId: 'A-328849599',
             _postcode: 'LN11 9JG',
             _isRegulated: false,
             _mainService: { id: 16, name: 'Head office services' },
@@ -585,10 +624,6 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
 
       expect(bulkUpload).to.have.property('validate');
 
-      const csvEstablishmentSchemaErrors = [];
-
-      const myWorkers = [];
-
       // call the validation to ensure the proper error is shown
       await bulkUpload.validate();
 
@@ -617,6 +652,10 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
             require: testUtils.wrapRequire({
               '../BUDI': {
                 BUDI
+              },
+              '../../index': {
+                establishment: models.establishment,
+                pcodedata: models.pcodedata
               }
             })
           }
@@ -647,10 +686,10 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
           SERVICEUSERS: '',
           OTHERUSERDESC: '',
           TOTALPERMTEMP: '1',
-          ALLJOBROLES: '34;8',
-          STARTERS: '0;0',
-          LEAVERS: '999',
-          VACANCIES: '999;333',
+          ALLJOBROLES: '34;8;4',
+          STARTERS: '0;0;0',
+          LEAVERS: '999;0;0',
+          VACANCIES: '999;333;1',
           REASONS: '',
           REASONNOS: ''
         },
@@ -757,10 +796,6 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
 
       expect(bulkUpload).to.have.property('validate');
 
-      const csvEstablishmentSchemaErrors = [];
-
-      const myWorkers = [];
-
       // call the validation to ensure the proper error is shown
       await bulkUpload.validate();
 
@@ -770,8 +805,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
 
       expect(validationErrors).to.deep.equal([]);
     });
-
-    it('should emit an error if SLV is greater than zero and this ALLJOBROLES is blank', async () => {
+    it('should not emit an error if REGTYPE is 2 (CQC) but a CQC regulated main service has been specified', async () => {
       const bulkUpload = new (testUtils.sandBox(
         filename,
         {
@@ -779,6 +813,10 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
             require: testUtils.wrapRequire({
               '../BUDI': {
                 BUDI
+              },
+              '../../index': {
+                establishment: models.establishment,
+                pcodedata: models.pcodedata
               }
             })
           }
@@ -798,18 +836,18 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
           PERMCQC: '1',
           PERMLA: '1',
           SHARELA: '708;721;720',
-          REGTYPE: '0',
-          PROVNUM: '',
-          LOCATIONID: '',
-          MAINSERVICE: '72',
-          ALLSERVICES: '72;13',
+          REGTYPE: '2',
+          PROVNUM: '1-123456789',
+          LOCATIONID: '1-123456789',
+          MAINSERVICE: '8',
+          ALLSERVICES: '12;13',
           CAPACITY: '0;0',
           UTILISATION: '0;0',
           SERVICEDESC: '1;1',
           SERVICEUSERS: '',
           OTHERUSERDESC: '',
-          TOTALPERMTEMP: '10',
-          ALLJOBROLES: '',
+          TOTALPERMTEMP: '1',
+          ALLJOBROLES: '34;8',
           STARTERS: '0;0',
           LEAVERS: '999',
           VACANCIES: '999;333',
@@ -914,15 +952,11 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
             _readyForDeletionWorkers: null,
             _status: 'COMPLETE',
             _logLevel: 300
-          }]
-      );
+          }
+        ]);
 
       expect(bulkUpload).to.have.property('validate');
 
-      const csvEstablishmentSchemaErrors = [];
-
-      const myWorkers = [];
-
       // call the validation to ensure the proper error is shown
       await bulkUpload.validate();
 
@@ -930,20 +964,9 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
 
       // assert a warning was returned
 
-      expect(validationErrors).to.deep.equal([{
-        lineNumber: 2,
-        name: 'omar3',
-        origin: 'Establishments',
-        source: '',
-        errCode: 1280,
-        errType: 'ALL_JOBS_ERROR',
-        error: 'ALLJOBROLES cannot be blank as you have STARTERS, LEAVERS, VACANCIES greater than zero'
-      }]);
+      expect(validationErrors).to.deep.equal([]);
     });
-  });
-
-  describe('cross entity validations', () => {
-    it('should emit a warning if there are zero staff', async () => {
+    it('should emit an error if REGTYPE is not 2 (CQC) but a registered manager vacancy has been specified', async () => {
       const bulkUpload = new (testUtils.sandBox(
         filename,
         {
@@ -951,6 +974,10 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
             require: testUtils.wrapRequire({
               '../BUDI': {
                 BUDI
+              },
+              '../../index': {
+                establishment: models.establishment,
+                pcodedata: models.pcodedata
               }
             })
           }
@@ -958,7 +985,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
       ).Establishment)(
         {
           LOCALESTID: 'omar3',
-          STATUS: 'UPDATE',
+          STATUS: 'NEW',
           ESTNAME: 'WOZiTech, with even more care',
           ADDRESS1: 'First Line',
           ADDRESS2: 'Second Line',
@@ -973,18 +1000,18 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
           REGTYPE: '0',
           PROVNUM: '',
           LOCATIONID: '',
-          MAINSERVICE: '72',
-          ALLSERVICES: '72;13',
-          CAPACITY: '',
-          UTILISATION: '',
+          MAINSERVICE: '12',
+          ALLSERVICES: '12;13',
+          CAPACITY: '0;0',
+          UTILISATION: '0;0',
           SERVICEDESC: '1;1',
           SERVICEUSERS: '',
           OTHERUSERDESC: '',
-          TOTALPERMTEMP: '0',
-          ALLJOBROLES: '34;8',
-          STARTERS: '0;0',
-          LEAVERS: '999',
-          VACANCIES: '999;333',
+          TOTALPERMTEMP: '1',
+          ALLJOBROLES: '34;8;4',
+          STARTERS: '0;0;0',
+          LEAVERS: '999;0;0',
+          VACANCIES: '999;333;1',
           REASONS: '',
           REASONNOS: ''
         },
@@ -1006,7 +1033,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
             _address3: '',
             _town: 'My Town',
             _county: '',
-            _locationId: 'A-328849599',
+            _locationId: null,
             _provId: null,
             _postcode: 'LN11 9JG',
             _isRegulated: false,
@@ -1089,46 +1116,191 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
           }
         ]);
 
-      expect(bulkUpload).to.have.property('crossValidate');
+      expect(bulkUpload).to.have.property('validate');
 
-      const csvEstablishmentSchemaErrors = [];
+      // call the validation to ensure the proper error is shown
+      await bulkUpload.validate();
 
-      const myWorkers = [];
+      const validationErrors = bulkUpload.validationErrors;
 
-      // the real version of this code is in the api Establishment business object and runs a sql query.
-      // We just return a 'fake result set'
-      const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => {
-        return [];
-      });
+      // assert a warning was returned
 
-      // Regular validation has to run first for the establishment to populate the internal properties correctly
-      await bulkUpload.validate();
+      expect(validationErrors).to.deep.equal([
+        {
+          origin: 'Establishments',
+          lineNumber: 2,
+          warnCode: 2180,
+          warnType: 'ALL_JOBS_WARNING',
+          warning: 'Vacancy for Registered Manager should not be included for this service and will be ignored',
+          source: '34;8;4',
+          name: 'omar3'
+        }
+      ]);
+    });
+      it('should not emit an error if REGTYPE is 2 (CQC) but a registered manager vacancy has been specified', async () => {
+        const bulkUpload = new (testUtils.sandBox(
+          filename,
+          {
+            locals: {
+              require: testUtils.wrapRequire({
+                '../BUDI': {
+                  BUDI
+                },
+                '../../index': {
+                  establishment: models.establishment,
+                pcodedata: models.pcodedata
+                }
+              })
+            }
+          }
+        ).Establishment)(
+          {
+            LOCALESTID: 'omar3',
+            STATUS: 'NEW',
+            ESTNAME: 'WOZiTech, with even more care',
+            ADDRESS1: 'First Line',
+            ADDRESS2: 'Second Line',
+            ADDRESS3: '',
+            POSTTOWN: 'My Town',
+            POSTCODE: 'LN11 9JG',
+            ESTTYPE: '6',
+            OTHERTYPE: '',
+            PERMCQC: '1',
+            PERMLA: '1',
+            SHARELA: '708;721;720',
+            REGTYPE: '2',
+            PROVNUM: '1-12345678',
+            LOCATIONID: '1-12345678',
+            MAINSERVICE: '8',
+          ALLSERVICES: '12;13',
+            CAPACITY: '0;0',
+            UTILISATION: '0;0',
+            SERVICEDESC: '1;1',
+            SERVICEUSERS: '',
+            OTHERUSERDESC: '',
+            TOTALPERMTEMP: '1',
+            ALLJOBROLES: '34;8;4',
+            STARTERS: '0;0;0',
+            LEAVERS: '999;0;0',
+            VACANCIES: '999;333;1',
+            REASONS: '',
+            REASONNOS: ''
+          },
+          2,
+          [
+            {
+              _validations: [],
+              _username: 'aylingw',
+              _id: 479,
+              _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+              _ustatus: null,
+              _created: '2019-03-15T09:54:10.562Z',
+              _updated: '2019-10-04T15:46:16.158Z',
+              _updatedBy: 'aylingw',
+              _auditEvents: null,
+              _name: 'WOZiTech, with even more care',
+              _address1: 'First Line',
+              _address2: 'Second Line',
+              _address3: '',
+              _town: 'My Town',
+              _county: '',
+              _locationId: null,
+              _provId: null,
+              _postcode: 'LN11 9JG',
+              _isRegulated: false,
+              _mainService: { id: 16, name: 'Head office services' },
+              _nmdsId: 'G1001114',
+              _lastWdfEligibility: '2019-08-16T07:17:38.014Z',
+              _overallWdfEligibility: '2019-08-16T07:17:38.340Z',
+              _establishmentWdfEligibility: null,
+              _staffWdfEligibility: '2019-08-13T12:41:24.836Z',
+              _isParent: true,
+              _parentUid: null,
+              _parentId: null,
+              _parentName: null,
+              _dataOwner: 'Workplace',
+              _dataPermissions: 'None',
+              _archived: false,
+              _dataOwnershipRequested: null,
+              _reasonsForLeaving: '',
+              _properties: {
+                _properties: [Object],
+                _propertyTypes: [Array],
+                _auditEvents: null,
+                _modifiedProperties: [],
+                _additionalModels: null
+              },
+              _isNew: false,
+              _workerEntities: {
+              },
+              _readyForDeletionWorkers: null,
+              _status: 'NEW',
+              _logLevel: 300
+            },
+            {
+              _validations: [],
+              _username: 'aylingw',
+              _id: 1446,
+              _uid: 'a415435f-40f2-4de5-abf7-bff611e85591',
+              _ustatus: null,
+              _created: '2019-07-31T15:09:57.405Z',
+              _updated: '2019-10-04T15:46:16.797Z',
+              _updatedBy: 'aylingw',
+              _auditEvents: null,
+              _name: 'WOZiTech Cares Sub 100',
+              _address1: 'Number 1',
+              _address2: 'My street',
+              _address3: '',
+              _town: 'My Town',
+              _county: '',
+              _locationId: '1-888777666',
+              _provId: '1-999888777',
+              _postcode: 'LN11 9JG',
+              _isRegulated: true,
+              _mainService: { id: 1, name: 'Carers support' },
+              _nmdsId: 'G1002110',
+              _lastWdfEligibility: '2019-10-04T15:46:16.797Z',
+              _overallWdfEligibility: null,
+              _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z',
+              _staffWdfEligibility: null,
+              _isParent: false,
+              _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+              _parentId: 479,
+              _parentName: null,
+              _dataOwner: 'Parent',
+              _dataPermissions: 'None',
+              _archived: false,
+              _dataOwnershipRequested: null,
+              _reasonsForLeaving: '',
+              _properties: {
+                _properties: [Object],
+                _propertyTypes: [Array],
+                _auditEvents: null,
+                _modifiedProperties: [],
+                _additionalModels: null
+              },
+              _isNew: false,
+              _workerEntities: {},
+              _readyForDeletionWorkers: null,
+              _status: 'COMPLETE',
+              _logLevel: 300
+            }
+          ]);
 
-      // call the method
-      await bulkUpload.crossValidate({
-        csvEstablishmentSchemaErrors,
-        myWorkers,
-        fetchMyEstablishmentsWorkers
-      });
+        expect(bulkUpload).to.have.property('validate');
 
-      // assert the fetchMyEstalishmentsWorkers function was called
-      expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1);
+        // call the validation to ensure the proper error is shown
+        await bulkUpload.validate();
 
-      // assert a warning was returned
-      expect(csvEstablishmentSchemaErrors.length).to.equal(1);
+        const validationErrors = bulkUpload.validationErrors;
 
-      expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({
-        lineNumber: 2,
-        name: 'omar3',
-        origin: 'Establishments',
-        source: '0',
-        warnCode: 2200,
-        warnType: 'TOTAL_PERM_TEMP_WARNING',
-        warning: 'The number of employed staff is 0 please check your staff records'
-      });
-    });
+        // assert a warning was returned
+
+        expect(validationErrors).to.deep.equal([
 
-    it('should emit a warning if there are no direct care staff', async () => {
+        ]);
+    });
+    it('should emit an error if locationId has already been used in the database and not this establishment', async () => {
       const bulkUpload = new (testUtils.sandBox(
         filename,
         {
@@ -1136,6 +1308,10 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
             require: testUtils.wrapRequire({
               '../BUDI': {
                 BUDI
+              },
+              '../../index': {
+                establishment: models.establishment,
+                pcodedata: models.pcodedata
               }
             })
           }
@@ -1156,24 +1332,1218 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
           PERMLA: '1',
           SHARELA: '708;721;720',
           REGTYPE: '2',
-          PROVNUM: '',
-          LOCATIONID: '',
-          MAINSERVICE: '72',
-          ALLSERVICES: '72;13',
-          CAPACITY: '',
-          UTILISATION: '',
+          PROVNUM: '1-123456780',
+          LOCATIONID: '1-123456780',
+          MAINSERVICE: '8',
+          ALLSERVICES: '12;13',
+          CAPACITY: '0;0',
+          UTILISATION: '0;0',
           SERVICEDESC: '1;1',
           SERVICEUSERS: '',
           OTHERUSERDESC: '',
           TOTALPERMTEMP: '1',
-          ALLJOBROLES: '34;8',
-          STARTERS: '0;0',
-          LEAVERS: '999',
-          VACANCIES: '999;333',
+          ALLJOBROLES: '34;8;4',
+          STARTERS: '0;0;0',
+          LEAVERS: '999;0;0',
+          VACANCIES: '999;333;1',
           REASONS: '',
           REASONNOS: ''
         },
         2,
+        [
+          {
+            _validations: [],
+            _username: 'aylingw',
+            _id: 479,
+            _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+            _ustatus: null,
+            _created: '2019-03-15T09:54:10.562Z',
+            _updated: '2019-10-04T15:46:16.158Z',
+            _updatedBy: 'aylingw',
+            _auditEvents: null,
+            _name: 'WOZiTech, with even more care',
+            _address1: 'First Line',
+            _address2: 'Second Line',
+            _address3: '',
+            _town: 'My Town',
+            _county: '',
+            _locationId: null,
+            _provId: null,
+            _postcode: 'LN11 9JG',
+            _isRegulated: false,
+            _mainService: { id: 16, name: 'Head office services' },
+            _nmdsId: 'G1001114',
+            _lastWdfEligibility: '2019-08-16T07:17:38.014Z',
+            _overallWdfEligibility: '2019-08-16T07:17:38.340Z',
+            _establishmentWdfEligibility: null,
+            _staffWdfEligibility: '2019-08-13T12:41:24.836Z',
+            _isParent: true,
+            _parentUid: null,
+            _parentId: null,
+            _parentName: null,
+            _dataOwner: 'Workplace',
+            _dataPermissions: 'None',
+            _archived: false,
+            _dataOwnershipRequested: null,
+            _reasonsForLeaving: '',
+            _properties: {
+              _properties: [Object],
+              _propertyTypes: [Array],
+              _auditEvents: null,
+              _modifiedProperties: [],
+              _additionalModels: null
+            },
+            _isNew: false,
+            _workerEntities: {
+            },
+            _readyForDeletionWorkers: null,
+            _status: 'NEW',
+            _logLevel: 300
+          },
+          {
+            _validations: [],
+            _username: 'aylingw',
+            _id: 1446,
+            _uid: 'a415435f-40f2-4de5-abf7-bff611e85591',
+            _ustatus: null,
+            _created: '2019-07-31T15:09:57.405Z',
+            _updated: '2019-10-04T15:46:16.797Z',
+            _updatedBy: 'aylingw',
+            _auditEvents: null,
+            _name: 'WOZiTech Cares Sub 100',
+            _address1: 'Number 1',
+            _address2: 'My street',
+            _address3: '',
+            _town: 'My Town',
+            _county: '',
+            _locationId: '1-888777666',
+            _provId: '1-999888777',
+            _postcode: 'LN11 9JG',
+            _isRegulated: true,
+            _mainService: { id: 1, name: 'Carers support' },
+            _nmdsId: 'G1002110',
+            _lastWdfEligibility: '2019-10-04T15:46:16.797Z',
+            _overallWdfEligibility: null,
+            _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z',
+            _staffWdfEligibility: null,
+            _isParent: false,
+            _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+            _parentId: 479,
+            _parentName: null,
+            _dataOwner: 'Parent',
+            _dataPermissions: 'None',
+            _archived: false,
+            _dataOwnershipRequested: null,
+            _reasonsForLeaving: '',
+            _properties: {
+              _properties: [Object],
+              _propertyTypes: [Array],
+              _auditEvents: null,
+              _modifiedProperties: [],
+              _additionalModels: null
+            },
+            _isNew: false,
+            _workerEntities: {},
+            _readyForDeletionWorkers: null,
+            _status: 'COMPLETE',
+            _logLevel: 300
+          }
+        ]);
+
+      expect(bulkUpload).to.have.property('validate');
+
+      // call the validation to ensure the proper error is shown
+      await bulkUpload.validate();
+
+      const validationErrors = bulkUpload.validationErrors;
+
+      // assert a warning was returned
+
+      expect(validationErrors).to.deep.equal([
+        {
+          "errCode": 1020,
+          "errType": "STATUS_ERROR",
+          "error": "Workplace has a STATUS of UPDATE but does not exist, please change to NEW to add it",
+          "lineNumber": 2,
+          "name": "omar3",
+          "origin": "Establishments",
+          "source": "UPDATE"
+        },
+        {
+          "errCode": 1110,
+          "errType": "LOCATION_ID_ERROR",
+          "error": "LOCATIONID already exists in ASC-WDS please contact Support on 0113 241 0969",
+          "lineNumber": 2,
+          "name": "omar3",
+          "origin": "Establishments",
+          "source": "1-123456780"
+        }
+      ]);
+  });
+  it('should not emit an error if locationId has already been used in the database and is this establishment', async () => {
+    const bulkUpload = new (testUtils.sandBox(
+      filename,
+      {
+        locals: {
+          require: testUtils.wrapRequire({
+            '../BUDI': {
+              BUDI
+            },
+            '../../index': {
+              establishment: models.establishment,
+                pcodedata: models.pcodedata
+            }
+          })
+        }
+      }
+    ).Establishment)(
+      {
+        LOCALESTID: '123',
+        STATUS: 'UPDATE',
+        ESTNAME: 'WOZiTech, with even more care',
+        ADDRESS1: 'First Line',
+        ADDRESS2: 'Second Line',
+        ADDRESS3: '',
+        POSTTOWN: 'My Town',
+        POSTCODE: 'LN11 9JG',
+        ESTTYPE: '6',
+        OTHERTYPE: '',
+        PERMCQC: '1',
+        PERMLA: '1',
+        SHARELA: '708;721;720',
+        REGTYPE: '2',
+        PROVNUM: '1-123456780',
+        LOCATIONID: '1-123456780',
+        MAINSERVICE: '8',
+        ALLSERVICES: '12;13',
+        CAPACITY: '0;0',
+        UTILISATION: '0;0',
+        SERVICEDESC: '1;1',
+        SERVICEUSERS: '',
+        OTHERUSERDESC: '',
+        TOTALPERMTEMP: '1',
+        ALLJOBROLES: '34;8;4',
+        STARTERS: '0;0;0',
+        LEAVERS: '999;0;0',
+        VACANCIES: '999;333;1',
+        REASONS: '',
+        REASONNOS: ''
+      },
+      2,
+      [
+        {
+          _validations: [],
+          _username: 'aylingw',
+          _id: 123,
+          _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+          _ustatus: null,
+          _created: '2019-03-15T09:54:10.562Z',
+          _updated: '2019-10-04T15:46:16.158Z',
+          _updatedBy: 'aylingw',
+          _auditEvents: null,
+          _name: 'WOZiTech, with even more care',
+          _address1: 'First Line',
+          _address2: 'Second Line',
+          _address3: '',
+          _town: 'My Town',
+          _county: '',
+          _locationId: null,
+          _provId: null,
+          _postcode: 'LN11 9JG',
+          _isRegulated: false,
+          _mainService: { id: 16, name: 'Head office services' },
+          _nmdsId: 'G1001114',
+          _lastWdfEligibility: '2019-08-16T07:17:38.014Z',
+          _overallWdfEligibility: '2019-08-16T07:17:38.340Z',
+          _establishmentWdfEligibility: null,
+          _staffWdfEligibility: '2019-08-13T12:41:24.836Z',
+          _isParent: true,
+          _parentUid: null,
+          _parentId: null,
+          _parentName: null,
+          _dataOwner: 'Workplace',
+          _dataPermissions: 'None',
+          _archived: false,
+          _dataOwnershipRequested: null,
+          _reasonsForLeaving: '',
+          _properties: {
+            _properties: [Object],
+            _propertyTypes: [Array],
+            _auditEvents: null,
+            _modifiedProperties: [],
+            _additionalModels: null
+          },
+          _isNew: false,
+          _workerEntities: {
+          },
+          _readyForDeletionWorkers: null,
+          _status: 'NEW',
+          _logLevel: 300,
+          key: '123'
+        },
+        {
+          _validations: [],
+          _username: 'aylingw',
+          _id: 1446,
+          _uid: 'a415435f-40f2-4de5-abf7-bff611e85591',
+          _ustatus: null,
+          _created: '2019-07-31T15:09:57.405Z',
+          _updated: '2019-10-04T15:46:16.797Z',
+          _updatedBy: 'aylingw',
+          _auditEvents: null,
+          _name: 'WOZiTech Cares Sub 100',
+          _address1: 'Number 1',
+          _address2: 'My street',
+          _address3: '',
+          _town: 'My Town',
+          _county: '',
+          _locationId: '1-888777666',
+          _provId: '1-999888777',
+          _postcode: 'LN11 9JG',
+          _isRegulated: true,
+          _mainService: { id: 1, name: 'Carers support' },
+          _nmdsId: 'G1002110',
+          _lastWdfEligibility: '2019-10-04T15:46:16.797Z',
+          _overallWdfEligibility: null,
+          _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z',
+          _staffWdfEligibility: null,
+          _isParent: false,
+          _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+          _parentId: 479,
+          _parentName: null,
+          _dataOwner: 'Parent',
+          _dataPermissions: 'None',
+          _archived: false,
+          _dataOwnershipRequested: null,
+          _reasonsForLeaving: '',
+          _properties: {
+            _properties: [Object],
+            _propertyTypes: [Array],
+            _auditEvents: null,
+            _modifiedProperties: [],
+            _additionalModels: null
+          },
+          _isNew: false,
+          _workerEntities: {},
+          _readyForDeletionWorkers: null,
+          _status: 'COMPLETE',
+          _logLevel: 300
+        }
+      ]);
+
+    expect(bulkUpload).to.have.property('validate');
+
+    // call the validation to ensure the proper error is shown
+    await bulkUpload.validate();
+
+    const validationErrors = bulkUpload.validationErrors;
+
+    // assert a warning was returned
+
+    expect(validationErrors).to.deep.equal([]);
+});
+
+  it('should not emit an error if locationId has not already been used in the database', async () => {
+    const bulkUpload = new (testUtils.sandBox(
+      filename,
+      {
+        locals: {
+          require: testUtils.wrapRequire({
+            '../BUDI': {
+              BUDI
+            },
+            '../../index': {
+              establishment: models.establishment,
+                pcodedata: models.pcodedata
+            }
+          })
+        }
+      }
+    ).Establishment)(
+      {
+        LOCALESTID: 'omar3',
+        STATUS: 'NEW',
+        ESTNAME: 'WOZiTech, with even more care',
+        ADDRESS1: 'First Line',
+        ADDRESS2: 'Second Line',
+        ADDRESS3: '',
+        POSTTOWN: 'My Town',
+        POSTCODE: 'LN11 9JG',
+        ESTTYPE: '6',
+        OTHERTYPE: '',
+        PERMCQC: '1',
+        PERMLA: '1',
+        SHARELA: '708;721;720',
+        REGTYPE: '2',
+        PROVNUM: '1-123456781',
+        LOCATIONID: '1-123456781',
+        MAINSERVICE: '8',
+      ALLSERVICES: '12;13',
+        CAPACITY: '0;0',
+        UTILISATION: '0;0',
+        SERVICEDESC: '1;1',
+        SERVICEUSERS: '',
+        OTHERUSERDESC: '',
+        TOTALPERMTEMP: '1',
+        ALLJOBROLES: '34;8;4',
+        STARTERS: '0;0;0',
+        LEAVERS: '999;0;0',
+        VACANCIES: '999;333;1',
+        REASONS: '',
+        REASONNOS: ''
+      },
+      2,
+      [
+        {
+          _validations: [],
+          _username: 'aylingw',
+          _id: 479,
+          _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+          _ustatus: null,
+          _created: '2019-03-15T09:54:10.562Z',
+          _updated: '2019-10-04T15:46:16.158Z',
+          _updatedBy: 'aylingw',
+          _auditEvents: null,
+          _name: 'WOZiTech, with even more care',
+          _address1: 'First Line',
+          _address2: 'Second Line',
+          _address3: '',
+          _town: 'My Town',
+          _county: '',
+          _locationId: null,
+          _provId: null,
+          _postcode: 'LN11 9JG',
+          _isRegulated: false,
+          _mainService: { id: 16, name: 'Head office services' },
+          _nmdsId: 'G1001114',
+          _lastWdfEligibility: '2019-08-16T07:17:38.014Z',
+          _overallWdfEligibility: '2019-08-16T07:17:38.340Z',
+          _establishmentWdfEligibility: null,
+          _staffWdfEligibility: '2019-08-13T12:41:24.836Z',
+          _isParent: true,
+          _parentUid: null,
+          _parentId: null,
+          _parentName: null,
+          _dataOwner: 'Workplace',
+          _dataPermissions: 'None',
+          _archived: false,
+          _dataOwnershipRequested: null,
+          _reasonsForLeaving: '',
+          _properties: {
+            _properties: [Object],
+            _propertyTypes: [Array],
+            _auditEvents: null,
+            _modifiedProperties: [],
+            _additionalModels: null
+          },
+          _isNew: false,
+          _workerEntities: {
+          },
+          _readyForDeletionWorkers: null,
+          _status: 'NEW',
+          _logLevel: 300
+        },
+        {
+          _validations: [],
+          _username: 'aylingw',
+          _id: 1446,
+          _uid: 'a415435f-40f2-4de5-abf7-bff611e85591',
+          _ustatus: null,
+          _created: '2019-07-31T15:09:57.405Z',
+          _updated: '2019-10-04T15:46:16.797Z',
+          _updatedBy: 'aylingw',
+          _auditEvents: null,
+          _name: 'WOZiTech Cares Sub 100',
+          _address1: 'Number 1',
+          _address2: 'My street',
+          _address3: '',
+          _town: 'My Town',
+          _county: '',
+          _locationId: '1-888777666',
+          _provId: '1-999888777',
+          _postcode: 'LN11 9JG',
+          _isRegulated: true,
+          _mainService: { id: 1, name: 'Carers support' },
+          _nmdsId: 'G1002110',
+          _lastWdfEligibility: '2019-10-04T15:46:16.797Z',
+          _overallWdfEligibility: null,
+          _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z',
+          _staffWdfEligibility: null,
+          _isParent: false,
+          _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+          _parentId: 479,
+          _parentName: null,
+          _dataOwner: 'Parent',
+          _dataPermissions: 'None',
+          _archived: false,
+          _dataOwnershipRequested: null,
+          _reasonsForLeaving: '',
+          _properties: {
+            _properties: [Object],
+            _propertyTypes: [Array],
+            _auditEvents: null,
+            _modifiedProperties: [],
+            _additionalModels: null
+          },
+          _isNew: false,
+          _workerEntities: {},
+          _readyForDeletionWorkers: null,
+          _status: 'COMPLETE',
+          _logLevel: 300
+        }
+      ]);
+
+    expect(bulkUpload).to.have.property('validate');
+
+    // call the validation to ensure the proper error is shown
+    await bulkUpload.validate();
+
+    const validationErrors = bulkUpload.validationErrors;
+
+    // assert a warning was returned
+
+    expect(validationErrors).to.deep.equal([]);
+});
+
+it('should emit an error if postcode cannot be found in the reference data', async () => {
+  const bulkUpload = new (testUtils.sandBox(
+    filename,
+    {
+      locals: {
+        require: testUtils.wrapRequire({
+          '../BUDI': {
+            BUDI
+          },
+          '../../index': {
+            establishment: models.establishment,
+                pcodedata: models.pcodedata
+          }
+        })
+      }
+    }
+  ).Establishment)(
+    {
+      LOCALESTID: 'omar3',
+      STATUS: 'NEW',
+      ESTNAME: 'WOZiTech, with even more care',
+      ADDRESS1: 'First Line',
+      ADDRESS2: 'Second Line',
+      ADDRESS3: '',
+      POSTTOWN: 'My Town',
+      POSTCODE: 'AB13 4NJ',
+      ESTTYPE: '6',
+      OTHERTYPE: '',
+      PERMCQC: '1',
+      PERMLA: '1',
+      SHARELA: '708;721;720',
+      REGTYPE: '2',
+      PROVNUM: '1-123456781',
+      LOCATIONID: '1-123456781',
+      MAINSERVICE: '8',
+    ALLSERVICES: '12;13',
+      CAPACITY: '0;0',
+      UTILISATION: '0;0',
+      SERVICEDESC: '1;1',
+      SERVICEUSERS: '',
+      OTHERUSERDESC: '',
+      TOTALPERMTEMP: '1',
+      ALLJOBROLES: '34;8;4',
+      STARTERS: '0;0;0',
+      LEAVERS: '999;0;0',
+      VACANCIES: '999;333;1',
+      REASONS: '',
+      REASONNOS: ''
+    },
+    2,
+    [
+      {
+        _validations: [],
+        _username: 'aylingw',
+        _id: 479,
+        _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+        _ustatus: null,
+        _created: '2019-03-15T09:54:10.562Z',
+        _updated: '2019-10-04T15:46:16.158Z',
+        _updatedBy: 'aylingw',
+        _auditEvents: null,
+        _name: 'WOZiTech, with even more care',
+        _address1: 'First Line',
+        _address2: 'Second Line',
+        _address3: '',
+        _town: 'My Town',
+        _county: '',
+        _locationId: null,
+        _provId: null,
+        _postcode: 'LN11 9JG',
+        _isRegulated: false,
+        _mainService: { id: 16, name: 'Head office services' },
+        _nmdsId: 'G1001114',
+        _lastWdfEligibility: '2019-08-16T07:17:38.014Z',
+        _overallWdfEligibility: '2019-08-16T07:17:38.340Z',
+        _establishmentWdfEligibility: null,
+        _staffWdfEligibility: '2019-08-13T12:41:24.836Z',
+        _isParent: true,
+        _parentUid: null,
+        _parentId: null,
+        _parentName: null,
+        _dataOwner: 'Workplace',
+        _dataPermissions: 'None',
+        _archived: false,
+        _dataOwnershipRequested: null,
+        _reasonsForLeaving: '',
+        _properties: {
+          _properties: [Object],
+          _propertyTypes: [Array],
+          _auditEvents: null,
+          _modifiedProperties: [],
+          _additionalModels: null
+        },
+        _isNew: false,
+        _workerEntities: {
+        },
+        _readyForDeletionWorkers: null,
+        _status: 'NEW',
+        _logLevel: 300
+      },
+      {
+        _validations: [],
+        _username: 'aylingw',
+        _id: 1446,
+        _uid: 'a415435f-40f2-4de5-abf7-bff611e85591',
+        _ustatus: null,
+        _created: '2019-07-31T15:09:57.405Z',
+        _updated: '2019-10-04T15:46:16.797Z',
+        _updatedBy: 'aylingw',
+        _auditEvents: null,
+        _name: 'WOZiTech Cares Sub 100',
+        _address1: 'Number 1',
+        _address2: 'My street',
+        _address3: '',
+        _town: 'My Town',
+        _county: '',
+        _locationId: '1-888777666',
+        _provId: '1-999888777',
+        _postcode: 'LN11 9JG',
+        _isRegulated: true,
+        _mainService: { id: 1, name: 'Carers support' },
+        _nmdsId: 'G1002110',
+        _lastWdfEligibility: '2019-10-04T15:46:16.797Z',
+        _overallWdfEligibility: null,
+        _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z',
+        _staffWdfEligibility: null,
+        _isParent: false,
+        _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+        _parentId: 479,
+        _parentName: null,
+        _dataOwner: 'Parent',
+        _dataPermissions: 'None',
+        _archived: false,
+        _dataOwnershipRequested: null,
+        _reasonsForLeaving: '',
+        _properties: {
+          _properties: [Object],
+          _propertyTypes: [Array],
+          _auditEvents: null,
+          _modifiedProperties: [],
+          _additionalModels: null
+        },
+        _isNew: false,
+        _workerEntities: {},
+        _readyForDeletionWorkers: null,
+        _status: 'COMPLETE',
+        _logLevel: 300
+      }
+    ]);
+
+  expect(bulkUpload).to.have.property('validate');
+
+  // call the validation to ensure the proper error is shown
+  await bulkUpload.validate();
+
+  const validationErrors = bulkUpload.validationErrors;
+
+  // assert a warning was returned
+
+  expect(validationErrors).to.deep.equal([
+    {
+      "lineNumber": 2,
+      "name": "omar3",
+      "origin": "Establishments",
+      "source": "AB13 4NJ",
+      "errCode": 1040,
+      "errType": "ADDRESS_ERROR",
+      "error": "The Postcode for this workplace cannot be found in our database and must be registered manually."
+    }
+  ]);
+});
+
+it('should not emit an error if postcode can be found in the reference data', async () => {
+  const bulkUpload = new (testUtils.sandBox(
+    filename,
+    {
+      locals: {
+        require: testUtils.wrapRequire({
+          '../BUDI': {
+            BUDI
+          },
+          '../../index': {
+            establishment: models.establishment,
+                pcodedata: models.pcodedata
+          }
+        })
+      }
+    }
+  ).Establishment)(
+    {
+      LOCALESTID: 'omar3',
+      STATUS: 'NEW',
+      ESTNAME: 'WOZiTech, with even more care',
+      ADDRESS1: 'First Line',
+      ADDRESS2: 'Second Line',
+      ADDRESS3: '',
+      POSTTOWN: 'My Town',
+      POSTCODE: 'AB13 4MJ',
+      ESTTYPE: '6',
+      OTHERTYPE: '',
+      PERMCQC: '1',
+      PERMLA: '1',
+      SHARELA: '708;721;720',
+      REGTYPE: '2',
+      PROVNUM: '1-123456781',
+      LOCATIONID: '1-123456781',
+      MAINSERVICE: '8',
+    ALLSERVICES: '12;13',
+      CAPACITY: '0;0',
+      UTILISATION: '0;0',
+      SERVICEDESC: '1;1',
+      SERVICEUSERS: '',
+      OTHERUSERDESC: '',
+      TOTALPERMTEMP: '1',
+      ALLJOBROLES: '34;8;4',
+      STARTERS: '0;0;0',
+      LEAVERS: '999;0;0',
+      VACANCIES: '999;333;1',
+      REASONS: '',
+      REASONNOS: ''
+    },
+    2,
+    [
+      {
+        _validations: [],
+        _username: 'aylingw',
+        _id: 479,
+        _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+        _ustatus: null,
+        _created: '2019-03-15T09:54:10.562Z',
+        _updated: '2019-10-04T15:46:16.158Z',
+        _updatedBy: 'aylingw',
+        _auditEvents: null,
+        _name: 'WOZiTech, with even more care',
+        _address1: 'First Line',
+        _address2: 'Second Line',
+        _address3: '',
+        _town: 'My Town',
+        _county: '',
+        _locationId: null,
+        _provId: null,
+        _postcode: 'LN11 9JG',
+        _isRegulated: false,
+        _mainService: { id: 16, name: 'Head office services' },
+        _nmdsId: 'G1001114',
+        _lastWdfEligibility: '2019-08-16T07:17:38.014Z',
+        _overallWdfEligibility: '2019-08-16T07:17:38.340Z',
+        _establishmentWdfEligibility: null,
+        _staffWdfEligibility: '2019-08-13T12:41:24.836Z',
+        _isParent: true,
+        _parentUid: null,
+        _parentId: null,
+        _parentName: null,
+        _dataOwner: 'Workplace',
+        _dataPermissions: 'None',
+        _archived: false,
+        _dataOwnershipRequested: null,
+        _reasonsForLeaving: '',
+        _properties: {
+          _properties: [Object],
+          _propertyTypes: [Array],
+          _auditEvents: null,
+          _modifiedProperties: [],
+          _additionalModels: null
+        },
+        _isNew: false,
+        _workerEntities: {
+        },
+        _readyForDeletionWorkers: null,
+        _status: 'NEW',
+        _logLevel: 300
+      },
+      {
+        _validations: [],
+        _username: 'aylingw',
+        _id: 1446,
+        _uid: 'a415435f-40f2-4de5-abf7-bff611e85591',
+        _ustatus: null,
+        _created: '2019-07-31T15:09:57.405Z',
+        _updated: '2019-10-04T15:46:16.797Z',
+        _updatedBy: 'aylingw',
+        _auditEvents: null,
+        _name: 'WOZiTech Cares Sub 100',
+        _address1: 'Number 1',
+        _address2: 'My street',
+        _address3: '',
+        _town: 'My Town',
+        _county: '',
+        _locationId: '1-888777666',
+        _provId: '1-999888777',
+        _postcode: 'LN11 9JG',
+        _isRegulated: true,
+        _mainService: { id: 1, name: 'Carers support' },
+        _nmdsId: 'G1002110',
+        _lastWdfEligibility: '2019-10-04T15:46:16.797Z',
+        _overallWdfEligibility: null,
+        _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z',
+        _staffWdfEligibility: null,
+        _isParent: false,
+        _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+        _parentId: 479,
+        _parentName: null,
+        _dataOwner: 'Parent',
+        _dataPermissions: 'None',
+        _archived: false,
+        _dataOwnershipRequested: null,
+        _reasonsForLeaving: '',
+        _properties: {
+          _properties: [Object],
+          _propertyTypes: [Array],
+          _auditEvents: null,
+          _modifiedProperties: [],
+          _additionalModels: null
+        },
+        _isNew: false,
+        _workerEntities: {},
+        _readyForDeletionWorkers: null,
+        _status: 'COMPLETE',
+        _logLevel: 300
+      }
+    ]);
+
+  expect(bulkUpload).to.have.property('validate');
+
+  // call the validation to ensure the proper error is shown
+  await bulkUpload.validate();
+
+  const validationErrors = bulkUpload.validationErrors;
+
+  // assert a warning was returned
+
+  expect(validationErrors).to.deep.equal([]);
+});
+
+it('should emit an warning if postcode cannot be found in the reference data', async () => {
+  const bulkUpload = new (testUtils.sandBox(
+    filename,
+    {
+      locals: {
+        require: testUtils.wrapRequire({
+          '../BUDI': {
+            BUDI
+          },
+          '../../index': {
+            establishment: models.establishment,
+                pcodedata: models.pcodedata
+          }
+        })
+      }
+    }
+  ).Establishment)(
+    {
+      LOCALESTID: 'omar3',
+      STATUS: 'UPDATE',
+      ESTNAME: 'WOZiTech, with even more care',
+      ADDRESS1: 'First Line',
+      ADDRESS2: 'Second Line',
+      ADDRESS3: '',
+      POSTTOWN: 'My Town',
+      POSTCODE: 'AB13 4NJ',
+      ESTTYPE: '6',
+      OTHERTYPE: '',
+      PERMCQC: '1',
+      PERMLA: '1',
+      SHARELA: '708;721;720',
+      REGTYPE: '2',
+      PROVNUM: '1-123456781',
+      LOCATIONID: '1-123456781',
+      MAINSERVICE: '8',
+    ALLSERVICES: '12;13',
+      CAPACITY: '0;0',
+      UTILISATION: '0;0',
+      SERVICEDESC: '1;1',
+      SERVICEUSERS: '',
+      OTHERUSERDESC: '',
+      TOTALPERMTEMP: '1',
+      ALLJOBROLES: '34;8;4',
+      STARTERS: '0;0;0',
+      LEAVERS: '999;0;0',
+      VACANCIES: '999;333;1',
+      REASONS: '',
+      REASONNOS: ''
+    },
+    2,
+    [
+      {
+        _validations: [],
+        _username: 'aylingw',
+        _id: 479,
+        _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+        _ustatus: null,
+        _created: '2019-03-15T09:54:10.562Z',
+        _updated: '2019-10-04T15:46:16.158Z',
+        _updatedBy: 'aylingw',
+        _auditEvents: null,
+        _name: 'WOZiTech, with even more care',
+        _address1: 'First Line',
+        _address2: 'Second Line',
+        _address3: '',
+        _town: 'My Town',
+        _county: '',
+        _locationId: null,
+        _provId: null,
+        _postcode: 'LN11 9JG',
+        _isRegulated: false,
+        _mainService: { id: 16, name: 'Head office services' },
+        _nmdsId: 'G1001114',
+        _lastWdfEligibility: '2019-08-16T07:17:38.014Z',
+        _overallWdfEligibility: '2019-08-16T07:17:38.340Z',
+        _establishmentWdfEligibility: null,
+        _staffWdfEligibility: '2019-08-13T12:41:24.836Z',
+        _isParent: true,
+        _parentUid: null,
+        _parentId: null,
+        _parentName: null,
+        _dataOwner: 'Workplace',
+        _dataPermissions: 'None',
+        _archived: false,
+        _dataOwnershipRequested: null,
+        _reasonsForLeaving: '',
+        _properties: {
+          _properties: [Object],
+          _propertyTypes: [Array],
+          _auditEvents: null,
+          _modifiedProperties: [],
+          _additionalModels: null
+        },
+        _isNew: false,
+        _workerEntities: {
+        },
+        _readyForDeletionWorkers: null,
+        _status: 'NEW',
+        _logLevel: 300
+      },
+      {
+        _validations: [],
+        _username: 'aylingw',
+        _id: 1446,
+        _uid: 'a415435f-40f2-4de5-abf7-bff611e85591',
+        _ustatus: null,
+        _created: '2019-07-31T15:09:57.405Z',
+        _updated: '2019-10-04T15:46:16.797Z',
+        _updatedBy: 'aylingw',
+        _auditEvents: null,
+        _name: 'WOZiTech Cares Sub 100',
+        _address1: 'Number 1',
+        _address2: 'My street',
+        _address3: '',
+        _town: 'My Town',
+        _county: '',
+        _locationId: '1-888777666',
+        _provId: '1-999888777',
+        _postcode: 'AB13 4NJ',
+        _isRegulated: true,
+        _mainService: { id: 1, name: 'Carers support' },
+        _nmdsId: 'G1002110',
+        _lastWdfEligibility: '2019-10-04T15:46:16.797Z',
+        _overallWdfEligibility: null,
+        _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z',
+        _staffWdfEligibility: null,
+        _isParent: false,
+        _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+        _parentId: 479,
+        _parentName: null,
+        _dataOwner: 'Parent',
+        _dataPermissions: 'None',
+        _archived: false,
+        _dataOwnershipRequested: null,
+        _reasonsForLeaving: '',
+        _properties: {
+          _properties: [Object],
+          _propertyTypes: [Array],
+          _auditEvents: null,
+          _modifiedProperties: [],
+          _additionalModels: null
+        },
+        _isNew: false,
+        _workerEntities: {},
+        _readyForDeletionWorkers: null,
+        _status: 'COMPLETE',
+        _logLevel: 300
+      }
+    ]);
+
+  expect(bulkUpload).to.have.property('validate');
+
+  // call the validation to ensure the proper error is shown
+  await bulkUpload.validate();
+
+  const validationErrors = bulkUpload.validationErrors;
+
+  // assert a warning was returned
+
+  expect(validationErrors).to.deep.equal([
+    {
+      "errCode": 1020,
+      "errType": "STATUS_ERROR",
+      "error": "Workplace has a STATUS of UPDATE but does not exist, please change to NEW to add it",
+      "lineNumber": 2,
+      "name": "omar3",
+      "origin": "Establishments",
+      "source": "UPDATE"
+    },
+    {
+      "lineNumber": 2,
+      "name": "omar3",
+      "origin": "Establishments",
+      "source": "AB13 4NJ",
+      "warnCode": 1040,
+      "warnType": "ADDRESS_ERROR",
+      "warning": "The POSTCODE cannot be found in our database and will be ignored."
+    }
+  ]);
+});
+
+it('should not emit an error if postcode can be found in the reference data', async () => {
+  const bulkUpload = new (testUtils.sandBox(
+    filename,
+    {
+      locals: {
+        require: testUtils.wrapRequire({
+          '../BUDI': {
+            BUDI
+          },
+          '../../index': {
+            establishment: models.establishment,
+                pcodedata: models.pcodedata
+          }
+        })
+      }
+    }
+  ).Establishment)(
+    {
+      LOCALESTID: 'omar3',
+      STATUS: 'UPDATE',
+      ESTNAME: 'WOZiTech, with even more care',
+      ADDRESS1: 'First Line',
+      ADDRESS2: 'Second Line',
+      ADDRESS3: '',
+      POSTTOWN: 'My Town',
+      POSTCODE: 'AB13 4MJ',
+      ESTTYPE: '6',
+      OTHERTYPE: '',
+      PERMCQC: '1',
+      PERMLA: '1',
+      SHARELA: '708;721;720',
+      REGTYPE: '2',
+      PROVNUM: '1-123456781',
+      LOCATIONID: '1-123456781',
+      MAINSERVICE: '8',
+    ALLSERVICES: '12;13',
+      CAPACITY: '0;0',
+      UTILISATION: '0;0',
+      SERVICEDESC: '1;1',
+      SERVICEUSERS: '',
+      OTHERUSERDESC: '',
+      TOTALPERMTEMP: '1',
+      ALLJOBROLES: '34;8;4',
+      STARTERS: '0;0;0',
+      LEAVERS: '999;0;0',
+      VACANCIES: '999;333;1',
+      REASONS: '',
+      REASONNOS: ''
+    },
+    2,
+    [
+      {
+        _validations: [],
+        _username: 'aylingw',
+        _id: 479,
+        _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+        _ustatus: null,
+        _created: '2019-03-15T09:54:10.562Z',
+        _updated: '2019-10-04T15:46:16.158Z',
+        _updatedBy: 'aylingw',
+        _auditEvents: null,
+        _name: 'WOZiTech, with even more care',
+        _address1: 'First Line',
+        _address2: 'Second Line',
+        _address3: '',
+        _town: 'My Town',
+        _county: '',
+        _locationId: null,
+        _provId: null,
+        _postcode: 'LN11 9JG',
+        _isRegulated: false,
+        _mainService: { id: 16, name: 'Head office services' },
+        _nmdsId: 'G1001114',
+        _lastWdfEligibility: '2019-08-16T07:17:38.014Z',
+        _overallWdfEligibility: '2019-08-16T07:17:38.340Z',
+        _establishmentWdfEligibility: null,
+        _staffWdfEligibility: '2019-08-13T12:41:24.836Z',
+        _isParent: true,
+        _parentUid: null,
+        _parentId: null,
+        _parentName: null,
+        _dataOwner: 'Workplace',
+        _dataPermissions: 'None',
+        _archived: false,
+        _dataOwnershipRequested: null,
+        _reasonsForLeaving: '',
+        _properties: {
+          _properties: [Object],
+          _propertyTypes: [Array],
+          _auditEvents: null,
+          _modifiedProperties: [],
+          _additionalModels: null
+        },
+        _isNew: false,
+        _workerEntities: {
+        },
+        _readyForDeletionWorkers: null,
+        _status: 'NEW',
+        _logLevel: 300
+      },
+      {
+        _validations: [],
+        _username: 'aylingw',
+        _id: 1446,
+        _uid: 'a415435f-40f2-4de5-abf7-bff611e85591',
+        _ustatus: null,
+        _created: '2019-07-31T15:09:57.405Z',
+        _updated: '2019-10-04T15:46:16.797Z',
+        _updatedBy: 'aylingw',
+        _auditEvents: null,
+        _name: 'WOZiTech Cares Sub 100',
+        _address1: 'Number 1',
+        _address2: 'My street',
+        _address3: '',
+        _town: 'My Town',
+        _county: '',
+        _locationId: '1-888777666',
+        _provId: '1-999888777',
+        _postcode: 'LN11 9JG',
+        _isRegulated: true,
+        _mainService: { id: 1, name: 'Carers support' },
+        _nmdsId: 'G1002110',
+        _lastWdfEligibility: '2019-10-04T15:46:16.797Z',
+        _overallWdfEligibility: null,
+        _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z',
+        _staffWdfEligibility: null,
+        _isParent: false,
+        _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+        _parentId: 479,
+        _parentName: null,
+        _dataOwner: 'Parent',
+        _dataPermissions: 'None',
+        _archived: false,
+        _dataOwnershipRequested: null,
+        _reasonsForLeaving: '',
+        _properties: {
+          _properties: [Object],
+          _propertyTypes: [Array],
+          _auditEvents: null,
+          _modifiedProperties: [],
+          _additionalModels: null
+        },
+        _isNew: false,
+        _workerEntities: {},
+        _readyForDeletionWorkers: null,
+        _status: 'COMPLETE',
+        _logLevel: 300
+      }
+    ]);
+
+  expect(bulkUpload).to.have.property('validate');
+
+  // call the validation to ensure the proper error is shown
+  await bulkUpload.validate();
+
+  const validationErrors = bulkUpload.validationErrors;
+
+  // assert a warning was returned
+
+  expect(validationErrors).to.deep.equal([
+    {
+      "errCode": 1020,
+      "errType": "STATUS_ERROR",
+      "error": "Workplace has a STATUS of UPDATE but does not exist, please change to NEW to add it",
+      "lineNumber": 2,
+      "name": "omar3",
+      "origin": "Establishments",
+      "source": "UPDATE"
+    }
+  ]);
+});
+  });
+
+  describe('cross entity validations', () => {
+    it('should an error if cqc registered and have no registered manager vacancy or registered manager staff member', async () => {
+      const bulkUpload = new (testUtils.sandBox(
+        filename,
+        {
+          locals: {
+            require: testUtils.wrapRequire({
+              '../BUDI': {
+                BUDI
+              },
+              '../../index': {
+                establishment: models.establishment,
+                    pcodedata: models.pcodedata
+              }
+            })
+          }
+        }
+      ).Establishment)(
+        {
+          LOCALESTID: 'omar3',
+      STATUS: 'UPDATE',
+      ESTNAME: 'WOZiTech, with even more care',
+      ADDRESS1: 'First Line',
+      ADDRESS2: 'Second Line',
+      ADDRESS3: '',
+      POSTTOWN: 'My Town',
+      POSTCODE: 'AB13 4NJ',
+      ESTTYPE: '6',
+      OTHERTYPE: '',
+      PERMCQC: '1',
+      PERMLA: '1',
+      SHARELA: '708;721;720',
+      REGTYPE: '2',
+      PROVNUM: '1-123456781',
+      LOCATIONID: '1-123456781',
+      MAINSERVICE: '8',
+      ALLSERVICES: '12;13',
+      CAPACITY: '0;0',
+      UTILISATION: '0;0',
+      SERVICEDESC: '1;1',
+      SERVICEUSERS: '',
+      OTHERUSERDESC: '',
+      TOTALPERMTEMP: '1',
+      ALLJOBROLES: '34;8',
+      STARTERS: '0;0',
+      LEAVERS: '999;0',
+      VACANCIES: '999;333',
+      REASONS: '',
+      REASONNOS: ''
+        },
+        2,
         [
           {
             _validations: [],
@@ -1279,12 +2649,10 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
       const csvEstablishmentSchemaErrors = [];
 
       const myWorkers = [{
-        establishmentKey: 'omar3',
         status: 'UPDATE',
-        uniqueWorker: '3',
-        contractTypeId: 1,
-        mainJobRoleId: 1,
-        otherJobIds: []
+        establishmentKey: 'omar3',
+        mainJobRoleId: 3,
+        otherJobIds: [6]
       }];
 
       // the real version of this code is in the api Establishment business object and runs a sql query.
@@ -1313,14 +2681,13 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
         lineNumber: 2,
         name: 'omar3',
         origin: 'Establishments',
-        source: '1',
-        warnCode: 2200,
-        warnType: 'TOTAL_PERM_TEMP_WARNING',
-        warning: 'The number of direct care staff is 0 please check your staff records'
+        source: '34;8',
+        errCode: 1280,
+        errType: 'ALL_JOBS_ERROR',
+        error: 'You do not have a staff record for a Registered Manager therefore must record a vacancy for one'
       });
     });
-
-    it('should emit a warning if there no non-direct care staff', async () => {
+    it('should not an error if cqc registered and have registered manager vacancy or registered manager staff member (as main)', async () => {
       const bulkUpload = new (testUtils.sandBox(
         filename,
         {
@@ -1328,6 +2695,10 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
             require: testUtils.wrapRequire({
               '../BUDI': {
                 BUDI
+              },
+              '../../index': {
+                establishment: models.establishment,
+                    pcodedata: models.pcodedata
               }
             })
           }
@@ -1335,35 +2706,35 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
       ).Establishment)(
         {
           LOCALESTID: 'omar3',
-          STATUS: 'UPDATE',
-          ESTNAME: 'WOZiTech, with even more care',
-          ADDRESS1: 'First Line',
-          ADDRESS2: 'Second Line',
-          ADDRESS3: '',
-          POSTTOWN: 'My Town',
-          POSTCODE: 'LN11 9JG',
-          ESTTYPE: '1',
-          OTHERTYPE: '',
-          PERMCQC: '1',
-          PERMLA: '1',
-          SHARELA: '708;721;720',
-          REGTYPE: '2',
-          PROVNUM: '',
-          LOCATIONID: '',
-          MAINSERVICE: '72',
-          ALLSERVICES: '72;13',
-          CAPACITY: '',
-          UTILISATION: '',
-          SERVICEDESC: '1;1',
-          SERVICEUSERS: '',
-          OTHERUSERDESC: '',
-          TOTALPERMTEMP: '1',
-          ALLJOBROLES: '34;8',
-          STARTERS: '0;0',
-          LEAVERS: '999',
-          VACANCIES: '999;333',
-          REASONS: '',
-          REASONNOS: ''
+      STATUS: 'UPDATE',
+      ESTNAME: 'WOZiTech, with even more care',
+      ADDRESS1: 'First Line',
+      ADDRESS2: 'Second Line',
+      ADDRESS3: '',
+      POSTTOWN: 'My Town',
+      POSTCODE: 'AB13 4NJ',
+      ESTTYPE: '6',
+      OTHERTYPE: '',
+      PERMCQC: '1',
+      PERMLA: '1',
+      SHARELA: '708;721;720',
+      REGTYPE: '2',
+      PROVNUM: '1-123456781',
+      LOCATIONID: '1-123456781',
+      MAINSERVICE: '8',
+      ALLSERVICES: '12;13',
+      CAPACITY: '0;0',
+      UTILISATION: '0;0',
+      SERVICEDESC: '1;1',
+      SERVICEUSERS: '',
+      OTHERUSERDESC: '',
+      TOTALPERMTEMP: '1',
+      ALLJOBROLES: '34;8',
+      STARTERS: '0;0',
+      LEAVERS: '999;0',
+      VACANCIES: '999;333',
+      REASONS: '',
+      REASONNOS: ''
         },
         2,
         [
@@ -1471,11 +2842,9 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
       const csvEstablishmentSchemaErrors = [];
 
       const myWorkers = [{
-        establishmentKey: 'omar3',
         status: 'UPDATE',
-        uniqueWorker: '3',
-        contractTypeId: 1,
-        mainJobRoleId: 10,
+        establishmentKey: 'omar3',
+        mainJobRoleId: 4,
         otherJobIds: []
       }];
 
@@ -1497,22 +2866,12 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
 
       // assert the fetchMyEstalishmentsWorkers function was called
       expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1);
-
       // assert a warning was returned
-      expect(csvEstablishmentSchemaErrors.length).to.equal(1);
+      expect(csvEstablishmentSchemaErrors.length).to.equal(0);
 
-      expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({
-        lineNumber: 2,
-        name: 'omar3',
-        origin: 'Establishments',
-        source: '1',
-        warnCode: 2200,
-        warnType: 'TOTAL_PERM_TEMP_WARNING',
-        warning: 'The number of non-direct care staff is 0 please check your staff records'
-      });
+      expect(csvEstablishmentSchemaErrors[0]).to.deep.equal();
     });
-
-    it('should emit a warning if there are fewer employed staff than non employed staff', async () => {
+    it('should not an error if cqc registered and have registered manager vacancy or registered manager staff member (as other)', async () => {
       const bulkUpload = new (testUtils.sandBox(
         filename,
         {
@@ -1520,6 +2879,10 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
             require: testUtils.wrapRequire({
               '../BUDI': {
                 BUDI
+              },
+              '../../index': {
+                establishment: models.establishment,
+                    pcodedata: models.pcodedata
               }
             })
           }
@@ -1527,35 +2890,35 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
       ).Establishment)(
         {
           LOCALESTID: 'omar3',
-          STATUS: 'UPDATE',
-          ESTNAME: 'WOZiTech, with even more care',
-          ADDRESS1: 'First Line',
-          ADDRESS2: 'Second Line',
-          ADDRESS3: '',
-          POSTTOWN: 'My Town',
-          POSTCODE: 'LN11 9JG',
-          ESTTYPE: '6',
-          OTHERTYPE: '',
-          PERMCQC: '1',
-          PERMLA: '1',
-          SHARELA: '708;721;720',
-          REGTYPE: '0',
-          PROVNUM: '',
-          LOCATIONID: '',
-          MAINSERVICE: '72',
-          ALLSERVICES: '72;13',
-          CAPACITY: '',
-          UTILISATION: '',
-          SERVICEDESC: '1;1',
-          SERVICEUSERS: '',
-          OTHERUSERDESC: '',
-          TOTALPERMTEMP: '10',
-          ALLJOBROLES: '34;8',
-          STARTERS: '0;0',
-          LEAVERS: '999',
-          VACANCIES: '999;333',
-          REASONS: '',
-          REASONNOS: ''
+      STATUS: 'UPDATE',
+      ESTNAME: 'WOZiTech, with even more care',
+      ADDRESS1: 'First Line',
+      ADDRESS2: 'Second Line',
+      ADDRESS3: '',
+      POSTTOWN: 'My Town',
+      POSTCODE: 'AB13 4NJ',
+      ESTTYPE: '6',
+      OTHERTYPE: '',
+      PERMCQC: '1',
+      PERMLA: '1',
+      SHARELA: '708;721;720',
+      REGTYPE: '2',
+      PROVNUM: '1-123456781',
+      LOCATIONID: '1-123456781',
+      MAINSERVICE: '8',
+      ALLSERVICES: '12;13',
+      CAPACITY: '0;0',
+      UTILISATION: '0;0',
+      SERVICEDESC: '1;1',
+      SERVICEUSERS: '',
+      OTHERUSERDESC: '',
+      TOTALPERMTEMP: '1',
+      ALLJOBROLES: '34;8',
+      STARTERS: '0;0',
+      LEAVERS: '999;0',
+      VACANCIES: '999;333',
+      REASONS: '',
+      REASONNOS: ''
         },
         2,
         [
@@ -1663,87 +3026,16 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
       const csvEstablishmentSchemaErrors = [];
 
       const myWorkers = [{
-        establishmentKey: 'omar3',
         status: 'UPDATE',
-        uniqueWorker: '3',
-        contractTypeId: 2,
-        mainJobRoleId: 10,
-        otherJobIds: []
+        establishmentKey: 'omar3',
+        mainJobRoleId: 3,
+        otherJobIds: [4]
       }];
 
       // the real version of this code is in the api Establishment business object and runs a sql query.
       // We just return a 'fake result set'
       const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => {
-        return [{
-          establishmentKey: 'omar3',
-          uniqueWorker: '3',
-          contractTypeId: 'Permanent',
-          mainJobRoleId: 10,
-          otherJobIds: ''
-        },
-        {
-          establishmentKey: 'omar3',
-          uniqueWorker: 'WA100',
-          contractTypeId: 'Temporary',
-          mainJobRoleId: 26,
-          otherJobIds: ''
-        },
-        {
-          establishmentKey: 'omar3',
-          uniqueWorker: '5',
-          contractTypeId: 'Pool/Bank',
-          mainJobRoleId: 7,
-          otherJobIds: ''
-        },
-        {
-          establishmentKey: 'omar3',
-          uniqueWorker: '6',
-          contractTypeId: 'Temporary',
-          mainJobRoleId: 17,
-          otherJobIds: ''
-        },
-        {
-          establishmentKey: 'omar3',
-          uniqueWorker: 'WA103',
-          contractTypeId: 'Temporary',
-          mainJobRoleId: 26,
-          otherJobIds: ''
-        },
-        {
-          establishmentKey: 'omar3',
-          uniqueWorker: '10',
-          contractTypeId: 'Other',
-          mainJobRoleId: 18,
-          otherJobIds: ''
-        },
-        {
-          establishmentKey: 'omar3',
-          uniqueWorker: '4',
-          contractTypeId: 'Other',
-          mainJobRoleId: 1,
-          otherJobIds: ''
-        },
-        {
-          establishmentKey: 'omar3',
-          uniqueWorker: 'SA 4',
-          contractTypeId: 'Other',
-          mainJobRoleId: 23,
-          otherJobIds: ''
-        },
-        {
-          establishmentKey: 'omar3',
-          uniqueWorker: 'FTSpecial',
-          contractTypeId: 'Other',
-          mainJobRoleId: 24,
-          otherJobIds: ''
-        },
-        {
-          establishmentKey: 'omar3',
-          uniqueWorker: '1',
-          contractTypeId: 'Other',
-          mainJobRoleId: 2,
-          otherJobIds: ''
-        }];
+        return [];
       });
 
       // Regular validation has to run first for the establishment to populate the internal properties correctly
@@ -1760,17 +3052,9 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => {
       expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1);
 
       // assert a warning was returned
-      expect(csvEstablishmentSchemaErrors.length).to.equal(1);
+      expect(csvEstablishmentSchemaErrors.length).to.equal(0);
 
-      expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({
-        lineNumber: 2,
-        name: 'omar3',
-        origin: 'Establishments',
-        source: '10',
-        warnCode: 2200,
-        warnType: 'TOTAL_PERM_TEMP_WARNING',
-        warning: 'The number of employed staff is less than the number of non-employed staff please check your staff records'
-      });
+      expect(csvEstablishmentSchemaErrors[0]).to.deep.equal();
     });
   });
 });
diff --git a/server/test/unit/models/Bulkimport/csv/workers.spec.js b/server/test/unit/models/Bulkimport/csv/workers.spec.js
index 661e202337..b85964af2f 100644
--- a/server/test/unit/models/Bulkimport/csv/workers.spec.js
+++ b/server/test/unit/models/Bulkimport/csv/workers.spec.js
@@ -4,6 +4,7 @@ const establishmentId = require('../../../mockdata/workers').establishmentId;
 const maxquals = require('../../../mockdata/workers').maxquals;
 const knownHeaders = require('../../../mockdata/workers').knownHeaders;
 const moment = require('moment');
+const filename = 'server/models/BulkImport/csv/workers.js';
 
 const testUtils = require('../../../../../utils/testUtils');
 const csv = require('csvtojson');
@@ -18,278 +19,278 @@ function mapCsvToWorker(worker, headers) {
   return mapped;
 }
 
+const BUDI = {
+    ethnicity: (direction, originalCode) => {
+      const fixedMapping = [
+        { ASC: 1, BUDI: 31 },
+        { ASC: 3, BUDI: 32 },
+        { ASC: 4, BUDI: 33 },
+        { ASC: 5, BUDI: 34 },
+        { ASC: 6, BUDI: 35 },
+        { ASC: 7, BUDI: 36 },
+        { ASC: 8, BUDI: 37 },
+        { ASC: 9, BUDI: 38 },
+        { ASC: 10, BUDI: 39 },
+        { ASC: 11, BUDI: 40 },
+        { ASC: 12, BUDI: 41 },
+        { ASC: 13, BUDI: 42 },
+        { ASC: 14, BUDI: 43 },
+        { ASC: 15, BUDI: 44 },
+        { ASC: 16, BUDI: 45 },
+        { ASC: 17, BUDI: 46 },
+        { ASC: 18, BUDI: 47 },
+        { ASC: 19, BUDI: 98 },
+        { ASC: 2, BUDI: 99 }
+      ];
+
+      if (direction === BUDI_TO_ASC) {
+        const found = fixedMapping.find(thisEthnicity => thisEthnicity.BUDI === originalCode);
+        return found ? found.ASC : null;
+      }
+
+      const found = fixedMapping.find(thisEthnicity => thisEthnicity.ASC === originalCode);
+      return found ? found.BUDI : null;
+    },
+
+    jobRoles: (direction, originalCode) => {
+      const fixedMapping = [
+        { ASC: 26, BUDI: 1 },
+        { ASC: 15, BUDI: 2 },
+        { ASC: 13, BUDI: 3 },
+        { ASC: 22, BUDI: 4 },
+        { ASC: 28, BUDI: 5 },
+        { ASC: 27, BUDI: 6 },
+        { ASC: 25, BUDI: 7 },
+        { ASC: 10, BUDI: 8 },
+        { ASC: 11, BUDI: 9 },
+        { ASC: 12, BUDI: 10 },
+        { ASC: 3, BUDI: 11 },
+        { ASC: 18, BUDI: 15 },
+        { ASC: 23, BUDI: 16 },
+        { ASC: 4, BUDI: 17 },
+        { ASC: 29, BUDI: 22 },
+        { ASC: 20, BUDI: 23 },
+        { ASC: 14, BUDI: 24 },
+        { ASC: 2, BUDI: 25 },
+        { ASC: 5, BUDI: 26 },
+        { ASC: 21, BUDI: 27 },
+        { ASC: 1, BUDI: 34 },
+        { ASC: 24, BUDI: 35 },
+        { ASC: 19, BUDI: 36 },
+        { ASC: 17, BUDI: 37 },
+        { ASC: 16, BUDI: 38 },
+        { ASC: 7, BUDI: 39 },
+        { ASC: 8, BUDI: 40 },
+        { ASC: 9, BUDI: 41 },
+        { ASC: 6, BUDI: 42 }
+      ];
+
+      if (direction === BUDI_TO_ASC) {
+        const found = fixedMapping.find(thisJob => thisJob.BUDI === originalCode);
+        return found ? found.ASC : null;
+      }
+
+      const found = fixedMapping.find(thisJob => thisJob.ASC === originalCode);
+      return found ? found.BUDI : null;
+    },
+    nursingSpecialist: (direction, originalCode) => {
+      const fixedMapping = [
+        { BUDI: 1, ASC: 1 },
+        { BUDI: 2, ASC: 2 },
+        { BUDI: 3, ASC: 3 },
+        { BUDI: 4, ASC: 4 },
+        { BUDI: 5, ASC: 5 },
+        { BUDI: 6, ASC: 6 },
+        { BUDI: 7, ASC: 7 },
+        { BUDI: 8, ASC: 8 }
+      ];
+
+      if (direction === BUDI_TO_ASC) {
+        const found = fixedMapping.find(thisSpecialist => thisSpecialist.BUDI === originalCode);
+        return found ? found.ASC : null;
+      }
+
+      const found = fixedMapping.find(thisSpecialist => thisSpecialist.ASC === originalCode);
+      return found ? found.BUDI : null;
+    },
+    qualificationLevels: (direction, originalCode) => {
+      const fixedMapping = [
+        { BUDI: 0, ASC: 1 },
+        { BUDI: 1, ASC: 2 },
+        { BUDI: 2, ASC: 3 },
+        { BUDI: 3, ASC: 4 },
+        { BUDI: 4, ASC: 5 },
+        { BUDI: 5, ASC: 6 },
+        { BUDI: 6, ASC: 7 },
+        { BUDI: 7, ASC: 8 },
+        { BUDI: 8, ASC: 9 },
+        { BUDI: 999, ASC: 10 }
+      ];
+
+      if (direction === BUDI_TO_ASC) {
+        const found = fixedMapping.find(thisSpecialist => thisSpecialist.BUDI === originalCode);
+        return found ? found.ASC : null;
+      }
+
+      const found = fixedMapping.find(thisSpecialist => thisSpecialist.ASC === originalCode);
+      return found ? found.BUDI : null;
+    },
+    qualifications: (direction, originalCode) => {
+      const fixedMapping = [
+        { BUDI: 1, ASC: 97 },
+        { BUDI: 2, ASC: 98 },
+        { BUDI: 3, ASC: 96 },
+        { BUDI: 4, ASC: 93 },
+        { BUDI: 5, ASC: 94 },
+        { BUDI: 6, ASC: 95 },
+        { BUDI: 8, ASC: 24 },
+        { BUDI: 9, ASC: 99 },
+        { BUDI: 10, ASC: 100 },
+        { BUDI: 12, ASC: 25 },
+        { BUDI: 13, ASC: 102 },
+        { BUDI: 14, ASC: 107 },
+        { BUDI: 15, ASC: 106 },
+        { BUDI: 16, ASC: 72 },
+        { BUDI: 17, ASC: 89 },
+        { BUDI: 18, ASC: 71 },
+        { BUDI: 19, ASC: 16 },
+        { BUDI: 20, ASC: 1 },
+        { BUDI: 22, ASC: 14 },
+        { BUDI: 25, ASC: 15 },
+        { BUDI: 26, ASC: 26 },
+        { BUDI: 27, ASC: 114 },
+        { BUDI: 28, ASC: 116 },
+        { BUDI: 32, ASC: 115 },
+        { BUDI: 33, ASC: 113 },
+        { BUDI: 34, ASC: 111 },
+        { BUDI: 35, ASC: 109 },
+        { BUDI: 36, ASC: 110 },
+        { BUDI: 37, ASC: 117 },
+        { BUDI: 38, ASC: 118 },
+        { BUDI: 39, ASC: 119 },
+        { BUDI: 41, ASC: 20 },
+        { BUDI: 42, ASC: 30 },
+        { BUDI: 48, ASC: 4 },
+        { BUDI: 49, ASC: 5 },
+        { BUDI: 50, ASC: 60 },
+        { BUDI: 51, ASC: 61 },
+        { BUDI: 52, ASC: 10 },
+        { BUDI: 53, ASC: 80 },
+        { BUDI: 54, ASC: 81 },
+        { BUDI: 55, ASC: 82 },
+        { BUDI: 56, ASC: 83 },
+        { BUDI: 57, ASC: 84 },
+        { BUDI: 58, ASC: 85 },
+        { BUDI: 62, ASC: 86 },
+        { BUDI: 63, ASC: 87 },
+        { BUDI: 64, ASC: 88 },
+        { BUDI: 67, ASC: 21 },
+        { BUDI: 68, ASC: 22 },
+        { BUDI: 72, ASC: 23 },
+        { BUDI: 73, ASC: 32 },
+        { BUDI: 74, ASC: 19 },
+        { BUDI: 76, ASC: 64 },
+        { BUDI: 77, ASC: 65 },
+        { BUDI: 82, ASC: 103 },
+        { BUDI: 83, ASC: 104 },
+        { BUDI: 84, ASC: 105 },
+        { BUDI: 85, ASC: 17 },
+        { BUDI: 86, ASC: 2 },
+        { BUDI: 87, ASC: 45 },
+        { BUDI: 88, ASC: 9 },
+        { BUDI: 89, ASC: 69 },
+        { BUDI: 90, ASC: 12 },
+        { BUDI: 91, ASC: 18 },
+        { BUDI: 92, ASC: 130 },
+        { BUDI: 93, ASC: 62 },
+        { BUDI: 94, ASC: 66 },
+        { BUDI: 95, ASC: 67 },
+        { BUDI: 96, ASC: 11 },
+        { BUDI: 98, ASC: 59 },
+        { BUDI: 99, ASC: 6 },
+        { BUDI: 100, ASC: 7 },
+        { BUDI: 101, ASC: 68 },
+        { BUDI: 102, ASC: 63 },
+        { BUDI: 103, ASC: 8 },
+        { BUDI: 104, ASC: 75 },
+        { BUDI: 105, ASC: 76 },
+        { BUDI: 107, ASC: 3 },
+        { BUDI: 108, ASC: 47 },
+        { BUDI: 109, ASC: 74 },
+        { BUDI: 110, ASC: 31 },
+        { BUDI: 111, ASC: 27 },
+        { BUDI: 112, ASC: 28 },
+        { BUDI: 113, ASC: 134 },
+        { BUDI: 114, ASC: 135 },
+        { BUDI: 115, ASC: 90 },
+        { BUDI: 116, ASC: 91 },
+        { BUDI: 92, ASC: 13 },
+        { BUDI: 119, ASC: 33 },
+        { BUDI: 121, ASC: 34 },
+        { BUDI: 136, ASC: 35 },
+        { BUDI: 123, ASC: 36 },
+        { BUDI: 124, ASC: 37 },
+        { BUDI: 125, ASC: 38 },
+        { BUDI: 118, ASC: 39 },
+        { BUDI: 137, ASC: 40 },
+        { BUDI: 131, ASC: 41 },
+        { BUDI: 134, ASC: 42 },
+        { BUDI: 138, ASC: 43 },
+        { BUDI: 143, ASC: 44 },
+        { BUDI: 141, ASC: 48 },
+        { BUDI: 120, ASC: 49 },
+        { BUDI: 122, ASC: 50 },
+        { BUDI: 126, ASC: 51 },
+        { BUDI: 128, ASC: 52 },
+        { BUDI: 127, ASC: 53 },
+        { BUDI: 142, ASC: 54 },
+        { BUDI: 133, ASC: 55 },
+        { BUDI: 135, ASC: 56 },
+        { BUDI: 139, ASC: 57 },
+        { BUDI: 140, ASC: 58 },
+        { BUDI: 129, ASC: 77 },
+        { BUDI: 130, ASC: 78 },
+        { BUDI: 132, ASC: 79 },
+        { BUDI: 117, ASC: 112 },
+        { BUDI: 302, ASC: 121 },
+        { BUDI: 304, ASC: 122 },
+        { BUDI: 303, ASC: 123 },
+        { BUDI: 310, ASC: 124 },
+        { BUDI: 308, ASC: 125 },
+        { BUDI: 306, ASC: 126 },
+        { BUDI: 301, ASC: 127 },
+        { BUDI: 305, ASC: 128 },
+        { BUDI: 307, ASC: 129 },
+        { BUDI: 312, ASC: 131 },
+        { BUDI: 313, ASC: 132 },
+        { BUDI: 311, ASC: 133 }
+      ];
+
+      if (direction === BUDI_TO_ASC) {
+        const found = fixedMapping.find(thisQualification => thisQualification.BUDI === originalCode);
+        return found ? found.ASC : null;
+      }
+
+      const found = fixedMapping.find(thisQualification => thisQualification.ASC === originalCode);
+      return found ? found.BUDI : null;
+    }
+};
+
 const getUnitInstance = () => {
   const ALL_CAPACITIES = null;
   const ALL_UTILISATIONS = null;
   const BUDI_TO_ASC = 100;
 
   const bulkUpload = testUtils.sandBox(
-    'server/models/BulkImport/csv/workers.js',
+    filename,
     {
       locals: {
         require: testUtils.wrapRequire({
           '../BUDI': {
-            BUDI: {
-
-              ethnicity: (direction, originalCode) => {
-                const fixedMapping = [
-                  { ASC: 1, BUDI: 31 },
-                  { ASC: 3, BUDI: 32 },
-                  { ASC: 4, BUDI: 33 },
-                  { ASC: 5, BUDI: 34 },
-                  { ASC: 6, BUDI: 35 },
-                  { ASC: 7, BUDI: 36 },
-                  { ASC: 8, BUDI: 37 },
-                  { ASC: 9, BUDI: 38 },
-                  { ASC: 10, BUDI: 39 },
-                  { ASC: 11, BUDI: 40 },
-                  { ASC: 12, BUDI: 41 },
-                  { ASC: 13, BUDI: 42 },
-                  { ASC: 14, BUDI: 43 },
-                  { ASC: 15, BUDI: 44 },
-                  { ASC: 16, BUDI: 45 },
-                  { ASC: 17, BUDI: 46 },
-                  { ASC: 18, BUDI: 47 },
-                  { ASC: 19, BUDI: 98 },
-                  { ASC: 2, BUDI: 99 }
-                ];
-
-                if (direction === BUDI_TO_ASC) {
-                  const found = fixedMapping.find(thisEthnicity => thisEthnicity.BUDI === originalCode);
-                  return found ? found.ASC : null;
-                }
-
-                const found = fixedMapping.find(thisEthnicity => thisEthnicity.ASC === originalCode);
-                return found ? found.BUDI : null;
-              },
-
-              jobRoles: (direction, originalCode) => {
-                const fixedMapping = [
-                  { ASC: 26, BUDI: 1 },
-                  { ASC: 15, BUDI: 2 },
-                  { ASC: 13, BUDI: 3 },
-                  { ASC: 22, BUDI: 4 },
-                  { ASC: 28, BUDI: 5 },
-                  { ASC: 27, BUDI: 6 },
-                  { ASC: 25, BUDI: 7 },
-                  { ASC: 10, BUDI: 8 },
-                  { ASC: 11, BUDI: 9 },
-                  { ASC: 12, BUDI: 10 },
-                  { ASC: 3, BUDI: 11 },
-                  { ASC: 18, BUDI: 15 },
-                  { ASC: 23, BUDI: 16 },
-                  { ASC: 4, BUDI: 17 },
-                  { ASC: 29, BUDI: 22 },
-                  { ASC: 20, BUDI: 23 },
-                  { ASC: 14, BUDI: 24 },
-                  { ASC: 2, BUDI: 25 },
-                  { ASC: 5, BUDI: 26 },
-                  { ASC: 21, BUDI: 27 },
-                  { ASC: 1, BUDI: 34 },
-                  { ASC: 24, BUDI: 35 },
-                  { ASC: 19, BUDI: 36 },
-                  { ASC: 17, BUDI: 37 },
-                  { ASC: 16, BUDI: 38 },
-                  { ASC: 7, BUDI: 39 },
-                  { ASC: 8, BUDI: 40 },
-                  { ASC: 9, BUDI: 41 },
-                  { ASC: 6, BUDI: 42 }
-                ];
-
-                if (direction === BUDI_TO_ASC) {
-                  const found = fixedMapping.find(thisJob => thisJob.BUDI === originalCode);
-                  return found ? found.ASC : null;
-                }
-
-                const found = fixedMapping.find(thisJob => thisJob.ASC === originalCode);
-                return found ? found.BUDI : null;
-              },
-              nursingSpecialist: (direction, originalCode) => {
-                const fixedMapping = [
-                  { BUDI: 1, ASC: 1 },
-                  { BUDI: 2, ASC: 2 },
-                  { BUDI: 3, ASC: 3 },
-                  { BUDI: 4, ASC: 4 },
-                  { BUDI: 5, ASC: 5 },
-                  { BUDI: 6, ASC: 6 },
-                  { BUDI: 7, ASC: 7 },
-                  { BUDI: 8, ASC: 8 }
-                ];
-
-                if (direction === BUDI_TO_ASC) {
-                  const found = fixedMapping.find(thisSpecialist => thisSpecialist.BUDI === originalCode);
-                  return found ? found.ASC : null;
-                }
-
-                const found = fixedMapping.find(thisSpecialist => thisSpecialist.ASC === originalCode);
-                return found ? found.BUDI : null;
-              },
-              qualificationLevels: (direction, originalCode) => {
-                const fixedMapping = [
-                  { BUDI: 0, ASC: 1 },
-                  { BUDI: 1, ASC: 2 },
-                  { BUDI: 2, ASC: 3 },
-                  { BUDI: 3, ASC: 4 },
-                  { BUDI: 4, ASC: 5 },
-                  { BUDI: 5, ASC: 6 },
-                  { BUDI: 6, ASC: 7 },
-                  { BUDI: 7, ASC: 8 },
-                  { BUDI: 8, ASC: 9 },
-                  { BUDI: 999, ASC: 10 }
-                ];
-
-                if (direction === BUDI_TO_ASC) {
-                  const found = fixedMapping.find(thisSpecialist => thisSpecialist.BUDI === originalCode);
-                  return found ? found.ASC : null;
-                }
-
-                const found = fixedMapping.find(thisSpecialist => thisSpecialist.ASC === originalCode);
-                return found ? found.BUDI : null;
-              },
-              qualifications: (direction, originalCode) => {
-                const fixedMapping = [
-                  { BUDI: 1, ASC: 97 },
-                  { BUDI: 2, ASC: 98 },
-                  { BUDI: 3, ASC: 96 },
-                  { BUDI: 4, ASC: 93 },
-                  { BUDI: 5, ASC: 94 },
-                  { BUDI: 6, ASC: 95 },
-                  { BUDI: 8, ASC: 24 },
-                  { BUDI: 9, ASC: 99 },
-                  { BUDI: 10, ASC: 100 },
-                  { BUDI: 12, ASC: 25 },
-                  { BUDI: 13, ASC: 102 },
-                  { BUDI: 14, ASC: 107 },
-                  { BUDI: 15, ASC: 106 },
-                  { BUDI: 16, ASC: 72 },
-                  { BUDI: 17, ASC: 89 },
-                  { BUDI: 18, ASC: 71 },
-                  { BUDI: 19, ASC: 16 },
-                  { BUDI: 20, ASC: 1 },
-                  { BUDI: 22, ASC: 14 },
-                  { BUDI: 25, ASC: 15 },
-                  { BUDI: 26, ASC: 26 },
-                  { BUDI: 27, ASC: 114 },
-                  { BUDI: 28, ASC: 116 },
-                  { BUDI: 32, ASC: 115 },
-                  { BUDI: 33, ASC: 113 },
-                  { BUDI: 34, ASC: 111 },
-                  { BUDI: 35, ASC: 109 },
-                  { BUDI: 36, ASC: 110 },
-                  { BUDI: 37, ASC: 117 },
-                  { BUDI: 38, ASC: 118 },
-                  { BUDI: 39, ASC: 119 },
-                  { BUDI: 41, ASC: 20 },
-                  { BUDI: 42, ASC: 30 },
-                  { BUDI: 48, ASC: 4 },
-                  { BUDI: 49, ASC: 5 },
-                  { BUDI: 50, ASC: 60 },
-                  { BUDI: 51, ASC: 61 },
-                  { BUDI: 52, ASC: 10 },
-                  { BUDI: 53, ASC: 80 },
-                  { BUDI: 54, ASC: 81 },
-                  { BUDI: 55, ASC: 82 },
-                  { BUDI: 56, ASC: 83 },
-                  { BUDI: 57, ASC: 84 },
-                  { BUDI: 58, ASC: 85 },
-                  { BUDI: 62, ASC: 86 },
-                  { BUDI: 63, ASC: 87 },
-                  { BUDI: 64, ASC: 88 },
-                  { BUDI: 67, ASC: 21 },
-                  { BUDI: 68, ASC: 22 },
-                  { BUDI: 72, ASC: 23 },
-                  { BUDI: 73, ASC: 32 },
-                  { BUDI: 74, ASC: 19 },
-                  { BUDI: 76, ASC: 64 },
-                  { BUDI: 77, ASC: 65 },
-                  { BUDI: 82, ASC: 103 },
-                  { BUDI: 83, ASC: 104 },
-                  { BUDI: 84, ASC: 105 },
-                  { BUDI: 85, ASC: 17 },
-                  { BUDI: 86, ASC: 2 },
-                  { BUDI: 87, ASC: 45 },
-                  { BUDI: 88, ASC: 9 },
-                  { BUDI: 89, ASC: 69 },
-                  { BUDI: 90, ASC: 12 },
-                  { BUDI: 91, ASC: 18 },
-                  { BUDI: 92, ASC: 130 },
-                  { BUDI: 93, ASC: 62 },
-                  { BUDI: 94, ASC: 66 },
-                  { BUDI: 95, ASC: 67 },
-                  { BUDI: 96, ASC: 11 },
-                  { BUDI: 98, ASC: 59 },
-                  { BUDI: 99, ASC: 6 },
-                  { BUDI: 100, ASC: 7 },
-                  { BUDI: 101, ASC: 68 },
-                  { BUDI: 102, ASC: 63 },
-                  { BUDI: 103, ASC: 8 },
-                  { BUDI: 104, ASC: 75 },
-                  { BUDI: 105, ASC: 76 },
-                  { BUDI: 107, ASC: 3 },
-                  { BUDI: 108, ASC: 47 },
-                  { BUDI: 109, ASC: 74 },
-                  { BUDI: 110, ASC: 31 },
-                  { BUDI: 111, ASC: 27 },
-                  { BUDI: 112, ASC: 28 },
-                  { BUDI: 113, ASC: 134 },
-                  { BUDI: 114, ASC: 135 },
-                  { BUDI: 115, ASC: 90 },
-                  { BUDI: 116, ASC: 91 },
-                  { BUDI: 92, ASC: 13 },
-                  { BUDI: 119, ASC: 33 },
-                  { BUDI: 121, ASC: 34 },
-                  { BUDI: 136, ASC: 35 },
-                  { BUDI: 123, ASC: 36 },
-                  { BUDI: 124, ASC: 37 },
-                  { BUDI: 125, ASC: 38 },
-                  { BUDI: 118, ASC: 39 },
-                  { BUDI: 137, ASC: 40 },
-                  { BUDI: 131, ASC: 41 },
-                  { BUDI: 134, ASC: 42 },
-                  { BUDI: 138, ASC: 43 },
-                  { BUDI: 143, ASC: 44 },
-                  { BUDI: 141, ASC: 48 },
-                  { BUDI: 120, ASC: 49 },
-                  { BUDI: 122, ASC: 50 },
-                  { BUDI: 126, ASC: 51 },
-                  { BUDI: 128, ASC: 52 },
-                  { BUDI: 127, ASC: 53 },
-                  { BUDI: 142, ASC: 54 },
-                  { BUDI: 133, ASC: 55 },
-                  { BUDI: 135, ASC: 56 },
-                  { BUDI: 139, ASC: 57 },
-                  { BUDI: 140, ASC: 58 },
-                  { BUDI: 129, ASC: 77 },
-                  { BUDI: 130, ASC: 78 },
-                  { BUDI: 132, ASC: 79 },
-                  { BUDI: 117, ASC: 112 },
-                  { BUDI: 302, ASC: 121 },
-                  { BUDI: 304, ASC: 122 },
-                  { BUDI: 303, ASC: 123 },
-                  { BUDI: 310, ASC: 124 },
-                  { BUDI: 308, ASC: 125 },
-                  { BUDI: 306, ASC: 126 },
-                  { BUDI: 301, ASC: 127 },
-                  { BUDI: 305, ASC: 128 },
-                  { BUDI: 307, ASC: 129 },
-                  { BUDI: 312, ASC: 131 },
-                  { BUDI: 313, ASC: 132 },
-                  { BUDI: 311, ASC: 133 }
-                ];
-
-                if (direction === BUDI_TO_ASC) {
-                  const found = fixedMapping.find(thisQualification => thisQualification.BUDI === originalCode);
-                  return found ? found.ASC : null;
-                }
-
-                const found = fixedMapping.find(thisQualification => thisQualification.ASC === originalCode);
-                return found ? found.BUDI : null;
-              }
-
-
-            }
-          },
-          moment
+            BUDI
+          }, 'moment': {
+            moment
+          }
         })
       }
     }
@@ -323,6 +324,931 @@ describe('/server/models/Bulkimport/csv/workers.js', () => {
     });
   });
 
+  describe('validations', () => {
+    it('should emit an error if REGTYPE is not 2 (CQC) but worker has registered manager main job role', async () => {
+        const bulkUpload = new (testUtils.sandBox(
+          filename,
+          {
+            locals: {
+              require: testUtils.wrapRequire({
+                '../BUDI': {
+                  BUDI
+                },
+                'moment': moment
+              }),
+            },
+          }
+        ).Worker)(
+          {
+            AMHP: "",
+            APPRENTICE: "2",
+            AVGHOURS: "",
+            BRITISHCITIZENSHIP: "",
+            CARECERT: "3",
+            CONTHOURS: "23",
+            COUNTRYOFBIRTH: "826",
+            DAYSSICK: "1",
+            DISABLED: "0",
+            DISPLAYID: "Aaron Russell",
+            DOB: "10/12/1982",
+            EMPLSTATUS: "1",
+            ETHNICITY: "41",
+            GENDER: "1",
+            HOURLYRATE: "",
+            LOCALESTID: "MARMA",
+            MAINJOBROLE: "4",
+            MAINJRDESC: "",
+            NATIONALITY: "826",
+            NINUMBER: "JA622112A",
+            NMCREG: "",
+            NONSCQUAL: "2",
+            NURSESPEC: "",
+            OTHERJOBROLE: "10",
+            OTHERJRDESC: "",
+            POSTCODE: "LS1 1AA",
+            QUALACH01: "",
+            QUALACH01NOTES: "",
+            QUALACH02: "",
+            QUALACH02NOTES: "",
+            QUALACH03: "",
+            QUALACH03NOTES: "",
+            RECSOURCE: "16",
+            SALARY: "20000",
+            SALARYINT: "1",
+            SCQUAL: "2",
+            STARTDATE: "12/11/2001",
+            STARTINSECT: "2001",
+            STATUS: "UPDATE",
+            UNIQUEWORKERID: "3",
+            YEAROFENTRY: "",
+            ZEROHRCONT: "2"
+          },
+          2,
+          [
+            {
+              _validations: [],
+              _username: 'aylingw',
+              _id: 479,
+              _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+              _ustatus: null,
+              _created: '2019-03-15T09:54:10.562Z',
+              _updated: '2019-10-04T15:46:16.158Z',
+              _updatedBy: 'aylingw',
+              _auditEvents: null,
+              _name: 'WOZiTech, with even more care',
+              _address1: 'First Line',
+              _address2: 'Second Line',
+              _address3: '',
+              _town: 'My Town',
+              _county: '',
+              _locationId: 'A-328849599',
+              _provId: null,
+              _postcode: 'LN11 9JG',
+              _isRegulated: false,
+              _mainService: { id: 16, name: 'Head office services' },
+              _nmdsId: 'G1001114',
+              _lastWdfEligibility: '2019-08-16T07:17:38.014Z',
+              _overallWdfEligibility: '2019-08-16T07:17:38.340Z',
+              _establishmentWdfEligibility: null,
+              _staffWdfEligibility: '2019-08-13T12:41:24.836Z',
+              _isParent: true,
+              _parentUid: null,
+              _parentId: null,
+              _parentName: null,
+              _dataOwner: 'Workplace',
+              _dataPermissions: 'None',
+              _archived: false,
+              _dataOwnershipRequested: null,
+              _reasonsForLeaving: '',
+              _properties: {
+                _properties: [Object],
+                _propertyTypes: [Array],
+                _auditEvents: null,
+                _modifiedProperties: [],
+                _additionalModels: null
+              },
+              _isNew: false,
+              _workerEntities: {
+              },
+              _readyForDeletionWorkers: null,
+              _status: 'NEW',
+              _logLevel: 300
+            },
+            {
+              _validations: [],
+              _username: 'aylingw',
+              _id: 1446,
+              _uid: 'a415435f-40f2-4de5-abf7-bff611e85591',
+              _ustatus: null,
+              _created: '2019-07-31T15:09:57.405Z',
+              _updated: '2019-10-04T15:46:16.797Z',
+              _updatedBy: 'aylingw',
+              _auditEvents: null,
+              _name: 'WOZiTech Cares Sub 100',
+              _address1: 'Number 1',
+              _address2: 'My street',
+              _address3: '',
+              _town: 'My Town',
+              _county: '',
+              _locationId: '1-888777666',
+              _provId: '1-999888777',
+              _postcode: 'LN11 9JG',
+              _isRegulated: true,
+              _mainService: { id: 1, name: 'Carers support' },
+              _nmdsId: 'G1002110',
+              _lastWdfEligibility: '2019-10-04T15:46:16.797Z',
+              _overallWdfEligibility: null,
+              _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z',
+              _staffWdfEligibility: null,
+              _isParent: false,
+              _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+              _parentId: 479,
+              _parentName: null,
+              _dataOwner: 'Parent',
+              _dataPermissions: 'None',
+              _archived: false,
+              _dataOwnershipRequested: null,
+              _reasonsForLeaving: '',
+              _properties: {
+                _properties: [Object],
+                _propertyTypes: [Array],
+                _auditEvents: null,
+                _modifiedProperties: [],
+                _additionalModels: null
+              },
+              _isNew: false,
+              _workerEntities: {},
+              _readyForDeletionWorkers: null,
+              _status: 'COMPLETE',
+              _logLevel: 300
+            }
+          ]);
+
+        expect(bulkUpload).to.have.property('crossValidate');
+
+        const csvWorkerSchemaErrors = [];
+
+        const myEstablishments = [{
+          key: 'MARMA',
+          status: 'UPDATE',
+          regtype: 1
+        }];
+
+        // Regular validation has to run first for the establishment to populate the internal properties correctly
+        await bulkUpload.validate();
+
+        // call the method
+        await bulkUpload.crossValidate({
+          csvWorkerSchemaErrors,
+          myEstablishments,
+        });
+
+        // assert a error was returned
+        expect(csvWorkerSchemaErrors.length).to.equal(1);
+
+        expect(csvWorkerSchemaErrors[0]).to.deep.equal({
+          lineNumber: 2,
+          name: 'MARMA',
+          source: '4',
+          worker: "3",
+          errCode: 1280,
+          errType: 'MAIN_JOB_ROLE_ERROR',
+          error: 'Workers MAINJOBROLE is Registered Manager but you are not providing a CQC regulated service. Please change to another Job Role'
+        });
+      });
+      it('should not emit an error if REGTYPE is 2 (CQC) but worker has registered manager main job role', async () => {
+        const bulkUpload = new (testUtils.sandBox(
+          filename,
+          {
+            locals: {
+              require: testUtils.wrapRequire({
+                '../BUDI': {
+                  BUDI
+                },
+                'moment': moment
+              }),
+            },
+          }
+        ).Worker)(
+          {
+            AMHP: "",
+            APPRENTICE: "2",
+            AVGHOURS: "",
+            BRITISHCITIZENSHIP: "",
+            CARECERT: "3",
+            CONTHOURS: "23",
+            COUNTRYOFBIRTH: "826",
+            DAYSSICK: "1",
+            DISABLED: "0",
+            DISPLAYID: "Aaron Russell",
+            DOB: "10/12/1982",
+            EMPLSTATUS: "1",
+            ETHNICITY: "41",
+            GENDER: "1",
+            HOURLYRATE: "",
+            LOCALESTID: "MARMA",
+            MAINJOBROLE: "4",
+            MAINJRDESC: "",
+            NATIONALITY: "826",
+            NINUMBER: "JA622112A",
+            NMCREG: "",
+            NONSCQUAL: "2",
+            NURSESPEC: "",
+            OTHERJOBROLE: "10",
+            OTHERJRDESC: "",
+            POSTCODE: "LS1 1AA",
+            QUALACH01: "",
+            QUALACH01NOTES: "",
+            QUALACH02: "",
+            QUALACH02NOTES: "",
+            QUALACH03: "",
+            QUALACH03NOTES: "",
+            RECSOURCE: "16",
+            SALARY: "20000",
+            SALARYINT: "1",
+            SCQUAL: "2",
+            STARTDATE: "12/11/2001",
+            STARTINSECT: "2001",
+            STATUS: "UPDATE",
+            UNIQUEWORKERID: "3",
+            YEAROFENTRY: "",
+            ZEROHRCONT: "2"
+          },
+          2,
+          [
+            {
+              _validations: [],
+              _username: 'aylingw',
+              _id: 479,
+              _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+              _ustatus: null,
+              _created: '2019-03-15T09:54:10.562Z',
+              _updated: '2019-10-04T15:46:16.158Z',
+              _updatedBy: 'aylingw',
+              _auditEvents: null,
+              _name: 'WOZiTech, with even more care',
+              _address1: 'First Line',
+              _address2: 'Second Line',
+              _address3: '',
+              _town: 'My Town',
+              _county: '',
+              _locationId: 'A-328849599',
+              _provId: null,
+              _postcode: 'LN11 9JG',
+              _isRegulated: true,
+              _mainService: { id: 16, name: 'Head office services' },
+              _nmdsId: 'G1001114',
+              _lastWdfEligibility: '2019-08-16T07:17:38.014Z',
+              _overallWdfEligibility: '2019-08-16T07:17:38.340Z',
+              _establishmentWdfEligibility: null,
+              _staffWdfEligibility: '2019-08-13T12:41:24.836Z',
+              _isParent: true,
+              _parentUid: null,
+              _parentId: null,
+              _parentName: null,
+              _dataOwner: 'Workplace',
+              _dataPermissions: 'None',
+              _archived: false,
+              _dataOwnershipRequested: null,
+              _reasonsForLeaving: '',
+              _properties: {
+                _properties: [Object],
+                _propertyTypes: [Array],
+                _auditEvents: null,
+                _modifiedProperties: [],
+                _additionalModels: null
+              },
+              _isNew: false,
+              _workerEntities: {
+              },
+              _readyForDeletionWorkers: null,
+              _status: 'NEW',
+              _logLevel: 300
+            },
+            {
+              _validations: [],
+              _username: 'aylingw',
+              _id: 1446,
+              _uid: 'a415435f-40f2-4de5-abf7-bff611e85591',
+              _ustatus: null,
+              _created: '2019-07-31T15:09:57.405Z',
+              _updated: '2019-10-04T15:46:16.797Z',
+              _updatedBy: 'aylingw',
+              _auditEvents: null,
+              _name: 'WOZiTech Cares Sub 100',
+              _address1: 'Number 1',
+              _address2: 'My street',
+              _address3: '',
+              _town: 'My Town',
+              _county: '',
+              _locationId: '1-888777666',
+              _provId: '1-999888777',
+              _postcode: 'LN11 9JG',
+              _isRegulated: true,
+              _mainService: { id: 1, name: 'Carers support' },
+              _nmdsId: 'G1002110',
+              _lastWdfEligibility: '2019-10-04T15:46:16.797Z',
+              _overallWdfEligibility: null,
+              _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z',
+              _staffWdfEligibility: null,
+              _isParent: false,
+              _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+              _parentId: 479,
+              _parentName: null,
+              _dataOwner: 'Parent',
+              _dataPermissions: 'None',
+              _archived: false,
+              _dataOwnershipRequested: null,
+              _reasonsForLeaving: '',
+              _properties: {
+                _properties: [Object],
+                _propertyTypes: [Array],
+                _auditEvents: null,
+                _modifiedProperties: [],
+                _additionalModels: null
+              },
+              _isNew: false,
+              _workerEntities: {},
+              _readyForDeletionWorkers: null,
+              _status: 'COMPLETE',
+              _logLevel: 300
+            }
+          ]);
+
+        expect(bulkUpload).to.have.property('crossValidate');
+
+        const csvWorkerSchemaErrors = [];
+
+        const myEstablishments = [{
+          key: 'MARMA',
+          status: 'UPDATE',
+          regType: 2
+        }];
+
+        // Regular validation has to run first for the establishment to populate the internal properties correctly
+        await bulkUpload.validate();
+
+        // call the method
+        await bulkUpload.crossValidate({
+          csvWorkerSchemaErrors,
+          myEstablishments,
+        });
+
+        // assert a error was returned
+        expect(csvWorkerSchemaErrors.length).to.equal(0);
+
+        expect(csvWorkerSchemaErrors).to.deep.equal([]);
+      });
+    it('should not emit an error if REGTYPE is 2 (CQC) but worker has registered manager main job role', async () => {
+        const bulkUpload = new (testUtils.sandBox(
+          filename,
+          {
+            locals: {
+              require: testUtils.wrapRequire({
+                '../BUDI': {
+                  BUDI
+                },
+                'moment': moment
+              }),
+            },
+          }
+        ).Worker)(
+          {
+            AMHP: "",
+            APPRENTICE: "2",
+            AVGHOURS: "",
+            BRITISHCITIZENSHIP: "",
+            CARECERT: "3",
+            CONTHOURS: "23",
+            COUNTRYOFBIRTH: "826",
+            DAYSSICK: "1",
+            DISABLED: "0",
+            DISPLAYID: "Aaron Russell",
+            DOB: "10/12/1982",
+            EMPLSTATUS: "1",
+            ETHNICITY: "41",
+            GENDER: "1",
+            HOURLYRATE: "",
+            LOCALESTID: "MARMA",
+            MAINJOBROLE: "4",
+            MAINJRDESC: "",
+            NATIONALITY: "826",
+            NINUMBER: "JA622112A",
+            NMCREG: "",
+            NONSCQUAL: "2",
+            NURSESPEC: "",
+            OTHERJOBROLE: "10",
+            OTHERJRDESC: "",
+            POSTCODE: "LS1 1AA",
+            QUALACH01: "",
+            QUALACH01NOTES: "",
+            QUALACH02: "",
+            QUALACH02NOTES: "",
+            QUALACH03: "",
+            QUALACH03NOTES: "",
+            RECSOURCE: "16",
+            SALARY: "20000",
+            SALARYINT: "1",
+            SCQUAL: "2",
+            STARTDATE: "12/11/2001",
+            STARTINSECT: "2001",
+            STATUS: "UPDATE",
+            UNIQUEWORKERID: "3",
+            YEAROFENTRY: "",
+            ZEROHRCONT: "2"
+          },
+          2,
+          [
+            {
+              _validations: [],
+              _username: 'aylingw',
+              _id: 479,
+              _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+              _ustatus: null,
+              _created: '2019-03-15T09:54:10.562Z',
+              _updated: '2019-10-04T15:46:16.158Z',
+              _updatedBy: 'aylingw',
+              _auditEvents: null,
+              _name: 'WOZiTech, with even more care',
+              _address1: 'First Line',
+              _address2: 'Second Line',
+              _address3: '',
+              _town: 'My Town',
+              _county: '',
+              _locationId: 'A-328849599',
+              _provId: null,
+              _postcode: 'LN11 9JG',
+              _isRegulated: true,
+              _mainService: { id: 16, name: 'Head office services' },
+              _nmdsId: 'G1001114',
+              _lastWdfEligibility: '2019-08-16T07:17:38.014Z',
+              _overallWdfEligibility: '2019-08-16T07:17:38.340Z',
+              _establishmentWdfEligibility: null,
+              _staffWdfEligibility: '2019-08-13T12:41:24.836Z',
+              _isParent: true,
+              _parentUid: null,
+              _parentId: null,
+              _parentName: null,
+              _dataOwner: 'Workplace',
+              _dataPermissions: 'None',
+              _archived: false,
+              _dataOwnershipRequested: null,
+              _reasonsForLeaving: '',
+              _properties: {
+                _properties: [Object],
+                _propertyTypes: [Array],
+                _auditEvents: null,
+                _modifiedProperties: [],
+                _additionalModels: null
+              },
+              _isNew: false,
+              _workerEntities: {
+              },
+              _readyForDeletionWorkers: null,
+              _status: 'NEW',
+              _logLevel: 300
+            },
+            {
+              _validations: [],
+              _username: 'aylingw',
+              _id: 1446,
+              _uid: 'a415435f-40f2-4de5-abf7-bff611e85591',
+              _ustatus: null,
+              _created: '2019-07-31T15:09:57.405Z',
+              _updated: '2019-10-04T15:46:16.797Z',
+              _updatedBy: 'aylingw',
+              _auditEvents: null,
+              _name: 'WOZiTech Cares Sub 100',
+              _address1: 'Number 1',
+              _address2: 'My street',
+              _address3: '',
+              _town: 'My Town',
+              _county: '',
+              _locationId: '1-888777666',
+              _provId: '1-999888777',
+              _postcode: 'LN11 9JG',
+              _isRegulated: true,
+              _mainService: { id: 1, name: 'Carers support' },
+              _nmdsId: 'G1002110',
+              _lastWdfEligibility: '2019-10-04T15:46:16.797Z',
+              _overallWdfEligibility: null,
+              _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z',
+              _staffWdfEligibility: null,
+              _isParent: false,
+              _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+              _parentId: 479,
+              _parentName: null,
+              _dataOwner: 'Parent',
+              _dataPermissions: 'None',
+              _archived: false,
+              _dataOwnershipRequested: null,
+              _reasonsForLeaving: '',
+              _properties: {
+                _properties: [Object],
+                _propertyTypes: [Array],
+                _auditEvents: null,
+                _modifiedProperties: [],
+                _additionalModels: null
+              },
+              _isNew: false,
+              _workerEntities: {},
+              _readyForDeletionWorkers: null,
+              _status: 'COMPLETE',
+              _logLevel: 300
+            }
+          ]);
+
+        expect(bulkUpload).to.have.property('crossValidate');
+
+        const csvWorkerSchemaErrors = [];
+
+        const myEstablishments = [{
+          key: 'MARMA',
+          status: 'UPDATE',
+          regType: 2
+        }];
+
+        // Regular validation has to run first for the establishment to populate the internal properties correctly
+        await bulkUpload.validate();
+
+        // call the method
+        await bulkUpload.crossValidate({
+          csvWorkerSchemaErrors,
+          myEstablishments,
+        });
+
+        // assert a error was returned
+        expect(csvWorkerSchemaErrors.length).to.equal(0);
+
+        expect(csvWorkerSchemaErrors).to.deep.equal([]);
+      });
+      it('should not emit an error if REGTYPE is 2 (CQC) but worker doesn\'t have registered manager main job role', async () => {
+        const bulkUpload = new (testUtils.sandBox(
+          filename,
+          {
+            locals: {
+              require: testUtils.wrapRequire({
+                '../BUDI': {
+                  BUDI
+                },
+                'moment': moment
+              }),
+            },
+          }
+        ).Worker)(
+          {
+            AMHP: "",
+            APPRENTICE: "2",
+            AVGHOURS: "",
+            BRITISHCITIZENSHIP: "",
+            CARECERT: "3",
+            CONTHOURS: "23",
+            COUNTRYOFBIRTH: "826",
+            DAYSSICK: "1",
+            DISABLED: "0",
+            DISPLAYID: "Aaron Russell",
+            DOB: "10/12/1982",
+            EMPLSTATUS: "1",
+            ETHNICITY: "41",
+            GENDER: "1",
+            HOURLYRATE: "",
+            LOCALESTID: "MARMA",
+            MAINJOBROLE: "3",
+            MAINJRDESC: "",
+            NATIONALITY: "826",
+            NINUMBER: "JA622112A",
+            NMCREG: "",
+            NONSCQUAL: "2",
+            NURSESPEC: "",
+            OTHERJOBROLE: "10",
+            OTHERJRDESC: "",
+            POSTCODE: "LS1 1AA",
+            QUALACH01: "",
+            QUALACH01NOTES: "",
+            QUALACH02: "",
+            QUALACH02NOTES: "",
+            QUALACH03: "",
+            QUALACH03NOTES: "",
+            RECSOURCE: "16",
+            SALARY: "20000",
+            SALARYINT: "1",
+            SCQUAL: "2",
+            STARTDATE: "12/11/2001",
+            STARTINSECT: "2001",
+            STATUS: "UPDATE",
+            UNIQUEWORKERID: "3",
+            YEAROFENTRY: "",
+            ZEROHRCONT: "2"
+          },
+          2,
+          [
+            {
+              _validations: [],
+              _username: 'aylingw',
+              _id: 479,
+              _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+              _ustatus: null,
+              _created: '2019-03-15T09:54:10.562Z',
+              _updated: '2019-10-04T15:46:16.158Z',
+              _updatedBy: 'aylingw',
+              _auditEvents: null,
+              _name: 'WOZiTech, with even more care',
+              _address1: 'First Line',
+              _address2: 'Second Line',
+              _address3: '',
+              _town: 'My Town',
+              _county: '',
+              _locationId: 'A-328849599',
+              _provId: null,
+              _postcode: 'LN11 9JG',
+              _isRegulated: true,
+              _mainService: { id: 16, name: 'Head office services' },
+              _nmdsId: 'G1001114',
+              _lastWdfEligibility: '2019-08-16T07:17:38.014Z',
+              _overallWdfEligibility: '2019-08-16T07:17:38.340Z',
+              _establishmentWdfEligibility: null,
+              _staffWdfEligibility: '2019-08-13T12:41:24.836Z',
+              _isParent: true,
+              _parentUid: null,
+              _parentId: null,
+              _parentName: null,
+              _dataOwner: 'Workplace',
+              _dataPermissions: 'None',
+              _archived: false,
+              _dataOwnershipRequested: null,
+              _reasonsForLeaving: '',
+              _properties: {
+                _properties: [Object],
+                _propertyTypes: [Array],
+                _auditEvents: null,
+                _modifiedProperties: [],
+                _additionalModels: null
+              },
+              _isNew: false,
+              _workerEntities: {
+              },
+              _readyForDeletionWorkers: null,
+              _status: 'NEW',
+              _logLevel: 300
+            },
+            {
+              _validations: [],
+              _username: 'aylingw',
+              _id: 1446,
+              _uid: 'a415435f-40f2-4de5-abf7-bff611e85591',
+              _ustatus: null,
+              _created: '2019-07-31T15:09:57.405Z',
+              _updated: '2019-10-04T15:46:16.797Z',
+              _updatedBy: 'aylingw',
+              _auditEvents: null,
+              _name: 'WOZiTech Cares Sub 100',
+              _address1: 'Number 1',
+              _address2: 'My street',
+              _address3: '',
+              _town: 'My Town',
+              _county: '',
+              _locationId: '1-888777666',
+              _provId: '1-999888777',
+              _postcode: 'LN11 9JG',
+              _isRegulated: true,
+              _mainService: { id: 1, name: 'Carers support' },
+              _nmdsId: 'G1002110',
+              _lastWdfEligibility: '2019-10-04T15:46:16.797Z',
+              _overallWdfEligibility: null,
+              _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z',
+              _staffWdfEligibility: null,
+              _isParent: false,
+              _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+              _parentId: 479,
+              _parentName: null,
+              _dataOwner: 'Parent',
+              _dataPermissions: 'None',
+              _archived: false,
+              _dataOwnershipRequested: null,
+              _reasonsForLeaving: '',
+              _properties: {
+                _properties: [Object],
+                _propertyTypes: [Array],
+                _auditEvents: null,
+                _modifiedProperties: [],
+                _additionalModels: null
+              },
+              _isNew: false,
+              _workerEntities: {},
+              _readyForDeletionWorkers: null,
+              _status: 'COMPLETE',
+              _logLevel: 300
+            }
+          ]);
+
+        expect(bulkUpload).to.have.property('crossValidate');
+
+        const csvWorkerSchemaErrors = [];
+
+        const myEstablishments = [{
+          key: 'MARMA',
+          status: 'UPDATE',
+          regType: 2
+        }];
+
+        // Regular validation has to run first for the establishment to populate the internal properties correctly
+        await bulkUpload.validate();
+
+        // call the method
+        await bulkUpload.crossValidate({
+          csvWorkerSchemaErrors,
+          myEstablishments,
+        });
+
+        // assert a error was returned
+        expect(csvWorkerSchemaErrors.length).to.equal(0);
+
+        expect(csvWorkerSchemaErrors).to.deep.equal([]);
+      });
+      it('should not emit an error if REGTYPE is not 2 (CQC) but worker doesn\'t have registered manager main job role', async () => {
+        const bulkUpload = new (testUtils.sandBox(
+          filename,
+          {
+            locals: {
+              require: testUtils.wrapRequire({
+                '../BUDI': {
+                  BUDI
+                },
+                'moment': moment
+              }),
+            },
+          }
+        ).Worker)(
+          {
+            AMHP: "",
+            APPRENTICE: "2",
+            AVGHOURS: "",
+            BRITISHCITIZENSHIP: "",
+            CARECERT: "3",
+            CONTHOURS: "23",
+            COUNTRYOFBIRTH: "826",
+            DAYSSICK: "1",
+            DISABLED: "0",
+            DISPLAYID: "Aaron Russell",
+            DOB: "10/12/1982",
+            EMPLSTATUS: "1",
+            ETHNICITY: "41",
+            GENDER: "1",
+            HOURLYRATE: "",
+            LOCALESTID: "MARMA",
+            MAINJOBROLE: "3",
+            MAINJRDESC: "",
+            NATIONALITY: "826",
+            NINUMBER: "JA622112A",
+            NMCREG: "",
+            NONSCQUAL: "2",
+            NURSESPEC: "",
+            OTHERJOBROLE: "10",
+            OTHERJRDESC: "",
+            POSTCODE: "LS1 1AA",
+            QUALACH01: "",
+            QUALACH01NOTES: "",
+            QUALACH02: "",
+            QUALACH02NOTES: "",
+            QUALACH03: "",
+            QUALACH03NOTES: "",
+            RECSOURCE: "16",
+            SALARY: "20000",
+            SALARYINT: "1",
+            SCQUAL: "2",
+            STARTDATE: "12/11/2001",
+            STARTINSECT: "2001",
+            STATUS: "UPDATE",
+            UNIQUEWORKERID: "3",
+            YEAROFENTRY: "",
+            ZEROHRCONT: "2"
+          },
+          2,
+          [
+            {
+              _validations: [],
+              _username: 'aylingw',
+              _id: 479,
+              _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+              _ustatus: null,
+              _created: '2019-03-15T09:54:10.562Z',
+              _updated: '2019-10-04T15:46:16.158Z',
+              _updatedBy: 'aylingw',
+              _auditEvents: null,
+              _name: 'WOZiTech, with even more care',
+              _address1: 'First Line',
+              _address2: 'Second Line',
+              _address3: '',
+              _town: 'My Town',
+              _county: '',
+              _locationId: 'A-328849599',
+              _provId: null,
+              _postcode: 'LN11 9JG',
+              _isRegulated: true,
+              _mainService: { id: 16, name: 'Head office services' },
+              _nmdsId: 'G1001114',
+              _lastWdfEligibility: '2019-08-16T07:17:38.014Z',
+              _overallWdfEligibility: '2019-08-16T07:17:38.340Z',
+              _establishmentWdfEligibility: null,
+              _staffWdfEligibility: '2019-08-13T12:41:24.836Z',
+              _isParent: true,
+              _parentUid: null,
+              _parentId: null,
+              _parentName: null,
+              _dataOwner: 'Workplace',
+              _dataPermissions: 'None',
+              _archived: false,
+              _dataOwnershipRequested: null,
+              _reasonsForLeaving: '',
+              _properties: {
+                _properties: [Object],
+                _propertyTypes: [Array],
+                _auditEvents: null,
+                _modifiedProperties: [],
+                _additionalModels: null
+              },
+              _isNew: false,
+              _workerEntities: {
+              },
+              _readyForDeletionWorkers: null,
+              _status: 'NEW',
+              _logLevel: 300
+            },
+            {
+              _validations: [],
+              _username: 'aylingw',
+              _id: 1446,
+              _uid: 'a415435f-40f2-4de5-abf7-bff611e85591',
+              _ustatus: null,
+              _created: '2019-07-31T15:09:57.405Z',
+              _updated: '2019-10-04T15:46:16.797Z',
+              _updatedBy: 'aylingw',
+              _auditEvents: null,
+              _name: 'WOZiTech Cares Sub 100',
+              _address1: 'Number 1',
+              _address2: 'My street',
+              _address3: '',
+              _town: 'My Town',
+              _county: '',
+              _locationId: '1-888777666',
+              _provId: '1-999888777',
+              _postcode: 'LN11 9JG',
+              _isRegulated: true,
+              _mainService: { id: 1, name: 'Carers support' },
+              _nmdsId: 'G1002110',
+              _lastWdfEligibility: '2019-10-04T15:46:16.797Z',
+              _overallWdfEligibility: null,
+              _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z',
+              _staffWdfEligibility: null,
+              _isParent: false,
+              _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+              _parentId: 479,
+              _parentName: null,
+              _dataOwner: 'Parent',
+              _dataPermissions: 'None',
+              _archived: false,
+              _dataOwnershipRequested: null,
+              _reasonsForLeaving: '',
+              _properties: {
+                _properties: [Object],
+                _propertyTypes: [Array],
+                _auditEvents: null,
+                _modifiedProperties: [],
+                _additionalModels: null
+              },
+              _isNew: false,
+              _workerEntities: {},
+              _readyForDeletionWorkers: null,
+              _status: 'COMPLETE',
+              _logLevel: 300
+            }
+          ]);
+
+        expect(bulkUpload).to.have.property('crossValidate');
+
+        const csvWorkerSchemaErrors = [];
+
+        const myEstablishments = [{
+          key: 'MARMA',
+          status: 'UPDATE',
+          regType: 1
+        }];
+
+        // Regular validation has to run first for the establishment to populate the internal properties correctly
+        await bulkUpload.validate();
+
+        // call the method
+        await bulkUpload.crossValidate({
+          csvWorkerSchemaErrors,
+          myEstablishments,
+        });
+
+        // assert a error was returned
+        expect(csvWorkerSchemaErrors.length).to.equal(0);
+
+        expect(csvWorkerSchemaErrors).to.deep.equal([]);
+      });
+    });
   workers.forEach((worker, index) => {
     describe('toCSV(establishmentId, entity, MAX_QUALIFICATIONS) with worker ' + index, () => {
       it('should match the header values', async () => {
diff --git a/server/test/unit/models/classes/training.spec.js b/server/test/unit/models/classes/training.spec.js
index 1648e32203..e1752407cc 100644
--- a/server/test/unit/models/classes/training.spec.js
+++ b/server/test/unit/models/classes/training.spec.js
@@ -1,10 +1,11 @@
 'use strict';
 const expect = require('chai').expect;
-const sinon = require('sinon');
+const sandbox = require('sinon').createSandbox();
 const moment = require('moment');
 //include Training class
 const Training = require('../../../../models/classes/training').Training;
 
+
 let establishmentId = 123;
 let workerRecords = [{
   "id": 9718,
@@ -47,10 +48,17 @@ let workerTrainingRecords = {
 }
 
 describe('/server/models/class/training.js', () => {
-  describe('getExpiringAndExpiredTrainingCounts', () => {
-    sinon.stub(Training, 'fetch').callsFake(() => {
+  afterEach(function () {
+    sandbox.restore();
+  });
+
+  before(() => {
+    sandbox.stub(Training, 'fetch').callsFake(() => {
       return workerTrainingRecords;
-    })
+    });
+  });
+
+  describe('getExpiringAndExpiredTrainingCounts', () => {
     it('should return updated worker records : Training.getExpiringAndExpiredTrainingCounts', async () => {
       const updateTrainingRecords = await Training.getExpiringAndExpiredTrainingCounts(establishmentId, workerRecords);
       if(updateTrainingRecords){
@@ -77,4 +85,5 @@ describe('/server/models/class/training.js', () => {
       }
     });
   });
+
 });
diff --git a/server/test/unit/routes/admin/approval/index.spec.js b/server/test/unit/routes/admin/approval/index.spec.js
new file mode 100644
index 0000000000..305cf00f60
--- /dev/null
+++ b/server/test/unit/routes/admin/approval/index.spec.js
@@ -0,0 +1,594 @@
+const expect = require('chai').expect;
+const sinon = require('sinon');
+const util = require('util');
+const Sequelize = require('sequelize');
+// To console.log a deep object:
+// console.log("*************************** json: " + util.inspect(json, false, null, true));
+
+const models = require('../../../../../models/index');
+
+const approval = require('../../../../../routes/admin/approval');
+
+const boobyTrappedEstablishmentId = 'this will not be populated for new users';
+
+var workplaceWithDuplicateId = null;
+var establishmentIdUsedToCheckForDuplicate = false;
+
+var testWorkplace = {};
+var foundWorkplace = {};
+const _initialiseTestWorkplace = () => {
+  testWorkplace.id = 4321;
+  testWorkplace.nmdsId = 'W1234567';
+  testWorkplace.ustatus = 'PENDING';
+  testWorkplace.update = (args) => { return true; };
+  testWorkplace.destroy = () => {return true;}
+  foundWorkplace = testWorkplace;
+};
+
+var testUser = {};
+var foundUser = {};
+const _initialiseTestUser = () => {
+  testUser.id = 1234;
+  testUser.establishment = testWorkplace;
+  testUser.destroy = () => { return true; };
+  foundUser = testUser;
+};
+
+var testLogin = {};
+const _initialiseTestLogin = () => {
+  testLogin.id = testUser.id;
+  testLogin.username = 'pickle-pop-panda';
+  testLogin.isActive = false;
+  testLogin.status = 'PENDING';
+  testLogin.user = testUser;
+  testLogin.update = (args) => { return true; };
+};
+
+var testRequestBody = {};
+const _initialiseTestRequestBody = () => {
+  testRequestBody.username = testLogin.username;
+  testRequestBody.approve = true;
+  testRequestBody.establishmentId = testWorkplace.id;
+  testRequestBody.nmdsId = testWorkplace.nmdsId;
+};
+
+sinon.stub(models.login, 'findOne').callsFake(async (args) => {
+  if (args.where.username[models.Sequelize.Op.iLike] === testLogin.username) {
+    return testLogin;
+  } else {
+    return null;
+  }
+});
+
+sinon.stub(models.user, 'findOne').callsFake(async (args) => {
+  if (args.where.id === testUser.id) {
+    return foundUser;
+  } else {
+    return null;
+  }
+});
+
+sinon.stub(models.establishment, 'findOne').callsFake(async (args) => {
+  if (args.where.id === testWorkplace.id) {
+    return foundWorkplace;
+  } else if (args.where.id[Sequelize.Op.ne] === boobyTrappedEstablishmentId) {
+    establishmentIdUsedToCheckForDuplicate = true;
+    return null;
+  } else if ((args.where.id[Sequelize.Op.ne] === testWorkplace.id)
+            && (args.where.nmdsId === testWorkplace.nmdsId)) {
+    return workplaceWithDuplicateId;
+  } else {
+    return null;
+  }
+});
+
+var returnedJson = null;
+var returnedStatus = null;
+const approvalJson = (json) => { returnedJson = json; };
+const approvalStatus = (status) => {
+  returnedStatus = status;
+  return {json: approvalJson, send: () => {} };
+};
+
+describe('admin/Approval route', () => {
+
+  beforeEach(async() => {
+    workplaceWithDuplicateId = null;
+    establishmentIdUsedToCheckForDuplicate = false;
+    _initialiseTestWorkplace();
+    _initialiseTestUser();
+    _initialiseTestLogin();
+    _initialiseTestRequestBody();
+    returnedJson = null;
+    returnedStatus = null;
+  });
+
+  describe('approving a new user', () => {
+    beforeEach(async() => {
+      // For new user registrations, establishmentId is set to null. See onSubmit in registration.component.ts
+      testRequestBody.establishmentId = null;
+      testRequestBody.approve = true;
+    });
+
+    it('should return a confirmation message and status 200 when the user is approved', async() => {
+      // Arrange (see beforeEach)
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedJson.status).to.deep.equal('0', 'returned Json should have status 0');
+      expect(returnedJson.message).to.deep.equal(approval.userApprovalConfirmation);
+      expect(returnedStatus).to.deep.equal(200);
+    });
+    
+    it('should mark the login as active when approving a new user', async () => {
+      // Arrange
+      var loginIsActive = false;
+      testLogin.update = (args) => {
+        loginIsActive = args.isActive;
+        return true;
+      }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(loginIsActive).to.deep.equal(true, 'login should have isActive set to true');
+    });
+    
+    it('should remove the pending status from the login when approving a new user', async () => {
+      // Arrange
+      var loginStatus = 'PENDING';
+      testLogin.update =  (args) => {
+        loginStatus = args.status;
+        return true;
+      }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(loginStatus).to.deep.equal(null, "login should have status set to null (instead of 'PENDING')");
+    });
+
+    it('should return status 400 if there is no login with matching username', async () => {
+      // Arrange
+      testRequestBody.username = 'no matching login available';
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedStatus).to.deep.equal(400);
+    });
+
+    it('should update the workplace Id when approving a new user', async () => {
+      // Arrange
+      testRequestBody.nmdsId = testWorkplace.nmdsId.concat('X');
+      var workplaceId = testWorkplace.nmdsId;
+      testWorkplace.update =  (args) => {
+        workplaceId = args.nmdsId;
+        return true;
+      }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(workplaceId).to.deep.equal(testRequestBody.nmdsId);
+    });
+    
+    it('should not use establishmentid to check for duplicate workplace id when approving new user', async () => {
+      // Arrange 
+      testRequestBody.establishmentId = boobyTrappedEstablishmentId;
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(establishmentIdUsedToCheckForDuplicate).to.deep.equal(false, 'should not use establishment id to check for duplicate');
+    });
+    
+    it('should return status 400 and error msg if there is workplace with duplicate workplace id when approving new user', async () => {
+      // Arrange 
+      workplaceWithDuplicateId = { nmdsId: testWorkplace.nmdsId };
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedJson.nmdsId).to.not.equal(undefined, 'returned json should have an nmdsId value');
+      expect(returnedJson.nmdsId).to.deep.equal(`This workplace ID (${testWorkplace.nmdsId}) belongs to another workplace. Enter a different workplace ID.`);
+      expect(returnedStatus).to.deep.equal(400);
+    });
+    
+    it('should NOT update the login when approving a new user with duplicate workplace Id', async () => {
+      // Arrange 
+      workplaceWithDuplicateId = { nmdsId: testWorkplace.nmdsId };
+      var loginUpdated = false;
+      testLogin.update =  (args) => {
+        loginUpdated = true;
+        return true;
+      }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+      
+      // Assert
+      expect(loginUpdated).to.equal(false, "login should not have been updated");
+    });
+    
+    it('should NOT remove the pending status from the workplace when approving a new user with duplicate workplace Id', async () => {
+      // Arrange 
+      workplaceWithDuplicateId = { nmdsId: testWorkplace.nmdsId };
+      var workplaceUpdated = false;
+      testWorkplace.update =  (args) => {
+        workplaceUpdated = true;
+        return true;
+      }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+      
+      // Assert
+      expect(workplaceUpdated).to.equal(false, "workplace should not have been updated");
+    });
+    
+    it('should return status 503 if login update returns false when approving a new user', async () => {
+      // Arrange 
+      testLogin.update = () => { return false; }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedStatus).to.deep.equal(503);
+    });
+    
+    it('should return status 503 if workplace update returns false when approving a new user', async () => {
+      // Arrange 
+      testWorkplace.update = () => { return false; }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedStatus).to.deep.equal(503);
+    });
+    
+    it('should return status 503 if login update throws exception when approving a new user', async () => {
+      // Arrange 
+      testLogin.update = () => { throw "Error"; }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedStatus).to.deep.equal(503);
+    });
+    
+    it('should return status 503 if workplace update throws exception when approving a new user', async () => {
+      // Arrange 
+      testWorkplace.update = () => { throw "Error"; }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedStatus).to.deep.equal(503);
+    });
+  });
+
+  describe('rejecting a new user', () => {
+    beforeEach(async() => {
+      // For new user registrations, establishmentId is set to null. See onSubmit in registration.component.ts
+      testRequestBody.establishmentId = null;
+      testRequestBody.approve = false;
+    });
+
+    it('should return a confirmation message and status 200 when the user is removed because the user is rejected', async () => {
+      // Arrange (see beforeEach)
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedJson.status).to.deep.equal('0', 'returned Json should have status 0');
+      expect(returnedJson.message).to.deep.equal(approval.userRejectionConfirmation);
+      expect(returnedStatus).to.deep.equal(200);
+    });
+
+    it('should delete the user when rejecting a new user', async () => {
+      // Arrange 
+      var userDestroyed = false;
+      testUser.destroy =  (args) => {
+        userDestroyed = true;
+        return true;
+      }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(userDestroyed).to.deep.equal(true, "user should have been destroyed");
+    });
+
+    it('should delete the workplace when rejecting a new user', async () => {
+      // Arrange 
+      var workplaceDestroyed = false;
+      testWorkplace.destroy =  (args) => {
+        workplaceDestroyed = true;
+        return true;
+      }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(workplaceDestroyed).to.deep.equal(true, "workplace should have been destroyed");
+    });
+
+    it('should not reject a new login that does not have an associated user', async () => {
+      // Arrange 
+      foundUser = null;
+      var workplaceDestroyed = false;
+      testWorkplace.destroy =  (args) => {
+        workplaceDestroyed = true;
+        return true;
+      }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+      
+      // Assert
+      expect(workplaceDestroyed).to.equal(false, "workplace should not have been destroyed");
+    });
+
+    it('should not reject a new user that does not have an associated workplace', async () => {
+      // Arrange 
+      foundWorkplace = null;
+      var userDestroyed = false;
+      testUser.destroy =  (args) => {
+        userDestroyed = true;
+        return true;
+      }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+      
+      // Assert
+      expect(userDestroyed).to.equal(false, "user should not have been destroyed");
+    });
+
+    it('should return status 503 if it is not possible to delete a user when rejecting a new user', async () => {
+      // Arrange 
+      testUser.destroy = () => { return false; }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedStatus).to.deep.equal(503);
+    });
+
+    it('should return status 503 if it is not possible to delete a workplace when rejecting a new user', async () => {
+      // Arrange 
+      testWorkplace.destroy = () => { return false; }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedStatus).to.deep.equal(503);
+    });
+  });
+
+  describe('approving a new workplace', () => {
+    beforeEach(async() => {
+      // For new workplace registrations, username is set to null. See onSubmit in registration.component.ts
+      testRequestBody.username = null;
+      testRequestBody.approve = true;
+    });
+
+    it('should return a confirmation message and status 200 when the workplace is approved', async () => {
+      // Arrange (see beforeEach)
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedJson.status).to.deep.equal('0', 'returned Json should have status 0');
+      expect(returnedJson.message).to.deep.equal(approval.workplaceApprovalConfirmation);
+      expect(returnedStatus).to.deep.equal(200);
+    });
+
+    it('should remove the pending status from the workplace when approving a new workplace', async () => {
+      // Arrange 
+      var workplaceStatus = 'PENDING';
+      testWorkplace.update =  (args) => {
+        workplaceStatus = args.ustatus;
+        return true;
+      }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(workplaceStatus).to.deep.equal(null, "workplace should have status set to null (instead of 'PENDING')");
+    });
+
+    it('should update the workplace Id when approving a new workplace', async () => {
+      // Arrange 
+      testRequestBody.nmdsId = testWorkplace.nmdsId.concat('X');
+      var workplaceId = testWorkplace.nmdsId;
+      testWorkplace.update =  (args) => {
+        workplaceId = args.nmdsId;
+        return true;
+      }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(workplaceId).to.deep.equal(testRequestBody.nmdsId);
+    });
+
+    it('should return status 400 and error msg if there is workplace with duplicate workplace id when approving new workplace', async () => {
+      // Arrange 
+      workplaceWithDuplicateId = { nmdsId: testWorkplace.nmdsId };
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedJson.nmdsId).to.not.equal(undefined, 'returned json should have an nmdsId value');
+      expect(returnedJson.nmdsId).to.deep.equal(`This workplace ID (${testWorkplace.nmdsId}) belongs to another workplace. Enter a different workplace ID.`);
+      expect(returnedStatus).to.deep.equal(400);
+    });
+
+    it('should NOT remove the pending status from the workplace when approving a new workplace with duplicate workplace Id', async () => {
+      // Arrange 
+      workplaceWithDuplicateId = { nmdsId: testWorkplace.nmdsId };
+      var workplaceUpdated = false;
+      testWorkplace.update =  (args) => {
+        workplaceUpdated = true;
+        return true;
+      }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+      
+      // Assert
+      expect(workplaceUpdated).to.equal(false, "workplace should not have been updated");
+    });
+
+    it('should return status 503 if workplace update returns false when approving a new workplace', async () => {
+      // Arrange 
+      testWorkplace.update = () => { return false; }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedStatus).to.deep.equal(503);
+    });
+
+    it('should return status 503 if workplace update throws exception when approving a new workplace', async () => {
+      // Arrange 
+      testWorkplace.update = () => { throw "Error"; }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedStatus).to.deep.equal(503);
+    });
+  });
+
+  describe('rejecting a new workplace', () => {
+    beforeEach(async() => {
+      // For new workplace registrations, username is set to null. See onSubmit in registration.component.ts
+      testRequestBody.username = null;
+      testRequestBody.approve = false;
+    });
+
+    it('should return a confirmation message and status 200 when the workplace is removed because the workplace is rejected', async () => {
+      // Arrange (see beforeEach)
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedJson.status).to.deep.equal('0', 'returned Json should have status 0');
+      expect(returnedJson.message).to.deep.equal(approval.workplaceRejectionConfirmation);
+      expect(returnedStatus).to.deep.equal(200);
+    });
+
+    it('should delete the workplace when rejecting a new workplace', async () => {
+      // Arrange 
+      var workplaceDestroyed = false;
+      testWorkplace.destroy =  (args) => {
+        workplaceDestroyed = true;
+        return true;
+      }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(workplaceDestroyed).to.deep.equal(true, "workplace should have been destroyed");
+    });
+
+    it('should return status 503 if it is not possible to delete a workplace when rejecting a new workplace', async () => {
+      // Arrange 
+      testWorkplace.destroy = () => { return false; }
+
+      // Act
+      await approval.adminApproval({
+        body: testRequestBody
+      }, {status: approvalStatus});
+
+      // Assert
+      expect(returnedStatus).to.deep.equal(503);
+    });
+  });
+});
diff --git a/server/test/unit/routes/admin/unlock-account/index.spec.js b/server/test/unit/routes/admin/unlock-account/index.spec.js
new file mode 100644
index 0000000000..b5f9866369
--- /dev/null
+++ b/server/test/unit/routes/admin/unlock-account/index.spec.js
@@ -0,0 +1,72 @@
+const expect = require('chai').expect;
+const sinon = require('sinon');
+
+const models = require('../../../../../models/index');
+
+const unlockAccount = require('../../../../../routes/admin/unlock-account')
+
+const user = {
+  username: 'fred123',
+  id: 12345,
+  isActive: false,
+  invalidAttempt: 10,
+  update: (args) => {
+    expect(args.isActive).to.deep.equal(true);
+    expect(args.invalidAttempt).to.deep.equal(9);
+    return true;
+  }
+};
+
+sinon.stub(models.login, 'findOne').callsFake(async (args) => {
+  if (args.where.username=== user.username) {
+    return user;
+  } else {
+    return null;
+  }
+});
+
+describe('unlock-account route', () => {
+  describe('unlockAccount()', () => {
+    it('should return with an unlocked account status', async() => {
+      const updateStatus = (status) => {
+        expect(status).to.deep.equal(200);
+      };
+      const updateJson = (json) => {
+        expect(typeof(json)).to.deep.equal('object');
+        expect(json.status).to.deep.equal('0');
+        expect(json.message).to.deep.equal('User has been set as active');
+      };
+      await unlockAccount.unlockAccount({
+        body: {
+          username: user.username
+        }
+      }, {status: updateStatus, json: updateJson, send: updateJson});
+    });
+
+    it('should not return with an unlocked account status if invalid username', async() => {
+      const updateStatus = (status) => {
+        expect(status).to.deep.equal(400);
+      };
+      const updateJson = (json) => {
+        expect(json).to.deep.equal();
+      };
+      await unlockAccount.unlockAccount({
+        body: {
+          username: user.username + '1'
+        }
+      }, {status: updateStatus, json: updateJson, send: updateJson});
+    });
+
+    it('should not return with an unlocked account status if no username', async() => {
+      const updateStatus = (status) => {
+        expect(status).to.deep.equal(400);
+      };
+      const updateJson = (json) => {
+        expect(json).to.deep.equal();
+      };
+      await unlockAccount.unlockAccount({
+        body: {},
+      }, {status: updateStatus, json: updateJson, send: updateJson});
+    });
+  });
+});
diff --git a/server/test/unit/routes/establishments/bulkUpload.spec.js b/server/test/unit/routes/establishments/bulkUpload.spec.js
new file mode 100644
index 0000000000..035dcf665f
--- /dev/null
+++ b/server/test/unit/routes/establishments/bulkUpload.spec.js
@@ -0,0 +1,241 @@
+'use strict';
+
+const expect = require('chai').expect;
+const sinon = require('sinon');
+const rfr = require('rfr');
+
+const bulkUpload = rfr('server/routes/establishments/bulkUpload');
+const EstablishmentCsvValidator = rfr('server/models/BulkImport/csv/establishments');
+const { Establishment } = rfr('server/models/classes/establishment');
+const buildEstablishmentCSV = rfr('server/test/factories/establishment/csv');
+
+describe('/server/routes/establishment/bulkUpload.js', () => {
+  describe('checkDuplicateLocations', () => {
+    it('can check for duplicate location IDs', async () => {
+      const csvEstablishmentSchemaErrors = [];
+      const myEstablishments = [
+        buildEstablishmentCSV({
+          overrides: {
+            LOCALESTID: 'Workplace 1',
+            LOCATIONID: '1-12345678',
+          },
+        }),
+        buildEstablishmentCSV({
+          overrides: {
+            LOCALESTID: 'Workplace 2',
+            LOCATIONID: '1-12345678',
+          },
+        }),
+      ].map((currentLine, currentLineNumber) => {
+        return new EstablishmentCsvValidator.Establishment(
+          currentLine,
+          currentLineNumber,
+        );
+      });
+
+      await bulkUpload.checkDuplicateLocations(
+        myEstablishments,
+        csvEstablishmentSchemaErrors,
+      );
+
+      expect(csvEstablishmentSchemaErrors.length).equals(1);
+      expect(csvEstablishmentSchemaErrors[0]).to.eql({
+        origin: 'Establishments',
+        lineNumber: 1,
+        errCode: 998,
+        errType: 'DUPLICATE_ERROR',
+        error: 'LOCATIONID is not unique',
+        source: '1-12345678',
+        name: 'Workplace 2',
+      });
+    });
+  });
+
+  describe('validateEstablishmentCsv()', () => {
+    it('should validate each line of the establishments CSV', async () => {
+      const workplace = { Address1: 'First Line',
+        Address2: 'Second Line',
+        Address3: '',
+        Town: 'My Town',
+        Postcode: 'LN11 9JG',
+        LocationId: '1-12345678',
+        ProvId: '1-12345678',
+        IsCQCRegulated: true,
+        reasonsForLeaving: '',
+        status: null,
+        name: 'WOZiTech, with even more care',
+        localIdentifier: 'omar3',
+        isRegulated: false,
+        employerType: { value: null, other: undefined },
+        localAuthorities: [],
+        mainService: null,
+        services: [],
+        serviceUsers: [],
+        numberOfStaff: null,
+        vacancies: 'None',
+        starters: 'None',
+        leavers: 'None',
+        share: { enabled: false },
+        capacities: []
+      };
+      sinon.stub(EstablishmentCsvValidator.Establishment.prototype, 'validate').resolves();
+      sinon.stub(EstablishmentCsvValidator.Establishment.prototype, 'transform').resolves({});
+      sinon.stub(Establishment.prototype, 'initialise').callsFake((Address1, Address2, Address3, Town, test, LocationId, ProvId, Postcode, IsCQCRegulated)  => {
+        expect(Address1).to.deep.equal(workplace.Address1);
+        expect(Address2).to.deep.equal(workplace.Address2);
+        expect(Address3).to.deep.equal(workplace.Address3);
+        expect(Town).to.deep.equal(workplace.Town);
+        expect(test).to.deep.equal(null);
+        expect(LocationId).to.deep.equal(workplace.LocationId);
+        expect(ProvId).to.deep.equal(workplace.ProvId);
+        expect(Postcode).to.deep.equal(workplace.Postcode);
+        expect(IsCQCRegulated).to.deep.equal(workplace.IsCQCRegulated);
+      });
+      sinon.stub(EstablishmentCsvValidator.Establishment.prototype, 'toAPI').callsFake(() => {
+        return workplace;
+      });
+      sinon.stub(Establishment.prototype, 'load').callsFake(args => {
+        expect(args).to.deep.equal(workplace);
+      });
+      sinon.stub(Establishment.prototype, 'validate').resolves({});
+      sinon.stub(Establishment.prototype, 'key').get(() =>{
+        return 'omar3';
+      });
+
+      await bulkUpload.validateEstablishmentCsv({
+        LOCALESTID: 'omar3',
+        STATUS: 'NEW',
+        ESTNAME: 'WOZiTech, with even more care',
+        ADDRESS1: 'First Line',
+        ADDRESS2: 'Second Line',
+        ADDRESS3: '',
+        POSTTOWN: 'My Town',
+        POSTCODE: 'LN11 9JG',
+        ESTTYPE: '6',
+        OTHERTYPE: '',
+        PERMCQC: '1',
+        PERMLA: '1',
+        SHARELA: '708;721;720',
+        REGTYPE: '2',
+        PROVNUM: '1-12345678',
+        LOCATIONID: '1-12345678',
+        MAINSERVICE: '8',
+      ALLSERVICES: '12;13',
+        CAPACITY: '0;0',
+        UTILISATION: '0;0',
+        SERVICEDESC: '1;1',
+        SERVICEUSERS: '',
+        OTHERUSERDESC: '',
+        TOTALPERMTEMP: '1',
+        ALLJOBROLES: '34;8;4',
+        STARTERS: '0;0;0',
+        LEAVERS: '999;0;0',
+        VACANCIES: '999;333;1',
+        REASONS: '',
+        REASONNOS: ''
+      },
+      2,
+      [],
+      [],
+      [
+        {
+          _validations: [],
+          _username: 'aylingw',
+          _id: 479,
+          _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+          _ustatus: null,
+          _created: '2019-03-15T09:54:10.562Z',
+          _updated: '2019-10-04T15:46:16.158Z',
+          _updatedBy: 'aylingw',
+          _auditEvents: null,
+          _name: 'WOZiTech, with even more care',
+          _address1: 'First Line',
+          _address2: 'Second Line',
+          _address3: '',
+          _town: 'My Town',
+          _county: '',
+          _locationId: null,
+          _provId: null,
+          _postcode: 'LN11 9JG',
+          _isRegulated: false,
+          _mainService: { id: 16, name: 'Head office services' },
+          _nmdsId: 'G1001114',
+          _lastWdfEligibility: '2019-08-16T07:17:38.014Z',
+          _overallWdfEligibility: '2019-08-16T07:17:38.340Z',
+          _establishmentWdfEligibility: null,
+          _staffWdfEligibility: '2019-08-13T12:41:24.836Z',
+          _isParent: true,
+          _parentUid: null,
+          _parentId: null,
+          _parentName: null,
+          _dataOwner: 'Workplace',
+          _dataPermissions: 'None',
+          _archived: false,
+          _dataOwnershipRequested: null,
+          _reasonsForLeaving: '',
+          _properties: {
+            _properties: [Object],
+            _propertyTypes: [Array],
+            _auditEvents: null,
+            _modifiedProperties: [],
+            _additionalModels: null
+          },
+          _isNew: false,
+          _workerEntities: {
+          },
+          _readyForDeletionWorkers: null,
+          _status: 'NEW',
+          _logLevel: 300
+        },
+        {
+          _validations: [],
+          _username: 'aylingw',
+          _id: 1446,
+          _uid: 'a415435f-40f2-4de5-abf7-bff611e85591',
+          _ustatus: null,
+          _created: '2019-07-31T15:09:57.405Z',
+          _updated: '2019-10-04T15:46:16.797Z',
+          _updatedBy: 'aylingw',
+          _auditEvents: null,
+          _name: 'WOZiTech Cares Sub 100',
+          _address1: 'Number 1',
+          _address2: 'My street',
+          _address3: '',
+          _town: 'My Town',
+          _county: '',
+          _locationId: '1-888777666',
+          _provId: '1-999888777',
+          _postcode: 'LN11 9JG',
+          _isRegulated: true,
+          _mainService: { id: 1, name: 'Carers support' },
+          _nmdsId: 'G1002110',
+          _lastWdfEligibility: '2019-10-04T15:46:16.797Z',
+          _overallWdfEligibility: null,
+          _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z',
+          _staffWdfEligibility: null,
+          _isParent: false,
+          _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd',
+          _parentId: 479,
+          _parentName: null,
+          _dataOwner: 'Parent',
+          _dataPermissions: 'None',
+          _archived: false,
+          _dataOwnershipRequested: null,
+          _reasonsForLeaving: '',
+          _properties: {
+            _properties: [Object],
+            _propertyTypes: [Array],
+            _auditEvents: null,
+            _modifiedProperties: [],
+            _additionalModels: null
+          },
+          _isNew: false,
+          _workerEntities: {},
+          _readyForDeletionWorkers: null,
+          _status: 'COMPLETE',
+          _logLevel: 300
+        }
+      ]);
+    });
+  });
+});
diff --git a/server/test/unit/routes/training.spec.js b/server/test/unit/routes/training.spec.js
new file mode 100644
index 0000000000..762c0fd3e1
--- /dev/null
+++ b/server/test/unit/routes/training.spec.js
@@ -0,0 +1,226 @@
+const expect = require('chai').expect;
+const sandbox = require('sinon').createSandbox();
+
+const trainingRoute = require('../../../routes/establishments/training/index.js');
+const Training = require('../../../models/classes/training').Training;
+const MandatoryTraining = require('../../../models/classes/mandatoryTraining').MandatoryTraining;
+
+let establishmentId = 123;
+
+
+function createWorkerTrainingRecord(hasTraining) {
+  if (hasTraining) {
+    return {
+      'workerUid': '59b6b514-89e0-4248-a62a-bbe721aab8ef',
+      'count': 1,
+      'lastUpdated': '2019-11-07T03:41:55.870Z',
+      'training': [
+        {
+          'uid': '4240c7ed-eb3a-4a94-8d08-11b4869d0d90',
+          'trainingCategory': {
+            'id': 14,
+            'category': 'Emergency Aid awareness'
+          },
+          'title': 'Test 2',
+          'accredited': 'Yes',
+          'completed': '2019-09-12',
+          'expires': '2019-10-10',
+          'created': '2019-11-07T03:41:55.870Z',
+          'updated': '2019-11-07T03:41:55.870Z',
+          'updatedBy': 'uname70'
+        }
+      ]
+    };
+  }
+  return {
+    'workerUid': '59b6b514-89e0-4248-a62a-bbe721aab8ef',
+    'count': 0,
+    'lastUpdated': '2019-11-07T03:41:55.870Z',
+    'training': []
+  };
+}
+
+
+const mandatoryTrainingRecords = [
+  {
+    id: 204,
+    establishmentFK: 479,
+    trainingCategoryFK: 4,
+    jobFK: 1,
+    created: new Date('2020-04-30T12:43:43.106Z'),
+    updated: new Date('2020-04-30T12:43:43.106Z'),
+    createdBy: '4b1a6e5e-c45e-49d6-8580-616fdbe9ae80',
+    updatedBy: '4b1a6e5e-c45e-49d6-8580-616fdbe9ae80',
+    workerTrainingCategories:
+      {
+        id: 4,
+        category: 'Autism'
+      }
+  },
+  {
+    id: 101,
+    establishmentFK: 479,
+    trainingCategoryFK: 14,
+    jobFK: 1,
+    created: new Date('2020-04-30T12:43:43.106Z'),
+    updated: new Date('2020-04-30T12:43:43.106Z'),
+    createdBy: '4b1a6e5e-c45e-49d6-8580-616fdbe9ae80',
+    updatedBy: '4b1a6e5e-c45e-49d6-8580-616fdbe9ae80',
+    workerTrainingCategories: {
+      id: 14,
+      category: 'Emergency Aid awareness'
+    }
+  }
+];
+
+describe('training route', () => {
+  describe('addMissingMandatoryTrainingToAllTraining', () => {
+    describe('normal stubs', () => {
+      afterEach(function() {
+        sandbox.restore();
+      });
+
+      it('should return updated training record with missing Mandatory training', async () => {
+        let workerTrainingRecord = createWorkerTrainingRecord(true);
+        sandbox.stub(MandatoryTraining, 'fetchMandatoryTrainingForWorker').callsFake(() => {
+          return mandatoryTrainingRecords;
+        });
+        sandbox.stub(Training, 'fetch').callsFake(() => {
+          return workerTrainingRecord;
+        });
+        const updateStatus = (status) => {
+          expect(status).to.deep.equal(200);
+        };
+        const updateJson = (json) => {
+          expect(typeof (json)).to.deep.equal('object');
+          expect(json.training[0].uid).to.equal(mandatoryTrainingRecords[0].id);
+          expect(json.training[1].uid).to.not.equal(mandatoryTrainingRecords[1].id);
+        };
+        await trainingRoute.getTrainingListWithMissingMandatoryTraining({
+          establishmentId: establishmentId,
+          username: 'test123',
+          params: {
+            workerId: workerTrainingRecord.workerUid
+          },
+          body: {
+            establishmentId: establishmentId
+          },
+          headers: {
+            'x-override-put-return-all': false
+          }
+        }, { status: updateStatus, json: updateJson, send: updateJson });
+      });
+
+      it('should fail as username doesnt exist', async () => {
+        let workerTrainingRecord = createWorkerTrainingRecord(true);
+        sandbox.stub(MandatoryTraining, 'fetchMandatoryTrainingForWorker').callsFake(() => {
+          return mandatoryTrainingRecords;
+        });
+        sandbox.stub(Training, 'fetch').callsFake(() => {
+          return workerTrainingRecord;
+        });
+        const updateStatus = (status) => {
+          expect(status).to.deep.equal(503);
+        };
+        const updateJson = (json) => {
+          expect(typeof (json)).to.deep.equal('object');
+          expect(json.training[0].uid).to.equal(mandatoryTrainingRecords[0].id);
+          expect(json.training[1].uid).to.not.equal(mandatoryTrainingRecords[1].id);
+        };
+        const updateSend = (string) => {
+          expect(typeof (string)).to.deep.equal('string');
+          expect(string).to.include('Failed to get Training Records for Worker');
+        };
+
+        await trainingRoute.getTrainingListWithMissingMandatoryTraining({
+          establishmentId: establishmentId,
+          username: 'test123',
+          params: {
+            workerId: 123456
+          },
+          body: {
+            establishmentId: establishmentId
+          },
+          headers: {
+            'x-override-put-return-all': false
+          }
+        }, { status: updateStatus, json: updateJson, send: updateSend });
+      });
+    });
+    describe('No mandatory Training stubs', () => {
+      afterEach(function() {
+        sandbox.restore();
+      });
+
+      it('should return no missing training', async () => {
+        let workerTrainingRecord = createWorkerTrainingRecord(true);
+        sandbox.stub(MandatoryTraining, 'fetchMandatoryTrainingForWorker').callsFake(() => {
+          return [];
+        });
+        sandbox.stub(Training, 'fetch').callsFake(() => {
+          return workerTrainingRecord;
+        });
+
+
+        const updateStatus = (status) => {
+          expect(status).to.deep.equal(200);
+        };
+        const updateJson = (json) => {
+          expect(typeof (json)).to.equal('object');
+          expect(json.training[0].uid).to.equal(workerTrainingRecord.training[0].uid);
+        };
+        await trainingRoute.getTrainingListWithMissingMandatoryTraining({
+          establishmentId: establishmentId,
+          username: 'test123',
+          params: {
+            workerId: workerTrainingRecord.workerUid
+          },
+          body: {
+            establishmentId: establishmentId
+          },
+          headers: {
+            'x-override-put-return-all': false
+          }
+        }, { status: updateStatus, json: updateJson, send: updateJson });
+      });
+    });
+    describe('No Training stubs', () => {
+      afterEach(function() {
+        sandbox.restore();
+      });
+
+
+      it('should return only missing training', async () => {
+        let workerTrainingRecord = createWorkerTrainingRecord(false);
+        sandbox.stub(MandatoryTraining, 'fetchMandatoryTrainingForWorker').callsFake(() => {
+          return mandatoryTrainingRecords;
+        });
+        sandbox.stub(Training, 'fetch').callsFake(() => {
+          return workerTrainingRecord;
+        });
+        const updateStatus = (status) => {
+          expect(status).to.deep.equal(200);
+        };
+        const updateJson = (json) => {
+          expect(typeof (json)).to.deep.equal('object');
+          expect(json.count).to.equal(0);
+          expect(json.training.length).to.equal(2);
+        };
+        await trainingRoute.getTrainingListWithMissingMandatoryTraining({
+          establishmentId: establishmentId,
+          username: 'test123',
+          params: {
+            workerId: workerTrainingRecord.workerUid
+          },
+          body: {
+            establishmentId: establishmentId
+          },
+          headers: {
+            'x-override-put-return-all': false
+          }
+        }, { status: updateStatus, json: updateJson, send: updateJson });
+      });
+    });
+  });
+});
+
diff --git a/server/utils/middleware/rateLimiting.js b/server/utils/middleware/rateLimiting.js
new file mode 100644
index 0000000000..005dd282c7
--- /dev/null
+++ b/server/utils/middleware/rateLimiting.js
@@ -0,0 +1,38 @@
+const models = require('../../models/');
+const {RateLimiterPostgres} = require('rate-limiter-flexible');
+const appConfig = require('../../config/config');
+
+const opts = {
+  points: appConfig.get('rateLimiting.points'),
+  duration: appConfig.get('rateLimiting.duration'),
+  storeClient: models.sequelize,
+  tableName: appConfig.get('rateLimiting.table'),
+  keyPrefix: 'UsernameLookup'
+};
+
+const ready = (err) => {
+  if (err) {
+    console.error(err);
+  } else {
+    console.log('Created/Found table needed for rate limiting');
+  }
+};
+
+const rateLimiter = new RateLimiterPostgres(opts, ready);
+
+exports.rateLimiting = (req, res, next) => {
+  rateLimiter.consume(req.ip, 1)
+    .then((rateLimiterRes) => {
+      const headers = {
+        "Retry-After": rateLimiterRes.msBeforeNext / 1000,
+        "X-RateLimit-Limit": opts.points,
+        "X-RateLimit-Remaining": rateLimiterRes.remainingPoints,
+        "X-RateLimit-Reset": new Date(Date.now() + rateLimiterRes.msBeforeNext)
+      };
+      res.set(headers);
+      next();
+    })
+    .catch(() => {
+      res.status(429).send('Too Many Requests');
+    });
+};
diff --git a/server/utils/wdfEligibilityDate.js b/server/utils/wdfEligibilityDate.js
index 26ba60037f..e808cea8f5 100644
--- a/server/utils/wdfEligibilityDate.js
+++ b/server/utils/wdfEligibilityDate.js
@@ -3,8 +3,8 @@ exports.wdfEligibilityDate = () => {
   const today = new Date();
   const yearStartMonth = 3;           // April (months start at 0)
   if (today.getMonth() < yearStartMonth) {
-      return new Date(Date.UTC(today.getFullYear()-1, 3, 1));
+      return new Date(Date.UTC(today.getFullYear()-1, yearStartMonth, 1));
   } else {
-      return new Date(Date.UTC(today.getFullYear(), 3, 1));
+      return new Date(Date.UTC(today.getFullYear(), yearStartMonth, 1));
   }
 };
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 7027013df0..f2f3c86c72 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -159,6 +159,15 @@ const routes: Routes = [
         path: 'notifications',
         loadChildren: '@features/notifications/notifications.module#NotificationsModule',
       },
+      {
+        path: 'add-mandatory-training',
+        loadChildren: '@features/add-mandatory-training/add-mandatory-training.module#AddMandatoryTrainingModule',
+        canActivate: [CheckPermissionsGuard],
+        data: {
+          permissions: ['canAddEstablishment'],
+          title: 'Add Mandatory Training',
+        },
+      },
     ],
   },
   {
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index f42aa584d9..01dfb8ba46 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,6 +1,6 @@
 import 'core-js';
 
-import { Component, ElementRef, enableProdMode, OnInit, ViewChild } from '@angular/core';
+import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { NavigationEnd, Router } from '@angular/router';
 import { AuthService } from '@core/services/auth.service';
@@ -9,8 +9,6 @@ import { NestedRoutesService } from '@core/services/nested-routes.service';
 import { Angulartics2GoogleTagManager } from 'angulartics2/gtm';
 import { filter, take, takeWhile } from 'rxjs/operators';
 
-enableProdMode();
-
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
diff --git a/src/app/core/breadcrumb/breadcrumb.model.ts b/src/app/core/breadcrumb/breadcrumb.model.ts
index fdaefb85e3..2828a8cf51 100644
--- a/src/app/core/breadcrumb/breadcrumb.model.ts
+++ b/src/app/core/breadcrumb/breadcrumb.model.ts
@@ -7,6 +7,7 @@ export enum JourneyType {
   REPORTS,
   SUBSIDIARY_REPORTS,
   NOTIFICATIONS,
+  MANDATORY_TRAINING,
 }
 
 export interface JourneyRoute {
diff --git a/src/app/core/breadcrumb/journey.mandatory_training.ts b/src/app/core/breadcrumb/journey.mandatory_training.ts
new file mode 100644
index 0000000000..55e5442a1f
--- /dev/null
+++ b/src/app/core/breadcrumb/journey.mandatory_training.ts
@@ -0,0 +1,21 @@
+import { JourneyRoute } from './breadcrumb.model';
+
+enum Path {
+  MANDATORY_TRAINING = '/add-mandatory-training',
+  DASHBOARD = '/dashboard',
+
+}
+
+export const mandatoryTrainingJourney: JourneyRoute = {
+  children: [
+    {
+      title: 'Mandatory training',
+      path: Path.MANDATORY_TRAINING,
+      referrer: {
+        path: Path.DASHBOARD,
+        fragment: 'training-and-qualifications',
+      },
+    },
+  ],
+};
+
diff --git a/src/app/core/breadcrumb/journey.workplaces.ts b/src/app/core/breadcrumb/journey.workplaces.ts
index 9c97045ade..c6f8bb8409 100644
--- a/src/app/core/breadcrumb/journey.workplaces.ts
+++ b/src/app/core/breadcrumb/journey.workplaces.ts
@@ -14,7 +14,7 @@ enum Path {
 export const myWorkplaceJourney: JourneyRoute = {
   children: [
     {
-      title: 'Staff record summary',
+      title: 'Staff record',
       path: Path.STAFF_RECORD,
       referrer: {
         path: Path.DASHBOARD,
@@ -22,7 +22,7 @@ export const myWorkplaceJourney: JourneyRoute = {
       },
     },
     {
-      title: 'Training and qualifications summary',
+      title: 'Training and qualifications',
       path: Path.TRAINING_AND_QUALIFICATIONS_RECORD,
       referrer: {
         path: Path.DASHBOARD,
@@ -65,7 +65,7 @@ export const allWorkplacesJourney: JourneyRoute = {
           path: Path.WORKPLACE,
           children: [
             {
-              title: 'Staff record summary',
+              title: 'Staff record',
               path: Path.STAFF_RECORD,
               referrer: {
                 path: Path.WORKPLACE,
@@ -73,7 +73,7 @@ export const allWorkplacesJourney: JourneyRoute = {
               },
             },
             {
-              title: 'Training and qualifications summary',
+              title: 'Training and qualifications',
               path: Path.TRAINING_AND_QUALIFICATIONS_RECORD,
               referrer: {
                 path: Path.WORKPLACE,
diff --git a/src/app/core/components/error/page-not-found/page-not-found.component.spec.ts b/src/app/core/components/error/page-not-found/page-not-found.component.spec.ts
deleted file mode 100644
index 4bba7ed574..0000000000
--- a/src/app/core/components/error/page-not-found/page-not-found.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { PageNotFoundComponent } from './page-not-found.component';
-
-describe('PageNotFoundComponent', () => {
-  let component: PageNotFoundComponent;
-  let fixture: ComponentFixture<PageNotFoundComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [PageNotFoundComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(PageNotFoundComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/core/components/error/problem-with-the-service/problem-with-the-service.component.spec.ts b/src/app/core/components/error/problem-with-the-service/problem-with-the-service.component.spec.ts
deleted file mode 100644
index 7dad51fc88..0000000000
--- a/src/app/core/components/error/problem-with-the-service/problem-with-the-service.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ProblemWithTheServiceComponent } from './problem-with-the-service.component';
-
-describe('ProblemWithTheServiceComponent', () => {
-  let component: ProblemWithTheServiceComponent;
-  let fixture: ComponentFixture<ProblemWithTheServiceComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ProblemWithTheServiceComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ProblemWithTheServiceComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/core/components/footer/footer.component.spec.ts b/src/app/core/components/footer/footer.component.spec.ts
deleted file mode 100644
index 163f646eb0..0000000000
--- a/src/app/core/components/footer/footer.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FooterComponent } from './footer.component';
-
-describe('FooterComponent', () => {
-  let component: FooterComponent;
-  let fixture: ComponentFixture<FooterComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [FooterComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(FooterComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/core/components/header/header.component.spec.ts b/src/app/core/components/header/header.component.spec.ts
deleted file mode 100644
index 550f4857c8..0000000000
--- a/src/app/core/components/header/header.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HeaderComponent } from './header.component';
-
-describe('HeaderComponent', () => {
-  let component: HeaderComponent;
-  let fixture: ComponentFixture<HeaderComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [HeaderComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(HeaderComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/core/guards/activation-complete/activation-complete.guard.spec.ts b/src/app/core/guards/activation-complete/activation-complete.guard.spec.ts
deleted file mode 100644
index 35e9595362..0000000000
--- a/src/app/core/guards/activation-complete/activation-complete.guard.spec.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { TestBed, inject } from '@angular/core/testing';
-
-import { ActivationCompleteGuard } from './activation-complete.guard';
-
-describe('ActivationCompleteGuard', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [ActivationCompleteGuard],
-    });
-  });
-
-  it('should ...', inject([ActivationCompleteGuard], (guard: ActivationCompleteGuard) => {
-    expect(guard).toBeTruthy();
-  }));
-});
diff --git a/src/app/core/guards/add-workplace-in-progress/add-workplace-in-progress.guard.spec.ts b/src/app/core/guards/add-workplace-in-progress/add-workplace-in-progress.guard.spec.ts
deleted file mode 100644
index 2e81c1fe12..0000000000
--- a/src/app/core/guards/add-workplace-in-progress/add-workplace-in-progress.guard.spec.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { TestBed, inject } from '@angular/core/testing';
-import { AddWorkplaceInProgressGuard } from './add-workplace-in-progress.guard';
-
-describe('AddWorkplaceInProgressGuard', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [AddWorkplaceInProgressGuard],
-    });
-  });
-
-  it('should ...', inject([AddWorkplaceInProgressGuard], (guard: AddWorkplaceInProgressGuard) => {
-    expect(guard).toBeTruthy();
-  }));
-});
diff --git a/src/app/core/guards/bulk-upload/bulk-upload.guard.spec.ts b/src/app/core/guards/bulk-upload/bulk-upload.guard.spec.ts
deleted file mode 100644
index 8e76d65f6b..0000000000
--- a/src/app/core/guards/bulk-upload/bulk-upload.guard.spec.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { TestBed, async, inject } from '@angular/core/testing';
-
-import { BulkUploadGuard } from './bulk-upload.guard';
-
-describe('BulkUploadGuard', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [BulkUploadGuard]
-    });
-  });
-
-  it('should ...', inject([BulkUploadGuard], (guard: BulkUploadGuard) => {
-    expect(guard).toBeTruthy();
-  }));
-});
diff --git a/src/app/core/guards/create-user/create-user.guard.spec.ts b/src/app/core/guards/create-user/create-user.guard.spec.ts
deleted file mode 100644
index 0b3d3d032d..0000000000
--- a/src/app/core/guards/create-user/create-user.guard.spec.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { TestBed, inject } from '@angular/core/testing';
-
-import { CreateUserGuard } from './create-user.guard';
-
-describe('CreateUserGuard', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [CreateUserGuard],
-    });
-  });
-
-  it('should ...', inject([CreateUserGuard], (guard: CreateUserGuard) => {
-    expect(guard).toBeTruthy();
-  }));
-});
diff --git a/src/app/core/guards/edit-user-permissions/edit-user-permissions.guard.spec.ts b/src/app/core/guards/edit-user-permissions/edit-user-permissions.guard.spec.ts
deleted file mode 100644
index 4ef4c4f03f..0000000000
--- a/src/app/core/guards/edit-user-permissions/edit-user-permissions.guard.spec.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { TestBed, async, inject } from '@angular/core/testing';
-
-import { EditUserPermissionsGuard } from './edit-user-permissions.guard';
-
-describe('EditUserPermissionsGuard', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [EditUserPermissionsGuard]
-    });
-  });
-
-  it('should ...', inject([EditUserPermissionsGuard], (guard: EditUserPermissionsGuard) => {
-    expect(guard).toBeTruthy();
-  }));
-});
diff --git a/src/app/core/guards/logged-out/logged-out.guard.spec.ts b/src/app/core/guards/logged-out/logged-out.guard.spec.ts
deleted file mode 100644
index d923aff1f1..0000000000
--- a/src/app/core/guards/logged-out/logged-out.guard.spec.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { TestBed, async, inject } from '@angular/core/testing';
-
-import { LoggedOutGuard } from './logged-out.guard';
-
-describe('LoggedOutGuard', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [LoggedOutGuard]
-    });
-  });
-
-  it('should ...', inject([LoggedOutGuard], (guard: LoggedOutGuard) => {
-    expect(guard).toBeTruthy();
-  }));
-});
diff --git a/src/app/core/guards/parent/parent.guard.spec.ts b/src/app/core/guards/parent/parent.guard.spec.ts
deleted file mode 100644
index ee19f02515..0000000000
--- a/src/app/core/guards/parent/parent.guard.spec.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { TestBed, async, inject } from '@angular/core/testing';
-
-import { ParentGuard } from './parent.guard';
-
-describe('ParentGuard', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [ParentGuard]
-    });
-  });
-
-  it('should ...', inject([ParentGuard], (guard: ParentGuard) => {
-    expect(guard).toBeTruthy();
-  }));
-});
diff --git a/src/app/core/guards/permissions/check-permissions/check-permissions.guard.spec.ts b/src/app/core/guards/permissions/check-permissions/check-permissions.guard.spec.ts
deleted file mode 100644
index 3af127e2f9..0000000000
--- a/src/app/core/guards/permissions/check-permissions/check-permissions.guard.spec.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { TestBed, async, inject } from '@angular/core/testing';
-
-import { CheckPermissionsGuard } from './check-permissions.guard';
-
-describe('CheckPermissionsGuard', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [CheckPermissionsGuard],
-    });
-  });
-
-  it('should ...', inject([CheckPermissionsGuard], (guard: CheckPermissionsGuard) => {
-    expect(guard).toBeTruthy();
-  }));
-});
diff --git a/src/app/core/guards/permissions/has-permissions/has-permissions.guard.spec.ts b/src/app/core/guards/permissions/has-permissions/has-permissions.guard.spec.ts
deleted file mode 100644
index 22e227a461..0000000000
--- a/src/app/core/guards/permissions/has-permissions/has-permissions.guard.spec.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { TestBed, async, inject } from '@angular/core/testing';
-
-import { HasPermissionsGuard } from './has-permissions.guard';
-
-describe('HasPermissionsGuard', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [HasPermissionsGuard],
-    });
-  });
-
-  it('should ...', inject([HasPermissionsGuard], (guard: HasPermissionsGuard) => {
-    expect(guard).toBeTruthy();
-  }));
-});
diff --git a/src/app/core/guards/register/register.guard.spec.ts b/src/app/core/guards/register/register.guard.spec.ts
deleted file mode 100644
index c6b58b5d21..0000000000
--- a/src/app/core/guards/register/register.guard.spec.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { TestBed, async, inject } from '@angular/core/testing';
-
-import { RegisterGuard } from './register.guard';
-
-describe('RegisterGuard', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [RegisterGuard],
-    });
-  });
-
-  it('should ...', inject([RegisterGuard], (guard: RegisterGuard) => {
-    expect(guard).toBeTruthy();
-  }));
-});
diff --git a/src/app/core/guards/role/role.guard.spec.ts b/src/app/core/guards/role/role.guard.spec.ts
deleted file mode 100644
index bf165d1192..0000000000
--- a/src/app/core/guards/role/role.guard.spec.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { TestBed, async, inject } from '@angular/core/testing';
-
-import { RoleGuard } from './role.guard';
-
-describe('RoleGuard', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [RoleGuard]
-    });
-  });
-
-  it('should ...', inject([RoleGuard], (guard: RoleGuard) => {
-    expect(guard).toBeTruthy();
-  }));
-});
diff --git a/src/app/core/model/establishment.model.ts b/src/app/core/model/establishment.model.ts
index 9e38353142..f59b3faed3 100644
--- a/src/app/core/model/establishment.model.ts
+++ b/src/app/core/model/establishment.model.ts
@@ -58,12 +58,18 @@ export interface Leaver {
   total: number;
 }
 
+export interface Category {
+  trainingId: number;
+  title: string;
+}
+
 export interface WDF {
   effectiveFrom: Date;
   overalWdfEligible: boolean;
-  lastEligibility: Date;
-  isEligible: boolean;
-  currentEligibility: boolean;
+  lastEligibility: Date;  // date establishment was last eligible
+  isEligible: boolean; //  are both the establishment & workers eligible?
+  currentEligibility: boolean; //  is the establishment currently eligible?
+  canConfirm: boolean; // can the establishment confirm their details are up-to-date?
   employerType: WDFValue;
   mainService: WDFValue;
   capacities: WDFValue;
@@ -79,6 +85,7 @@ export interface Establishment {
   createdByUserUID?: string;
   id: number;
   uid: string;
+  ustatus?: string;
   ownerChangeRequestUID?: any;
   name: string;
   address: string;
@@ -117,18 +124,19 @@ export interface Establishment {
   dataOwnershipRequested: string;
   ownershipChangeRequestId?: string;
   linkToParentRequested?: string;
-  address1?: string
-  address2?: string
-  address3?: string
-  town?: string
-  county?: string
-  locationId?: string
+  address1?: string;
+  address2?: string;
+  address3?: string;
+  town?: string;
+  county?: string;
+  locationId?: string;
 }
 
 export interface UpdateJobsRequest {
   leavers?: Leaver[] | string;
   starters?: Starter[] | string;
   vacancies?: Vacancy[] | string;
+  categories?: Category[] | string;
 }
 
 export enum jobOptionsEnum {
@@ -137,6 +145,11 @@ export enum jobOptionsEnum {
   NONE = 'None',
 }
 
+export enum mandatoryTrainingJobOption {
+  all = 'all',
+  selected = 'selected',
+}
+
 export interface LocalIdentifiersRequest {
   localIdentifiers: LocalIdentifier[];
 }
@@ -167,6 +180,26 @@ export interface setPermission {
   permissionToSet: string;
 }
 
+export interface mandatoryJobs {
+  id: number;
+}
+
+export interface mandatoryTraining {
+  trainingCategoryId: number;
+  allJobRoles: boolean;
+  selectedJobRoles?: boolean;
+  jobs: mandatoryJobs[];
+}
+
+export interface allMandatoryTrainingCategories {
+  mandatoryTrainingCount: number;
+  allJobRolesCount: number;
+  mandatoryTraining: mandatoryTraining[];
+}
+export interface mandatoryTrainingCategories {
+  categories: mandatoryTraining[];
+}
+
 export enum SortStaffOptions {
   '0_asc' = 'Staff name ascending',
   '0_dsc' = 'Staff name descending',
diff --git a/src/app/core/model/permissions.model.ts b/src/app/core/model/permissions.model.ts
index 478e5513e2..c90af5633d 100644
--- a/src/app/core/model/permissions.model.ts
+++ b/src/app/core/model/permissions.model.ts
@@ -18,6 +18,7 @@ export type PermissionType =
   | 'canBulkUpload'
   | 'canChangePermissionsForSubsidiary'
   | 'canDeleteEstablishment'
+  | 'canDeleteAllEstablishments'
   | 'canDeleteUser'
   | 'canDeleteWorker'
   | 'canEditEstablishment'
@@ -37,4 +38,5 @@ export type PermissionType =
   | 'canViewWdfReport'
   | 'canViewWorker'
   | 'canLinkToParent'
-  | 'canRemoveParentAssociation';
+  | 'canRemoveParentAssociation'
+  | 'canDownloadWdfReport';
diff --git a/src/app/core/model/training.model.ts b/src/app/core/model/training.model.ts
index f589436055..31788b4cee 100644
--- a/src/app/core/model/training.model.ts
+++ b/src/app/core/model/training.model.ts
@@ -40,6 +40,7 @@ export interface TrainingRecord {
   updated: string;
   updatedBy: string;
   trainingStatus?: number;
+  missing?: boolean;
 }
 
 export interface TrainingLockStatus {
diff --git a/src/app/core/model/worker.model.ts b/src/app/core/model/worker.model.ts
index e728e3d323..7847fbfa33 100644
--- a/src/app/core/model/worker.model.ts
+++ b/src/app/core/model/worker.model.ts
@@ -3,6 +3,7 @@ import { JobRole } from './job.model';
 import { WDFValue } from './wdf.model';
 
 export interface Worker {
+  trainingAlert?: number;
   uid?: string;
   ustatus?: string;
   nameOrId: string;
@@ -90,6 +91,7 @@ export interface Worker {
   trainingCount: number;
   expiredTrainingCount: number;
   expiringTrainingCount: number;
+  missingMandatoryTrainingCount: number;
   qualificationCount: number;
 }
 
diff --git a/src/app/core/services/auth.service.ts b/src/app/core/services/auth.service.ts
index 98203ec9c0..e6c353e0af 100644
--- a/src/app/core/services/auth.service.ts
+++ b/src/app/core/services/auth.service.ts
@@ -17,6 +17,7 @@ export class AuthService {
   private _isAuthenticated$: BehaviorSubject<boolean> = new BehaviorSubject(null);
   private jwt = new JwtHelperService();
   private previousUser: string;
+  private previousToken: string = null;
   private redirect: string;
 
   constructor(
@@ -104,6 +105,20 @@ export class AuthService {
     this.permissionsService.clearPermissions();
   }
 
+  public setPreviousToken(): void {
+    if(this.previousToken === null)
+      this.previousToken = this.token
+  }
+
+  public restorePreviousToken(): void {
+    if(this.previousToken !== null)
+      this.token = this.previousToken
+  }
+
+  public getPreviousToken(): any {
+    return this.jwt.decodeToken(this.previousToken)
+  }
+
   private setPreviousUser(): void {
     const data = this.jwt.decodeToken(this.token);
     this.previousUser = data && data.sub ? data.sub : null;
diff --git a/src/app/core/services/breadcrumb.service.ts b/src/app/core/services/breadcrumb.service.ts
index 5019f9b162..d109c0ba0b 100644
--- a/src/app/core/services/breadcrumb.service.ts
+++ b/src/app/core/services/breadcrumb.service.ts
@@ -4,6 +4,7 @@ import { NavigationEnd, PRIMARY_OUTLET, Router, UrlSegment } from '@angular/rout
 import { JourneyRoute, JourneyType } from '@core/breadcrumb/breadcrumb.model';
 import { accountJourney } from '@core/breadcrumb/journey.accounts';
 import { bulkUploadJourney } from '@core/breadcrumb/journey.bulk-upload';
+import { mandatoryTrainingJourney } from '@core/breadcrumb/journey.mandatory_training';
 import { notificationsJourney } from '@core/breadcrumb/journey.notifications';
 import { publicJourney } from '@core/breadcrumb/journey.public';
 import { reportJourney, subsidiaryReportJourney } from '@core/breadcrumb/journey.report';
@@ -161,6 +162,10 @@ export class BreadcrumbService {
         routes = notificationsJourney;
         break;
       }
+      case JourneyType.MANDATORY_TRAINING: {
+        routes = mandatoryTrainingJourney;
+        break;
+      }
       default: {
         routes = null;
       }
diff --git a/src/app/core/services/bulk-upload.service.spec.ts b/src/app/core/services/bulk-upload.service.spec.ts
deleted file mode 100644
index b8abba8c9c..0000000000
--- a/src/app/core/services/bulk-upload.service.spec.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { TestBed } from '@angular/core/testing';
-
-import { FilesUploadComponent } from '../../features/bulk-upload/files-upload/files-upload.component';
-import { BulkUploadService } from './bulk-upload.service';
-
-describe('BulkUploadService', () => {
-  // We declare the variables that we'll use for the Test Controller and for our Service
-  let httpTestingController: HttpTestingController;
-  let service: BulkUploadService;
-  let controller: FilesUploadComponent;
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [BulkUploadService],
-      imports: [HttpClientTestingModule],
-    });
-
-    // We inject our service (which imports the HttpClient) and the Test Controller
-    httpTestingController = TestBed.get(HttpTestingController);
-    service = TestBed.get(BulkUploadService);
-    controller = TestBed.get(FilesUploadComponent);
-  });
-
-  afterEach(() => {
-    httpTestingController.verify();
-  });
-
-  // Angular default test added when you generate a service using the CLI
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-  describe('getPresignedUrls()', () => {
-    it('returned Observable should match the right data', () => {
-      const mockPresignedFiles = {
-        files: [
-          {
-            filename: 'workers.csv',
-          },
-          {
-            filename: 'establishments.csv',
-          },
-        ],
-      };
-      const mockPresignedUrls = [
-        {
-          filename: 'workers.csv',
-          signedUrl:
-            'https://sfcbulkuploadfiles.s3.eu-west-2.amazonaws.com/479/latest/workers.csv?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAVJZVYRR3Y57EFIOC%2F20191125%2Feu-west-2%2Fs3%2Faws4_request&X-Amz-Date=20191125T154950Z&X-Amz-Expires=300&X-Amz-Signature=405cbbe79b512afee1010a939ada7034b0b04642ae3fbffbb6e292e93768811b&X-Amz-SignedHeaders=host%3Bx-amz-meta-establishmentid%3Bx-amz-meta-username%3Bx-amz-meta-validationstatus&x-amz-meta-establishmentid=479&x-amz-meta-username=aylingw&x-amz-meta-validationstatus=pending',
-        },
-        {
-          filename: 'establishments.csv',
-          signedUrl:
-            'https://sfcbulkuploadfiles.s3.eu-west-2.amazonaws.com/479/latest/establishments.csv?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAVJZVYRR3Y57EFIOC%2F20191125%2Feu-west-2%2Fs3%2Faws4_request&X-Amz-Date=20191125T154950Z&X-Amz-Expires=300&X-Amz-Signature=98880e9cba7b28eb9c090dfc42475eb06b097952450e34f6980d78cfb1e723ac&X-Amz-SignedHeaders=host%3Bx-amz-meta-establishmentid%3Bx-amz-meta-username%3Bx-amz-meta-validationstatus&x-amz-meta-establishmentid=479&x-amz-meta-username=aylingw&x-amz-meta-validationstatus=pending',
-        },
-      ];
-      const mockLock = {
-        message: 'Lock for establishment 479 acquired.',
-        requestId: 'ec67d8f8-5d05-40bb-952d-ed7f7e5fdbf0',
-      };
-
-      service.getPresignedUrls(mockPresignedFiles).subscribe(presignedUrls => {
-        expect(presignedUrls).toEqual(mockPresignedUrls);
-      });
-
-      const lockReq = httpTestingController.expectOne(
-        `/api/establishment/${this.establishmentService.establishmentId}/bulkupload/uploaded`
-      );
-      const presignedUrlReq = httpTestingController.expectOne(
-        `/api/establishment/${this.establishmentService.establishmentId}/bulkupload/uploaded`
-      );
-      expect(lockReq.request.method).toEqual('POST');
-      expect(presignedUrlReq.request.method).toEqual('GET');
-
-      lockReq.flush(mockLock);
-      presignedUrlReq.flush(mockPresignedUrls);
-    });
-  });
-});
diff --git a/src/app/core/services/create-account/create-account.service.spec.ts b/src/app/core/services/create-account/create-account.service.spec.ts
deleted file mode 100644
index 89601de4a3..0000000000
--- a/src/app/core/services/create-account/create-account.service.spec.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { CreateAccountService } from './create-account.service';
-
-describe('CreateAccountService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
-
-  it('should be created', () => {
-    const service: CreateAccountService = TestBed.get(CreateAccountService);
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/core/services/establishment.service.ts b/src/app/core/services/establishment.service.ts
index 7a1f41b8d0..5bdef00c86 100644
--- a/src/app/core/services/establishment.service.ts
+++ b/src/app/core/services/establishment.service.ts
@@ -1,11 +1,13 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable, isDevMode } from '@angular/core';
 import {
+  allMandatoryTrainingCategories,
   CancelOwnerShip,
   ChangeOwner,
   Establishment,
   LocalIdentifiersRequest,
   LocalIdentifiersResponse,
+  mandatoryTraining,
   setPermission,
   UpdateJobsRequest,
 } from '@core/model/establishment.model';
@@ -72,7 +74,7 @@ export class EstablishmentService {
   public previousEstablishmentId: string;
   public isSameLoggedInUser: boolean;
   private _primaryWorkplace$: BehaviorSubject<Establishment> = new BehaviorSubject<Establishment>(null);
-
+  public isMandatoryTrainingView = new BehaviorSubject<boolean>(false);
   constructor(private http: HttpClient) {}
 
   private _establishmentId: string = null;
@@ -96,7 +98,7 @@ export class EstablishmentService {
     return this.getEstablishment(this.establishmentId.toString()).pipe(
       tap(establishment => {
         this.setState(establishment);
-      })
+      }),
     );
   }
 
@@ -222,7 +224,7 @@ export class EstablishmentService {
   public updateLocalIdentifiers(request: LocalIdentifiersRequest): Observable<LocalIdentifiersResponse> {
     return this.http.put<LocalIdentifiersResponse>(
       `/api/establishment/${this.establishmentId}/localIdentifier`,
-      request
+      request,
     );
   }
 
@@ -248,7 +250,7 @@ export class EstablishmentService {
   public cancelOwnership(establishmentId, ownershipChangeId, data: CancelOwnerShip): Observable<Establishment> {
     return this.http.post<Establishment>(
       `/api/establishment/${establishmentId}/ownershipChange/${ownershipChangeId}`,
-      data
+      data,
     );
   }
 
@@ -272,4 +274,12 @@ export class EstablishmentService {
   public removeParentAssociation(establishmentId, data): Observable<Establishment> {
     return this.http.put<Establishment>(`/api/establishment/${establishmentId}/linkToParent/delink`, data);
   }
+  //get all mandatory training
+  public getAllMandatoryTrainings(establishmentId): Observable<allMandatoryTrainingCategories> {
+    return this.http.get<allMandatoryTrainingCategories>(`/api/establishment/${establishmentId}/mandatoryTraining`);
+  }
+  //update mandatory training
+  public updateMandatoryTraining(establishmentId, data: mandatoryTraining[]) {
+    return this.http.post<Establishment>(`/api/establishment/${establishmentId}/mandatoryTraining`, data);
+  }
 }
diff --git a/src/app/core/services/notifications/notifications.service.spec.ts b/src/app/core/services/notifications/notifications.service.spec.ts
deleted file mode 100644
index 70045188f1..0000000000
--- a/src/app/core/services/notifications/notifications.service.spec.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { NotificationsService } from './notifications.service';
-
-describe('NotificationsService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
-
-  it('should be created', () => {
-    const service: NotificationsService = TestBed.get(NotificationsService);
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/core/services/password-reset.service.spec.ts b/src/app/core/services/password-reset.service.spec.ts
deleted file mode 100644
index 7f686cf442..0000000000
--- a/src/app/core/services/password-reset.service.spec.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { PasswordResetService } from './password-reset.service';
-
-describe('PasswordResetService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
-
-  it('should be created', () => {
-    const service: PasswordResetService = TestBed.get(PasswordResetService);
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/core/services/permissions/permissions.service.spec.ts b/src/app/core/services/permissions/permissions.service.spec.ts
deleted file mode 100644
index daab69f80f..0000000000
--- a/src/app/core/services/permissions/permissions.service.spec.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { PermissionsService } from './permissions.service';
-
-describe('PermissionsService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
-
-  it('should be created', () => {
-    const service: PermissionsService = TestBed.get(PermissionsService);
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/core/services/registration.service.ts b/src/app/core/services/registration.service.ts
index e73badccac..891b289edf 100644
--- a/src/app/core/services/registration.service.ts
+++ b/src/app/core/services/registration.service.ts
@@ -19,6 +19,7 @@ export class RegistrationService {
   public loginCredentials$: BehaviorSubject<LoginCredentials> = new BehaviorSubject(null);
   public securityDetails$: BehaviorSubject<SecurityDetails> = new BehaviorSubject(null);
   public isRegulated$: BehaviorSubject<boolean> = new BehaviorSubject(null);
+  public isCqcRegulated$: BehaviorSubject<boolean> = new BehaviorSubject(null);
   public manuallyEnteredWorkplace$: BehaviorSubject<boolean> = new BehaviorSubject(null);
   public returnTo$ = new BehaviorSubject<URLStructure>(null);
 
diff --git a/src/app/core/services/registrations.service.ts b/src/app/core/services/registrations.service.ts
index aad6a69bd4..6eb89ae31a 100644
--- a/src/app/core/services/registrations.service.ts
+++ b/src/app/core/services/registrations.service.ts
@@ -16,4 +16,8 @@ export class RegistrationsService {
   public registrationApproval(data: object) {
     return this.http.post<any>('/api/admin/approval/', data);
   }
+
+  public unlockAccount(data: object) {
+    return this.http.post<any>('/api/admin/unlock-account/', data);
+  }
 }
diff --git a/src/app/core/services/report.service.spec.ts b/src/app/core/services/report.service.spec.ts
deleted file mode 100644
index 7189a9992b..0000000000
--- a/src/app/core/services/report.service.spec.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { ReportService } from './report.service';
-
-describe('ReportService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
-
-  it('should be created', () => {
-    const service: ReportService = TestBed.get(ReportService);
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/core/services/trainingStatus.service.ts b/src/app/core/services/trainingStatus.service.ts
new file mode 100644
index 0000000000..6b3184101e
--- /dev/null
+++ b/src/app/core/services/trainingStatus.service.ts
@@ -0,0 +1,63 @@
+import { Injectable } from '@angular/core';
+import * as moment from 'moment';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class TrainingStatusService {
+  readonly MISSING = 2;
+  readonly EXPIRED = 3;
+  readonly EXPIRING = 1;
+  readonly ACTIVE = 0;
+
+
+  public getAggregatedStatus(trainingRecords) {
+    let expired = false;
+    let expiring = false;
+    let missing = false;
+    let trainingStatus = 0;
+
+    trainingRecords.forEach(training => {
+      trainingStatus = this.getTrainingStatus(training.expires, training.missing);
+      switch (trainingStatus) {
+        case this.MISSING: {
+         missing = true;
+         break;
+        }
+        case this.EXPIRING: {
+          expiring = true;
+          break;
+        }
+        case this.EXPIRED: {
+          expired = true;
+          break;
+        }
+      }
+    });
+    if (expired) {
+      return this.EXPIRED;
+    } else if (missing) {
+      return this.MISSING;
+    } else if (expiring) {
+      return this.EXPIRING;
+    } else {
+      return this.ACTIVE;
+    }
+  }
+
+  public getTrainingStatus(expires, missing) {
+    if (missing) {
+      return this.MISSING;
+    } else if (expires) {
+      const expiringDate = moment(expires);
+      const currentDate = moment();
+      const daysDifference = expiringDate.diff(currentDate, 'days');
+      if (daysDifference < 0) {
+        return this.EXPIRED;
+      } else if (daysDifference >= 0 && daysDifference <= 90) {
+        return this.EXPIRING;
+      }
+    }
+    return this.ACTIVE;
+  }
+}
diff --git a/src/app/core/services/user.service.spec.ts b/src/app/core/services/user.service.spec.ts
deleted file mode 100644
index 9e7fd1c3ea..0000000000
--- a/src/app/core/services/user.service.spec.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { UserService } from './user.service';
-
-describe('UserService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
-
-  it('should be created', () => {
-    const service: UserService = TestBed.get(UserService);
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/core/services/worker.service.ts b/src/app/core/services/worker.service.ts
index be2c8b6ac8..8e72700875 100644
--- a/src/app/core/services/worker.service.ts
+++ b/src/app/core/services/worker.service.ts
@@ -44,6 +44,7 @@ export class WorkerService {
 
   private _workers$: BehaviorSubject<Worker[]> = new BehaviorSubject<Worker[]>(null);
   public workers$: Observable<Worker[]> = this._workers$.asObservable();
+  public tabChanged: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   constructor(private http: HttpClient) {}
 
diff --git a/src/app/core/services/workplace.service.spec.ts b/src/app/core/services/workplace.service.spec.ts
deleted file mode 100644
index 3c94390c3a..0000000000
--- a/src/app/core/services/workplace.service.spec.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { WorkplaceService } from './workplace.service';
-
-describe('WorkplaceService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
-
-  it('should be created', () => {
-    const service: WorkplaceService = TestBed.get(WorkplaceService);
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/core/services/workplace.service.ts b/src/app/core/services/workplace.service.ts
index 97872a9816..60b546c1a5 100644
--- a/src/app/core/services/workplace.service.ts
+++ b/src/app/core/services/workplace.service.ts
@@ -34,6 +34,10 @@ export class WorkplaceService {
     return this.http.get<Array<ServiceGroup>>(`/api/services/byCategory?cqc=${isRegulated}`);
   }
 
+  public getAllMandatoryTrainings(establishmentId: number): Observable<any> {
+    return this.http.get(`/api/establishment/${establishmentId}/mandatoryTraining/all`);
+  }
+
   public addWorkplace(establishmentuid: string, request: AddWorkplaceRequest): Observable<AddWorkplaceResponse> {
     return this.http.post<AddWorkplaceResponse>(`/api/establishment/${establishmentuid}`, request);
   }
diff --git a/src/app/core/test-utils/MockAuthService.ts b/src/app/core/test-utils/MockAuthService.ts
new file mode 100644
index 0000000000..e5c686df0c
--- /dev/null
+++ b/src/app/core/test-utils/MockAuthService.ts
@@ -0,0 +1,7 @@
+import { AuthService } from '@core/services/auth.service';
+
+export class MockAuthService extends AuthService {
+  public getPreviousToken(): any {
+    return {};
+  }
+}
diff --git a/src/app/core/test-utils/MockEstablishmentService.ts b/src/app/core/test-utils/MockEstablishmentService.ts
new file mode 100644
index 0000000000..a541161cee
--- /dev/null
+++ b/src/app/core/test-utils/MockEstablishmentService.ts
@@ -0,0 +1,45 @@
+import { EstablishmentService } from '@core/services/establishment.service';
+import { Establishment } from '@core/model/establishment.model';
+
+export class MockEstablishmentService extends EstablishmentService {
+  public get establishmentId(): string {
+    return '';
+  }
+
+  get primaryWorkplace(): Establishment {
+    return {
+      address: '',
+      capacities: [],
+      created: undefined,
+      dataOwner: undefined,
+      dataOwnershipRequested: '',
+      dataPermissions: undefined,
+      employerType: { other: '', value: '' },
+      id: 0,
+      isRegulated: false,
+      leavers: undefined,
+      localAuthorities: [],
+      mainService: undefined,
+      name: '',
+      nmdsId: '',
+      numberOfStaff: 0,
+      otherServices: [],
+      postcode: '',
+      primaryAuthority: undefined,
+      serviceUsers: [],
+      share: {
+        enabled: false,
+        with: []
+      },
+      starters: undefined,
+      totalLeavers: 0,
+      totalStarters: 0,
+      totalVacancies: 0,
+      totalWorkers: 0,
+      uid: '',
+      updated: undefined,
+      updatedBy: '',
+      vacancies: undefined
+    };
+  }
+}
diff --git a/src/app/core/test-utils/MockNotificationsService.ts b/src/app/core/test-utils/MockNotificationsService.ts
new file mode 100644
index 0000000000..f5252d6087
--- /dev/null
+++ b/src/app/core/test-utils/MockNotificationsService.ts
@@ -0,0 +1,8 @@
+import { NotificationsService } from '@core/services/notifications/notifications.service';
+import { Notification } from '@core/model/notifications.model';
+
+export class MockNotificationsService extends NotificationsService {
+  get notifications(): Notification[] {
+    return [];
+  }
+}
diff --git a/src/app/core/test-utils/MockPermissionsService.ts b/src/app/core/test-utils/MockPermissionsService.ts
new file mode 100644
index 0000000000..a4f8df17dd
--- /dev/null
+++ b/src/app/core/test-utils/MockPermissionsService.ts
@@ -0,0 +1,23 @@
+import { PermissionsService } from '@core/services/permissions/permissions.service';
+import { PermissionsList, PermissionType } from '@core/model/permissions.model';
+import { HttpClient } from '@angular/common/http';
+import { Router } from '@angular/router';
+import { UserService } from '@core/services/user.service';
+
+export class MockPermissionsService extends PermissionsService {
+  private _permissions: PermissionType[] = [];
+
+  public static factory(permissions: PermissionType[] = []) {
+    return (http: HttpClient, router: Router, userService: UserService) => {
+      const service = new MockPermissionsService(http, router, userService);
+      service._permissions = permissions;
+      return service;
+    };
+  }
+
+  permissions(workplaceUid: string): PermissionsList {
+    const perms = {};
+    this._permissions.forEach((p) => perms[p] = true);
+    return perms;
+  }
+}
diff --git a/src/app/core/test-utils/MockUserService.ts b/src/app/core/test-utils/MockUserService.ts
new file mode 100644
index 0000000000..c29adb4844
--- /dev/null
+++ b/src/app/core/test-utils/MockUserService.ts
@@ -0,0 +1,38 @@
+import { UserService } from '@core/services/user.service';
+import { UserDetails } from '@core/model/userDetails.model';
+import { Observable, of } from 'rxjs';
+import { GetWorkplacesResponse, Workplace } from '@core/model/my-workplaces.model';
+import { Mock } from 'protractor/built/driverProviders';
+import { HttpClient } from '@angular/common/http';
+import { Roles } from '@core/model/roles.enum';
+
+export class MockUserService extends UserService {
+  private subsidiaries = 0;
+  private isAdmin = false;
+
+  public static factory(subsidiaries = 0, isAdmin = false) {
+    return (httpClient: HttpClient) => {
+      const service = new MockUserService(httpClient);
+      service.subsidiaries = subsidiaries;
+      service.isAdmin = isAdmin;
+      return service;
+    };
+  }
+
+  public get loggedInUser(): UserDetails {
+    return {
+      email: '', fullname: '', jobTitle: '', phone: '', role: this.isAdmin ? 'Admin' as Roles : undefined
+    };
+  }
+
+  public getEstablishments(wdf: boolean = false): Observable<GetWorkplacesResponse> {
+    return of({
+      primary: {
+      },
+      subsidaries: {
+        count: this.subsidiaries,
+        establishments: []
+      }
+    } as GetWorkplacesResponse);
+  }
+}
diff --git a/src/app/features/account-management/change-password/change-password.component.spec.ts b/src/app/features/account-management/change-password/change-password.component.spec.ts
deleted file mode 100644
index 934f0e89fe..0000000000
--- a/src/app/features/account-management/change-password/change-password.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ChangePasswordComponent } from './change-password.component';
-
-describe('ChangePasswordComponent', () => {
-  let component: ChangePasswordComponent;
-  let fixture: ComponentFixture<ChangePasswordComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ChangePasswordComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ChangePasswordComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/account-management/change-password/confirmation/confirmation.component.spec.ts b/src/app/features/account-management/change-password/confirmation/confirmation.component.spec.ts
deleted file mode 100644
index 87ce5f204a..0000000000
--- a/src/app/features/account-management/change-password/confirmation/confirmation.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangePasswordConfirmationComponent } from './confirmation.component';
-
-describe('ChangePasswordConfirmationComponent', () => {
-  let component: ChangePasswordConfirmationComponent;
-  let fixture: ComponentFixture<ChangePasswordConfirmationComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ChangePasswordConfirmationComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ChangePasswordConfirmationComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/account-management/change-password/edit/edit.component.spec.ts b/src/app/features/account-management/change-password/edit/edit.component.spec.ts
deleted file mode 100644
index 38d5325b2d..0000000000
--- a/src/app/features/account-management/change-password/edit/edit.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangePasswordEditComponent } from './edit.component';
-
-describe('ChangePasswordEditComponent', () => {
-  let component: ChangePasswordEditComponent;
-  let fixture: ComponentFixture<ChangePasswordEditComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ChangePasswordEditComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ChangePasswordEditComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/account-management/change-user-security/change-user-security.component.spec.ts b/src/app/features/account-management/change-user-security/change-user-security.component.spec.ts
deleted file mode 100644
index d14fa9fd12..0000000000
--- a/src/app/features/account-management/change-user-security/change-user-security.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ChangeUserSecurityComponent } from './change-user-security.component';
-
-describe('ChangeUserSecurityComponent', () => {
-  let component: ChangeUserSecurityComponent;
-  let fixture: ComponentFixture<ChangeUserSecurityComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ChangeUserSecurityComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ChangeUserSecurityComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/account-management/change-your-details/change-your-details.component.spec.ts b/src/app/features/account-management/change-your-details/change-your-details.component.spec.ts
deleted file mode 100644
index bf21aedd2d..0000000000
--- a/src/app/features/account-management/change-your-details/change-your-details.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ChangeYourDetailsComponent } from './change-your-details.component';
-
-describe('ChangeYourDetailsComponent', () => {
-  let component: ChangeYourDetailsComponent;
-  let fixture: ComponentFixture<ChangeYourDetailsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ChangeYourDetailsComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ChangeYourDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/account-management/your-account/your-account.component.spec.ts b/src/app/features/account-management/your-account/your-account.component.spec.ts
deleted file mode 100644
index 15426e1d56..0000000000
--- a/src/app/features/account-management/your-account/your-account.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { YourAccountComponent } from './your-account.component';
-
-describe('YourAccountComponent', () => {
-  let component: YourAccountComponent;
-  let fixture: ComponentFixture<YourAccountComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [YourAccountComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(YourAccountComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/account/account-details/account-details.spec.ts b/src/app/features/account/account-details/account-details.spec.ts
deleted file mode 100644
index e093f4c614..0000000000
--- a/src/app/features/account/account-details/account-details.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AccountDetails } from './account-details';
-
-describe('AccountDetails', () => {
-  let component: AccountDetails;
-  let fixture: ComponentFixture<AccountDetails>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ AccountDetails ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AccountDetails);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/account/account-details/account-details.ts b/src/app/features/account/account-details/account-details.ts
index 77856346e6..c020ccbdee 100644
--- a/src/app/features/account/account-details/account-details.ts
+++ b/src/app/features/account/account-details/account-details.ts
@@ -21,15 +21,15 @@ export class AccountDetails implements OnInit, OnDestroy, AfterViewInit {
   public form: FormGroup;
   public formControlsMap: any[] = [
     {
-      label: 'Your full name',
+      label: 'Full name',
       name: 'fullname',
     },
     {
-      label: 'Your job title',
+      label: 'Job title',
       name: 'jobTitle',
     },
     {
-      label: 'Your email address',
+      label: 'Email address',
       name: 'email',
     },
     {
@@ -44,7 +44,7 @@ export class AccountDetails implements OnInit, OnDestroy, AfterViewInit {
     protected backService: BackService,
     protected errorSummaryService: ErrorSummaryService,
     protected fb: FormBuilder,
-    protected router: Router
+    protected router: Router,
   ) {}
 
   ngOnInit() {
@@ -83,11 +83,11 @@ export class AccountDetails implements OnInit, OnDestroy, AfterViewInit {
         type: [
           {
             name: 'required',
-            message: 'Please enter your full name.',
+            message: 'Please enter full name.',
           },
           {
             name: 'maxlength',
-            message: 'Your fullname must be no longer than 120 characters.',
+            message: 'Full name must be no longer than 120 characters.',
           },
         ],
       },
@@ -96,11 +96,11 @@ export class AccountDetails implements OnInit, OnDestroy, AfterViewInit {
         type: [
           {
             name: 'required',
-            message: 'Please enter your job title.',
+            message: 'Please enter job title.',
           },
           {
             name: 'maxlength',
-            message: 'Your job title must be no longer than 120 characters.',
+            message: 'Job title must be no longer than 120 characters.',
           },
         ],
       },
@@ -109,11 +109,11 @@ export class AccountDetails implements OnInit, OnDestroy, AfterViewInit {
         type: [
           {
             name: 'required',
-            message: 'Please enter your email address.',
+            message: 'Please enter email address.',
           },
           {
             name: 'maxlength',
-            message: 'Your email address must be no longer than 120 characters.',
+            message: 'Email address must be no longer than 120 characters.',
           },
           {
             name: 'pattern',
@@ -126,7 +126,7 @@ export class AccountDetails implements OnInit, OnDestroy, AfterViewInit {
         type: [
           {
             name: 'required',
-            message: 'Please enter your contact phone number.',
+            message: 'Please enter contact phone number.',
           },
           {
             name: 'pattern',
diff --git a/src/app/features/account/confirm-account-details/confirm-account-details.spec.ts b/src/app/features/account/confirm-account-details/confirm-account-details.spec.ts
deleted file mode 100644
index 5e79f8eb5b..0000000000
--- a/src/app/features/account/confirm-account-details/confirm-account-details.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ConfirmAccountDetails } from './confirm-account-details';
-
-describe('ConfirmAccountDetails', () => {
-  let component: ConfirmAccountDetails;
-  let fixture: ComponentFixture<ConfirmAccountDetails>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ConfirmAccountDetails ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ConfirmAccountDetails);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/account/confirm-account-details/confirm-account-details.ts b/src/app/features/account/confirm-account-details/confirm-account-details.ts
index 4e29bc64d3..88ea72a9a4 100644
--- a/src/app/features/account/confirm-account-details/confirm-account-details.ts
+++ b/src/app/features/account/confirm-account-details/confirm-account-details.ts
@@ -28,6 +28,7 @@ export class ConfirmAccountDetails implements OnInit, OnDestroy, AfterViewInit {
   public submitted = false;
   public userDetails: UserDetails;
   protected actionType: string;
+  public slectedCqcValue: boolean;
 
   constructor(protected errorSummaryService: ErrorSummaryService, protected formBuilder: FormBuilder) {}
 
diff --git a/src/app/features/account/create-username/create-username.spec.ts b/src/app/features/account/create-username/create-username.spec.ts
deleted file mode 100644
index 58ddc691d1..0000000000
--- a/src/app/features/account/create-username/create-username.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CreateUsername } from './create-username';
-
-describe('CreateUsernameComponent', () => {
-  let component: CreateUsername;
-  let fixture: ComponentFixture<CreateUsername>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ CreateUsername ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CreateUsername);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/account/security-question/security-question.spec.ts b/src/app/features/account/security-question/security-question.spec.ts
deleted file mode 100644
index 997ec7ac65..0000000000
--- a/src/app/features/account/security-question/security-question.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SecurityQuestion } from './security-question';
-
-describe('SecurityQuestion', () => {
-  let component: SecurityQuestion;
-  let fixture: ComponentFixture<SecurityQuestion>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SecurityQuestion],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SecurityQuestion);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/activate-user-account/activation-complete/activation-complete.component.spec.ts b/src/app/features/activate-user-account/activation-complete/activation-complete.component.spec.ts
deleted file mode 100644
index f751b00f3b..0000000000
--- a/src/app/features/activate-user-account/activation-complete/activation-complete.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ActivationCompleteComponent } from './activation-complete.component';
-
-describe('ActivationCompleteComponent', () => {
-  let component: ActivationCompleteComponent;
-  let fixture: ComponentFixture<ActivationCompleteComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ActivationCompleteComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ActivationCompleteComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/activate-user-account/change-your-details/change-your-details.component.spec.ts b/src/app/features/activate-user-account/change-your-details/change-your-details.component.spec.ts
deleted file mode 100644
index bf21aedd2d..0000000000
--- a/src/app/features/activate-user-account/change-your-details/change-your-details.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ChangeYourDetailsComponent } from './change-your-details.component';
-
-describe('ChangeYourDetailsComponent', () => {
-  let component: ChangeYourDetailsComponent;
-  let fixture: ComponentFixture<ChangeYourDetailsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ChangeYourDetailsComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ChangeYourDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/activate-user-account/confirm-account-details/confirm-account-details.component.spec.ts b/src/app/features/activate-user-account/confirm-account-details/confirm-account-details.component.spec.ts
deleted file mode 100644
index 347e5c1af4..0000000000
--- a/src/app/features/activate-user-account/confirm-account-details/confirm-account-details.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ConfirmAccountDetailsComponent } from './confirm-account-details.component';
-
-describe('ConfirmAccountDetailsComponent', () => {
-  let component: ConfirmAccountDetailsComponent;
-  let fixture: ComponentFixture<ConfirmAccountDetailsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ConfirmAccountDetailsComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ConfirmAccountDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/activate-user-account/create-username/create-username.component.spec.ts b/src/app/features/activate-user-account/create-username/create-username.component.spec.ts
deleted file mode 100644
index 866035424a..0000000000
--- a/src/app/features/activate-user-account/create-username/create-username.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CreateUsernameComponent } from './create-username.component';
-
-describe('CreateUsernameComponent', () => {
-  let component: CreateUsernameComponent;
-  let fixture: ComponentFixture<CreateUsernameComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ CreateUsernameComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CreateUsernameComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/activate-user-account/security-question/security-question.component.spec.ts b/src/app/features/activate-user-account/security-question/security-question.component.spec.ts
deleted file mode 100644
index ca5793a632..0000000000
--- a/src/app/features/activate-user-account/security-question/security-question.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SecurityQuestionComponent } from './security-question.component';
-
-describe('SecurityQuestionComponent', () => {
-  let component: SecurityQuestionComponent;
-  let fixture: ComponentFixture<SecurityQuestionComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ SecurityQuestionComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SecurityQuestionComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/add-mandatory-training/add-mandatory-routing.module.ts b/src/app/features/add-mandatory-training/add-mandatory-routing.module.ts
new file mode 100644
index 0000000000..af631784a2
--- /dev/null
+++ b/src/app/features/add-mandatory-training/add-mandatory-routing.module.ts
@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+import { AddMandatoryTrainingComponent } from './add-mandatory-training.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: AddMandatoryTrainingComponent,
+    data: { title: 'Add Mandatory Training' },
+  },
+
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class AddMandatoryTrainingRoutingModule {}
diff --git a/src/app/features/add-mandatory-training/add-mandatory-training.component.html b/src/app/features/add-mandatory-training/add-mandatory-training.component.html
new file mode 100644
index 0000000000..68c56e8213
--- /dev/null
+++ b/src/app/features/add-mandatory-training/add-mandatory-training.component.html
@@ -0,0 +1,132 @@
+<app-error-summary *ngIf="(submitted && form.invalid) || serverError" [formErrorsMap]="formErrorsMap"
+  [serverError]="serverError" [form]="form">
+</app-error-summary>
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <h1 class="govuk-heading-xl">Manage mandatory training</h1>
+    <details class="govuk-details" data-module="govuk-details">
+      <summary class="govuk-details__summary">
+        <span class="govuk-details__summary-text">
+          Help with mandatory training
+        </span>
+      </summary>
+      <div class="govuk-details__text">
+        Choose the training you want to make mandatory for your staff, dependent on your main service and the needs of those you provide care for. It will help you identify who needs training and let you know when training expires.
+      </div>
+    </details>
+    <a href="#"
+       *ngIf="existingMandatoryTrainings.mandatoryTrainingCount > 0"
+       (click)="removeAllCategories($event)"
+       class="govuk-list govuk-list--inline">
+      Remove all training selections</a>
+  </div>
+</div>
+<form #formEl novalidate (ngSubmit)="onSubmit()" [formGroup]="form">
+  <fieldset class="govuk-fieldset">
+    <ng-container formArrayName="categories">
+      <div *ngFor="let category of categoriesArray.controls; let i = index" [formGroupName]="i">
+        <div class="govuk-grid-row govuk-!-margin-bottom-1"
+          [class.govuk-form-group--error]="submitted && category.get('trainingCategory').invalid">
+          <div class="govuk-form-group">
+            <div class="govuk-grid-column-two-thirds">
+              <label class="govuk-label govuk-!-margin-top-4" for="trainingCategory-{{ i }}">
+                Mandatory training
+              </label>
+              <span *ngIf="submitted" id="trainingCategory-{{ i }}-error" class="govuk-error-message">
+                <ng-container *ngIf="submitted && category.get('trainingCategory').invalid">
+                  {{ getFormErrorMessage('categories.trainingCategory', 'required') }}
+                </ng-container>
+              </span>
+              <select class="govuk-select govuk-!-width-full"
+                [class.govuk-select--error]="submitted && category.get('trainingCategory').invalid"
+                [formControlName]="'trainingCategory'" id="trainingCategory-{{ i }}" name="trainingCategory">
+                <option [ngValue]="null">Select training category</option>
+                <option *ngFor="let training of selectableTrainings(i)" [value]="training.id">
+                  {{ training.category }}
+                </option>
+              </select>
+            </div>
+            <div class="govuk-grid-column-one-third govuk-!-margin-top-8">
+              <a *ngIf="categoriesArray.length > 1" href="#" class="govuk-list govuk-list--inline "
+                (click)="removeCategory($event, i)">
+                Remove</a>
+            </div>
+          </div>
+        </div>
+        <div class="govuk-grid-row">
+          <div class="govuk-grid-column-two-thirds govuk-!-margin-top-2">
+            <div class="govuk-form-group">
+              <legend class="govuk-fieldset__legend">
+                <span class="govuk-label">
+                  Which job roles need this training?
+                </span>
+              </legend>
+              <div class="govuk-radios govuk-radios--inline">
+                {{ vacancyType }}
+                <div class="govuk-radios__item" *ngFor="let option of vacanciesOptions; let j = index">
+                  <input class="govuk-radios__input" id="vacancyType-{{ i }}-{{ j }}" [formControlName]="'vacancyType'"
+                    type="radio" [value]="option.value" (change)="onVacancyTypeSelectionChange(i)" />
+                  <label class="govuk-label govuk-radios__label" for="vacancyType-{{ i }}-{{ j }}">
+                    {{ option.label }}
+                  </label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="govuk-grid-row govuk-radios__conditional" *ngIf="category.get('vacancies').controls.length > 0"
+          formArrayName="vacancies">
+          <div [formGroupName]="k" *ngFor="let vacancy of category.get('vacancies').controls; let k = index"
+            [class.govuk-form-group--error]="submitted && vacancy.get('id').invalid">
+            <div class="govuk-grid-row govuk-!-margin-bottom-6">
+              <div class="govuk-grid-column-one-half">
+                <div class="govuk-form-group">
+                  <label class="govuk-label" for="id-{{ i }}-{{ k }}">
+                    Job role
+                  </label>
+                  <span *ngIf="submitted && vacancy.get('id').invalid" id="id-{{ i }}-{{ k }}-error"
+                    class="govuk-error-message">
+                    <ng-container *ngIf="vacancy.get('id').invalid">
+                      {{ getFormErrorMessage('vacancies.id', 'required') }}
+                    </ng-container>
+                  </span>
+                  <select class="govuk-select" [class.govuk-select--error]="submitted && vacancy.get('id').invalid"
+                    [formControlName]="'id'" id="id-{{ i }}-{{ k }}">
+                    <option [ngValue]="null">Select job role</option>
+                    <option *ngFor="let job of selectableJobs(i, k)" [value]="job.id">
+                      {{ job.title }}
+                    </option>
+                  </select>
+                </div>
+              </div>
+              <div class="govuk-grid-column-one-half govuk-!-margin-top-6">
+                <a *ngIf="category.get('vacancies').controls.length > 1" href="#" class="govuk-list govuk-list--inline "
+                  (click)="removeVacancy($event, i, k)">Remove
+                </a>
+              </div>
+            </div>
+          </div>
+          <div class="govuk-grid-row">
+            <div class="govuk-grid-column-two-thirds">
+              <button *ngIf="
+                  category.get('vacancies').controls.length > 0 &&
+                  category.get('vacancies').controls.length < jobs.length
+                " class="govuk-button govuk-button--secondary" type="button" (click)="addVacancy(i)">
+                Add another job role
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="govuk-grid-row">
+        <div class="govuk-grid-column-two-thirds govuk-!-margin-bottom-6">
+          <button *ngIf="!allTrainingsSelected" class="govuk-button govuk-button--secondary" type="button"
+            (click)="addCategory()">
+            Add more mandatory training
+          </button>
+        </div>
+      </div>
+    </ng-container>
+  </fieldset>
+  <app-submit-exit-buttons [return]="return"></app-submit-exit-buttons>
+</form>
diff --git a/src/app/features/add-mandatory-training/add-mandatory-training.component.ts b/src/app/features/add-mandatory-training/add-mandatory-training.component.ts
new file mode 100644
index 0000000000..8b666553e3
--- /dev/null
+++ b/src/app/features/add-mandatory-training/add-mandatory-training.component.ts
@@ -0,0 +1,340 @@
+import { Component, OnInit } from '@angular/core';
+import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { Router } from '@angular/router';
+import { ErrorDefinition, ErrorDetails } from '@core/model/errorSummary.model';
+import {
+  allMandatoryTrainingCategories,
+  Establishment,
+  mandatoryTrainingCategories,
+  mandatoryTrainingJobOption,
+} from '@core/model/establishment.model';
+import { Job } from '@core/model/job.model';
+import { TrainingCategory } from '@core/model/training.model';
+import { URLStructure } from '@core/model/url.model';
+import { AlertService } from '@core/services/alert.service';
+import { BackService } from '@core/services/back.service';
+import { DialogService } from '@core/services/dialog.service';
+import { ErrorSummaryService } from '@core/services/error-summary.service';
+import { EstablishmentService } from '@core/services/establishment.service';
+import { JobService } from '@core/services/job.service';
+import { TrainingService } from '@core/services/training.service';
+import { RemoveAllSelectionsDialogComponent } from '@features/add-mandatory-training/remove-all-selections-dialog.component';
+import { Subscription } from 'rxjs';
+import { take } from 'rxjs/internal/operators/take';
+
+@Component({
+  selector: 'app-add-mandatory-training',
+  templateUrl: './add-mandatory-training.component.html',
+})
+export class AddMandatoryTrainingComponent implements OnInit {
+  public form: FormGroup;
+  public submitted = false;
+  public categories: TrainingCategory[];
+  private subscriptions: Subscription = new Subscription();
+  public jobs: Job[] = [];
+  public trainings: TrainingCategory[] = [];
+  public establishment: Establishment;
+  public primaryWorkplace: Establishment;
+  public formErrorsMap: Array<ErrorDetails> = [];
+  public serverError: string;
+  public serverErrorsMap: Array<ErrorDefinition> = [];
+  public return: URLStructure;
+  public existingMandatoryTrainings: allMandatoryTrainingCategories;
+  public vacanciesOptions = [
+    {
+      label: 'All job roles',
+      value: mandatoryTrainingJobOption.all,
+    },
+    {
+      label: `Selected job roles only`,
+      value: mandatoryTrainingJobOption.selected,
+    },
+  ];
+  constructor(
+    private alertService: AlertService,
+    protected backService: BackService,
+    private dialogService: DialogService,
+    private trainingService: TrainingService,
+    protected formBuilder: FormBuilder,
+    protected errorSummaryService: ErrorSummaryService,
+    protected establishmentService: EstablishmentService,
+    private jobService: JobService,
+    protected router: Router
+  ) { }
+
+  get categoriesArray(): FormArray {
+    return this.form.get('categories') as FormArray;
+  }
+
+  get allTrainingsSelected(): boolean {
+    return this.categoriesArray.length >= this.trainings.length;
+  }
+
+  ngOnInit(): void {
+    this.establishmentService.isMandatoryTrainingView.subscribe(value => {
+      if (value === true) {
+        this.return = { url: ['/workplace/view-all-mandatory-training'] };
+      } else {
+        this.return = { url: ['/dashboard'], fragment: 'training-and-qualifications' };
+      }
+    });
+
+    this.setBackLink();
+    this.getAllTrainingCategories();
+    this.getAlJobs();
+    this.setupForm();
+    this.setupFormErrorsMap();
+    this.setupServerErrorsMap();
+    this.subscriptions.add(
+      this.establishmentService.establishment$.subscribe(establishment => {
+        this.establishment = establishment;
+        this.establishmentService.getAllMandatoryTrainings(this.establishment.uid).subscribe(
+          trainings => {
+            this.existingMandatoryTrainings = trainings;
+            this.prefill(trainings);
+          },
+          error => {
+            if (error.error.message) {
+              this.serverError = error.error.message;
+            }
+          },
+        );
+      }),
+    );
+  }
+
+  private setBackLink(): void {
+    this.backService.setBackLink(this.return);
+  }
+
+  //Setup form for mandatory category
+  private setupForm(): void {
+    this.form = this.formBuilder.group({
+      categories: this.formBuilder.array([]),
+    });
+  }
+  //get all jobs
+  private getAlJobs(): void {
+    this.subscriptions.add(
+      this.jobService
+        .getJobs()
+        .pipe(take(1))
+        .subscribe(jobs => (this.jobs = jobs)),
+    );
+  }
+  //get all trainings
+  private getAllTrainingCategories(): void {
+    this.subscriptions.add(
+      this.trainingService
+        .getCategories()
+        .pipe(take(1))
+        .subscribe(trainings => (this.trainings = trainings)),
+    );
+  }
+  //setup form error message
+  protected setupFormErrorsMap(): void {
+    this.formErrorsMap = [
+      {
+        item: 'categories.trainingCategory',
+        type: [
+          {
+            name: 'required',
+            message: 'Select the mandatory training',
+          },
+        ],
+      },
+      {
+        item: 'vacancies.id',
+        type: [
+          {
+            name: 'required',
+            message: 'Select the job role',
+          },
+        ],
+      },
+    ];
+  }
+
+  //setup server error message
+  private setupServerErrorsMap(): void {
+    this.serverErrorsMap = [
+      {
+        name: 503,
+        message: 'There has been a problem saving your mandatory training. Please try again.',
+      },
+      {
+        name: 400,
+        message: 'There has been a problem saving your mandatory training. Please try again.',
+      },
+      {
+        name: 404,
+        message: 'There has been a problem saving your mandatory training. Please try again.',
+      },
+    ];
+  }
+
+  //get form error
+  public getFormErrorMessage(item: string, errorType: string): string {
+    return this.errorSummaryService.getFormErrorMessage(item, errorType, this.formErrorsMap);
+  }
+
+  //Select training
+  public selectableTrainings(index): TrainingCategory[] {
+    return this.trainings.filter(
+      training =>
+        !this.categoriesArray.controls.some(
+          category =>
+            category !== this.categoriesArray.controls[index] &&
+            parseInt(category.get('trainingCategory').value, 10) === training.id,
+        ),
+    );
+  }
+
+  //Add new training category
+  public addCategory(): void {
+    this.categoriesArray.push(this.createCategoryControl());
+  }
+
+  //Remove existing training
+  public removeCategory(event: Event, index): void {
+    event.preventDefault();
+    this.categoriesArray.removeAt(index);
+  }
+
+  public removeAllCategories(event: Event): void {
+    event.preventDefault();
+
+    this.dialogService
+      .open(RemoveAllSelectionsDialogComponent, { })
+      .afterClosed.subscribe(deleteConfirmed => {
+        if(deleteConfirmed) {
+          this.categoriesArray.clear();
+          const props = this.generateUpdateProps();
+          this.updateMandatoryTraining(props, true);
+        }
+    });
+  }
+
+  // create training category contral to add new training
+  private createCategoryControl(trainingId = null, vType = mandatoryTrainingJobOption.all): FormGroup {
+    return this.formBuilder.group({
+      trainingCategory: [trainingId, [Validators.required]],
+      vacancyType: [vType, [Validators.required]],
+      vacancies: this.formBuilder.array([]),
+    });
+  }
+
+  //select Jobs
+  public selectableJobs(categoryIndex, jobIndex): Job[] {
+    const vacanciesArray = <FormArray>(<FormGroup>this.categoriesArray.controls[categoryIndex]).controls.vacancies;
+    return this.jobs.filter(
+      job =>
+        !vacanciesArray.controls.some(
+          vacancy => vacancy !== vacanciesArray.controls[jobIndex] && parseInt(vacancy.get('id').value, 10) === job.id,
+        ),
+    );
+  }
+
+  // add new job role
+  public addVacancy(index): void {
+    const vacancyArray = <FormArray>(<FormGroup>this.categoriesArray.controls[index]).controls.vacancies;
+    vacancyArray.push(this.createVacancyControl());
+  }
+
+  // remove vacancy contral
+  public removeVacancy(event: Event, categoryIndex, jobIndex): void {
+    event.preventDefault();
+    const vacanciesArray = <FormArray>(<FormGroup>this.categoriesArray.controls[categoryIndex]).controls.vacancies;
+    vacanciesArray.removeAt(jobIndex);
+  }
+
+  // create vacancy contral to add new job
+  private createVacancyControl(jobId = null): FormGroup {
+    return this.formBuilder.group({
+      id: [jobId, [Validators.required]],
+    });
+  }
+
+  //set vancancy
+  public setVacancy(index, jobs: any[]) {
+    jobs.forEach(job => {
+      (<FormArray>(<FormGroup>this.categoriesArray.controls[index]).controls.vacancies).push(
+        this.createVacancyControl(job.id),
+      );
+    });
+  }
+
+  //prefill trainings and jobs
+  private prefill(trainings): void {
+    if (trainings.mandatoryTrainingCount > 0) {
+      trainings.mandatoryTraining.forEach((trainingCategory, categoryIndex) => {
+        const vacancyType =
+          trainings.allJobRolesCount === trainingCategory.jobs.length
+            ? mandatoryTrainingJobOption.all
+            : mandatoryTrainingJobOption.selected;
+        const jobs = vacancyType === mandatoryTrainingJobOption.all ? [] : trainingCategory.jobs;
+        this.categoriesArray.push(this.createCategoryControl(trainingCategory.trainingCategoryId, vacancyType));
+        this.setVacancy(categoryIndex, jobs);
+      });
+    } else {
+      this.categoriesArray.push(this.createCategoryControl());
+    }
+  }
+
+  //Generate training object arrording to server requirement
+  protected generateUpdateProps(): any {
+    return {
+      categories: this.categoriesArray.value.map(category => ({
+        trainingCategoryId: parseInt(category.trainingCategory, 10),
+        allJobRoles: category.vacancyType === mandatoryTrainingJobOption.all ? true : false,
+        jobs: category.vacancies,
+      })),
+    };
+  }
+
+  //Send updated training object to server
+  protected updateMandatoryTraining(props: mandatoryTrainingCategories, remove: boolean = false): void {
+    this.subscriptions.add(
+      this.establishmentService.updateMandatoryTraining(this.establishment.uid, props.categories).subscribe(
+        data => {
+          this.router.navigate(this.return.url, { fragment: this.return.fragment }).then(() => {
+            if (remove) {
+              this.alertService.addAlert({
+                type: 'success',
+                message: "You've removed all the selections for mandatory training in your workplace."
+              });
+            }
+          });
+        },
+        error => {
+          this.serverError = this.errorSummaryService.getServerErrorMessage(error.status, this.serverErrorsMap);
+        },
+      ),
+    );
+  }
+
+  //update vacancy array on vanancy type change
+  public onVacancyTypeSelectionChange(index: number) {
+    const vacancyType = this.categoriesArray.controls[index].get('vacancyType').value;
+    let vacanciesArray = <FormArray>(<FormGroup>this.categoriesArray.controls[index]).controls.vacancies;
+    if (vacancyType === mandatoryTrainingJobOption.all) {
+      while (vacanciesArray.length > 0) {
+        vacanciesArray.removeAt(0);
+      }
+      vacanciesArray.reset([], { emitEvent: false });
+    } else {
+      this.addVacancy(index);
+    }
+  }
+
+  //chek form validity and set mandatory traing
+  public onSubmit() {
+    this.submitted = true;
+    if (!this.form.valid) {
+      this.errorSummaryService.scrollToErrorSummary();
+      return;
+    }
+    const props = this.generateUpdateProps();
+    this.updateMandatoryTraining(props);
+  }
+}
diff --git a/src/app/features/add-mandatory-training/add-mandatory-training.module.ts b/src/app/features/add-mandatory-training/add-mandatory-training.module.ts
new file mode 100644
index 0000000000..c0fd22c54d
--- /dev/null
+++ b/src/app/features/add-mandatory-training/add-mandatory-training.module.ts
@@ -0,0 +1,21 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { ReactiveFormsModule } from '@angular/forms';
+import { AddMandatoryTrainingRoutingModule } from '@features/add-mandatory-training/add-mandatory-routing.module';
+import { SharedModule } from '@shared/shared.module';
+
+import { AddMandatoryTrainingComponent } from './add-mandatory-training.component';
+import { RemoveAllSelectionsDialogComponent } from '@features/add-mandatory-training/remove-all-selections-dialog.component';
+
+@NgModule({
+  imports: [CommonModule, AddMandatoryTrainingRoutingModule, ReactiveFormsModule, SharedModule],
+  declarations: [
+    AddMandatoryTrainingComponent,
+    RemoveAllSelectionsDialogComponent
+  ],
+  entryComponents: [
+    RemoveAllSelectionsDialogComponent
+  ]
+
+})
+export class AddMandatoryTrainingModule {}
diff --git a/src/app/features/add-mandatory-training/remove-all-selections-dialog.component.html b/src/app/features/add-mandatory-training/remove-all-selections-dialog.component.html
new file mode 100644
index 0000000000..ffdfd7c3ce
--- /dev/null
+++ b/src/app/features/add-mandatory-training/remove-all-selections-dialog.component.html
@@ -0,0 +1,10 @@
+<h1 id="dialogHeading">
+  You're about to remove all training selections.
+</h1>
+
+<p>If you do this, your workplace will not have any training set up as being mandatory for your staff at the moment.</p>
+
+<button (click)="close(true)" class="govuk-button">Remove all training selections</button>
+<button (click)="close(false)" class="govuk-button govuk-button--link govuk-util__float-right">
+  Cancel
+</button>
diff --git a/src/app/features/add-mandatory-training/remove-all-selections-dialog.component.ts b/src/app/features/add-mandatory-training/remove-all-selections-dialog.component.ts
new file mode 100644
index 0000000000..e022b03d47
--- /dev/null
+++ b/src/app/features/add-mandatory-training/remove-all-selections-dialog.component.ts
@@ -0,0 +1,20 @@
+import { Component, Inject } from '@angular/core';
+import { DialogComponent } from '@core/components/dialog.component';
+import { Dialog, DIALOG_DATA } from '@core/services/dialog.service';
+
+@Component({
+  selector: 'app-remove-all-selections-dialog',
+  templateUrl: './remove-all-selections-dialog.component.html',
+})
+export class RemoveAllSelectionsDialogComponent extends DialogComponent {
+  constructor(
+    @Inject(DIALOG_DATA) public data: { },
+    public dialog: Dialog<RemoveAllSelectionsDialogComponent>
+  ) {
+    super(data, dialog);
+  }
+
+  public close(confirmed: boolean) {
+    this.dialog.close(confirmed);
+  }
+}
diff --git a/src/app/features/add-workplace/add-workplace-complete/add-workplace-complete.component.spec.ts b/src/app/features/add-workplace/add-workplace-complete/add-workplace-complete.component.spec.ts
deleted file mode 100644
index cdaa589103..0000000000
--- a/src/app/features/add-workplace/add-workplace-complete/add-workplace-complete.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { AddWorkplaceCompleteComponent } from './add-workplace-complete.component';
-
-describe('AddWorkplaceCompleteComponent', () => {
-  let component: AddWorkplaceCompleteComponent;
-  let fixture: ComponentFixture<AddWorkplaceCompleteComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ AddWorkplaceCompleteComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AddWorkplaceCompleteComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/add-workplace/change-your-details/change-your-details.component.spec.ts b/src/app/features/add-workplace/change-your-details/change-your-details.component.spec.ts
deleted file mode 100644
index 9f739d23d0..0000000000
--- a/src/app/features/add-workplace/change-your-details/change-your-details.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangeYourDetailsComponent } from './change-your-details.component';
-
-describe('ChangeYourDetailsComponent', () => {
-  let component: ChangeYourDetailsComponent;
-  let fixture: ComponentFixture<ChangeYourDetailsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ChangeYourDetailsComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ChangeYourDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/add-workplace/confirm-account-details/confirm-account-details.component.spec.ts b/src/app/features/add-workplace/confirm-account-details/confirm-account-details.component.spec.ts
deleted file mode 100644
index 245db1ab28..0000000000
--- a/src/app/features/add-workplace/confirm-account-details/confirm-account-details.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ConfirmAccountDetailsComponent } from './confirm-account-details.component';
-
-describe('ConfirmAccountDetailsComponent', () => {
-  let component: ConfirmAccountDetailsComponent;
-  let fixture: ComponentFixture<ConfirmAccountDetailsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ConfirmAccountDetailsComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ConfirmAccountDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/add-workplace/confirm-workplace-details/confirm-workplace-details.component.spec.ts b/src/app/features/add-workplace/confirm-workplace-details/confirm-workplace-details.component.spec.ts
deleted file mode 100644
index 796146ffda..0000000000
--- a/src/app/features/add-workplace/confirm-workplace-details/confirm-workplace-details.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ConfirmWorkplaceDetailsComponent } from './confirm-workplace-details.component';
-
-describe('ConfirmWorkplaceDetailsComponent', () => {
-  let component: ConfirmWorkplaceDetailsComponent;
-  let fixture: ComponentFixture<ConfirmWorkplaceDetailsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ConfirmWorkplaceDetailsComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ConfirmWorkplaceDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/add-workplace/create-user-account/create-user-account.component.spec.ts b/src/app/features/add-workplace/create-user-account/create-user-account.component.spec.ts
deleted file mode 100644
index f844edf7d2..0000000000
--- a/src/app/features/add-workplace/create-user-account/create-user-account.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { CreateUserAccountComponent } from './create-user-account.component';
-
-describe('CreateUserAccountComponent', () => {
-  let component: CreateUserAccountComponent;
-  let fixture: ComponentFixture<CreateUserAccountComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [CreateUserAccountComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CreateUserAccountComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/add-workplace/enter-workplace-address/enter-workplace-address.component.spec.ts b/src/app/features/add-workplace/enter-workplace-address/enter-workplace-address.component.spec.ts
deleted file mode 100644
index 7c850aed84..0000000000
--- a/src/app/features/add-workplace/enter-workplace-address/enter-workplace-address.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { EnterWorkplaceAddressComponent } from './enter-workplace-address.component';
-
-describe('EnterWorkplaceAddressComponent', () => {
-  let component: EnterWorkplaceAddressComponent;
-  let fixture: ComponentFixture<EnterWorkplaceAddressComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ EnterWorkplaceAddressComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EnterWorkplaceAddressComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/add-workplace/find-workplace-address/find-workplace-address.component.spec.ts b/src/app/features/add-workplace/find-workplace-address/find-workplace-address.component.spec.ts
deleted file mode 100644
index 55679cc0cf..0000000000
--- a/src/app/features/add-workplace/find-workplace-address/find-workplace-address.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FindWorkplaceAddressComponent } from './find-workplace-address.component';
-
-describe('FindWorkplaceAddressComponent', () => {
-  let component: FindWorkplaceAddressComponent;
-  let fixture: ComponentFixture<FindWorkplaceAddressComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ FindWorkplaceAddressComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(FindWorkplaceAddressComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/add-workplace/regulated-by-cqc/regulated-by-cqc.component.html b/src/app/features/add-workplace/regulated-by-cqc/regulated-by-cqc.component.html
index ab2b1ac2a8..b6efcf5fbd 100644
--- a/src/app/features/add-workplace/regulated-by-cqc/regulated-by-cqc.component.html
+++ b/src/app/features/add-workplace/regulated-by-cqc/regulated-by-cqc.component.html
@@ -17,9 +17,13 @@ <h1 class="govuk-fieldset__heading">
         </legend>
 
         <div class="govuk-form-group" [class.govuk-form-group--error]="submitted && (form.invalid || serverError)">
-          <span *ngIf="submitted && regulatedByCQC.errors" id="regulatedByCQC-error" class="govuk-error-message">
-            <span class="govuk-visually-hidden">Error:</span> {{ getFirstErrorMessage('regulatedByCQC') }}
+          <span *ngIf="submitted" id="regulated-error" class="govuk-error-message">
+            <span *ngIf="regulatedByCQC.errors" id="regulatedByCQC-error">{{
+              getFirstErrorMessage('regulatedByCQC')
+            }}</span>
+            <span *ngIf="group.errors" id="group-error"> {{ getFirstErrorMessage('group') }}</span>
           </span>
+
           <div class="govuk-radios govuk-radios--conditional">
             <!-- regulated -->
             <div class="govuk-radios__item" (click)="onRegulatedByCQCTruthy()">
diff --git a/src/app/features/add-workplace/regulated-by-cqc/regulated-by-cqc.component.spec.ts b/src/app/features/add-workplace/regulated-by-cqc/regulated-by-cqc.component.spec.ts
deleted file mode 100644
index 0c2fec3ed4..0000000000
--- a/src/app/features/add-workplace/regulated-by-cqc/regulated-by-cqc.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RegulatedByCqcComponent } from './regulated-by-cqc.component';
-
-describe('RegulatedByCqcComponent', () => {
-  let component: RegulatedByCqcComponent;
-  let fixture: ComponentFixture<RegulatedByCqcComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [RegulatedByCqcComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(RegulatedByCqcComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/add-workplace/select-main-service/select-main-service.component.spec.ts b/src/app/features/add-workplace/select-main-service/select-main-service.component.spec.ts
deleted file mode 100644
index 1fbd112375..0000000000
--- a/src/app/features/add-workplace/select-main-service/select-main-service.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SelectMainServiceComponent } from './select-main-service.component';
-
-describe('SelectMainServiceComponent', () => {
-  let component: SelectMainServiceComponent;
-  let fixture: ComponentFixture<SelectMainServiceComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ SelectMainServiceComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SelectMainServiceComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/add-workplace/select-workplace-address/select-workplace-address.component.spec.ts b/src/app/features/add-workplace/select-workplace-address/select-workplace-address.component.spec.ts
deleted file mode 100644
index 0d0767de8f..0000000000
--- a/src/app/features/add-workplace/select-workplace-address/select-workplace-address.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SelectWorkplaceAddressComponent } from './select-workplace-address.component';
-
-describe('SelectWorkplaceAddressComponent', () => {
-  let component: SelectWorkplaceAddressComponent;
-  let fixture: ComponentFixture<SelectWorkplaceAddressComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SelectWorkplaceAddressComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SelectWorkplaceAddressComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/add-workplace/select-workplace/select-workplace.component.spec.ts b/src/app/features/add-workplace/select-workplace/select-workplace.component.spec.ts
deleted file mode 100644
index af238c8dae..0000000000
--- a/src/app/features/add-workplace/select-workplace/select-workplace.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SelectWorkplaceComponent } from './select-workplace.component';
-
-describe('SelectWorkplaceComponent', () => {
-  let component: SelectWorkplaceComponent;
-  let fixture: ComponentFixture<SelectWorkplaceComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SelectWorkplaceComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SelectWorkplaceComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/add-workplace/start/start.component.spec.ts b/src/app/features/add-workplace/start/start.component.spec.ts
deleted file mode 100644
index 01270a2d58..0000000000
--- a/src/app/features/add-workplace/start/start.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { StartComponent } from './start.component';
-
-describe('StartComponent', () => {
-  let component: StartComponent;
-  let fixture: ComponentFixture<StartComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ StartComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(StartComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/add-workplace/workplace-not-found/workplace-not-found.component.spec.ts b/src/app/features/add-workplace/workplace-not-found/workplace-not-found.component.spec.ts
deleted file mode 100644
index 1c59c4e426..0000000000
--- a/src/app/features/add-workplace/workplace-not-found/workplace-not-found.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WorkplaceNotFoundComponent } from './workplace-not-found.component';
-
-describe('WorkplaceNotFoundComponent', () => {
-  let component: WorkplaceNotFoundComponent;
-  let fixture: ComponentFixture<WorkplaceNotFoundComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ WorkplaceNotFoundComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WorkplaceNotFoundComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/bulk-upload/bulk-upload-page/bulk-upload-page.component.spec.ts b/src/app/features/bulk-upload/bulk-upload-page/bulk-upload-page.component.spec.ts
deleted file mode 100644
index 237b4f6a87..0000000000
--- a/src/app/features/bulk-upload/bulk-upload-page/bulk-upload-page.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BulkUploadPageComponent } from './bulk-upload-page.component';
-
-describe('BulkUploadPageComponent', () => {
-  let component: BulkUploadPageComponent;
-  let fixture: ComponentFixture<BulkUploadPageComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ BulkUploadPageComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(BulkUploadPageComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/bulk-upload/bulk-upload-references/bulk-upload-references.html b/src/app/features/bulk-upload/bulk-upload-references/bulk-upload-references.html
index 4dc6871a4c..96f1282630 100644
--- a/src/app/features/bulk-upload/bulk-upload-references/bulk-upload-references.html
+++ b/src/app/features/bulk-upload/bulk-upload-references/bulk-upload-references.html
@@ -90,8 +90,8 @@ <h2 class="govuk-heading-m govuk__reference-subsidiary-name govuk-!-margin-0">{{
         </ng-container>
         <ng-template #staffRecordsNextSteps>
           <p class="govuk-!-margin-top-4">
-            {{ referenceType }} records need to be added for this workplace before you can create
-            {{ referenceType.toLowerCase() }} references.
+            {{ referenceType }} records need to be added for this workplace before you can create {{
+            referenceType.toLowerCase() }} references.
           </p>
           <h3 class="govuk-heading-m">What you can do next?</h3>
           <ul class="govuk-list govuk-list--bullet">
@@ -131,18 +131,17 @@ <h3 class="govuk-heading-m">What you can do next?</h3>
           <button
             type="button"
             class="govuk-button govuk-!-margin-right-8 govuk-!-margin-bottom-0"
-            (click)="onSubmit(true)"
+            (click)="onSubmit($event, true)"
           >
             {{ !!returnTo ? 'Save and return' : 'Save and continue' }}
           </button>
           <span class="govuk-visually-hidden">or</span>
-          <button
-            type="button"
-            class="govuk-button govuk-button--link govuk-!-margin-bottom-0"
-            (click)="onSubmit(false)"
+          <a
+            href="#"
+            class="govuk-list govuk-list--inline govuk-util__float-right govuk-!-margin-top-2"
+            (click)="onSubmit($event,false)"
+            >Save and exit</a
           >
-            Save and exit
-          </button>
         </div>
       </div>
     </div>
diff --git a/src/app/features/bulk-upload/bulk-upload-references/bulk-upload-references.spec.ts b/src/app/features/bulk-upload/bulk-upload-references/bulk-upload-references.spec.ts
deleted file mode 100644
index 5d31cb7174..0000000000
--- a/src/app/features/bulk-upload/bulk-upload-references/bulk-upload-references.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BulkUploadReferences } from './bulk-upload-references';
-
-describe('BulkUploadReferences', () => {
-  let component: BulkUploadReferences;
-  let fixture: ComponentFixture<BulkUploadReferences>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ BulkUploadReferences ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(BulkUploadReferences);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/bulk-upload/bulk-upload-references/bulk-upload-references.ts b/src/app/features/bulk-upload/bulk-upload-references/bulk-upload-references.ts
index 5dd8aeb844..ef96b8984f 100644
--- a/src/app/features/bulk-upload/bulk-upload-references/bulk-upload-references.ts
+++ b/src/app/features/bulk-upload/bulk-upload-references/bulk-upload-references.ts
@@ -38,7 +38,7 @@ export class BulkUploadReferences implements OnInit, OnDestroy, AfterViewInit {
     protected bulkUploadService: BulkUploadService,
     protected router: Router,
     protected formBuilder: FormBuilder,
-    protected errorSummaryService: ErrorSummaryService
+    protected errorSummaryService: ErrorSummaryService,
   ) {
     this.setPrimaryEstablishmentName();
   }
@@ -66,7 +66,7 @@ export class BulkUploadReferences implements OnInit, OnDestroy, AfterViewInit {
     this.references.forEach((reference: Workplace | Worker) => {
       this.form.addControl(
         `reference-${reference.uid}`,
-        new FormControl(reference.localIdentifier, [Validators.required, Validators.maxLength(this.maxLength)])
+        new FormControl(reference.localIdentifier, [Validators.required, Validators.maxLength(this.maxLength)]),
       );
 
       this.formErrorsMap.push({
@@ -106,7 +106,7 @@ export class BulkUploadReferences implements OnInit, OnDestroy, AfterViewInit {
             }
           }
         });
-      })
+      }),
     );
   }
 
@@ -163,7 +163,8 @@ export class BulkUploadReferences implements OnInit, OnDestroy, AfterViewInit {
 
   protected save(saveAndContinue: boolean): void {}
 
-  public onSubmit(saveAndContinue: boolean): void {
+  public onSubmit(event: Event, saveAndContinue: boolean): void {
+    event.preventDefault();
     this.submitted = true;
     this.errorSummaryService.syncFormErrorsEvent.next(true);
 
diff --git a/src/app/features/bulk-upload/bulk-upload-start-page/bulk-upload-start-page.component.spec.ts b/src/app/features/bulk-upload/bulk-upload-start-page/bulk-upload-start-page.component.spec.ts
deleted file mode 100644
index 397a1aff88..0000000000
--- a/src/app/features/bulk-upload/bulk-upload-start-page/bulk-upload-start-page.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { BulkUploadStartPageComponent } from '@features/bulk-upload/bulk-upload-start-page/bulk-upload-start-page.component';
-
-describe('BulkUploadStartPageComponent', () => {
-  let component: BulkUploadStartPageComponent;
-  let fixture: ComponentFixture<BulkUploadStartPageComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [BulkUploadStartPageComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(BulkUploadStartPageComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/bulk-upload/check-workplace-references/check-workplace-references.component.spec.ts b/src/app/features/bulk-upload/check-workplace-references/check-workplace-references.component.spec.ts
deleted file mode 100644
index 99e09ba990..0000000000
--- a/src/app/features/bulk-upload/check-workplace-references/check-workplace-references.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CheckWorkplaceReferencesComponent } from './check-workplace-references.component';
-
-describe('CheckWorkplaceReferencesComponent', () => {
-  let component: CheckWorkplaceReferencesComponent;
-  let fixture: ComponentFixture<CheckWorkplaceReferencesComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ CheckWorkplaceReferencesComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CheckWorkplaceReferencesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/bulk-upload/download-data-files/download-data-files.component.spec.ts b/src/app/features/bulk-upload/download-data-files/download-data-files.component.spec.ts
deleted file mode 100644
index 4a1a30f2f8..0000000000
--- a/src/app/features/bulk-upload/download-data-files/download-data-files.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DownloadDataFilesComponent } from './download-data-files.component';
-
-describe('DownloadDataFilesComponent', () => {
-  let component: DownloadDataFilesComponent;
-  let fixture: ComponentFixture<DownloadDataFilesComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ DownloadDataFilesComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DownloadDataFilesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/bulk-upload/file-validate-status/file-validate-status.component.ts b/src/app/features/bulk-upload/file-validate-status/file-validate-status.component.ts
index 8d27ef3837..45d21a3440 100644
--- a/src/app/features/bulk-upload/file-validate-status/file-validate-status.component.ts
+++ b/src/app/features/bulk-upload/file-validate-status/file-validate-status.component.ts
@@ -1,10 +1,11 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, ViewEncapsulation } from '@angular/core';
 import { FileValidateStatus } from '@core/model/bulk-upload.model';
 
 @Component({
   selector: 'app-file-validate-status',
   templateUrl: './file-validate-status.component.html',
-  styleUrls: ['./file-validate-status.component.scss']
+  styleUrls: ['./file-validate-status.component.scss'],
+  encapsulation: ViewEncapsulation.None,
 })
 export class FileValidateStatusComponent {
   public statusEnum = FileValidateStatus;
diff --git a/src/app/features/bulk-upload/files-upload/files-upload.component.spec.ts b/src/app/features/bulk-upload/files-upload/files-upload.component.spec.ts
deleted file mode 100644
index 90c184fba7..0000000000
--- a/src/app/features/bulk-upload/files-upload/files-upload.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FilesUploadComponent } from './files-upload.component';
-
-describe('FilesUploadComponent', () => {
-  let component: FilesUploadComponent;
-  let fixture: ComponentFixture<FilesUploadComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ FilesUploadComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(FilesUploadComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/bulk-upload/references-created-page/references-created-page.component.spec.ts b/src/app/features/bulk-upload/references-created-page/references-created-page.component.spec.ts
deleted file mode 100644
index 935d4653fe..0000000000
--- a/src/app/features/bulk-upload/references-created-page/references-created-page.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ReferencesCreatedPageComponent } from './references-created-page.component';
-
-describe('ReferencesCreatedPageComponent', () => {
-  let component: ReferencesCreatedPageComponent;
-  let fixture: ComponentFixture<ReferencesCreatedPageComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ReferencesCreatedPageComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ReferencesCreatedPageComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/bulk-upload/report-download-link/report-download-link.component.spec.ts b/src/app/features/bulk-upload/report-download-link/report-download-link.component.spec.ts
deleted file mode 100644
index 38030d9ec8..0000000000
--- a/src/app/features/bulk-upload/report-download-link/report-download-link.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ReportDownloadLinkComponent } from './report-download-link.component';
-
-describe('ReportDownloadLinkComponent', () => {
-  let component: ReportDownloadLinkComponent;
-  let fixture: ComponentFixture<ReportDownloadLinkComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ReportDownloadLinkComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ReportDownloadLinkComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/bulk-upload/report-download-link/report-download-link.component.ts b/src/app/features/bulk-upload/report-download-link/report-download-link.component.ts
index 26ce0b9f5b..058f52191b 100644
--- a/src/app/features/bulk-upload/report-download-link/report-download-link.component.ts
+++ b/src/app/features/bulk-upload/report-download-link/report-download-link.component.ts
@@ -58,6 +58,6 @@ export class ReportDownloadLinkComponent {
       Training: 'TrainingResults.txt',
       Worker: 'StaffrecordsResults.txt',
     };
-    return filenameMap[this.fileType];
+    return encodeURI(filenameMap[this.fileType]);
   }
 }
diff --git a/src/app/features/bulk-upload/selected-files-list/selected-files-list.component.spec.ts b/src/app/features/bulk-upload/selected-files-list/selected-files-list.component.spec.ts
deleted file mode 100644
index ccbccc0b25..0000000000
--- a/src/app/features/bulk-upload/selected-files-list/selected-files-list.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SelectedFilesListComponent } from './selected-files-list.component';
-
-describe('SelectedFilesListComponent', () => {
-  let component: SelectedFilesListComponent;
-  let fixture: ComponentFixture<SelectedFilesListComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ SelectedFilesListComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SelectedFilesListComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/bulk-upload/staff-references-page/staff-references-page.component.spec.ts b/src/app/features/bulk-upload/staff-references-page/staff-references-page.component.spec.ts
deleted file mode 100644
index d00b1a5f48..0000000000
--- a/src/app/features/bulk-upload/staff-references-page/staff-references-page.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { StaffReferencesPageComponent } from './staff-references-page.component';
-
-describe('WorkplaceReferencesPageComponent', () => {
-  let component: StaffReferencesPageComponent;
-  let fixture: ComponentFixture<StaffReferencesPageComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ StaffReferencesPageComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(StaffReferencesPageComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/bulk-upload/upload-data-files/upload-data-files.component.spec.ts b/src/app/features/bulk-upload/upload-data-files/upload-data-files.component.spec.ts
deleted file mode 100644
index f8c77b8350..0000000000
--- a/src/app/features/bulk-upload/upload-data-files/upload-data-files.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { UploadDataFilesComponent } from './upload-data-files.component';
-
-describe('UploadDataFilesComponent', () => {
-  let component: UploadDataFilesComponent;
-  let fixture: ComponentFixture<UploadDataFilesComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ UploadDataFilesComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(UploadDataFilesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/bulk-upload/upload-warning-dialog/upload-warning-dialog.component.spec.ts b/src/app/features/bulk-upload/upload-warning-dialog/upload-warning-dialog.component.spec.ts
deleted file mode 100644
index ab56d588fd..0000000000
--- a/src/app/features/bulk-upload/upload-warning-dialog/upload-warning-dialog.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { UploadWarningDialogComponent } from './upload-warning-dialog.component';
-
-describe('UploadWarningDialogComponent', () => {
-  let component: UploadWarningDialogComponent;
-  let fixture: ComponentFixture<UploadWarningDialogComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [UploadWarningDialogComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(UploadWarningDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.html b/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.html
index 063cd6abed..1f16452d7d 100644
--- a/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.html
+++ b/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.html
@@ -32,7 +32,7 @@
           [class.govuk-!-padding-left-6]="file.errors"
         >
           <p class="govuk-!-margin-top-2 govuk-!-margin-bottom-2">
-            <a href="/bulk-upload/download/{{ file.filename }}" (click)="downloadFile($event, file.key)">
+            <a href="/bulk-upload/download/{{ encodeUrl(file.filename) }}" (click)="downloadFile($event, file.key)">
               {{ file.filename }}
             </a>
           </p>
diff --git a/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.spec.ts b/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.spec.ts
deleted file mode 100644
index 7b03f1d580..0000000000
--- a/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { UploadedFilesListComponent } from './uploaded-files-list.component';
-
-describe('UploadedFilesListComponent', () => {
-  let component: UploadedFilesListComponent;
-  let fixture: ComponentFixture<UploadedFilesListComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ UploadedFilesListComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(UploadedFilesListComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.ts b/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.ts
index 2602ecf37f..40860b6b13 100644
--- a/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.ts
+++ b/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.ts
@@ -213,6 +213,14 @@ export class UploadedFilesListComponent implements OnInit, OnDestroy {
       });
   }
 
+  /**
+   * Encode the filename so we have valid HTML
+   * @param url string
+   */
+  public encodeUrl(url: string): string {
+    return encodeURI(url);
+  }
+
   /**
    * Set validate success update uploaded files
    * And then set total warnings and/or errors and status
diff --git a/src/app/features/bulk-upload/workplace-references-page/workplace-references-page.component.spec.ts b/src/app/features/bulk-upload/workplace-references-page/workplace-references-page.component.spec.ts
deleted file mode 100644
index 990e4b44dd..0000000000
--- a/src/app/features/bulk-upload/workplace-references-page/workplace-references-page.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WorkplaceReferencesPageComponent } from './workplace-references-page.component';
-
-describe('WorkplaceReferencesPageComponent', () => {
-  let component: WorkplaceReferencesPageComponent;
-  let fixture: ComponentFixture<WorkplaceReferencesPageComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ WorkplaceReferencesPageComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WorkplaceReferencesPageComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/dashboard/dashboard.component.html b/src/app/features/dashboard/dashboard.component.html
index 7e4f9219e4..0b36b133e8 100644
--- a/src/app/features/dashboard/dashboard.component.html
+++ b/src/app/features/dashboard/dashboard.component.html
@@ -7,12 +7,25 @@ <h1 class="govuk-heading-l govuk-!-margin-bottom-0">
       }}</span>
       {{ workplace?.name }}
     </h1>
+
+    <div *ngIf="workplace && canDeleteEstablishment && subsidiaryCount < 1 && workplace.ustatus != 'PENDING'">
+      <button
+        class="govuk-button govuk-button--link govuk__flex govuk__align-items-center"
+        (click)="onDeleteWorkplace($event)"
+      >
+        <img src="/assets/images/bin.svg" alt="" />
+        <span class="govuk-!-margin-left-1">
+        Delete <span class="govuk-visually-hidden">{{ workplace.name }}</span> Workplace
+      </span>
+      </button>
+    </div>
     <p class="govuk-!-font-size-16 govuk-!-margin-top-4 govuk-!-margin-bottom-0">
       Workplace ID: {{ workplace?.nmdsId }}
     </p>
     <p *ngIf="lastLoggedIn" class="govuk-!-font-size-16 govuk-!-margin-top-2">
       Last signed in on {{ lastLoggedIn | date: 'd MMMM y' }}
     </p>
+
   </div>
 
   <div class="govuk-grid-column-one-third contact-col" [class.contact-col--parent]="workplace?.isParent">
@@ -25,7 +38,31 @@ <h2 class="govuk-heading-s govuk-!-margin-bottom-0">
     <p class="govuk-!-font-size-16 govuk-!-margin-top-2">
       <a href="mailto:ascwds-support@skillsforcare.org.uk">ascwds-support@skillsforcare.org.uk</a>
     </p>
+    <p class="govuk__flex govuk__align-items-center govuk-!-font-size-16">
+      <img alt="" src="/assets/images/envelope.svg" class="govuk-!-margin-right-1">
+      <ng-container *ngIf="numberOfNewNotifications > 0; else noNotifications">
+        You have
+        <a [routerLink]="['/notifications']">
+          <span class="notification-alert__count">{{ numberOfNewNotifications }}</span>new
+          {{
+                numberOfNewNotifications
+                  | i18nPlural
+                    : {
+                        '=1': 'notification',
+                        other: 'notifications'
+                      }
+              }}
+        </a>
+      </ng-container>
+      <ng-template #noNotifications>
+        <a [routerLink]="['/notifications']">Notifications</a>
+      </ng-template>
+    </p>
   </div>
+</div>
+<div class="govuk-grid-row">
+
+
 </div>
 
 <div class="govuk-grid-row">
@@ -42,6 +79,7 @@ <h2 class="govuk-heading-s govuk-!-margin-bottom-0">
       <app-tab *ngIf="workplace && canViewListOfWorkers" [alert]="totalStaffRecords === 0" [title]="'Staff records'">
         <app-staff-records-tab [workplace]="workplace"></app-staff-records-tab>
       </app-tab>
+
       <app-tab
         *ngIf="workplace && canViewListOfWorkers"
         [alert]="trainingAlert === 1"
diff --git a/src/app/features/dashboard/dashboard.component.spec.ts b/src/app/features/dashboard/dashboard.component.spec.ts
index ba47529181..899d51666a 100644
--- a/src/app/features/dashboard/dashboard.component.spec.ts
+++ b/src/app/features/dashboard/dashboard.component.spec.ts
@@ -1,24 +1,145 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DashboardComponent } from './dashboard.component';
+import { DashboardComponent } from '@features/dashboard/dashboard.component';
+import { render, within } from '@testing-library/angular';
+import { HomeTabComponent } from '@features/dashboard/home-tab/home-tab.component';
+import { SharedModule } from '@shared/shared.module';
+import { Router, RouterModule } from '@angular/router';
+import { WindowRef } from '@core/services/window.ref';
+import { RouterTestingModule } from '@angular/router/testing';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { PermissionsService } from '@core/services/permissions/permissions.service';
+import { UserService } from '@core/services/user.service';
+import { NotificationsService } from '@core/services/notifications/notifications.service';
+import { MockPermissionsService } from '@core/test-utils/MockPermissionsService';
+import { MockNotificationsService } from '@core/test-utils/MockNotificationsService';
+import { MockUserService } from '@core/test-utils/MockUserService';
+import { HttpClient } from '@angular/common/http';
+import { EstablishmentService } from '@core/services/establishment.service';
+import { MockEstablishmentService } from '@core/test-utils/MockEstablishmentService';
+import { getTestBed } from '@angular/core/testing';
+import { of } from 'rxjs';
+import { AuthService } from '@core/services/auth.service';
+import { MockAuthService } from '@core/test-utils/MockAuthService';
 
 describe('DashboardComponent', () => {
-  let component: DashboardComponent;
-  let fixture: ComponentFixture<DashboardComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [DashboardComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DashboardComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+  async function setup(isAdmin = true, subsidiaries = 0) {
+    const component =  await render(DashboardComponent, {
+      imports: [
+        SharedModule,
+        RouterModule,
+        RouterTestingModule,
+        HttpClientTestingModule
+      ],
+      declarations: [
+        HomeTabComponent
+      ],
+      providers: [
+        {
+          provide: WindowRef,
+          useClass: WindowRef
+        },
+        {
+          provide: PermissionsService,
+          useFactory: MockPermissionsService.factory(),
+          deps: [HttpClient, Router, UserService]
+        },
+        {
+          provide: UserService,
+          useFactory: MockUserService.factory(subsidiaries, isAdmin),
+          deps: [HttpClient]
+        },
+        {
+          provide: NotificationsService,
+          useClass: MockNotificationsService
+        },
+        {
+          provide: EstablishmentService,
+          useClass: MockEstablishmentService
+        },
+        {
+          provide: AuthService,
+          useClass: MockAuthService
+        }
+      ]
+    });
+
+    const injector = getTestBed();
+    const establishmentService = injector.get(EstablishmentService) as EstablishmentService;
+    const router = injector.get(Router) as Router;
+
+    return {
+      component,
+      establishmentService,
+      router
+    };
+  }
 
-  it('should create', () => {
+  it('should render a DashboardComponent', async () => {
+    const component = await setup();
     expect(component).toBeTruthy();
   });
+
+  describe('Archive Workplace', () => {
+    it('should display a Delete Workplace link if user is an admin', async () => {
+      const { component } = await setup(true);
+
+      component.getByText('Delete Workplace');
+    });
+
+    it('should not display a Delete Workplace link if the workplace has subsidiaries', async () => {
+      const { component } = await setup(true, 1);
+
+      expect(component.queryByText('Delete Workplace')).toBeNull();
+    });
+
+    it('should not display a Delete Workplace link if user not an admin', async () => {
+      const { component } = await setup(false);
+
+      expect(component.queryByText('Delete Workplace')).toBeNull();
+    });
+
+    it('should display a modal when the user clicks on Delete Workplace', async () => {
+      const { component } = await setup(true);
+
+      const deleteWorkplace = component.getByText('Delete Workplace');
+      deleteWorkplace.click();
+
+      const dialog = await within(document.body).findByRole('dialog');
+
+      const cancel = within(dialog).getByText('Cancel');
+      cancel.click();
+    });
+
+    it('should send a DELETE request once the user confirms to Delete Workplace', async () => {
+      const { component, establishmentService } = await setup(true);
+
+      const spy = spyOn(establishmentService, 'deleteWorkplace');
+
+      const deleteWorkplace = component.getByText('Delete Workplace');
+      deleteWorkplace.click();
+
+      const dialog = await within(document.body).findByRole('dialog');
+      const confirm = within(dialog).getByText('Delete workplace');
+      confirm.click();
+
+      expect(spy).toHaveBeenCalled();
+    });
+
+    it('should redirect the user after deleting a workplace', async () => {
+      const { component, establishmentService, router } = await setup(true);
+
+      spyOn(establishmentService, 'deleteWorkplace').and.returnValue(of({}));
+      const spy = spyOn(router, 'navigate');
+      spy.and.returnValue(Promise.resolve({}));
+
+      const deleteWorkplace = component.getByText('Delete Workplace');
+      deleteWorkplace.click();
+
+      const dialog = await within(document.body).findByRole('dialog');
+      const confirm = within(dialog).getByText('Delete workplace');
+      confirm.click();
+
+      expect(spy).toHaveBeenCalled();
+    });
+  });
 });
+
diff --git a/src/app/features/dashboard/dashboard.component.ts b/src/app/features/dashboard/dashboard.component.ts
index 9fb66a7504..db729882e8 100644
--- a/src/app/features/dashboard/dashboard.component.ts
+++ b/src/app/features/dashboard/dashboard.component.ts
@@ -1,10 +1,17 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { Establishment } from '@core/model/establishment.model';
 import { EstablishmentService } from '@core/services/establishment.service';
+import { NotificationsService } from '@core/services/notifications/notifications.service';
 import { PermissionsService } from '@core/services/permissions/permissions.service';
 import { UserService } from '@core/services/user.service';
 import { WorkerService } from '@core/services/worker.service';
-import { Subscription } from 'rxjs';
+import { interval, Subscription } from 'rxjs';
+import { DialogService } from '@core/services/dialog.service';
+import { Router } from '@angular/router';
+import { AlertService } from '@core/services/alert.service';
+import { DeleteWorkplaceDialogComponent } from '@features/workplace/delete-workplace-dialog/delete-workplace-dialog.component';
+import { take } from 'rxjs/operators';
+import { AuthService } from '@core/services/auth.service';
 
 @Component({
   selector: 'app-dashboard',
@@ -13,6 +20,7 @@ import { Subscription } from 'rxjs';
 })
 export class DashboardComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription = new Subscription();
+  public canDeleteEstablishment: boolean;
   public canViewEstablishment: boolean;
   public canViewListOfUsers: boolean;
   public canViewListOfWorkers: boolean;
@@ -20,13 +28,20 @@ export class DashboardComponent implements OnInit, OnDestroy {
   public totalStaffRecords: number;
   public workplace: Establishment;
   public trainingAlert: number;
+  public subsidiaryCount: number;
+
 
   constructor(
+    private alertService: AlertService,
+    private authService: AuthService,
     private establishmentService: EstablishmentService,
     private permissionsService: PermissionsService,
     private userService: UserService,
-    private workerService: WorkerService
-  ) {}
+    private workerService: WorkerService,
+    private notificationsService: NotificationsService,
+    private dialogService: DialogService,
+    private router: Router,
+  ) { }
 
   ngOnInit() {
     this.workplace = this.establishmentService.primaryWorkplace;
@@ -34,6 +49,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
     this.canViewListOfUsers = this.permissionsService.can(workplaceUid, 'canViewListOfUsers');
     this.canViewListOfWorkers = this.permissionsService.can(workplaceUid, 'canViewListOfWorkers');
     this.canViewEstablishment = this.permissionsService.can(workplaceUid, 'canViewEstablishment');
+    this.canDeleteEstablishment = this.permissionsService.can(workplaceUid, 'canDeleteAllEstablishments');
 
     if (this.workplace) {
       this.subscriptions.add(
@@ -52,15 +68,22 @@ export class DashboardComponent implements OnInit, OnDestroy {
         this.workerService.getAllWorkers(this.workplace.uid).subscribe(
           workers => {
             this.workerService.setWorkers(workers);
-            this.trainingAlert = this.getTrainingAlertFlag(workers);
+            if (workers.length > 0) {
+              this.trainingAlert = workers[0].trainingAlert;
+            }
           },
           error => {
             console.error(error.error);
           }
         )
       );
-    }
 
+      this.subscriptions.add(
+        this.userService.getEstablishments().subscribe(res => {
+          this.subsidiaryCount = res.subsidaries ? res.subsidaries.count : 0;
+        })
+      )
+    }
     const lastLoggedIn = this.userService.loggedInUser.lastLoggedIn;
     this.lastLoggedIn = lastLoggedIn ? lastLoggedIn : null;
 
@@ -68,27 +91,91 @@ export class DashboardComponent implements OnInit, OnDestroy {
       url: ['/dashboard'],
       fragment: 'user-accounts',
     });
+
+    //get latest notification after every 30 seconds
+    this.subscriptions.add(
+      interval(30000).subscribe(
+        () => {
+          this.notificationsService.getAllNotifications().subscribe(
+            notifications => {
+              this.notificationsService.notifications$.next(notifications);
+            },
+            error => {
+              console.error(error.error);
+            }
+          );
+        }
+      )
+    );
   }
 
-  /**
-   * Function used to display training alert flag over the traing and qualifications tab
-   * @param {workers} list of workers
-   * @return {number} 0 for up-to-date, 1 for expiring soon and 2 for expired.
-   */
-  public getTrainingAlertFlag(workers) {
-    if (workers.length > 0) {
-      const expariedTrainingCount = workers.filter(worker => worker.expiredTrainingCount > 0).length || 0;
-      const expiringTrainingCount = workers.filter(worker => worker.expiringTrainingCount > 0).length || 0;
-      if (expariedTrainingCount > 0) {
-        return 2;
-      } else if (expiringTrainingCount > 0) {
-        return 1;
-      } else {
-        return 0;
+  public onDeleteWorkplace(event: Event): void {
+    event.preventDefault();
+
+    if (!this.canDeleteEstablishment) {
+      return;
+    }
+
+    this.dialogService
+      .open(DeleteWorkplaceDialogComponent, { workplaceName: this.workplace.name })
+      .afterClosed.subscribe(deleteConfirmed => {
+      if (deleteConfirmed) {
+        this.deleteWorkplace();
       }
-    } else {
-      return 0;
+    });
+  }
+
+  private deleteWorkplace(): void {
+    if (!this.canDeleteEstablishment) {
+      return;
     }
+
+    this.subscriptions.add(
+      this.establishmentService.deleteWorkplace(this.workplace.uid).subscribe(
+        () => {
+          this.permissionsService.clearPermissions();
+          this.authService.restorePreviousToken();
+
+          if(this.authService.getPreviousToken().EstablishmentUID) {
+            this.establishmentService
+              .getEstablishment(this.authService.getPreviousToken().EstablishmentUID)
+              .pipe(take(1))
+              .subscribe(
+                workplace => {
+                  this.establishmentService.setState(workplace);
+                  this.establishmentService.setPrimaryWorkplace(workplace);
+                  this.establishmentService.establishmentId = workplace.uid;
+                  this.router.navigate(['/search-establishments']).then(() => {
+                    this.alertService.addAlert({
+                      type: 'success',
+                      message: `${this.workplace.name} has been permanently deleted.`,
+                    });
+                  });
+                });
+          } else {
+            this.router.navigate(['/search-establishments']).then(() => {
+              this.alertService.addAlert({
+                type: 'success',
+                message: `${this.workplace.name} has been permanently deleted.`,
+              });
+            });
+          }
+        },
+        e => {
+          console.error(e)
+          this.alertService.addAlert({
+            type: 'warning',
+            message: 'There was an error deleting the workplace.',
+          });
+        }
+      )
+    );
+  }
+
+
+ get numberOfNewNotifications() {
+    const newNotifications = this.notificationsService.notifications.filter(notification => !notification.isViewed);
+    return newNotifications.length;
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/features/dashboard/home-tab/home-tab.component.html b/src/app/features/dashboard/home-tab/home-tab.component.html
index 2909bb3f06..87e1f186ce 100644
--- a/src/app/features/dashboard/home-tab/home-tab.component.html
+++ b/src/app/features/dashboard/home-tab/home-tab.component.html
@@ -3,61 +3,69 @@
     <h2 class="govuk-heading-m">Home</h2>
     <ng-container *ngIf="workplace && canEditEstablishment">
       <p *ngIf="!workplace.employerType || updateStaffRecords">What you need to do first.</p>
-      <app-inset-text *ngIf="!workplace?.employerType" [color]="'todo'">
-        You need to provide information on your workplace.<br />
-        <a [routerLink]="['/workplace', workplace?.uid, 'start']">Add workplace information</a>
-      </app-inset-text>
-
-      <app-inset-text *ngIf="updateStaffRecords" [color]="'todo'">
-        You need to provide information on all your staff.<br />
-        <a [routerLink]="['/workplace', workplace.uid, 'staff-record', 'basic-records-start-screen']">
+      <app-inset-text *ngIf="!workplace.employerType || updateStaffRecords" [color]="'todo'">
+        <a *ngIf="!workplace?.employerType" [routerLink]="['/workplace', workplace?.uid, 'start']"
+          >Add workplace information</a
+        >
+        <br /><a
+          *ngIf="updateStaffRecords"
+          [routerLink]="['/workplace', workplace.uid, 'staff-record', 'basic-records-start-screen']"
+        >
           Add staff records
         </a>
       </app-inset-text>
     </ng-container>
+    <div *ngIf="workplace">
+      <div *ngIf="canAddWorker">
+        <span class="govuk-!-font-size-24">
+          <a href="#" (click)="selectStaffTab($event)">
+            Add a staff record
+          </a>
+        </span>
+
+        <p>
+          Create staff records for your workplace by providing current work information, personal details, employment
+          and qualifications and training information.
+        </p>
+      </div>
+      <div *ngIf="canViewReports">
+        <span class="govuk-!-font-size-24">
+          <a [routerLink]="['/reports']">
+            View reports
+          </a>
+        </span>
+        <p>
+          View your Workforce Development Fund report to check whether you’re eligible to claim funding towards training
+          and qualifications.
+        </p>
+      </div>
+      <div *ngIf="canBulkUpload">
+        <span class="govuk-!-font-size-24">
+          <a [routerLink]="['/bulk-upload']" (click)="setReturn()">
+            Bulk upload
+          </a>
+        </span>
+        <p>
+          Bulk upload is used to edit large quantities of staff, workplace and training information.
+        </p>
+      </div>
+    </div>
   </div>
   <div class="govuk-grid-column-one-third">
-    <h3 class="govuk-heading-s">Notifications</h3>
-    <ng-container *ngIf="numberOfNewNotifications > 0; else noNotifications">
-      <p>
-        <a [routerLink]="['/notifications']" class="notification-alert">
-          You have <span class="notification-alert__count">{{ numberOfNewNotifications }}</span> new
-          {{
-            numberOfNewNotifications
-              | i18nPlural
-                : {
-                    '=1': 'notification',
-                    other: 'notifications'
-                  }
-          }}
-        </a>
-      </p>
-    </ng-container>
-    <ng-template #noNotifications>
-      <p>
-        <a [routerLink]="['/notifications']" class="notification-alert">You have no new notifications</a>
-      </p>
-    </ng-template>
     <ng-container
       *ngIf="
-        canBulkUpload ||
         canViewWorkplaces ||
-        canViewReports ||
         canViewChangeDataOwner ||
         canViewDataPermissionsLink ||
         canLinkToParent ||
         canRemoveParentAssociation
       "
     >
-      <h3 class="govuk-heading-s govuk-!-margin-top-6">Other things you can do</h3>
+      <h3 class="govuk-heading-s govuk-!-margin-top-1">Related content</h3>
       <ul *ngIf="workplace" class="govuk-list">
-        <li *ngIf="canBulkUpload">
-          <a [routerLink]="['/bulk-upload']" (click)="setReturn()">Bulk upload</a>
-        </li>
         <li *ngIf="canViewWorkplaces">
           <a [routerLink]="['/workplace', 'view-all-workplaces']">View all workplaces</a>
         </li>
-        <li *ngIf="canViewReports"><a [routerLink]="['/reports']">View reports</a></li>
         <li *ngIf="canViewChangeDataOwner">
           <ng-container *ngIf="isOwnershipRequested; else changeDataOwner">
             <a (click)="cancelChangeDataOwnerRequest($event)" href="#">Data request pending</a>
@@ -67,18 +75,18 @@ <h3 class="govuk-heading-s govuk-!-margin-top-6">Other things you can do</h3>
           </ng-template>
         </li>
         <li *ngIf="canViewDataPermissionsLink">
-          <a (click)="setDataPermissions($event)" href="#">Data permissions</a>
+          <a (click)="setDataPermissions($event)" href="#">Set data permissions</a>
         </li>
         <li *ngIf="canLinkToParent">
           <ng-container *ngIf="linkToParentRequestedStatus; else requestLinkToParent">
-            <a (click)="cancelLinkToParent($event)" href="#">Link to your parent organisation pending</a>
+            <a (click)="cancelLinkToParent($event)" href="#">Link to my parent organisation pending</a>
           </ng-container>
           <ng-template #requestLinkToParent>
-            <a (click)="linkToParent($event)" href="#">Link to your parent organisation</a>
+            <a (click)="linkToParent($event)" href="#">Link to my parent organisation</a>
           </ng-template>
         </li>
         <li *ngIf="canRemoveParentAssociation">
-          <a (click)="removeLinkToParent($event)" href="#">Remove link to parent organisation</a>
+          <a (click)="removeLinkToParent($event)" href="#">Remove link to my parent organisation</a>
         </li>
       </ul>
     </ng-container>
diff --git a/src/app/features/dashboard/home-tab/home-tab.component.spec.ts b/src/app/features/dashboard/home-tab/home-tab.component.spec.ts
deleted file mode 100644
index 733820edc0..0000000000
--- a/src/app/features/dashboard/home-tab/home-tab.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HomeTabComponent } from './home-tab.component';
-
-describe('HomeTabComponent', () => {
-  let component: HomeTabComponent;
-  let fixture: ComponentFixture<HomeTabComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [HomeTabComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(HomeTabComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/dashboard/home-tab/home-tab.component.ts b/src/app/features/dashboard/home-tab/home-tab.component.ts
index 652a94d904..77928690d3 100644
--- a/src/app/features/dashboard/home-tab/home-tab.component.ts
+++ b/src/app/features/dashboard/home-tab/home-tab.component.ts
@@ -8,7 +8,6 @@ import { AlertService } from '@core/services/alert.service';
 import { BulkUploadService } from '@core/services/bulk-upload.service';
 import { DialogService } from '@core/services/dialog.service';
 import { EstablishmentService } from '@core/services/establishment.service';
-import { NotificationsService } from '@core/services/notifications/notifications.service';
 import { PermissionsService } from '@core/services/permissions/permissions.service';
 import { UserService } from '@core/services/user.service';
 import { WorkerService } from '@core/services/worker.service';
@@ -60,13 +59,13 @@ export class HomeTabComponent implements OnInit, OnDestroy {
   public canLinkToParent: boolean;
   public linkToParentRequestedStatus: boolean;
   public canRemoveParentAssociation: boolean;
+  public canAddWorker: boolean;
 
   constructor(
     private bulkUploadService: BulkUploadService,
     private permissionsService: PermissionsService,
     private userService: UserService,
     private workerService: WorkerService,
-    private notificationsService: NotificationsService,
     private dialogService: DialogService,
     private alertService: AlertService,
     private router: Router,
@@ -155,10 +154,6 @@ export class HomeTabComponent implements OnInit, OnDestroy {
     this.bulkUploadService.setReturnTo({ url: ['/dashboard'] });
   }
 
-  get numberOfNewNotifications() {
-    const newNotifications = this.notificationsService.notifications.filter(notification => !notification.isViewed);
-    return newNotifications.length;
-  }
   /**
    * Function used to open modal box for link a workplace to parent organisation
    * @param {event} triggred event
@@ -250,12 +245,13 @@ export class HomeTabComponent implements OnInit, OnDestroy {
   public setPermissionLinks() {
     const workplaceUid: string = this.workplace ? this.workplace.uid : null;
     this.canEditEstablishment = this.permissionsService.can(workplaceUid, 'canEditEstablishment');
+    this.canAddWorker = this.permissionsService.can(workplaceUid, 'canAddWorker');
     this.canBulkUpload = this.permissionsService.can(workplaceUid, 'canBulkUpload');
     this.canViewWorkplaces = this.workplace && this.workplace.isParent;
     this.canViewChangeDataOwner =
-      this.workplace && this.workplace.parentUid != null && this.workplace.dataOwner !== 'Workplace';
+      this.workplace && this.workplace.parentUid != null && this.workplace.dataOwner !== 'Workplace' && this.user.role!= 'Read';
     this.canViewDataPermissionsLink =
-      this.workplace && this.workplace.parentUid != null && this.workplace.dataOwner === 'Workplace';
+      this.workplace && this.workplace.parentUid != null && this.workplace.dataOwner === 'Workplace' && this.user.role!= 'Read';
     this.canViewReports =
       this.permissionsService.can(workplaceUid, 'canViewWdfReport') ||
       this.permissionsService.can(workplaceUid, 'canRunLocalAuthorityReport');
@@ -275,6 +271,13 @@ export class HomeTabComponent implements OnInit, OnDestroy {
       this.linkToParentRequestedStatus = true;
     }
   }
+  //open Staff Tab
+  public selectStaffTab(event: Event) {
+    if (event) {
+      event.preventDefault();
+    }
+    this.workerService.tabChanged.next(true);
+  }
 
   ngOnDestroy(): void {
     this.subscriptions.unsubscribe();
diff --git a/src/app/features/forgot-your-password/confirmation/confirmation.component.spec.ts b/src/app/features/forgot-your-password/confirmation/confirmation.component.spec.ts
deleted file mode 100644
index ad7d5ced3d..0000000000
--- a/src/app/features/forgot-your-password/confirmation/confirmation.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ForgotYourPasswordConfirmationComponent } from './confirmation.component';
-
-describe('ConfirmationComponent', () => {
-  let component: ForgotYourPasswordConfirmationComponent;
-  let fixture: ComponentFixture<ForgotYourPasswordConfirmationComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ForgotYourPasswordConfirmationComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ForgotYourPasswordConfirmationComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/forgot-your-password/edit/edit.component.spec.ts b/src/app/features/forgot-your-password/edit/edit.component.spec.ts
deleted file mode 100644
index c023d8d32d..0000000000
--- a/src/app/features/forgot-your-password/edit/edit.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ForgotYourPasswordEditComponent } from '@features/forgot-your-password/edit/edit.component';
-
-describe('ForgotYourPasswordEditComponent', () => {
-  let component: ForgotYourPasswordEditComponent;
-  let fixture: ComponentFixture<ForgotYourPasswordEditComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ForgotYourPasswordEditComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ForgotYourPasswordEditComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/forgot-your-password/forgot-your-password.component.spec.ts b/src/app/features/forgot-your-password/forgot-your-password.component.spec.ts
deleted file mode 100644
index 556d084f26..0000000000
--- a/src/app/features/forgot-your-password/forgot-your-password.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ForgotYourPasswordComponent } from './forgot-your-password.component';
-
-describe('ForgotYourPasswordComponent', () => {
-  let component: ForgotYourPasswordComponent;
-  let fixture: ComponentFixture<ForgotYourPasswordComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ForgotYourPasswordComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ForgotYourPasswordComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/login/login.component.spec.ts b/src/app/features/login/login.component.spec.ts
deleted file mode 100644
index 3eb0bcf818..0000000000
--- a/src/app/features/login/login.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { LoginComponent } from './login.component';
-
-describe('LoginComponent', () => {
-  let component: LoginComponent;
-  let fixture: ComponentFixture<LoginComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [LoginComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(LoginComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/login/login.component.ts b/src/app/features/login/login.component.ts
index c3b4a42370..8cda7fb78c 100644
--- a/src/app/features/login/login.component.ts
+++ b/src/app/features/login/login.component.ts
@@ -79,11 +79,7 @@ export class LoginComponent implements OnInit, OnDestroy, AfterViewInit {
       {
         name: 401,
         message:
-          'Please Note<br>' +
-          'Your username / password is incorrect ' +
-          '(please consider resetting your password now, 5 incorrect attempts will lock your account)<br>' +
-          'Or<br>' +
-          'Your registration request is awaiting approval (contact support)',
+          'Your username/password is incorrect',
       },
       {
         name: 404,
@@ -93,6 +89,14 @@ export class LoginComponent implements OnInit, OnDestroy, AfterViewInit {
         name: 503,
         message: 'Unable to authenticate user.',
       },
+      {
+        name: 409,
+        message: 'There is a problem with your account, please contact support on 0113 241 0969',
+      },
+      {
+        name: 405,
+        message: 'Your registration request is awaiting approval, please contact support on 0113 241 0969',
+      }
     ];
   }
 
diff --git a/src/app/features/logout/logout.component.spec.ts b/src/app/features/logout/logout.component.spec.ts
deleted file mode 100644
index b8d38bc20e..0000000000
--- a/src/app/features/logout/logout.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { LogoutComponent } from './logout.component';
-
-describe('LogoutComponent', () => {
-  let component: LogoutComponent;
-  let fixture: ComponentFixture<LogoutComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [LogoutComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(LogoutComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/migrated-user-terms-conditions/migrated-user-terms-conditions.component.spec.ts b/src/app/features/migrated-user-terms-conditions/migrated-user-terms-conditions.component.spec.ts
deleted file mode 100644
index 533153d538..0000000000
--- a/src/app/features/migrated-user-terms-conditions/migrated-user-terms-conditions.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MigratedUserTermsConditionsComponent } from './migrated-user-terms-conditions.component';
-
-describe('MigratedUserTermsConditionsComponent', () => {
-  let component: MigratedUserTermsConditionsComponent;
-  let fixture: ComponentFixture<MigratedUserTermsConditionsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ MigratedUserTermsConditionsComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(MigratedUserTermsConditionsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/notifications/notification-delink-to-parent/notification-delink-to-parent.component.html b/src/app/features/notifications/notification-delink-to-parent/notification-delink-to-parent.component.html
index 2e6ed44f81..1703ba4e01 100644
--- a/src/app/features/notifications/notification-delink-to-parent/notification-delink-to-parent.component.html
+++ b/src/app/features/notifications/notification-delink-to-parent/notification-delink-to-parent.component.html
@@ -7,13 +7,11 @@ <h1 class="govuk-heading-l">
   </div>
 </div>
 <div class="govuk-grid-row">
-  <div class="govuk-grid-column-two-thirds">
+  <div class="govuk-grid-column-two-thirds" *ngIf="notification">
     <h2 class="govuk-heading-s govuk-util__inline-block govuk-!-margin-right-2">From:</h2>
-    <p class="govuk-util__inline-block" *ngIf="notification">
-      {{ requestorName }}, {{ notification.created | longDate }}
-    </p>
-    <h2 class="govuk-heading-s" *ngIf="notification">Subject</h2>
-    <p>{{ notification?.type | notificationType }}</p>
+    <p class="govuk-util__inline-block">{{ requestorName }}, {{ notification.created | longDate }}</p>
+    <h2 class="govuk-heading-s govuk-util__inline-block govuk-!-margin-right-2">Subject:</h2>
+    <p class="govuk-util__inline-block">{{ notification?.type | notificationType }}</p>
   </div>
 </div>
 <ng-container *ngIf="notification">
diff --git a/src/app/features/notifications/notification-link-to-parent/notification-link-to-parent.component.html b/src/app/features/notifications/notification-link-to-parent/notification-link-to-parent.component.html
index e3bf2244a7..b590a19423 100644
--- a/src/app/features/notifications/notification-link-to-parent/notification-link-to-parent.component.html
+++ b/src/app/features/notifications/notification-link-to-parent/notification-link-to-parent.component.html
@@ -7,13 +7,11 @@ <h1 class="govuk-heading-l">
   </div>
 </div>
 <div class="govuk-grid-row">
-  <div class="govuk-grid-column-two-thirds">
+  <div class="govuk-grid-column-two-thirds" *ngIf="notification">
     <h2 class="govuk-heading-s govuk-util__inline-block govuk-!-margin-right-2">From:</h2>
-    <p class="govuk-util__inline-block" *ngIf="notification">
-      {{ requestorName }}, {{ notification.created | longDate }}
-    </p>
-    <h2 class="govuk-heading-s" *ngIf="notification">Subject</h2>
-    <p>{{ notification?.type | notificationType }}</p>
+    <p class="govuk-util__inline-block">{{ requestorName }}, {{ notification.created | longDate }}</p>
+    <h2 class="govuk-heading-s govuk-util__inline-block govuk-!-margin-right-2">Subject:</h2>
+    <p class="govuk-util__inline-block">{{ notification?.type | notificationType }}</p>
   </div>
 </div>
 <ng-container *ngIf="notification">
diff --git a/src/app/features/notifications/notification-list/notification-list.component.spec.ts b/src/app/features/notifications/notification-list/notification-list.component.spec.ts
deleted file mode 100644
index ff1b6658c1..0000000000
--- a/src/app/features/notifications/notification-list/notification-list.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { NotificationListComponent } from './notification-list.component';
-
-describe('NotificationListComponent', () => {
-  let component: NotificationListComponent;
-  let fixture: ComponentFixture<NotificationListComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ NotificationListComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(NotificationListComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/notifications/notification/notification.component.html b/src/app/features/notifications/notification/notification.component.html
index 788aed3e92..27eacdbc09 100644
--- a/src/app/features/notifications/notification/notification.component.html
+++ b/src/app/features/notifications/notification/notification.component.html
@@ -7,13 +7,13 @@ <h1 class="govuk-heading-l">
   </div>
 </div>
 <div class="govuk-grid-row">
-  <div class="govuk-grid-column-two-thirds">
+  <div class="govuk-grid-column-two-thirds" *ngIf="notification">
     <h2 class="govuk-heading-s govuk-util__inline-block govuk-!-margin-right-2">From:</h2>
-    <p class="govuk-util__inline-block" *ngIf="notification">
+    <p class="govuk-util__inline-block">
       {{ notification.typeContent.requestorName }}, {{ notification.created | longDate }}
     </p>
-    <h2 class="govuk-heading-s" *ngIf="notification">Subject</h2>
-    <p>{{ notification?.type | notificationType }}</p>
+    <h2 class="govuk-heading-s govuk-util__inline-block govuk-!-margin-right-2">Subject:</h2>
+    <p class="govuk-util__inline-block">{{ notification?.type | notificationType }}</p>
   </div>
 </div>
 <ng-container *ngIf="notification">
diff --git a/src/app/features/notifications/notification/notification.component.spec.ts b/src/app/features/notifications/notification/notification.component.spec.ts
deleted file mode 100644
index aea9d7dd73..0000000000
--- a/src/app/features/notifications/notification/notification.component.spec.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { LongDatePipe } from '../../../shared/pipes/long-date.pipe';
-import { NotificationTypePipe } from '@shared/pipes/notification-type.pipe';
-import { NotificationComponent } from './notification.component';
-import { DataViewPermissionsPipe } from '../../../shared/pipes/data-view-permissions.pipe';
-import { RouterTestingModule } from '@angular/router/testing';
-import { HttpClientModule } from '@angular/common/http';
-import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
-import { AlertService } from '@core/services/alert.service';
-import { WindowRef } from '../../../core/services/window.ref';
-
-describe('NotificationComponent', () => {
-  let component: NotificationComponent;
-  let fixture: ComponentFixture<NotificationComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [DataViewPermissionsPipe, NotificationTypePipe, LongDatePipe, NotificationComponent],
-      imports: [RouterTestingModule, HttpClientModule, BrowserDynamicTestingModule],
-      providers: [AlertService, WindowRef],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(NotificationComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create NotificationComponent', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/public/accessibility-statement/accessibility-statement.component.html b/src/app/features/public/accessibility-statement/accessibility-statement.component.html
index 6e2b741cc9..5d740a8ddb 100644
--- a/src/app/features/public/accessibility-statement/accessibility-statement.component.html
+++ b/src/app/features/public/accessibility-statement/accessibility-statement.component.html
@@ -7,11 +7,11 @@ <h2 class="govuk-heading-m">Summary</h2>
       as possible to be able to use this service. For example, that means you should be able to:
     </p>
     <ul class="govuk-list govuk-list--bullet">
-      <li>Access the service on a range of mobile, tablet and desktop devices</li>
+      <li>access the service on a range of mobile, tablet and desktop devices</li>
       <li>change colours, contrast levels, fonts and adapt your display settings</li>
       <li>zoom in up to 300% without the text spilling off the screen</li>
       <li>navigate most of the service using just a keyboard</li>
-      <li>Skip to the main content using a keyboard accessible link at the top of each page</li>
+      <li>skip to the main content using a keyboard accessible link at the top of each page</li>
       <li>navigate most of the service using speech recognition software</li>
       <li>
         listen to most of the content using a screen reader (including the most recent versions of JAWS, NVDA and
@@ -20,7 +20,7 @@ <h2 class="govuk-heading-m">Summary</h2>
     </ul>
     <p>
       Advice on making your device easier to use if you have a disability can be found at
-      <a href="https://abilitynet.org.uk/" target="_blank">AbilityNet</a>.
+      <a href="https://abilitynet.org.uk/" target="_blank">AbilityNet</a>
     </p>
     <h2 class="govuk-heading-m">How accessible this service is</h2>
     <p>
@@ -29,31 +29,31 @@ <h2 class="govuk-heading-m">How accessible this service is</h2>
     </p>
     <ul class="govuk-list govuk-list--bullet">
       <li>
-        Forms may be difficult to submit without keyboard, mouse or touch interactions with form elements when using
-        speech recognition software (e.g. Dragon Naturally Speaking).
+        forms may be difficult to submit without keyboard, mouse or touch interactions with form elements when using
+        speech recognition software (e.g. Dragon Naturally Speaking)
       </li>
       <li>
-        When using a keyboard to activate error summary panel links, you may encounter problems accessing links and form
+        when using a keyboard to activate error summary panel links, you may encounter problems accessing links and form
         elements further down the page. You may need to navigate manually down to page content after an error message is
-        displayed to work around this issue.
+        displayed to work around this issue
       </li>
-      <li>PDF documents aren&apos;t tagged and may not read aloud in a logical order.</li>
+      <li>PDF documents aren&apos;t tagged and may not read aloud in a logical order</li>
       <li>
-        The bulk uploads section uses legacy functionality that may be difficult to use with screen readers, for example
+        the bulk uploads section uses legacy functionality that may be difficult to use with screen readers, for example
         validating status updates are not announced. Some users may find the bulk uploads instructions difficult to use
-        as they are contained in the PDF documents and error messages may not always describe the error in detail.
+        as they are contained in the PDF documents and error messages may not always describe the error in detail
       </li>
       <li>
-        The bulk uploads staff summary report is provided in a plain text download file. This file isn't formatted using
+        the bulk uploads staff summary report is provided in a plain text download file. This file isn't formatted using
         standard plain text formatting conventions and screen reader users may have difficulty understanding the
-        document structure.
+        document structure
       </li>
       <li>
-        If you accidentally or otherwise, refresh the bulk uploads page, you may be directed to the dashboard and have
+        if you accidentally or otherwise, refresh the bulk uploads page, you may be directed to the dashboard and have
         to manually sign out and in again to activate the bulk uploads navigation link. This applies to all users
-        including keyboard, mouse and assistive technology users.
+        including keyboard, mouse and assistive technology users
       </li>
-      <li>This service requires JavaScript enabled and is not progressively enhanced.</li>
+      <li>this service requires JavaScript enabled and is not progressively enhanced</li>
     </ul>
 
     <h2 class="govuk-heading-m">What to do if you can&apos;t access parts of this website</h2>
diff --git a/src/app/features/public/accessibility-statement/accessibility-statement.component.spec.ts b/src/app/features/public/accessibility-statement/accessibility-statement.component.spec.ts
deleted file mode 100644
index 75a656915f..0000000000
--- a/src/app/features/public/accessibility-statement/accessibility-statement.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AccessibilityStatementComponent } from './accessibility-statement.component';
-
-describe('AccessibilityStatementComponent', () => {
-  let component: AccessibilityStatementComponent;
-  let fixture: ComponentFixture<AccessibilityStatementComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ AccessibilityStatementComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AccessibilityStatementComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/public/contact-us/contact-us.component.html b/src/app/features/public/contact-us/contact-us.component.html
index c62e9688ee..e5d6ede521 100644
--- a/src/app/features/public/contact-us/contact-us.component.html
+++ b/src/app/features/public/contact-us/contact-us.component.html
@@ -3,7 +3,9 @@
     <h1 class="govuk-heading-l">Contact us</h1>
     <p>
       If you require direct assistance, please call 0113 241 0969, to speak to a member of the ASC-WDS Support Team or
-      you can email us at <a href="mailto:ascwds-support@skillsforcare.org.uk">ascwds-support@skillsforcare.org.uk</a>.
+      you can email us at <br /><a href="mailto:ascwds-support@skillsforcare.org.uk"
+        >ascwds-support@skillsforcare.org.uk</a
+      >.
     </p>
     <p>
       Our support staff are available Monday to Friday 9.00am - 5.00pm excluding bank holidays.
diff --git a/src/app/features/public/contact-us/contact-us.component.spec.ts b/src/app/features/public/contact-us/contact-us.component.spec.ts
deleted file mode 100644
index 88143a8638..0000000000
--- a/src/app/features/public/contact-us/contact-us.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ContactUsComponent } from './contact-us.component';
-
-describe('StaffComponent', () => {
-  let component: ContactUsComponent;
-  let fixture: ComponentFixture<ContactUsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ContactUsComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ContactUsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/public/cookie-policy/cookie-policy.component.html b/src/app/features/public/cookie-policy/cookie-policy.component.html
index 2ddd423ae2..76c8445738 100644
--- a/src/app/features/public/cookie-policy/cookie-policy.component.html
+++ b/src/app/features/public/cookie-policy/cookie-policy.component.html
@@ -46,7 +46,7 @@ <h3 class="govuk-heading-s govuk-!-margin-bottom-0">Functionality cookies</h3>
       </thead>
       <tbody class="govuk-table__body">
         <tr class="govuk-table__row">
-          <td class="govuk-table__cell govuk-!-padding-left-0">Essential Cookies</td>
+          <td class="govuk-table__cell govuk-util__vertical-align-top">Essential Cookies</td>
           <td class="govuk-table__cell">
             This cookie is essential for our site. It stores a AuthToken so our website can remember you from one page
             request to the next.
@@ -54,12 +54,14 @@ <h3 class="govuk-heading-s govuk-!-margin-bottom-0">Functionality cookies</h3>
           <td class="govuk-table__cell"></td>
         </tr>
         <tr class="govuk-table__row">
-          <td class="govuk-table__cell govuk-!-padding-left-0">Google Analytics</td>
+          <td class="govuk-table__cell govuk-util__vertical-align-top">Google Analytics</td>
           <td class="govuk-table__cell">
             This cookie enables us to collect standard internet log information and details of visitor behaviour
             patterns. We do this to find out things such as the number of visitors to the various parts of the site.
           </td>
-          <td class="govuk-table__cell"><a href="https://bit.ly/1dm9wka" target="_blank">https://bit.ly/1dm9wka</a></td>
+          <td class="govuk-table__cell govuk-util__vertical-align-top">
+            <a href="https://bit.ly/1dm9wka" target="_blank">https://bit.ly/1dm9wka</a>
+          </td>
         </tr>
       </tbody>
     </table>
diff --git a/src/app/features/public/cookie-policy/cookie-policy.component.spec.ts b/src/app/features/public/cookie-policy/cookie-policy.component.spec.ts
deleted file mode 100644
index 91f1525959..0000000000
--- a/src/app/features/public/cookie-policy/cookie-policy.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CookiePolicyComponent } from './cookie-policy.component';
-
-describe('CookiePolicyComponent', () => {
-  let component: CookiePolicyComponent;
-  let fixture: ComponentFixture<CookiePolicyComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ CookiePolicyComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CookiePolicyComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/public/feedback/feedback.component.html b/src/app/features/public/feedback/feedback.component.html
index 5646f63452..5cc6ceca76 100644
--- a/src/app/features/public/feedback/feedback.component.html
+++ b/src/app/features/public/feedback/feedback.component.html
@@ -137,7 +137,7 @@ <h3 class="govuk-heading-m">If you would like us to respond to your feedback, en
     <ng-template #feedbackSubmitted>
       <h1 class="govuk-heading-xl">Thank You</h1>
 
-      <p>Your feedback has been submitted</p>
+      <p>Your feedback has been submitted.</p>
     </ng-template>
   </div>
 </div>
diff --git a/src/app/features/public/feedback/feedback.component.spec.ts b/src/app/features/public/feedback/feedback.component.spec.ts
deleted file mode 100644
index 62130edafa..0000000000
--- a/src/app/features/public/feedback/feedback.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FeedbackComponent } from './feedback.component';
-
-describe('StaffComponent', () => {
-  let component: FeedbackComponent;
-  let fixture: ComponentFixture<FeedbackComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [FeedbackComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(FeedbackComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/public/privacy-notice/privacy-notice.component.spec.ts b/src/app/features/public/privacy-notice/privacy-notice.component.spec.ts
deleted file mode 100644
index 782c58b8f0..0000000000
--- a/src/app/features/public/privacy-notice/privacy-notice.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { PrivacyNoticeComponent } from './privacy-notice.component';
-
-describe('PrivacyNoticeComponent', () => {
-  let component: PrivacyNoticeComponent;
-  let fixture: ComponentFixture<PrivacyNoticeComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [PrivacyNoticeComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(PrivacyNoticeComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/public/terms-conditions/terms-conditions.component.spec.ts b/src/app/features/public/terms-conditions/terms-conditions.component.spec.ts
deleted file mode 100644
index 08d8b9538e..0000000000
--- a/src/app/features/public/terms-conditions/terms-conditions.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TermsConditionsComponent } from './terms-conditions.component';
-
-describe('TermsConditionsComponent', () => {
-  let component: TermsConditionsComponent;
-  let fixture: ComponentFixture<TermsConditionsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [TermsConditionsComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(TermsConditionsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/change-your-details/change-your-details.component.spec.ts b/src/app/features/registration/change-your-details/change-your-details.component.spec.ts
deleted file mode 100644
index b7d5769e66..0000000000
--- a/src/app/features/registration/change-your-details/change-your-details.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ChangeYourDetailsComponent } from './change-your-details.component';
-
-describe('ChangeYourDetailsComponent', () => {
-  let component: ChangeYourDetailsComponent;
-  let fixture: ComponentFixture<ChangeYourDetailsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ChangeYourDetailsComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ChangeYourDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/confirm-account-details/confirm-account-details.component.spec.ts b/src/app/features/registration/confirm-account-details/confirm-account-details.component.spec.ts
deleted file mode 100644
index 220fc30341..0000000000
--- a/src/app/features/registration/confirm-account-details/confirm-account-details.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ConfirmAccountDetailsComponent } from './confirm-account-details.component';
-
-describe('ConfirmAccountDetailsComponent', () => {
-  let component: ConfirmAccountDetailsComponent;
-  let fixture: ComponentFixture<ConfirmAccountDetailsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ConfirmAccountDetailsComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ConfirmAccountDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/confirm-account-details/confirm-account-details.component.ts b/src/app/features/registration/confirm-account-details/confirm-account-details.component.ts
index ffaf4525bb..1bf7952077 100644
--- a/src/app/features/registration/confirm-account-details/confirm-account-details.component.ts
+++ b/src/app/features/registration/confirm-account-details/confirm-account-details.component.ts
@@ -31,6 +31,11 @@ export class ConfirmAccountDetailsComponent extends ConfirmAccountDetails {
   protected init() {
     this.setupSubscriptions();
     this.setBackLink();
+    this.subscriptions.add(
+    this.registrationService.isCqcRegulated$.subscribe(value => {
+      this.slectedCqcValue = value;
+    })
+    );
   }
 
   protected setupSubscriptions(): void {
@@ -107,7 +112,7 @@ export class ConfirmAccountDetailsComponent extends ConfirmAccountDetails {
     payload.locationId = this.service.isCQC ? this.locationAddress.locationId : null;
     payload.mainService = this.service.name;
     payload.mainServiceOther = this.service.otherName ? this.service.otherName : null;
-    payload.isRegulated = this.service.isCQC;
+    payload.isRegulated = this.service.isCQC === null ? this.slectedCqcValue : this.service.isCQC;
     payload.user = this.userDetails;
     payload.user.username = this.loginCredentials.username;
     payload.user.password = this.loginCredentials.password;
diff --git a/src/app/features/registration/confirm-workplace-details/confirm-workplace-details.component.spec.ts b/src/app/features/registration/confirm-workplace-details/confirm-workplace-details.component.spec.ts
deleted file mode 100644
index b83fe39037..0000000000
--- a/src/app/features/registration/confirm-workplace-details/confirm-workplace-details.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ConfirmWorkplaceDetailsComponent } from './confirm-workplace-details.component';
-
-describe('ConfirmWorkplaceDetailsComponent', () => {
-  let component: ConfirmWorkplaceDetailsComponent;
-  let fixture: ComponentFixture<ConfirmWorkplaceDetailsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ConfirmWorkplaceDetailsComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ConfirmWorkplaceDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/create-username/create-username.component.html b/src/app/features/registration/create-username/create-username.component.html
index 7697ecee80..44c123a6c9 100644
--- a/src/app/features/registration/create-username/create-username.component.html
+++ b/src/app/features/registration/create-username/create-username.component.html
@@ -13,7 +13,7 @@
         <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
           <span class="govuk-caption-l">User account</span>
           <h1 class="govuk-fieldset__heading">
-            Create a username
+            Create a username and password
           </h1>
         </legend>
 
@@ -22,7 +22,7 @@ <h1 class="govuk-fieldset__heading">
             Username
           </label>
           <span id="username-hint" class="govuk-hint">
-            You will use this to sign in. It should be unique to you
+            You will use this to sign in. It should be unique to you.
           </span>
           <span *ngIf="submitted && getUsername.errors" id="username-error" class="govuk-error-message">
             <span class="govuk-visually-hidden">Error:</span>
@@ -44,7 +44,7 @@ <h1 class="govuk-fieldset__heading">
               Password
             </label>
             <span id="createPasswordInput-hint" class="govuk-hint">
-              This must be at least 8 characters, contain one uppercase and one lowercase letter and a number
+              This must be at least 8 characters, contain one uppercase and one lowercase letter and a number.
             </span>
             <span
               *ngIf="submitted && getPassword.errors"
diff --git a/src/app/features/registration/create-username/create-username.component.spec.ts b/src/app/features/registration/create-username/create-username.component.spec.ts
deleted file mode 100644
index 9e00bb50b7..0000000000
--- a/src/app/features/registration/create-username/create-username.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CreateUsernameComponent } from './create-username.component';
-
-describe('CreateUsernameComponent', () => {
-  let component: CreateUsernameComponent;
-  let fixture: ComponentFixture<CreateUsernameComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [CreateUsernameComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CreateUsernameComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/enter-workplace-address/enter-workplace-address.component.html b/src/app/features/registration/enter-workplace-address/enter-workplace-address.component.html
index 2e18dfc702..dec5964b5f 100644
--- a/src/app/features/registration/enter-workplace-address/enter-workplace-address.component.html
+++ b/src/app/features/registration/enter-workplace-address/enter-workplace-address.component.html
@@ -4,7 +4,7 @@
   <div class="govuk-grid-column-two-thirds-from-desktop">
     <form #formEl novalidate (ngSubmit)="onSubmit()" [formGroup]="form">
       <fieldset class="govuk-fieldset">
-        <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
+        <legend class="govuk-fieldset__legend govuk-fieldset__legend--xl">
           <h1 class="govuk-fieldset__heading">
             Enter your workplace address
           </h1>
diff --git a/src/app/features/registration/enter-workplace-address/enter-workplace-address.component.spec.ts b/src/app/features/registration/enter-workplace-address/enter-workplace-address.component.spec.ts
deleted file mode 100644
index 46cbac6731..0000000000
--- a/src/app/features/registration/enter-workplace-address/enter-workplace-address.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { EnterWorkplaceAddressComponent } from './enter-workplace-address.component';
-
-describe('EnterWorkplaceAddressComponent', () => {
-  let component: EnterWorkplaceAddressComponent;
-  let fixture: ComponentFixture<EnterWorkplaceAddressComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [EnterWorkplaceAddressComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EnterWorkplaceAddressComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/find-workplace-address/find-workplace-address.component.spec.ts b/src/app/features/registration/find-workplace-address/find-workplace-address.component.spec.ts
deleted file mode 100644
index 0b41f301b1..0000000000
--- a/src/app/features/registration/find-workplace-address/find-workplace-address.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FindWorkplaceAddressComponent } from './find-workplace-address.component';
-
-describe('FindWorkplaceAddressComponent', () => {
-  let component: FindWorkplaceAddressComponent;
-  let fixture: ComponentFixture<FindWorkplaceAddressComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [FindWorkplaceAddressComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(FindWorkplaceAddressComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/registration-awaiting-approval/registration-awaiting-approval.component.spec.ts b/src/app/features/registration/registration-awaiting-approval/registration-awaiting-approval.component.spec.ts
deleted file mode 100644
index bbe5e577c6..0000000000
--- a/src/app/features/registration/registration-awaiting-approval/registration-awaiting-approval.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { RegistrationAwaitingApprovalComponent } from './registration-awaiting-approval.component';
-
-describe('RegistrationCompleteComponent', () => {
-  let component: RegistrationAwaitingApprovalComponent;
-  let fixture: ComponentFixture<RegistrationAwaitingApprovalComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [RegistrationAwaitingApprovalComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(RegistrationAwaitingApprovalComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/registration-complete/registration-complete.component.spec.ts b/src/app/features/registration/registration-complete/registration-complete.component.spec.ts
deleted file mode 100644
index 239cf289f4..0000000000
--- a/src/app/features/registration/registration-complete/registration-complete.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { RegistrationCompleteComponent } from './registration-complete.component';
-
-describe('RegistrationCompleteComponent', () => {
-  let component: RegistrationCompleteComponent;
-  let fixture: ComponentFixture<RegistrationCompleteComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [RegistrationCompleteComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(RegistrationCompleteComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/regulated-by-cqc/regulated-by-cqc.component.html b/src/app/features/registration/regulated-by-cqc/regulated-by-cqc.component.html
index ab2b1ac2a8..b2911d02b4 100644
--- a/src/app/features/registration/regulated-by-cqc/regulated-by-cqc.component.html
+++ b/src/app/features/registration/regulated-by-cqc/regulated-by-cqc.component.html
@@ -17,8 +17,11 @@ <h1 class="govuk-fieldset__heading">
         </legend>
 
         <div class="govuk-form-group" [class.govuk-form-group--error]="submitted && (form.invalid || serverError)">
-          <span *ngIf="submitted && regulatedByCQC.errors" id="regulatedByCQC-error" class="govuk-error-message">
-            <span class="govuk-visually-hidden">Error:</span> {{ getFirstErrorMessage('regulatedByCQC') }}
+          <span *ngIf="submitted" id="regulated-error" class="govuk-error-message">
+            <span *ngIf="regulatedByCQC.errors" id="regulatedByCQC-error">{{
+              getFirstErrorMessage('regulatedByCQC')
+            }}</span>
+            <span *ngIf="group.errors" id="group-error"> {{ getFirstErrorMessage('group') }}</span>
           </span>
           <div class="govuk-radios govuk-radios--conditional">
             <!-- regulated -->
diff --git a/src/app/features/registration/regulated-by-cqc/regulated-by-cqc.component.spec.ts b/src/app/features/registration/regulated-by-cqc/regulated-by-cqc.component.spec.ts
deleted file mode 100644
index eb73715eef..0000000000
--- a/src/app/features/registration/regulated-by-cqc/regulated-by-cqc.component.spec.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { FormsModule } from '@angular/forms';
-
-import { RegulatedByCqcComponent } from './regulated-by-cqc.component';
-
-describe('RegulatedByCqcComponent', () => {
-  let component: RegulatedByCqcComponent;
-  let fixture: ComponentFixture<RegulatedByCqcComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [FormsModule],
-      declarations: [RegulatedByCqcComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(RegulatedByCqcComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/regulated-by-cqc/regulated-by-cqc.component.ts b/src/app/features/registration/regulated-by-cqc/regulated-by-cqc.component.ts
index bf646a8920..255d30fb75 100644
--- a/src/app/features/registration/regulated-by-cqc/regulated-by-cqc.component.ts
+++ b/src/app/features/registration/regulated-by-cqc/regulated-by-cqc.component.ts
@@ -41,6 +41,7 @@ export class RegulatedByCqcComponent extends RegulatedByCQC implements AfterView
 
   protected onSuccess(data: LocationSearchResponse): void {
     this.registrationService.isRegulated$.next(this.regulatedByCQC.value === 'yes');
+    this.registrationService.isCqcRegulated$.next(this.regulatedByCQC.value === 'yes' ? true : false);
     this.registrationService.registrationInProgress$.next(true);
 
     if (data.success === 1) {
diff --git a/src/app/features/registration/security-question/security-question.component.spec.ts b/src/app/features/registration/security-question/security-question.component.spec.ts
deleted file mode 100644
index b5a16672d6..0000000000
--- a/src/app/features/registration/security-question/security-question.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SecurityQuestionComponent } from './security-question.component';
-
-describe('SecurityQuestionComponent', () => {
-  let component: SecurityQuestionComponent;
-  let fixture: ComponentFixture<SecurityQuestionComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SecurityQuestionComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SecurityQuestionComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/select-main-service/select-main-service.component.spec.ts b/src/app/features/registration/select-main-service/select-main-service.component.spec.ts
deleted file mode 100644
index 40b40040c8..0000000000
--- a/src/app/features/registration/select-main-service/select-main-service.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SelectMainServiceComponent } from './select-main-service.component';
-
-describe('SelectMainServiceComponent', () => {
-  let component: SelectMainServiceComponent;
-  let fixture: ComponentFixture<SelectMainServiceComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SelectMainServiceComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SelectMainServiceComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/select-workplace-address/select-workplace-address.component.spec.ts b/src/app/features/registration/select-workplace-address/select-workplace-address.component.spec.ts
deleted file mode 100644
index bd8b793927..0000000000
--- a/src/app/features/registration/select-workplace-address/select-workplace-address.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SelectWorkplaceAddressComponent } from './select-workplace-address.component';
-
-describe('SelectWorkplaceAddressComponent', () => {
-  let component: SelectWorkplaceAddressComponent;
-  let fixture: ComponentFixture<SelectWorkplaceAddressComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SelectWorkplaceAddressComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SelectWorkplaceAddressComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/select-workplace/select-workplace.component.spec.ts b/src/app/features/registration/select-workplace/select-workplace.component.spec.ts
deleted file mode 100644
index 4a28e511ca..0000000000
--- a/src/app/features/registration/select-workplace/select-workplace.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SelectWorkplaceComponent } from './select-workplace.component';
-
-describe('SelectWorkplaceComponent', () => {
-  let component: SelectWorkplaceComponent;
-  let fixture: ComponentFixture<SelectWorkplaceComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SelectWorkplaceComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SelectWorkplaceComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/start/start.component.spec.ts b/src/app/features/registration/start/start.component.spec.ts
deleted file mode 100644
index 01270a2d58..0000000000
--- a/src/app/features/registration/start/start.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { StartComponent } from './start.component';
-
-describe('StartComponent', () => {
-  let component: StartComponent;
-  let fixture: ComponentFixture<StartComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ StartComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(StartComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/workplace-not-found/workplace-not-found.component.spec.ts b/src/app/features/registration/workplace-not-found/workplace-not-found.component.spec.ts
deleted file mode 100644
index 1c59c4e426..0000000000
--- a/src/app/features/registration/workplace-not-found/workplace-not-found.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WorkplaceNotFoundComponent } from './workplace-not-found.component';
-
-describe('WorkplaceNotFoundComponent', () => {
-  let component: WorkplaceNotFoundComponent;
-  let fixture: ComponentFixture<WorkplaceNotFoundComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ WorkplaceNotFoundComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WorkplaceNotFoundComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/registration/your-details/your-details.component.html b/src/app/features/registration/your-details/your-details.component.html
index a689e7e45b..df8a1bd9dd 100644
--- a/src/app/features/registration/your-details/your-details.component.html
+++ b/src/app/features/registration/your-details/your-details.component.html
@@ -13,7 +13,7 @@
         <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
           <span class="govuk-caption-l">User account</span>
           <h1 class="govuk-fieldset__heading">
-            Your details
+            Add user account
           </h1>
         </legend>
 
diff --git a/src/app/features/registration/your-details/your-details.component.spec.ts b/src/app/features/registration/your-details/your-details.component.spec.ts
deleted file mode 100644
index 1585a96434..0000000000
--- a/src/app/features/registration/your-details/your-details.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { YourDetailsComponent } from './your-details.component';
-
-describe('YourDetailsComponent', () => {
-  let component: YourDetailsComponent;
-  let fixture: ComponentFixture<YourDetailsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [YourDetailsComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(YourDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/reports/components/wdf-eligibility/wdf-eligibility.component.html b/src/app/features/reports/components/wdf-eligibility/wdf-eligibility.component.html
index 975fbf7ae6..59b75c24ca 100644
--- a/src/app/features/reports/components/wdf-eligibility/wdf-eligibility.component.html
+++ b/src/app/features/reports/components/wdf-eligibility/wdf-eligibility.component.html
@@ -1,14 +1,10 @@
-<dl class="govuk-list--definition-heading-grid">
-  <div class="govuk-list--definition-heading-grid__row">
+<div class="govuk-list--definition-heading-grid__row">
+  <dl class="govuk-list--definition">
     <ng-container *ngFor="let criterion of criteria">
-      <div class="govuk-list--definition-heading-grid__col">
-        <dt>
-          {{ criterion.label }}
-        </dt>
-        <dd>
-          <app-eligibility-icon [eligible]="criterion.truthy"></app-eligibility-icon>
-        </dd>
-      </div>
+      <dt><app-eligibility-icon [eligible]="criterion.truthy"></app-eligibility-icon></dt>
+      <dd>
+        {{ criterion.label }}
+      </dd>
     </ng-container>
-  </div>
-</dl>
+  </dl>
+</div>
diff --git a/src/app/features/reports/components/wdf-eligibility/wdf-eligibility.component.spec.ts b/src/app/features/reports/components/wdf-eligibility/wdf-eligibility.component.spec.ts
deleted file mode 100644
index 2a549f5fcc..0000000000
--- a/src/app/features/reports/components/wdf-eligibility/wdf-eligibility.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { WdfEligibilityComponent } from '@features/reports/components/wdf-eligibility/wdf-eligibility.component';
-
-describe('EligibilityDisplayOverviewComponent', () => {
-  let component: WdfEligibilityComponent;
-  let fixture: ComponentFixture<WdfEligibilityComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [WdfEligibilityComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WdfEligibilityComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/reports/components/wdf-update-warning/wdf-update-warning.component.spec.ts b/src/app/features/reports/components/wdf-update-warning/wdf-update-warning.component.spec.ts
deleted file mode 100644
index 65eb767ee6..0000000000
--- a/src/app/features/reports/components/wdf-update-warning/wdf-update-warning.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WdfUpdateWarningComponent } from './wdf-update-warning.component';
-
-describe('WdfUpdateWarningComponent', () => {
-  let component: WdfUpdateWarningComponent;
-  let fixture: ComponentFixture<WdfUpdateWarningComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ WdfUpdateWarningComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WdfUpdateWarningComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/reports/pages/reports/reports.component.spec.ts b/src/app/features/reports/pages/reports/reports.component.spec.ts
deleted file mode 100644
index 666baa4a26..0000000000
--- a/src/app/features/reports/pages/reports/reports.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ReportsComponent } from './reports.component';
-
-describe('ReportsComponent', () => {
-  let component: ReportsComponent;
-  let fixture: ComponentFixture<ReportsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ReportsComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ReportsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/reports/pages/wdf/wdf.component.spec.ts b/src/app/features/reports/pages/wdf/wdf.component.spec.ts
deleted file mode 100644
index 8f67ea1dfb..0000000000
--- a/src/app/features/reports/pages/wdf/wdf.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { WdfComponent } from '@features/reports/pages/wdf/wdf.component';
-
-describe('WdfReportComponent', () => {
-  let component: WdfComponent;
-  let fixture: ComponentFixture<WdfComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [WdfComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WdfComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/reports/pages/wdf/wdf.component.ts b/src/app/features/reports/pages/wdf/wdf.component.ts
index 33870a0957..56b171620e 100644
--- a/src/app/features/reports/pages/wdf/wdf.component.ts
+++ b/src/app/features/reports/pages/wdf/wdf.component.ts
@@ -32,6 +32,7 @@ export class WdfComponent implements OnInit, OnDestroy {
   public returnUrl: URLStructure;
   public exitUrl: URLStructure;
   public canViewWorker: boolean;
+  public canEditEstablishment: boolean;
 
   private subscriptions: Subscription = new Subscription();
 
@@ -58,6 +59,7 @@ export class WdfComponent implements OnInit, OnDestroy {
     this.breadcrumbService.show(breadcrumbConfig);
 
     this.canViewWorker = this.permissionsService.can(workplaceUid, 'canViewWorker');
+    this.canEditEstablishment = this.permissionsService.can(workplaceUid, 'canEditEstablishment');
     this.returnUrl = { url: ['/reports', 'workplace', workplaceUid, 'wdf'] };
     this.exitUrl = { url: ['/reports'] };
     this.workerService.setReturnTo(null);
@@ -139,7 +141,19 @@ export class WdfComponent implements OnInit, OnDestroy {
       });
   }
 
-  get displayConfirmationPanel() {
-    return this.workplace && this.workplace.wdf.currentEligibility && !this.workplace.wdf.isEligible;
+  get displayConfirmationPanel(): boolean {
+    if (!this.workplace) {
+      return false;
+    }
+
+    if (!this.canEditEstablishment) {
+      return false;
+    }
+
+    if (!this.workplace.wdf.canConfirm) {
+      return false;
+    }
+
+    return true;
   }
 }
diff --git a/src/app/features/reports/pages/workplaces/workplaces.component.html b/src/app/features/reports/pages/workplaces/workplaces.component.html
index 282d5f64ba..fcf056db82 100644
--- a/src/app/features/reports/pages/workplaces/workplaces.component.html
+++ b/src/app/features/reports/pages/workplaces/workplaces.component.html
@@ -5,7 +5,7 @@ <h1 class="govuk-heading-l">
       Workplaces
     </h1>
   </div>
-  <div class="govuk-grid-column-one-third contact-col" *ngIf="primaryWorkplace?.isParent">
+  <div class="govuk-grid-column-one-third contact-col" *ngIf="canDownloadWdfReport">
     <ul class="govuk-list govuk-list--inline govuk-list govuk-visually-hidden">
       <li>
         <a href="#">Workforce Development Fund</a>
diff --git a/src/app/features/reports/pages/workplaces/workplaces.component.spec.ts b/src/app/features/reports/pages/workplaces/workplaces.component.spec.ts
deleted file mode 100644
index 47530fdb0b..0000000000
--- a/src/app/features/reports/pages/workplaces/workplaces.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WorkplacesComponent } from './workplaces.component';
-
-describe('WorkplacesComponent', () => {
-  let component: WorkplacesComponent;
-  let fixture: ComponentFixture<WorkplacesComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ WorkplacesComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WorkplacesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/reports/pages/workplaces/workplaces.component.ts b/src/app/features/reports/pages/workplaces/workplaces.component.ts
index f248c0ab08..19650cfe50 100644
--- a/src/app/features/reports/pages/workplaces/workplaces.component.ts
+++ b/src/app/features/reports/pages/workplaces/workplaces.component.ts
@@ -5,6 +5,7 @@ import { Establishment } from '@core/model/establishment.model';
 import { DataPermissions, GetWorkplacesResponse, Workplace, WorkplaceDataOwner } from '@core/model/my-workplaces.model';
 import { BreadcrumbService } from '@core/services/breadcrumb.service';
 import { EstablishmentService } from '@core/services/establishment.service';
+import { PermissionsService } from '@core/services/permissions/permissions.service';
 import { ReportService } from '@core/services/report.service';
 import { UserService } from '@core/services/user.service';
 import { filter, orderBy } from 'lodash';
@@ -21,17 +22,20 @@ export class WorkplacesComponent implements OnInit {
   private subscriptions: Subscription = new Subscription();
   public primaryWorkplace: Establishment;
   public now: Date = new Date();
+  public canDownloadWdfReport: boolean;
 
   constructor(
     private breadcrumbService: BreadcrumbService,
     private userService: UserService,
     private establishmentService: EstablishmentService,
-    private reportService: ReportService
+    private reportService: ReportService,
+    private permissionsService: PermissionsService,
   ) {}
 
   ngOnInit() {
     this.breadcrumbService.show(JourneyType.REPORTS);
     this.primaryWorkplace = this.establishmentService.primaryWorkplace;
+    this.canDownloadWdfReport = this.permissionsService.can(this.primaryWorkplace.uid, 'canDownloadWdfReport');
 
     this.subscriptions.add(
       this.userService.getEstablishments(true).subscribe((workplaces: GetWorkplacesResponse) => {
diff --git a/src/app/features/reports/reports.module.ts b/src/app/features/reports/reports.module.ts
index 2336a7788d..4882e566a9 100644
--- a/src/app/features/reports/reports.module.ts
+++ b/src/app/features/reports/reports.module.ts
@@ -8,6 +8,9 @@ import { ReportsHeaderComponent } from '@features/reports/components/reports-hea
 import { WdfEligibilityComponent } from '@features/reports/components/wdf-eligibility/wdf-eligibility.component';
 import { WdfUpdateWarningComponent } from '@features/reports/components/wdf-update-warning/wdf-update-warning.component';
 import { WdfComponent } from '@features/reports/pages/wdf/wdf.component';
+import {
+  WdfWorkplaceConfirmationDialogComponent,
+} from '@features/workplace/wdf-workplace-confirmation-dialog/wdf-workplace-confirmation-dialog.component';
 import { SharedModule } from '@shared/shared.module';
 
 import { ReportsComponent } from './pages/reports/reports.component';
@@ -23,7 +26,9 @@ import { ReportsRoutingModule } from './reports-routing.module';
     ReportsHeaderComponent,
     WdfUpdateWarningComponent,
     WorkplacesComponent,
+    WdfWorkplaceConfirmationDialogComponent,
   ],
   providers: [WorkerResolver, DialogService],
+  entryComponents: [WdfWorkplaceConfirmationDialogComponent],
 })
 export class ReportsModule {}
diff --git a/src/app/features/reset-password/confirmation/confirmation.component.spec.ts b/src/app/features/reset-password/confirmation/confirmation.component.spec.ts
deleted file mode 100644
index 6d737b2a7a..0000000000
--- a/src/app/features/reset-password/confirmation/confirmation.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ResetPasswordConfirmationComponent } from './confirmation.component';
-
-describe('ResetPasswordConfirmationComponent', () => {
-  let component: ResetPasswordConfirmationComponent;
-  let fixture: ComponentFixture<ResetPasswordConfirmationComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ResetPasswordConfirmationComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ResetPasswordConfirmationComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/reset-password/edit/edit.component.spec.ts b/src/app/features/reset-password/edit/edit.component.spec.ts
deleted file mode 100644
index b5e2c5fca6..0000000000
--- a/src/app/features/reset-password/edit/edit.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ResetPasswordEditComponent } from './edit.component';
-
-describe('ResetPasswordEditComponent', () => {
-  let component: ResetPasswordEditComponent;
-  let fixture: ComponentFixture<ResetPasswordEditComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ResetPasswordEditComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ResetPasswordEditComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/reset-password/reset-password.component.spec.ts b/src/app/features/reset-password/reset-password.component.spec.ts
deleted file mode 100644
index 6814bd7137..0000000000
--- a/src/app/features/reset-password/reset-password.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ResetPasswordComponent } from './reset-password.component';
-
-describe('ResetPasswordComponent', () => {
-  let component: ResetPasswordComponent;
-  let fixture: ComponentFixture<ResetPasswordComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ResetPasswordComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ResetPasswordComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/search/registration/registration.component.html b/src/app/features/search/registration/registration.component.html
new file mode 100644
index 0000000000..bc5ce1ae1a
--- /dev/null
+++ b/src/app/features/search/registration/registration.component.html
@@ -0,0 +1,142 @@
+<h2 class="govuk-heading-l">Registration from {{ registration.establishment.name }}</h2>
+<form #formEl novalidate (ngSubmit)="onSubmit()" [formGroup]="registrationForm" id="form-registration">
+  <table class="govuk-table">
+    <tbody class="govuk-table__body">
+      <tr class="govuk-table__row">
+        <th class="govuk-table__cell">Created</th>
+        <td class="govuk-table__cell">
+          {{ registration.created }}
+        </td>
+        <th *ngIf="registration.username" class="govuk-table__cell">Username</th>
+        <td *ngIf="registration.username" class="govuk-table__cell">
+          {{ registration.username }}
+        </td>
+        <th *ngIf="registration.establishment.parentEstablishmentId" class="govuk-table__cell">Parent Establishment ID</th>
+        <td *ngIf="registration.establishment.parentEstablishmentId" class="govuk-table__cell">
+          {{ registration.establishment.parentEstablishmentId }}
+        </td>
+      </tr>
+      <tr *ngIf="registration.name"class="govuk-table__row">
+        <th class="govuk-table__cell">Name</th>
+        <td class="govuk-table__cell" colspan="3">
+          {{ registration.name }}
+        </td>
+      </tr>
+      <tr *ngIf="registration.email" class="govuk-table__row">
+        <th class="govuk-table__cell">Email</th>
+        <td class="govuk-table__cell">
+          <a href="mailto:{{ registration.email }}">{{ registration.email }}</a>
+        </td>
+        <th class="govuk-table__cell">Phone number</th>
+        <td class="govuk-table__cell">
+          {{ registration.phone }}
+        </td>
+      </tr>
+      <tr *ngIf="registration.securityQuestion" class="govuk-table__row">
+        <th class="govuk-table__cell">Security question</th>
+        <td class="govuk-table__cell">
+          {{ registration.securityQuestion }}
+        </td>
+        <th class="govuk-table__cell">Security question answer</th>
+        <td class="govuk-table__cell">
+          {{ registration.securityQuestionAnswer }}
+        </td>
+      </tr>
+      <tr class="govuk-table__row">
+        <th class="govuk-table__cell">Regulated</th>
+        <td class="govuk-table__cell">
+          {{ registration.establishment.isRegulated }}
+        </td>
+        <th class="govuk-table__cell">Provider ID</th>
+        <td class="govuk-table__cell">
+          {{ registration.establishment.provId }}
+        </td>
+      </tr>
+      <tr class="govuk-table__row">
+        <th class="govuk-table__cell">Workplace ID</th>
+        <td class="govuk-table__cell">
+          <input
+            class="govuk-input govuk-input--width-10"
+            id="nmdsid"
+            name="nmdsid"
+            [formControlName]="'nmdsId'"
+            pattern="^[A-Z].*"
+            type="text"
+          />
+
+          <span *ngIf="nmdsid.invalid && (nmdsid.dirty || nmdsid.touched)" class="govuk-error-message">
+            <span class="govuk-visually-hidden">Error:</span>
+            <span *ngIf="nmdsid.errors | getFirstError:nmdsid.errors?.required">
+              Enter a workplace ID.
+            </span>
+            <span *ngIf="nmdsid.errors | getFirstError:nmdsid.errors?.minlength">
+              Workplace ID must be between 1 and 8 characters.
+            </span>
+            <span *ngIf="nmdsid.errors | getFirstError:nmdsid.errors?.maxlength">
+              Workplace ID must be between 1 and 8 characters.
+            </span>
+            <span *ngIf="nmdsid.errors | getFirstError:nmdsid.errors?.pattern">
+              Workplace ID must start with an uppercase letter.
+            </span>
+            <span *ngIf="nmdsid.errors | getFirstError:nmdsid.errors?.serverError">
+              {{ nmdsid.errors?.serverError }}
+            </span>
+          </span>
+        </td>
+        <th class="govuk-table__cell">Location ID</th>
+        <td class="govuk-table__cell">
+          {{ registration.establishment.locationId }}
+        </td>
+      </tr>
+      <tr class="govuk-table__row">
+        <th class="govuk-table__cell">Address</th>
+        <td class="govuk-table__cell" colspan="3">
+          {{ registration.establishment.name }}<br />
+          {{ registration.establishment.address }}<br *ngIf="registration.establishment.address2" />
+          {{ registration.establishment.address2 }}<br *ngIf="registration.establishment.address3" />
+          {{ registration.establishment.address3 }}<br />
+          {{ registration.establishment.town }}<br />
+          {{ registration.establishment.postcode }}
+        </td>
+      </tr>
+      <tr class="govuk-table__row">
+        <th class="govuk-table__cell">County</th>
+        <td class="govuk-table__cell">
+          {{ registration.establishment.county }}
+        </td>
+        <th class="govuk-table__cell">Main Service</th>
+        <td class="govuk-table__cell">
+          {{ registration.establishment.mainService }}
+        </td>
+      </tr>
+      <tr class="govuk-table__row">
+        <td class="gov-uk-table__cell" colspan="4">
+          <div class="govuk-button-group" *ngIf="registration.email">
+            <button
+              type="submit"
+              class="govuk-button govuk-button--warning govuk-util__float-right"
+              (click)="approveRegistration(registration.username, false)"
+            >
+              Reject
+            </button>
+            <button class="govuk-button" type="submit" name="approve" (click)="approveRegistration(registration.username, true)">
+              Approve
+            </button>
+          </div>
+          <div class="govuk-button-group" *ngIf="!registration.email">
+            <button
+              type="submit"
+              class="govuk-button govuk-button--warning govuk-util__float-right"
+              (click)="approveRegistration(registration.establishment.id, false)"
+            >
+              Reject
+            </button>
+            <button class="govuk-button" type="submit" (click)="approveRegistration(registration.establishment.id, true)">
+              Approve
+            </button>
+          </div>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</form>
diff --git a/src/app/features/search/registration/registration.component.spec.ts b/src/app/features/search/registration/registration.component.spec.ts
new file mode 100644
index 0000000000..cbf0ae867c
--- /dev/null
+++ b/src/app/features/search/registration/registration.component.spec.ts
@@ -0,0 +1,243 @@
+import { HttpErrorResponse } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { ReactiveFormsModule } from '@angular/forms';
+import { RegistrationsService } from '@core/services/registrations.service';
+import { FirstErrorPipe } from '@shared/pipes/first-error.pipe';
+import { render } from '@testing-library/angular';
+import { throwError } from 'rxjs';
+import { spy } from 'sinon';
+
+import { RegistrationComponent } from './registration.component';
+
+const testUsername = 'mr-twiggy';
+const testEmail = 'mr.twiggy@cats.com';
+const testNmdsId = 'W1234567';
+const testWorkplaceId = 12345;
+const newUserAccount = 'New-User-Account';
+const registrationTypeIrrelevant = 'Registration-Type-Irrelevant';
+const workplaceAddedByParent = 'Workplace-Added-By-Parent';
+
+describe('RegistrationComponent', () => {
+  async function getRegistrationComponent(registrationType) {
+    const registration = {
+      email: null,
+      username: null,
+      establishment: {
+        id: testWorkplaceId,
+        nmdsId: testNmdsId
+      },
+    };
+
+    if (registrationType === newUserAccount) {
+      registration.username = testUsername;
+      registration.email = testEmail;
+    };
+
+    return await render(RegistrationComponent, {
+      imports: [ReactiveFormsModule, HttpClientTestingModule],
+      providers: [RegistrationsService],
+      declarations: [FirstErrorPipe],
+      componentProperties: {
+        index: 0,
+        handleRegistration: {
+          emit: spy(),
+        } as any,
+        registration,
+      },
+    });
+  }
+
+  it('should create', async() => {
+    const component = await getRegistrationComponent(registrationTypeIrrelevant);
+
+    expect(component).toBeTruthy();
+  });
+
+  it('should be able to approve the registration of a workplace created by a parent', async () => {
+    const { click, getByText, fixture } = await getRegistrationComponent(workplaceAddedByParent);
+
+    const { componentInstance: component } = fixture;
+
+    const registrationApproval = spyOn(component.registrationsService, 'registrationApproval').and.callThrough();
+
+    click(getByText('Approve'));
+
+    expect(registrationApproval).toHaveBeenCalledWith({
+      establishmentId: testWorkplaceId,
+      nmdsId: testNmdsId,
+      approve: true,
+    });
+  });
+
+  it('should be able to reject the registration of a workplace created by a parent', async () => {
+    const { click, getByText, fixture } = await getRegistrationComponent(workplaceAddedByParent);
+
+    const { componentInstance: component } = fixture;
+
+    const registrationApproval = spyOn(component.registrationsService, 'registrationApproval').and.callThrough();
+
+    click(getByText('Reject'));
+
+    expect(registrationApproval).toHaveBeenCalledWith({
+      establishmentId: testWorkplaceId,
+      nmdsId: testNmdsId,
+      approve: false,
+    });
+  });
+
+  it('should be able to approve the registration of a workplace created via a new user account', async () => {
+    const { click, getByText, fixture } = await getRegistrationComponent(newUserAccount);
+
+    const { componentInstance: component } = fixture;
+
+    const registrationApproval = spyOn(component.registrationsService, 'registrationApproval').and.callThrough();
+
+    click(getByText('Approve'));
+
+    expect(registrationApproval).toHaveBeenCalledWith({
+      username: testUsername,
+      nmdsId: testNmdsId,
+      approve: true,
+    });
+  });
+
+  it('should be able to reject the registration of a workplace created via a new user account', async () => {
+    const { click, getByText, fixture } = await getRegistrationComponent(newUserAccount);
+
+    const { componentInstance: component } = fixture;
+
+    const registrationApproval = spyOn(component.registrationsService, 'registrationApproval').and.callThrough();
+
+    click(getByText('Reject'));
+
+    expect(registrationApproval).toHaveBeenCalledWith({
+      username: testUsername,
+      nmdsId: testNmdsId,
+      approve: false,
+    });
+  });
+
+  it('should change the nmdsID for the registration of a Workplace', async () => {
+    const { click, getByText, fixture, container, type } = await getRegistrationComponent(registrationTypeIrrelevant);
+
+    const { componentInstance: component } = fixture;
+
+    const registrationApproval = spyOn(component.registrationsService, 'registrationApproval').and.callThrough();
+
+    const nmdsIdInput = container.querySelector('input[name=nmdsid]') as HTMLElement;
+    nmdsIdInput.nodeValue = '';
+
+    const newNmdsId = 'G1234567';
+    type(nmdsIdInput, newNmdsId);
+    click(getByText('Approve'));
+
+    expect(registrationApproval).toHaveBeenCalledWith({
+      establishmentId: testWorkplaceId,
+      nmdsId: newNmdsId,
+      approve: true,
+    });
+  });
+
+  describe('FormValidation', () => {
+    it('validates a Workplace ID is required', async () => {
+      const { getByText, fixture, container, type } = await getRegistrationComponent(registrationTypeIrrelevant);
+      const { componentInstance: component } = fixture;
+
+      spyOn(component.registrationsService, 'registrationApproval').and.callThrough();
+      spyOn(component.handleRegistration, 'emit').and.callThrough();
+
+      const nmdsIdInput = container.querySelector('input[name=nmdsid]') as HTMLElement;
+      nmdsIdInput.nodeValue = '';
+
+      type(nmdsIdInput, '');
+
+      expect(getByText('Enter a workplace ID.'));
+      expect(component.registrationsService.registrationApproval).toHaveBeenCalledTimes(0);
+    });
+
+    it('validates the min length of a Workplace ID', async () => {
+      const { getByText, fixture, container, type } = await getRegistrationComponent(registrationTypeIrrelevant);
+      const { componentInstance: component } = fixture;
+
+      const registrationApproval = spyOn(component.registrationsService, 'registrationApproval').and.callThrough();
+
+      const nmdsIdInput = container.querySelector('input[name=nmdsid]') as HTMLElement;
+      nmdsIdInput.nodeValue = '';
+
+      type(nmdsIdInput, 'W123456');
+
+      expect(getByText('Workplace ID must be between 1 and 8 characters.'));
+      expect(registrationApproval).toHaveBeenCalledTimes(0);
+    });
+
+    it('validates the max length of a Workplace ID', async () => {
+      const { getByText, fixture, container, type } = await getRegistrationComponent(registrationTypeIrrelevant);
+      const { componentInstance: component } = fixture;
+
+      const registrationApproval = spyOn(component.registrationsService, 'registrationApproval').and.callThrough();
+
+      const nmdsIdInput = container.querySelector('input[name=nmdsid]') as HTMLElement;
+      nmdsIdInput.nodeValue = '';
+
+      type(nmdsIdInput, 'W12345678910');
+
+      expect(getByText('Workplace ID must be between 1 and 8 characters.'));
+      expect(registrationApproval).toHaveBeenCalledTimes(0);
+    });
+
+    it('validates that a Workplace ID must start with a letter', async () => {
+      const { getByText, fixture, container, type } = await getRegistrationComponent(registrationTypeIrrelevant);
+      const { componentInstance: component } = fixture;
+
+      const registrationApproval = spyOn(component.registrationsService, 'registrationApproval').and.callThrough();
+
+      const nmdsIdInput = container.querySelector('input[name=nmdsid]') as HTMLElement;
+      nmdsIdInput.nodeValue = '';
+
+      type(nmdsIdInput, '12345678');
+
+      expect(getByText('Workplace ID must start with an uppercase letter.'));
+      expect(registrationApproval).toHaveBeenCalledTimes(0);
+    });
+
+    it('validates that a Workplace ID must start with an uppercase letter', async () => {
+      const { getByText, fixture, container, type } = await getRegistrationComponent(registrationTypeIrrelevant);
+      const { componentInstance: component } = fixture;
+
+      const registrationApproval = spyOn(component.registrationsService, 'registrationApproval').and.callThrough();
+
+      const nmdsIdInput = container.querySelector('input[name=nmdsid]') as HTMLElement;
+      nmdsIdInput.nodeValue = '';
+
+      type(nmdsIdInput, 'w1234567');
+
+      expect(getByText('Workplace ID must start with an uppercase letter.'));
+      expect(registrationApproval).toHaveBeenCalledTimes(0);
+    });
+
+    it('validates that a Workplace ID cannot be the same as an existing Workplace ID', async () => {
+      const { getByText, fixture, container, type, click } = await getRegistrationComponent(registrationTypeIrrelevant);
+      const { componentInstance: component } = fixture;
+
+      const mockErrorResponse = new HttpErrorResponse({
+        status: 400,
+        statusText: 'Bad Request',
+        error: {
+          nmdsId: 'This workplace ID (W1234567) belongs to another workplace. Enter a different workplace ID.',
+        }
+      });
+
+      spyOn(component.registrationsService, 'registrationApproval').and.returnValue(
+        throwError(mockErrorResponse)
+      );
+
+      const nmdsIdInput = container.querySelector('input[name=nmdsid]') as HTMLElement;
+      nmdsIdInput.nodeValue = '';
+
+      type(nmdsIdInput, testNmdsId);
+      click(getByText('Approve'));
+
+      expect(getByText(`This workplace ID (${ testNmdsId }) belongs to another workplace. Enter a different workplace ID.`));
+    });
+  });
+});
diff --git a/src/app/features/search/registration/registration.component.ts b/src/app/features/search/registration/registration.component.ts
new file mode 100644
index 0000000000..8a3c750476
--- /dev/null
+++ b/src/app/features/search/registration/registration.component.ts
@@ -0,0 +1,81 @@
+import { HttpErrorResponse } from '@angular/common/http';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { RegistrationsService } from '@core/services/registrations.service';
+
+@Component({
+  selector: 'app-registration',
+  templateUrl: './registration.component.html',
+})
+export class RegistrationComponent implements OnInit {
+  @Output() handleRegistration: EventEmitter<any> = new EventEmitter<any>();
+  @Input() index: number;
+  @Input() registration: any;
+  public registrationForm: FormGroup;
+  public username: string;
+  public approve: boolean;
+
+  constructor(
+    public registrationsService: RegistrationsService,
+  ) {}
+  ngOnInit() {
+    this.registrationForm = new FormGroup({
+      nmdsId: new FormControl(this.registration.establishment.nmdsId, [
+        Validators.required,
+        Validators.minLength(8),
+        Validators.maxLength(8),
+      ]),
+    });
+  }
+
+  get nmdsid() {
+    return this.registrationForm.get('nmdsId');
+  }
+
+  public approveRegistration(username: string, approve: boolean) {
+    this.username = username;
+    this.approve = approve;
+  }
+  public onSubmit() {
+    if (this.registrationForm.valid) {
+      let data;
+      data = {
+        username: this.username,
+        nmdsId: this.registrationForm.get('nmdsId').value,
+        approve: this.approve,
+      };
+
+      if (!this.registration.email) {
+        data = {
+          establishmentId: this.username,
+          nmdsId: this.registrationForm.get('nmdsId').value,
+          approve: this.approve,
+        };
+      }
+
+      this.registrationsService.registrationApproval(data).subscribe(
+        () => {
+          this.handleRegistration.emit(this.index);
+        },
+        (err) => {
+          if (err instanceof HttpErrorResponse) {
+            this.populateErrorFromServer(err);
+          }
+        }
+      );
+    }
+  }
+
+  private populateErrorFromServer(err) {
+    const validationErrors = err.error;
+
+    Object.keys(validationErrors).forEach((prop) => {
+      const formControl = this.registrationForm.get(prop);
+      if (formControl) {
+        formControl.setErrors({
+          serverError: validationErrors[prop],
+        });
+      }
+    });
+  }
+}
diff --git a/src/app/features/search/registrations/registrations.component.html b/src/app/features/search/registrations/registrations.component.html
new file mode 100644
index 0000000000..0754300ade
--- /dev/null
+++ b/src/app/features/search/registrations/registrations.component.html
@@ -0,0 +1,6 @@
+<h1 class="govuk-heading-xl">
+  Registrations
+</h1>
+<div *ngFor="let registration of registrations; let i = index">
+  <app-registration [index]="i" [registration]="registration" (handleRegistration)="handleRegistration($event)"></app-registration>
+</div>
diff --git a/src/app/features/search/registrations/registrations.component.spec.ts b/src/app/features/search/registrations/registrations.component.spec.ts
new file mode 100644
index 0000000000..b700bd2247
--- /dev/null
+++ b/src/app/features/search/registrations/registrations.component.spec.ts
@@ -0,0 +1,95 @@
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { inject, TestBed } from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
+import { RegistrationsService } from '@core/services/registrations.service';
+import { FirstErrorPipe } from '@shared/pipes/first-error.pipe';
+import { render, RenderResult } from '@testing-library/angular';
+import { of } from 'rxjs';
+
+import { RegistrationComponent } from '../registration/registration.component';
+import { RegistrationsComponent } from './registrations.component';
+
+describe('RegistrationsComponent', () => {
+  let component: RenderResult<RegistrationsComponent>;
+
+  it('should create', async () => {
+    component = await render(RegistrationsComponent, {
+      imports: [ReactiveFormsModule, HttpClientTestingModule],
+      declarations: [FirstErrorPipe, RegistrationComponent],
+      providers: [RegistrationsService],
+    });
+
+    expect(component).toBeTruthy();
+  });
+
+  it('can get registrations', () => {
+    inject([HttpClientTestingModule], async () => {
+      const registrations = [
+        {
+          establishment: {
+            id: 1,
+            nmdsId: 'J1234567',
+          },
+        },
+        {
+          establishment: {
+            id: 2,
+            nmdsId: 'J5678910',
+          },
+        }
+      ];
+
+      const registrationService = TestBed.get(RegistrationsService);
+      spyOn(registrationService, 'getRegistrations').and.returnValue(
+        of(registrations)
+      );
+
+      const { fixture } = await render(RegistrationsComponent, {
+        imports: [ReactiveFormsModule, HttpClientTestingModule],
+        declarations: [FirstErrorPipe, RegistrationComponent],
+        providers: [
+          {
+            provide: RegistrationsService,
+            useClass: registrationService
+          }],
+      });
+
+      const { componentInstance } = fixture;
+
+      expect(componentInstance.registrations).toEqual(registrations);
+    });
+  });
+
+  it('should remove registrations', async () => {
+    const registrations = [
+      {
+        establishment: {
+          id: 1,
+          nmdsId: 'J1234567',
+        },
+      },
+      {
+        establishment: {
+          id: 2,
+          nmdsId: 'J5678910',
+        },
+      }
+    ];
+
+    const { fixture } = await render(RegistrationsComponent, {
+      imports: [ReactiveFormsModule, HttpClientTestingModule],
+      declarations: [FirstErrorPipe, RegistrationComponent],
+      providers: [RegistrationsService],
+      componentProperties: {
+        registrations
+      },
+    });
+
+    const { componentInstance } = fixture;
+
+    componentInstance.handleRegistration(0);
+
+    expect(componentInstance.registrations).toContain(registrations[0]);
+    expect(componentInstance.registrations.length).toBe(1);
+  });
+});
diff --git a/src/app/features/search/registrations/registrations.component.ts b/src/app/features/search/registrations/registrations.component.ts
new file mode 100644
index 0000000000..a4476ee085
--- /dev/null
+++ b/src/app/features/search/registrations/registrations.component.ts
@@ -0,0 +1,33 @@
+import { Component, OnInit } from '@angular/core';
+import { RegistrationsService } from '@core/services/registrations.service';
+
+@Component({
+  selector: 'app-registrations',
+  templateUrl: './registrations.component.html',
+})
+export class RegistrationsComponent implements OnInit {
+  public registrations = [];
+
+  constructor(
+    public registrationsService: RegistrationsService,
+  ) {}
+
+  ngOnInit() {
+    this.getRegistrations();
+  }
+
+  public getRegistrations() {
+    this.registrationsService.getRegistrations().subscribe(
+      data => {
+        this.registrations = data;
+      },
+      error => this.onError(error)
+    );
+  }
+
+  public handleRegistration(index: number) {
+    this.registrations.splice(index, 1);
+  }
+
+  private onError(error) {}
+}
diff --git a/src/app/features/search/search.component.html b/src/app/features/search/search.component.html
index adc378c231..2f7ebc3268 100644
--- a/src/app/features/search/search.component.html
+++ b/src/app/features/search/search.component.html
@@ -155,10 +155,11 @@ <h2 class="govuk-error-summary__title" id="error-summary-title">
             <th class="govuk-table__header" scope="col">Security Question</th>
             <th class="govuk-table__header" scope="col">Security Answer</th>
             <th class="govuk-table__header" scope="col">Parent ID</th>
+            <th class="govuk-table__header" scope="col">Locked</th>
           </tr>
         </thead>
         <tbody class="govuk-table__body">
-          <tr class="govuk-table__row" *ngFor="let item of results">
+          <tr class="govuk-table__row" *ngFor="let item of results; index as index">
             <td class="govuk-table__cell">{{ item.username }}</td>
             <td class="govuk-table__cell">{{ item.name }}</td>
             <td class="govuk-table__cell">
@@ -175,6 +176,9 @@ <h2 class="govuk-error-summary__title" id="error-summary-title">
                 item.establishment.parent && item.establishment.parent.nmdsId ? item.establishment.parent.nmdsId : ''
               }}
             </td>
+            <td class="govuk-table__cell">
+              <a (click)="unlockUser(item.username, index, $event)" href="#" *ngIf="item.isLocked">Unlock</a>
+            </td>
           </tr>
         </tbody>
       </table>
@@ -213,124 +217,6 @@ <h2 class="govuk-error-summary__title" id="error-summary-title">
       </table>
     </div>
 
-    <div *ngIf="form.type === 'registrations'">
-      <h1 class="govuk-heading-xl">
-        Registrations
-      </h1>
-      <div *ngFor="let registration of registrations; let i = index">
-        <h2 class="govuk-heading-l">Registration from {{ registration.establishment.name }}</h2>
-        <table class="govuk-table" *ngIf="registrations && registrations.length">
-          <tbody class="govuk-table__body">
-            <tr class="govuk-table__row">
-              <th class="govuk-table__cell">Created</th>
-              <td class="govuk-table__cell">
-                {{ registration.created }}
-              </td>
-              <th *ngIf="registration.username" class="govuk-table__cell">Username</th>
-              <td *ngIf="registration.username" class="govuk-table__cell">
-                {{ registration.username }}
-              </td>
-              <th *ngIf="registration.establishment.parentEstablishmentId" class="govuk-table__cell">Parent Establishment ID</th>
-              <td *ngIf="registration.establishment.parentEstablishmentId" class="govuk-table__cell">
-                {{ registration.establishment.parentEstablishmentId }}
-              </td>
-            </tr>
-            <tr *ngIf="registration.name"class="govuk-table__row">
-              <th class="govuk-table__cell">Name</th>
-              <td class="govuk-table__cell" colspan="3">
-                {{ registration.name }}
-              </td>
-            </tr>
-            <tr *ngIf="registration.email" class="govuk-table__row">
-              <th class="govuk-table__cell">Email</th>
-              <td class="govuk-table__cell">
-                <a href="mailto:{{ registration.email }}">{{ registration.email }}</a>
-              </td>
-              <th class="govuk-table__cell">Phone number</th>
-              <td class="govuk-table__cell">
-                {{ registration.phone }}
-              </td>
-            </tr>
-            <tr *ngIf="registration.securityQuestion" class="govuk-table__row">
-              <th class="govuk-table__cell">Security question</th>
-              <td class="govuk-table__cell">
-                {{ registration.securityQuestion }}
-              </td>
-              <th class="govuk-table__cell">Security question answer</th>
-              <td class="govuk-table__cell">
-                {{ registration.securityQuestionAnswer }}
-              </td>
-            </tr>
-            <tr class="govuk-table__row">
-              <th class="govuk-table__cell">Regulated</th>
-              <td class="govuk-table__cell">
-                {{ registration.establishment.isRegulated }}
-              </td>
-              <th class="govuk-table__cell">Provider ID</th>
-              <td class="govuk-table__cell">
-                {{ registration.establishment.provId }}
-              </td>
-            </tr>
-            <tr class="govuk-table__row">
-              <th class="govuk-table__cell">Workplace ID</th>
-              <td class="govuk-table__cell">
-                {{ registration.establishment.nmdsId }}
-              </td>
-              <th class="govuk-table__cell">Location ID</th>
-              <td class="govuk-table__cell">
-                {{ registration.establishment.locationId }}
-              </td>
-            </tr>
-            <tr class="govuk-table__row">
-              <th class="govuk-table__cell">Address</th>
-              <td class="govuk-table__cell" colspan="3">
-                {{ registration.establishment.name }}<br />
-                {{ registration.establishment.address }}<br *ngIf="registration.establishment.address2" />
-                {{ registration.establishment.address2 }}<br *ngIf="registration.establishment.address3" />
-                {{ registration.establishment.address3 }}<br />
-                {{ registration.establishment.town }}<br />
-                {{ registration.establishment.postcode }}
-              </td>
-            </tr>
-            <tr class="govuk-table__row">
-              <th class="govuk-table__cell">County</th>
-              <td class="govuk-table__cell">
-                {{ registration.establishment.county }}
-              </td>
-              <th class="govuk-table__cell">Main Service</th>
-              <td class="govuk-table__cell">
-                {{ registration.establishment.mainService }}
-              </td>
-            </tr>
-            <tr class="govuk-table__row">
-              <td class="gov-uk-table__cell" colspan="4">
-                <div class="govuk-button-group" *ngIf="registration.email" >
-                  <button
-                    class="govuk-button govuk-button--warning govuk-util__float-right"
-                    (click)="approveRegistration(registration.username, false, i,false)"
-                  >
-                    Reject
-                  </button>
-                  <button class="govuk-button" (click)="approveRegistration(registration.username, true, i,false)">
-                    Approve
-                  </button>
-                </div>
-                <div class="govuk-button-group" *ngIf="!registration.email" >
-                  <button
-                    class="govuk-button govuk-button--warning govuk-util__float-right"
-                    (click)="approveRegistration(registration.establishment.id, false, i,true)"
-                  >
-                    Reject
-                  </button>
-                  <button class="govuk-button" (click)="approveRegistration(registration.establishment.id, true, i,true)">
-                    Approve
-                  </button>
-                </div>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
+    <app-registrations *ngIf="form.type === 'registrations'"></app-registrations>
   </div>
 </div>
diff --git a/src/app/features/search/search.component.ts b/src/app/features/search/search.component.ts
index acad3fa2c8..124a476bf6 100644
--- a/src/app/features/search/search.component.ts
+++ b/src/app/features/search/search.component.ts
@@ -1,22 +1,25 @@
+import { Overlay } from '@angular/cdk/overlay';
 import { HttpClient } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { AuthService } from '@core/services/auth.service';
 import { BackService } from '@core/services/back.service';
+import { DialogService } from '@core/services/dialog.service';
 import { EstablishmentService } from '@core/services/establishment.service';
 import { NotificationsService } from '@core/services/notifications/notifications.service';
 import { PermissionsService } from '@core/services/permissions/permissions.service';
-import { RegistrationsService } from '@core/services/registrations.service';
-import { UserService } from '@core/services/user.service';
+import {
+  AdminUnlockConfirmationDialogComponent,
+} from '@shared/components/link-to-parent-cancel copy/admin-unlock-confirmation';
 import { take } from 'rxjs/operators';
 
 @Component({
   selector: 'app-search',
   templateUrl: './search.component.html',
+  providers: [DialogService, AdminUnlockConfirmationDialogComponent, Overlay],
 })
 export class SearchComponent implements OnInit {
   public results = [];
-  public registrations = [];
   public selectedWorkplaceUid: string;
   public notificationData: any;
   public form = {
@@ -42,8 +45,7 @@ export class SearchComponent implements OnInit {
     private authService: AuthService,
     private permissionsService: PermissionsService,
     private notificationsService: NotificationsService,
-    private userService: UserService,
-    private registrationsService: RegistrationsService
+    private dialogService: DialogService
   ) {}
 
   ngOnInit() {
@@ -66,16 +68,18 @@ export class SearchComponent implements OnInit {
     } else {
       this.form.type = 'registrations';
     }
-    this.getRegistrations();
   }
 
-  public getRegistrations() {
-    this.registrationsService.getRegistrations().subscribe(
-      data => {
-        this.registrations = data;
-      },
-      error => this.onError(error)
-    );
+  public unlockUser(username: string, index: number, e) {
+    e.preventDefault();
+    const data = {
+      username,
+      index,
+      removeUnlock: () => {
+        this.results[index].isLocked = false;
+      }
+    }
+    this.dialogService.open(AdminUnlockConfirmationDialogComponent, data);
   }
 
   public searchType(data, type) {
@@ -148,6 +152,7 @@ export class SearchComponent implements OnInit {
 
   private onSwapSuccess(data) {
     if (data.body && data.body.establishment && data.body.establishment.uid) {
+      this.authService.setPreviousToken();
       this.authService.token = data.headers.get('authorization');
       const workplaceUid = data.body.establishment.uid;
       this.establishmentService
@@ -173,20 +178,4 @@ export class SearchComponent implements OnInit {
   protected setBackLink(): void {
     this.backService.setBackLink({ url: ['/dashboard'] });
   }
-  //used to approve workplace or user registration
-  public approveRegistration(usernameOrId: string, approved: boolean, index: number, isEstablishment: boolean) {
-    let data;
-    data = {
-      username: usernameOrId,
-      approve: approved,
-    };
-    if (isEstablishment) {
-      data = {
-        establishmentId: usernameOrId,
-        approve: approved,
-      };
-    }
-    this.registrations.splice(index, 1);
-    this.registrationsService.registrationApproval(data).subscribe();
-  }
 }
diff --git a/src/app/features/search/search.module.ts b/src/app/features/search/search.module.ts
index 209b98298d..d741720224 100644
--- a/src/app/features/search/search.module.ts
+++ b/src/app/features/search/search.module.ts
@@ -1,14 +1,29 @@
+import { OverlayModule } from '@angular/cdk/overlay';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { ReactiveFormsModule, FormsModule } from '@angular/forms';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { DialogService } from '@core/services/dialog.service';
+import {
+  AdminUnlockConfirmationDialogComponent,
+} from '@shared/components/link-to-parent-cancel copy/admin-unlock-confirmation';
+import { FirstErrorPipe } from '@shared/pipes/first-error.pipe';
 import { SharedModule } from '@shared/shared.module';
+
+import { RegistrationComponent } from './registration/registration.component';
+import { RegistrationsComponent } from './registrations/registrations.component';
 import { SearchRoutingModule } from './search-routing.module';
 import { SearchComponent } from './search.component';
 
 @NgModule({
-  imports: [CommonModule, ReactiveFormsModule, SharedModule, SearchRoutingModule, FormsModule],
+  imports: [CommonModule, OverlayModule, ReactiveFormsModule, SharedModule, SearchRoutingModule, FormsModule],
+  providers: [DialogService],
   declarations: [
-    SearchComponent
-  ]
+    SearchComponent,
+    AdminUnlockConfirmationDialogComponent,
+    FirstErrorPipe,
+    RegistrationComponent,
+    RegistrationsComponent,
+  ],
+  entryComponents: [AdminUnlockConfirmationDialogComponent]
 })
 export class SearchModule { }
diff --git a/src/app/features/search/search.spec.ts b/src/app/features/search/search.spec.ts
deleted file mode 100644
index 047c73bad6..0000000000
--- a/src/app/features/search/search.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SearchComponent } from './search.component';
-
-describe('SearchComponent', () => {
-  let component: SearchComponent;
-  let fixture: ComponentFixture<SearchComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SearchComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SearchComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/add-edit-qualification/add-edit-qualification.component.spec.ts b/src/app/features/workers/add-edit-qualification/add-edit-qualification.component.spec.ts
deleted file mode 100644
index 06e34bc00b..0000000000
--- a/src/app/features/workers/add-edit-qualification/add-edit-qualification.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AddEditQualificationComponent } from './add-edit-qualification.component';
-
-describe('AddEditQualificationComponent', () => {
-  let component: AddEditQualificationComponent;
-  let fixture: ComponentFixture<AddEditQualificationComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [AddEditQualificationComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AddEditQualificationComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/add-edit-training/add-edit-training.component.html b/src/app/features/workers/add-edit-training/add-edit-training.component.html
index df38a6f1c9..22467b94b4 100644
--- a/src/app/features/workers/add-edit-training/add-edit-training.component.html
+++ b/src/app/features/workers/add-edit-training/add-edit-training.component.html
@@ -6,12 +6,12 @@
       <fieldset class="govuk-fieldset">
         <legend class="govuk-fieldset__legend govuk-fieldset__legend--xl">
           <h1 class="govuk-fieldset__heading">
-            {{ trainingRecordId ? 'Edit training details' : 'Add training details' }}
+            {{ trainingRecordId ? 'Edit training details' : 'Enter training details' }}
           </h1>
         </legend>
         <div class="govuk-form-group" [class.govuk-form-group--error]="submitted && form.get('category').invalid">
           <label class="govuk-label" for="category">
-            Training Category
+            Training category
           </label>
           <span *ngIf="submitted && form.get('category').invalid" id="category-error" class="govuk-error-message">
             <span class="govuk-visually-hidden">Error:</span> {{ getFirstErrorMessage('category') }}
diff --git a/src/app/features/workers/add-edit-training/add-edit-training.component.spec.ts b/src/app/features/workers/add-edit-training/add-edit-training.component.spec.ts
deleted file mode 100644
index a9fbba41c9..0000000000
--- a/src/app/features/workers/add-edit-training/add-edit-training.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AddEditTrainingComponent } from './add-edit-training.component';
-
-describe('AddEditTrainingComponent', () => {
-  let component: AddEditTrainingComponent;
-  let fixture: ComponentFixture<AddEditTrainingComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [AddEditTrainingComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AddEditTrainingComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/adult-social-care-started/adult-social-care-started.component.spec.ts b/src/app/features/workers/adult-social-care-started/adult-social-care-started.component.spec.ts
deleted file mode 100644
index b235868d6e..0000000000
--- a/src/app/features/workers/adult-social-care-started/adult-social-care-started.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AdultSocialCareStartedComponent } from './adult-social-care-started.component';
-
-describe('AdultSocialCareStartedComponent', () => {
-  let component: AdultSocialCareStartedComponent;
-  let fixture: ComponentFixture<AdultSocialCareStartedComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [AdultSocialCareStartedComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AdultSocialCareStartedComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/apprenticeship-training/apprenticeship-training.component.spec.ts b/src/app/features/workers/apprenticeship-training/apprenticeship-training.component.spec.ts
deleted file mode 100644
index 215d64e410..0000000000
--- a/src/app/features/workers/apprenticeship-training/apprenticeship-training.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ApprenticeshipTrainingComponent } from './apprenticeship-training.component';
-
-describe('ApprenticeshipTrainingComponent', () => {
-  let component: ApprenticeshipTrainingComponent;
-  let fixture: ComponentFixture<ApprenticeshipTrainingComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ApprenticeshipTrainingComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ApprenticeshipTrainingComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/average-weekly-hours/average-weekly-hours.component.spec.ts b/src/app/features/workers/average-weekly-hours/average-weekly-hours.component.spec.ts
deleted file mode 100644
index 0258f4e44c..0000000000
--- a/src/app/features/workers/average-weekly-hours/average-weekly-hours.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { AverageWeeklyHoursComponent } from './average-weekly-hours.component';
-
-describe('AverageWeeklyHoursComponent', () => {
-  let component: AverageWeeklyHoursComponent;
-  let fixture: ComponentFixture<AverageWeeklyHoursComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [AverageWeeklyHoursComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AverageWeeklyHoursComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/basic-records-save-success/basic-records-save-success.component.spec.ts b/src/app/features/workers/basic-records-save-success/basic-records-save-success.component.spec.ts
deleted file mode 100644
index d631762e5a..0000000000
--- a/src/app/features/workers/basic-records-save-success/basic-records-save-success.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BasicRecordsSaveSuccessComponent } from './basic-records-save-success.component';
-
-describe('BasicRecordsSaveSuccessComponent', () => {
-  let component: BasicRecordsSaveSuccessComponent;
-  let fixture: ComponentFixture<BasicRecordsSaveSuccessComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [BasicRecordsSaveSuccessComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(BasicRecordsSaveSuccessComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/british-citizenship/british-citizenship.component.spec.ts b/src/app/features/workers/british-citizenship/british-citizenship.component.spec.ts
deleted file mode 100644
index 8572bc13a4..0000000000
--- a/src/app/features/workers/british-citizenship/british-citizenship.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BritishCitizenshipComponent } from './british-citizenship.component';
-
-describe('BritishCitizenshipComponent', () => {
-  let component: BritishCitizenshipComponent;
-  let fixture: ComponentFixture<BritishCitizenshipComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [BritishCitizenshipComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(BritishCitizenshipComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/care-certificate/care-certificate.component.spec.ts b/src/app/features/workers/care-certificate/care-certificate.component.spec.ts
deleted file mode 100644
index 8b6b17fe11..0000000000
--- a/src/app/features/workers/care-certificate/care-certificate.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { CareCertificateComponent } from './care-certificate.component';
-
-describe('CareCertificate', () => {
-  let component: CareCertificateComponent;
-  let fixture: ComponentFixture<CareCertificateComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [CareCertificateComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CareCertificateComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/check-staff-record/check-staff-record.component.spec.ts b/src/app/features/workers/check-staff-record/check-staff-record.component.spec.ts
deleted file mode 100644
index 01ab72e901..0000000000
--- a/src/app/features/workers/check-staff-record/check-staff-record.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CheckStaffRecordComponent } from './check-staff-record.component';
-
-describe('CheckStaffRecordComponent', () => {
-  let component: CheckStaffRecordComponent;
-  let fixture: ComponentFixture<CheckStaffRecordComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [CheckStaffRecordComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CheckStaffRecordComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/contract-with-zero-hours/contract-with-zero-hours.component.spec.ts b/src/app/features/workers/contract-with-zero-hours/contract-with-zero-hours.component.spec.ts
deleted file mode 100644
index 6e5b93537c..0000000000
--- a/src/app/features/workers/contract-with-zero-hours/contract-with-zero-hours.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ContractWithZeroHoursComponent } from './contract-with-zero-hours.component';
-
-describe('ContractWithZeroHoursComponent', () => {
-  let component: ContractWithZeroHoursComponent;
-  let fixture: ComponentFixture<ContractWithZeroHoursComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ContractWithZeroHoursComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ContractWithZeroHoursComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/country-of-birth/country-of-birth.component.spec.ts b/src/app/features/workers/country-of-birth/country-of-birth.component.spec.ts
deleted file mode 100644
index c1d52531c0..0000000000
--- a/src/app/features/workers/country-of-birth/country-of-birth.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CountryOfBirthComponent } from './country-of-birth.component';
-
-describe('CountryOfBirthComponent', () => {
-  let component: CountryOfBirthComponent;
-  let fixture: ComponentFixture<CountryOfBirthComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [CountryOfBirthComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CountryOfBirthComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/create-basic-records-start-screen/create-basic-records-start-screen.component.spec.ts b/src/app/features/workers/create-basic-records-start-screen/create-basic-records-start-screen.component.spec.ts
deleted file mode 100644
index 6ec3eb51d8..0000000000
--- a/src/app/features/workers/create-basic-records-start-screen/create-basic-records-start-screen.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CreateBasicRecordsStartScreenComponent } from './create-basic-records-start-screen.component';
-
-describe('CreateBasicRecordsStartScreenComponent', () => {
-  let component: CreateBasicRecordsStartScreenComponent;
-  let fixture: ComponentFixture<CreateBasicRecordsStartScreenComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [CreateBasicRecordsStartScreenComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CreateBasicRecordsStartScreenComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/create-basic-records/create-basic-records.component.html b/src/app/features/workers/create-basic-records/create-basic-records.component.html
index a6ffa959e4..9b2b03efc4 100644
--- a/src/app/features/workers/create-basic-records/create-basic-records.component.html
+++ b/src/app/features/workers/create-basic-records/create-basic-records.component.html
@@ -79,7 +79,7 @@ <h2 class="govuk-fieldset__heading">Staff record {{ i + 1 + totalWorkers }}</h2>
             "
           >
             <label class="govuk-label" for="mainJobRole-{{ i }}">
-              What is their main job role?
+              Main job role?
             </label>
             <span
               *ngIf="staffRecord.get('mainJobRole').invalid && staffRecord.get('mainJobRole').touched"
@@ -96,7 +96,7 @@ <h2 class="govuk-fieldset__heading">Staff record {{ i + 1 + totalWorkers }}</h2>
               [formControlName]="'mainJobRole'"
               id="mainJobRole-{{ i }}"
             >
-              <option [ngValue]="null">Select Main Job Role</option>
+              <option [ngValue]="null">Select main job role</option>
               <option *ngFor="let job of jobs" [value]="job.id">
                 {{ job.title }}
               </option>
@@ -192,7 +192,7 @@ <h2 class="govuk-fieldset__heading">Staff record {{ i + 1 + totalWorkers }}</h2>
   <button *ngIf="!displayAddMore" class="govuk-button govuk-button--secondary" type="button" (click)="addStaffRecord()">
     Add another staff record
   </button>
-  <div class="govuk-row">
+  <div class="govuk-row" *ngIf="!displayAddMore">
     <button class="govuk-button" type="submit">Continue</button>
   </div>
 </form>
diff --git a/src/app/features/workers/create-basic-records/create-basic-records.component.spec.ts b/src/app/features/workers/create-basic-records/create-basic-records.component.spec.ts
deleted file mode 100644
index 693620618b..0000000000
--- a/src/app/features/workers/create-basic-records/create-basic-records.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CreateBasicRecordsComponent } from './create-basic-records.component';
-
-describe('CreateBasicRecordsComponent', () => {
-  let component: CreateBasicRecordsComponent;
-  let fixture: ComponentFixture<CreateBasicRecordsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [CreateBasicRecordsComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CreateBasicRecordsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/create-staff-record-start-screen/create-staff-record-start-screen.component.spec.ts b/src/app/features/workers/create-staff-record-start-screen/create-staff-record-start-screen.component.spec.ts
deleted file mode 100644
index dc3ad58323..0000000000
--- a/src/app/features/workers/create-staff-record-start-screen/create-staff-record-start-screen.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CreateStaffRecordStartScreenComponent } from './create-staff-record-start-screen.component';
-
-describe('CreateStaffRecordStartScreenComponent', () => {
-  let component: CreateStaffRecordStartScreenComponent;
-  let fixture: ComponentFixture<CreateStaffRecordStartScreenComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [CreateStaffRecordStartScreenComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CreateStaffRecordStartScreenComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/date-of-birth/date-of-birth.component.spec.ts b/src/app/features/workers/date-of-birth/date-of-birth.component.spec.ts
deleted file mode 100644
index d8530fdd80..0000000000
--- a/src/app/features/workers/date-of-birth/date-of-birth.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DateOfBirthComponent } from './date-of-birth.component';
-
-describe('DateOfBirthComponent', () => {
-  let component: DateOfBirthComponent;
-  let fixture: ComponentFixture<DateOfBirthComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [DateOfBirthComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DateOfBirthComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/days-of-sickness/days-of-sickness.component.spec.ts b/src/app/features/workers/days-of-sickness/days-of-sickness.component.spec.ts
deleted file mode 100644
index 89322c74be..0000000000
--- a/src/app/features/workers/days-of-sickness/days-of-sickness.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DaysOfSicknessComponent } from './days-of-sickness.component';
-
-describe('DaysOfSicknessComponent', () => {
-  let component: DaysOfSicknessComponent;
-  let fixture: ComponentFixture<DaysOfSicknessComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [DaysOfSicknessComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DaysOfSicknessComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/delete-qualification-dialog/delete-qualification-dialog.component.spec.ts b/src/app/features/workers/delete-qualification-dialog/delete-qualification-dialog.component.spec.ts
deleted file mode 100644
index 55a3fbe988..0000000000
--- a/src/app/features/workers/delete-qualification-dialog/delete-qualification-dialog.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DeleteQualificationDialogComponent } from './delete-qualification-dialog.component';
-
-describe('DeleteQualificationDialogComponent', () => {
-  let component: DeleteQualificationDialogComponent;
-  let fixture: ComponentFixture<DeleteQualificationDialogComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [DeleteQualificationDialogComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DeleteQualificationDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/delete-training-dialog/delete-training-dialog.component.html b/src/app/features/workers/delete-training-dialog/delete-training-dialog.component.html
index 7a12af42ef..a72ad3821e 100644
--- a/src/app/features/workers/delete-training-dialog/delete-training-dialog.component.html
+++ b/src/app/features/workers/delete-training-dialog/delete-training-dialog.component.html
@@ -1,9 +1,9 @@
 <h1 id="dialogHeading" class="govuk-heading-l">You are about to delete the following training record.</h1>
 
-<dl class="govuk-summary-list govuk-summary-list--no-border">
+<dl class="govuk-summary-list govuk-summary-list--no-border govuk-summary-list--wide-key">
   <div class="govuk-summary-list__row">
     <dt class="govuk-summary-list__key">
-      Staff Record
+      Staff record
     </dt>
     <dd class="govuk-summary-list__value">
       {{ data.nameOrId }}
@@ -11,23 +11,26 @@ <h1 id="dialogHeading" class="govuk-heading-l">You are about to delete the follo
   </div>
   <div class="govuk-summary-list__row">
     <dt class="govuk-summary-list__key">
-      Training name
+      Training category
     </dt>
     <dd class="govuk-summary-list__value">
-      {{ data.trainingRecord.title }}
+      {{ data.trainingRecord.trainingCategory.category }}
     </dd>
   </div>
   <div class="govuk-summary-list__row">
     <dt class="govuk-summary-list__key">
-      Training category
+      Training name
     </dt>
     <dd class="govuk-summary-list__value">
-      {{ data.trainingRecord.trainingCategory.category }}
+      {{ data.trainingRecord.title }}
     </dd>
   </div>
 </dl>
 
-<button type="submit" class="govuk-button" (click)="close(true)">Delete training record</button>
-<button type="button" class="govuk-button govuk-button--link govuk-util__float-right" (click)="close(false)">
-  Cancel
-</button>
+<button type="submit" class="govuk-button" (click)="close($event, true)">Delete training record</button>
+<a
+  href="#"
+  class="govuk-list govuk-list--inline govuk-util__float-right govuk-!-margin-top-2"
+  (click)="close($event, false)"
+  >Cancel</a
+>
diff --git a/src/app/features/workers/delete-training-dialog/delete-training-dialog.component.spec.ts b/src/app/features/workers/delete-training-dialog/delete-training-dialog.component.spec.ts
deleted file mode 100644
index 04276ee6b5..0000000000
--- a/src/app/features/workers/delete-training-dialog/delete-training-dialog.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DeleteTrainingDialogComponent } from './delete-training-dialog.component';
-
-describe('DeleteTrainingDialogComponent', () => {
-  let component: DeleteTrainingDialogComponent;
-  let fixture: ComponentFixture<DeleteTrainingDialogComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [DeleteTrainingDialogComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DeleteTrainingDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/delete-training-dialog/delete-training-dialog.component.ts b/src/app/features/workers/delete-training-dialog/delete-training-dialog.component.ts
index 8ed031b7ab..6e0240f2ca 100644
--- a/src/app/features/workers/delete-training-dialog/delete-training-dialog.component.ts
+++ b/src/app/features/workers/delete-training-dialog/delete-training-dialog.component.ts
@@ -11,7 +11,8 @@ export class DeleteTrainingDialogComponent extends DialogComponent {
     super(data, dialog);
   }
 
-  close(confirm: boolean) {
+  close(event: Event, confirm: boolean) {
+    event.preventDefault();
     this.dialog.close(confirm);
   }
 }
diff --git a/src/app/features/workers/delete-worker-dialog/delete-worker-dialog.component.html b/src/app/features/workers/delete-worker-dialog/delete-worker-dialog.component.html
index afe687514e..d706707ad1 100644
--- a/src/app/features/workers/delete-worker-dialog/delete-worker-dialog.component.html
+++ b/src/app/features/workers/delete-worker-dialog/delete-worker-dialog.component.html
@@ -8,11 +8,8 @@ <h1 class="govuk-fieldset__heading">
       </h1>
     </legend>
     <div class="govuk-form-group">
-      <label class="govuk-label" for="reason">
-        Select a reason
-      </label>
       <select class="govuk-select" [formControlName]="'reason'" id="reason" name="reason">
-        <option [ngValue]="null">Select Reason</option>
+        <option [ngValue]="null">Select a reason</option>
         <option *ngFor="let reason of reasons" [value]="reason.id">
           {{ reason.reason }}
         </option>
@@ -40,9 +37,8 @@ <h1 class="govuk-fieldset__heading">
       </div>
     </div>
   </fieldset>
-
   <button type="submit" class="govuk-button">Delete record</button>
-  <button type="button" class="govuk-button govuk-button--link govuk-util__float-right" (click)="close()">
-    Cancel
-  </button>
+  <a href="#" class="govuk-list govuk-list--inline govuk-util__float-right govuk-!-margin-top-2" (click)="close($event)"
+    >Cancel</a
+  >
 </form>
diff --git a/src/app/features/workers/delete-worker-dialog/delete-worker-dialog.component.spec.ts b/src/app/features/workers/delete-worker-dialog/delete-worker-dialog.component.spec.ts
deleted file mode 100644
index 0a09823a42..0000000000
--- a/src/app/features/workers/delete-worker-dialog/delete-worker-dialog.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DeleteWorkerDialogComponent } from './delete-worker-dialog.component';
-
-describe('DeleteWorkerDialogComponent', () => {
-  let component: DeleteWorkerDialogComponent;
-  let fixture: ComponentFixture<DeleteWorkerDialogComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [DeleteWorkerDialogComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DeleteWorkerDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/delete-worker-dialog/delete-worker-dialog.component.ts b/src/app/features/workers/delete-worker-dialog/delete-worker-dialog.component.ts
index 2a5d41f868..0083674ec8 100644
--- a/src/app/features/workers/delete-worker-dialog/delete-worker-dialog.component.ts
+++ b/src/app/features/workers/delete-worker-dialog/delete-worker-dialog.component.ts
@@ -30,7 +30,7 @@ export class DeleteWorkerDialogComponent extends DialogComponent implements OnIn
     private formBuilder: FormBuilder,
     private alertService: AlertService,
     private errorSummaryService: ErrorSummaryService,
-    private workerService: WorkerService
+    private workerService: WorkerService,
   ) {
     super(data, dialog);
 
@@ -44,7 +44,7 @@ export class DeleteWorkerDialogComponent extends DialogComponent implements OnIn
     this.subscriptions.add(
       this.workerService.getLeaveReasons().subscribe(reasons => {
         this.reasons = reasons;
-      })
+      }),
     );
 
     this.setupFormErrors();
@@ -58,7 +58,8 @@ export class DeleteWorkerDialogComponent extends DialogComponent implements OnIn
     return this.errorSummaryService.getFormErrorMessage(item, errorType, this.formErrorsMap);
   }
 
-  public close() {
+  public close(event: Event) {
+    event.preventDefault();
     this.dialog.close();
   }
 
@@ -84,9 +85,10 @@ export class DeleteWorkerDialogComponent extends DialogComponent implements OnIn
       : null;
 
     this.subscriptions.add(
-      this.workerService
-        .deleteWorker(this.data.workplace.uid, this.data.worker.uid, deleteReason)
-        .subscribe(() => this.onSuccess(), error => this.onError(error))
+      this.workerService.deleteWorker(this.data.workplace.uid, this.data.worker.uid, deleteReason).subscribe(
+        () => this.onSuccess(),
+        error => this.onError(error),
+      ),
     );
   }
 
@@ -97,7 +99,7 @@ export class DeleteWorkerDialogComponent extends DialogComponent implements OnIn
         : ['/workplace', this.data.workplace.uid];
     this.router.navigate(url, { fragment: 'staff-records' });
     this.alertService.addAlert({ type: 'success', message: `${this.data.worker.nameOrId} has been deleted` });
-    this.close();
+    this.close(event);
   }
 
   private onError(error): void {
diff --git a/src/app/features/workers/disability/disability.component.spec.ts b/src/app/features/workers/disability/disability.component.spec.ts
deleted file mode 100644
index bd60684160..0000000000
--- a/src/app/features/workers/disability/disability.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DisabilityComponent } from './disability.component';
-
-describe('DisabilityComponent', () => {
-  let component: DisabilityComponent;
-  let fixture: ComponentFixture<DisabilityComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [DisabilityComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DisabilityComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/ethnicity/ethnicity.component.spec.ts b/src/app/features/workers/ethnicity/ethnicity.component.spec.ts
deleted file mode 100644
index 47f7502b68..0000000000
--- a/src/app/features/workers/ethnicity/ethnicity.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { EthnicityComponent } from './ethnicity.component';
-
-describe('EthnicityComponent', () => {
-  let component: EthnicityComponent;
-  let fixture: ComponentFixture<EthnicityComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [EthnicityComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EthnicityComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/gender/gender.component.spec.ts b/src/app/features/workers/gender/gender.component.spec.ts
deleted file mode 100644
index a219c1ee1d..0000000000
--- a/src/app/features/workers/gender/gender.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { GenderComponent } from './gender.component';
-
-describe('GenderComponent', () => {
-  let component: GenderComponent;
-  let fixture: ComponentFixture<GenderComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [GenderComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(GenderComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/home-postcode/home-postcode.component.spec.ts b/src/app/features/workers/home-postcode/home-postcode.component.spec.ts
deleted file mode 100644
index c3cc25fce9..0000000000
--- a/src/app/features/workers/home-postcode/home-postcode.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HomePostcodeComponent } from './home-postcode.component';
-
-describe('HomePostcodeComponent', () => {
-  let component: HomePostcodeComponent;
-  let fixture: ComponentFixture<HomePostcodeComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [HomePostcodeComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(HomePostcodeComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/main-job-start-date/main-job-start-date.component.spec.ts b/src/app/features/workers/main-job-start-date/main-job-start-date.component.spec.ts
deleted file mode 100644
index 1199ecf20f..0000000000
--- a/src/app/features/workers/main-job-start-date/main-job-start-date.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MainJobStartDateComponent } from './main-job-start-date.component';
-
-describe('MainJobStartDateComponent', () => {
-  let component: MainJobStartDateComponent;
-  let fixture: ComponentFixture<MainJobStartDateComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [MainJobStartDateComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(MainJobStartDateComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/mental-health-professional/mental-health-professional.component.spec.ts b/src/app/features/workers/mental-health-professional/mental-health-professional.component.spec.ts
deleted file mode 100644
index 6d53b56971..0000000000
--- a/src/app/features/workers/mental-health-professional/mental-health-professional.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MentalHealthProfessionalComponent } from './mental-health-professional.component';
-
-describe('MentalHealthProfessionalComponent', () => {
-  let component: MentalHealthProfessionalComponent;
-  let fixture: ComponentFixture<MentalHealthProfessionalComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [MentalHealthProfessionalComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(MentalHealthProfessionalComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/move-worker-dialog/move-worker-dialog.component.html b/src/app/features/workers/move-worker-dialog/move-worker-dialog.component.html
index c6bdd7d4e4..0f071da4b9 100644
--- a/src/app/features/workers/move-worker-dialog/move-worker-dialog.component.html
+++ b/src/app/features/workers/move-worker-dialog/move-worker-dialog.component.html
@@ -1,23 +1,24 @@
-<app-error-summary
-  *ngIf="submitted && (form.invalid || serverError)"
-  [formErrorsMap]="formErrorsMap"
-  [form]="form"
-  [serverError]="serverError"
->
-</app-error-summary>
-<h1 id="dialogHeading" class="govuk-heading-l">Transfer staff record</h1>
-<form #formEl novalidate (ngSubmit)="onSubmit()" [formGroup]="form" autocomplete="off">
-  <fieldset class="govuk-fieldset">
-    <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
-      <h1 class="govuk-fieldset__heading">
-        Find the workplace to move to
-      </h1>
-    </legend>
-    <div class="govuk-form-group" [class.govuk-form-group--error]="submitted && form.invalid">
-      <label class="govuk-label" for="workplaceNameOrPostCode">
-        Enter a workplace name or postcode
-      </label>
-       <span
+<div class="govuk-max-width">
+  <app-error-summary
+    *ngIf="submitted && (form.invalid || serverError)"
+    [formErrorsMap]="formErrorsMap"
+    [form]="form"
+    [serverError]="serverError"
+  >
+  </app-error-summary>
+  <h1 id="dialogHeading" class="govuk-heading-l">Transfer staff record</h1>
+  <form #formEl novalidate (ngSubmit)="onSubmit()" [formGroup]="form" autocomplete="off">
+    <fieldset class="govuk-fieldset">
+      <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
+        <h1 class="govuk-fieldset__heading">
+          Find the workplace to move to
+        </h1>
+      </legend>
+      <div class="govuk-form-group" [class.govuk-form-group--error]="submitted && form.invalid">
+        <label class="govuk-label" for="workplaceNameOrPostCode">
+          Enter a workplace name or postcode
+        </label>
+        <span
           *ngIf="submitted && form.get('workplaceNameOrPostCode').invalid"
           id="workplaceNameOrPostCode-error"
           class="govuk-error-message"
@@ -25,17 +26,24 @@ <h1 class="govuk-fieldset__heading">
           <span class="govuk-visually-hidden">Error:</span>
           {{ getFirstErrorMessage('workplaceNameOrPostCode') }}
         </span>
-      <app-auto-suggest
+        <app-auto-suggest
           [formGroup]="form"
+          class="300px;"
           [dataProvider]="workplaceNameOrPostCodeFilter"
           [formControlName]="'workplaceNameOrPostCode'"
         ></app-auto-suggest>
-    </div>
-    <p *ngIf="form.valid"><strong>You are about to move {{ data.worker.nameOrId }} to {{ form.get('workplaceNameOrPostCode').value }}.</strong></p>
-  </fieldset>
+      </div>
 
-  <button type="submit" class="govuk-button">Transfer</button>
-  <button type="button" class="govuk-button govuk-button--secondary govuk-util__float-right" (click)="close()">
-    Close
-  </button>
-</form>
+      <p *ngIf="form.valid">
+        <strong
+          >You are about to move {{ data.worker.nameOrId }} {{ form.get('workplaceNameOrPostCode').value }}.</strong
+        >
+      </p>
+    </fieldset>
+
+    <button type="submit" class="govuk-button">Transfer</button>
+    <button type="button" class="govuk-button govuk-button--secondary govuk-util__float-right" (click)="close($event)">
+      Close
+    </button>
+  </form>
+</div>
diff --git a/src/app/features/workers/move-worker-dialog/move-worker-dialog.component.ts b/src/app/features/workers/move-worker-dialog/move-worker-dialog.component.ts
index 03a9c29b8c..3ca7080345 100644
--- a/src/app/features/workers/move-worker-dialog/move-worker-dialog.component.ts
+++ b/src/app/features/workers/move-worker-dialog/move-worker-dialog.component.ts
@@ -17,7 +17,6 @@ import { Subscription } from 'rxjs';
   templateUrl: './move-worker-dialog.component.html',
 })
 export class MoveWorkerDialogComponent extends DialogComponent implements OnInit, OnDestroy {
-
   public form: FormGroup;
   public submitted = false;
   private formErrorsMap: Array<ErrorDetails>;
@@ -28,8 +27,6 @@ export class MoveWorkerDialogComponent extends DialogComponent implements OnInit
   public availableWorkPlaces;
   public workplaceNameOrPostCode: string;
 
-
-
   constructor(
     @Inject(DIALOG_DATA) public data: { worker: Worker; workplace: Establishment; primaryWorkplaceUid: string },
     public dialog: Dialog<MoveWorkerDialogComponent>,
@@ -46,15 +43,12 @@ export class MoveWorkerDialogComponent extends DialogComponent implements OnInit
     this.setupForm();
   }
 
-
-
   ngOnInit() {
     this.getMyAllWorkPlaces();
     this.setupFormErrorsMap();
     this.setupServerErrorsMap();
   }
 
-
   //function is use to get all available workplaces
   private getMyAllWorkPlaces() {
     this.subscriptions.add(
@@ -68,15 +62,15 @@ export class MoveWorkerDialogComponent extends DialogComponent implements OnInit
             allEstablishments = subsidaryEstablishments.concat([primary]);
           }
           const currentWorkplaceUid = this.data.workplace.uid;
-          this.availableWorkPlaces = allEstablishments.filter(wp =>
-            wp.uid !== currentWorkplaceUid)
+          this.availableWorkPlaces = allEstablishments
+            .filter(wp => wp.uid !== currentWorkplaceUid)
             .map(wp => {
               wp.nameAndPostCode = wp.name + ', ' + wp.postCode;
               return wp;
-            }
-
-            );
-          this.availableWorkPlaces = this.availableWorkPlaces.filter(item => item.dataOwner === 'Parent' && item.ustatus !== 'PENDING');
+            });
+          this.availableWorkPlaces = this.availableWorkPlaces.filter(
+            item => item.dataOwner === 'Parent' && item.ustatus !== 'PENDING',
+          );
           if (currentWorkplaceUid !== this.data.primaryWorkplaceUid) {
             this.availableWorkPlaces.push(primary);
           }
@@ -86,22 +80,23 @@ export class MoveWorkerDialogComponent extends DialogComponent implements OnInit
           if (error.error.message) {
             this.serverError = error.error.message;
           }
-        }
-      )
+        },
+      ),
     );
   }
 
   /**
-     * Pass in formGroup or formControl name
-     * Then return error message
-     * @param error item
-     */
+   * Pass in formGroup or formControl name
+   * Then return error message
+   * @param error item
+   */
   public getFirstErrorMessage(item: string): string {
     const errorType = Object.keys(this.form.get(item).errors)[0];
     return this.errorSummaryService.getFormErrorMessage(item, errorType, this.formErrorsMap);
   }
 
-  public close() {
+  public close(event: Event) {
+    event.preventDefault();
     this.dialog.close();
   }
 
@@ -118,7 +113,10 @@ export class MoveWorkerDialogComponent extends DialogComponent implements OnInit
     this.subscriptions.add(
       this.workerService
         .updateWorker(this.data.workplace.uid, this.data.worker.uid, { establishmentId: newEstablishmentId })
-        .subscribe(() => this.onSuccess(this.form.value.workplaceNameOrPostCode), error => this.onError(error))
+        .subscribe(
+          () => this.onSuccess(this.form.value.workplaceNameOrPostCode),
+          error => this.onError(error),
+        ),
     );
   }
   /**
@@ -136,9 +134,9 @@ export class MoveWorkerDialogComponent extends DialogComponent implements OnInit
     this.router.navigate(url, { fragment: 'staff-records' });
     this.alertService.addAlert({
       type: 'success',
-      message: `${this.data.worker.nameOrId} has been moved to ${newEstablishmentName}.`
+      message: `${this.data.worker.nameOrId} has been moved to ${newEstablishmentName}.`,
     });
-    this.close();
+    this.close(event);
   }
 
   private onError(error): void {
@@ -148,7 +146,7 @@ export class MoveWorkerDialogComponent extends DialogComponent implements OnInit
   //Set the form fields and validator
   private setupForm(): void {
     this.form = this.formBuilder.group({
-      workplaceNameOrPostCode: [null, [Validators.required, this.workplaceNameOrPostCodeValidator]]
+      workplaceNameOrPostCode: [null, [Validators.required, this.workplaceNameOrPostCodeValidator]],
     });
   }
 
@@ -164,7 +162,7 @@ export class MoveWorkerDialogComponent extends DialogComponent implements OnInit
           },
           {
             name: 'validNameOrPostCode',
-            message: 'Enter correct workplace name or post code',
+            message: 'Enter correct workplace name or post code.',
           },
         ],
       },
@@ -189,7 +187,6 @@ export class MoveWorkerDialogComponent extends DialogComponent implements OnInit
     ];
   }
 
-
   /**
    * Function is used to validate input workplace name or Post code is  valid or not.
    * if valid then return null otherwise return object {validNameOrPostCode:true}
@@ -202,11 +199,10 @@ export class MoveWorkerDialogComponent extends DialogComponent implements OnInit
       if (workplaceNameOrPostCode.value !== null) {
         const workplaceNameOrPostCodeLowerCase = workplaceNameOrPostCode.value.toLowerCase();
         return this.availableWorkPlaces.some(
-          wp => wp.nameAndPostCode.toLowerCase() === workplaceNameOrPostCodeLowerCase
+          wp => wp.nameAndPostCode.toLowerCase() === workplaceNameOrPostCodeLowerCase,
         )
           ? null
           : { validNameOrPostCode: true };
-
       }
     }
 
@@ -227,7 +223,7 @@ export class MoveWorkerDialogComponent extends DialogComponent implements OnInit
           wp =>
             wp.name.toLowerCase().startsWith(workplaceNameOrPostCodeLowerCase) ||
             wp.postCode.toLowerCase().startsWith(workplaceNameOrPostCodeLowerCase) ||
-            wp.nameAndPostCode.toLowerCase().startsWith(workplaceNameOrPostCodeLowerCase)
+            wp.nameAndPostCode.toLowerCase().startsWith(workplaceNameOrPostCodeLowerCase),
         )
         .filter(wp => wp.nameAndPostCode.toLowerCase() !== workplaceNameOrPostCodeLowerCase)
         .map(wp => wp.nameAndPostCode);
@@ -245,7 +241,7 @@ export class MoveWorkerDialogComponent extends DialogComponent implements OnInit
   public getWorkplaceEstablishmentIdOrName(nameAndPostCode: string, nameOrId: string) {
     if (nameAndPostCode) {
       const filterArray = this.availableWorkPlaces.filter(
-        wp => wp.nameAndPostCode.toLowerCase() === nameAndPostCode.toLowerCase()
+        wp => wp.nameAndPostCode.toLowerCase() === nameAndPostCode.toLowerCase(),
       );
       if (nameOrId === 'id') {
         return filterArray[0].id;
@@ -254,9 +250,7 @@ export class MoveWorkerDialogComponent extends DialogComponent implements OnInit
     }
   }
 
-
   ngOnDestroy() {
     this.subscriptions.unsubscribe();
   }
 }
-
diff --git a/src/app/features/workers/national-insurance-number/national-insurance-number.component.spec.ts b/src/app/features/workers/national-insurance-number/national-insurance-number.component.spec.ts
deleted file mode 100644
index 0f32f8b0bc..0000000000
--- a/src/app/features/workers/national-insurance-number/national-insurance-number.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { NationalInsuranceNumberComponent } from './national-insurance-number.component';
-
-describe('NationalInsuranceNumberComponent', () => {
-  let component: NationalInsuranceNumberComponent;
-  let fixture: ComponentFixture<NationalInsuranceNumberComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [NationalInsuranceNumberComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(NationalInsuranceNumberComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/nationality/nationality.component.spec.ts b/src/app/features/workers/nationality/nationality.component.spec.ts
deleted file mode 100644
index c5c0e7cd30..0000000000
--- a/src/app/features/workers/nationality/nationality.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { NationalityComponent } from './nationality.component';
-
-describe('NationalityComponent', () => {
-  let component: NationalityComponent;
-  let fixture: ComponentFixture<NationalityComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [NationalityComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(NationalityComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/nursing-category/nursing-category.component.spec.ts b/src/app/features/workers/nursing-category/nursing-category.component.spec.ts
deleted file mode 100644
index d1b298da48..0000000000
--- a/src/app/features/workers/nursing-category/nursing-category.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { NursingCategoryComponent } from '@features/workers/nursing-category/nursing-category.component';
-
-describe('NursingCategoryComponent', () => {
-  let component: NursingCategoryComponent;
-  let fixture: ComponentFixture<NursingCategoryComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [NursingCategoryComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(NursingCategoryComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/nursing-specialism/nursing-specialism.component.spec.ts b/src/app/features/workers/nursing-specialism/nursing-specialism.component.spec.ts
deleted file mode 100644
index d0bf068a0e..0000000000
--- a/src/app/features/workers/nursing-specialism/nursing-specialism.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { NursingSpecialismComponent } from './nursing-specialism.component';
-
-describe('NursingSpecialismComponent', () => {
-  let component: NursingSpecialismComponent;
-  let fixture: ComponentFixture<NursingSpecialismComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ NursingSpecialismComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(NursingSpecialismComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/other-job-roles/other-job-roles.component.spec.ts b/src/app/features/workers/other-job-roles/other-job-roles.component.spec.ts
deleted file mode 100644
index 09039ba9ba..0000000000
--- a/src/app/features/workers/other-job-roles/other-job-roles.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { OtherJobRolesComponent } from './other-job-roles.component';
-
-describe('OtherJobRolesComponent', () => {
-  let component: OtherJobRolesComponent;
-  let fixture: ComponentFixture<OtherJobRolesComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [OtherJobRolesComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(OtherJobRolesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/other-qualifications-level/other-qualifications-level.component.spec.ts b/src/app/features/workers/other-qualifications-level/other-qualifications-level.component.spec.ts
deleted file mode 100644
index f7c11c1fd2..0000000000
--- a/src/app/features/workers/other-qualifications-level/other-qualifications-level.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { OtherQualificationsLevelComponent } from './other-qualifications-level.component';
-
-describe('OtherQualificationsLevelComponent', () => {
-  let component: OtherQualificationsLevelComponent;
-  let fixture: ComponentFixture<OtherQualificationsLevelComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [OtherQualificationsLevelComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(OtherQualificationsLevelComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/other-qualifications/other-qualifications.component.spec.ts b/src/app/features/workers/other-qualifications/other-qualifications.component.spec.ts
deleted file mode 100644
index 56c963a9d2..0000000000
--- a/src/app/features/workers/other-qualifications/other-qualifications.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { OtherQualificationsComponent } from './other-qualifications.component';
-
-describe('OtherQualificationsComponent', () => {
-  let component: OtherQualificationsComponent;
-  let fixture: ComponentFixture<OtherQualificationsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [OtherQualificationsComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(OtherQualificationsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/question/question.component.spec.ts b/src/app/features/workers/question/question.component.spec.ts
deleted file mode 100644
index 0ce5d840a1..0000000000
--- a/src/app/features/workers/question/question.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { QuestionComponent } from './question.component';
-
-describe('QuestionComponent', () => {
-  let component: QuestionComponent;
-  let fixture: ComponentFixture<QuestionComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [QuestionComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(QuestionComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/recruited-from/recruited-from.component.spec.ts b/src/app/features/workers/recruited-from/recruited-from.component.spec.ts
deleted file mode 100644
index 4a9df2da99..0000000000
--- a/src/app/features/workers/recruited-from/recruited-from.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { RecruitedFromComponent } from './recruited-from.component';
-
-describe('RecruitedFromComponent', () => {
-  let component: RecruitedFromComponent;
-  let fixture: ComponentFixture<RecruitedFromComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [RecruitedFromComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(RecruitedFromComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/salary/salary.component.spec.ts b/src/app/features/workers/salary/salary.component.spec.ts
deleted file mode 100644
index 629ce4f1df..0000000000
--- a/src/app/features/workers/salary/salary.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SalaryComponent } from './salary.component';
-
-describe('SalaryComponent', () => {
-  let component: SalaryComponent;
-  let fixture: ComponentFixture<SalaryComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SalaryComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SalaryComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/select-record-type/select-record-type.component.html b/src/app/features/workers/select-record-type/select-record-type.component.html
index 90728d6936..b8ea8c7279 100644
--- a/src/app/features/workers/select-record-type/select-record-type.component.html
+++ b/src/app/features/workers/select-record-type/select-record-type.component.html
@@ -9,7 +9,7 @@
   <div class="govuk-grid-column-two-thirds-from-desktop">
     <form #formEl novalidate (ngSubmit)="onSubmit()" [formGroup]="form" id="server-error">
       <fieldset class="govuk-fieldset">
-        <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
+        <legend class="govuk-fieldset__legend govuk-fieldset__legend--xl">
           <h1 class="govuk-fieldset__heading">
             Select the type of record
           </h1>
diff --git a/src/app/features/workers/social-care-qualification-level/social-care-qualification-level.component.spec.ts b/src/app/features/workers/social-care-qualification-level/social-care-qualification-level.component.spec.ts
deleted file mode 100644
index b905dd674f..0000000000
--- a/src/app/features/workers/social-care-qualification-level/social-care-qualification-level.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SocialCareQualificationLevelComponent } from './social-care-qualification-level.component';
-
-describe('SocialCareQualificationLevelComponent', () => {
-  let component: SocialCareQualificationLevelComponent;
-  let fixture: ComponentFixture<SocialCareQualificationLevelComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SocialCareQualificationLevelComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SocialCareQualificationLevelComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/social-care-qualification/social-care-qualification.component.spec.ts b/src/app/features/workers/social-care-qualification/social-care-qualification.component.spec.ts
deleted file mode 100644
index 560956a756..0000000000
--- a/src/app/features/workers/social-care-qualification/social-care-qualification.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SocialCareQualificationComponent } from './social-care-qualification.component';
-
-describe('SocialCareQualificationComponent', () => {
-  let component: SocialCareQualificationComponent;
-  let fixture: ComponentFixture<SocialCareQualificationComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SocialCareQualificationComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SocialCareQualificationComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/staff-details/staff-details.component.html b/src/app/features/workers/staff-details/staff-details.component.html
index 0c55e57529..213708ef43 100644
--- a/src/app/features/workers/staff-details/staff-details.component.html
+++ b/src/app/features/workers/staff-details/staff-details.component.html
@@ -5,7 +5,7 @@
     <div class="govuk-grid-column-two-thirds-from-desktop">
       <fieldset class="govuk-fieldset">
         <legend class="govuk-fieldset__legend govuk-fieldset__legend--xl">
-          <h1 class="govuk-fieldset__heading">{{ worker ? 'Edit' : 'Create' }} Staff Details</h1>
+          <h1 class="govuk-fieldset__heading">{{ worker ? 'Edit' : 'Enter' }} basic staff record details</h1>
         </legend>
         <div
           class="govuk-form-group"
@@ -29,7 +29,7 @@ <h1 class="govuk-fieldset__heading">{{ worker ? 'Edit' : 'Create' }} Staff Detai
         </div>
         <div class="govuk-form-group" [class.govuk-form-group--error]="submitted && form.get('mainJob').invalid">
           <label class="govuk-label" for="mainJob">
-            What is their main job role
+            Main job role
           </label>
           <span *ngIf="submitted && form.get('mainJob').errors" id="mainJob-error" class="govuk-error-message">
             <span class="govuk-visually-hidden">Error:</span>
@@ -43,7 +43,7 @@ <h1 class="govuk-fieldset__heading">{{ worker ? 'Edit' : 'Create' }} Staff Detai
             name="mainJob"
             (change)="selectedJobRole($event.target.value)"
           >
-            <option [ngValue]="null">Select Main Job Role</option>
+            <option [ngValue]="null">Select main job role</option>
             <option *ngFor="let job of jobsAvailable" [value]="job.id">
               {{ job.title }}
             </option>
diff --git a/src/app/features/workers/staff-details/staff-details.component.spec.ts b/src/app/features/workers/staff-details/staff-details.component.spec.ts
deleted file mode 100644
index b9bfb524fc..0000000000
--- a/src/app/features/workers/staff-details/staff-details.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { StaffDetailsComponent } from './staff-details.component';
-
-describe('StaffDetailsComponent', () => {
-  let component: StaffDetailsComponent;
-  let fixture: ComponentFixture<StaffDetailsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [StaffDetailsComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(StaffDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/staff-record/staff-record.component.spec.ts b/src/app/features/workers/staff-record/staff-record.component.spec.ts
deleted file mode 100644
index dd78ad9b48..0000000000
--- a/src/app/features/workers/staff-record/staff-record.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { StaffRecordComponent } from './staff-record.component';
-
-describe('StaffRecordComponent', () => {
-  let component: StaffRecordComponent;
-  let fixture: ComponentFixture<StaffRecordComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [StaffRecordComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(StaffRecordComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/total-staff/total-staff.component.spec.ts b/src/app/features/workers/total-staff/total-staff.component.spec.ts
deleted file mode 100644
index f0ac07fd02..0000000000
--- a/src/app/features/workers/total-staff/total-staff.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TotalStaffComponent } from './total-staff.component';
-
-describe('TotalStaffComponent', () => {
-  let component: TotalStaffComponent;
-  let fixture: ComponentFixture<TotalStaffComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [TotalStaffComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(TotalStaffComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/training-qualifications-record/qualifications/qualifications.component.html b/src/app/features/workers/training-qualifications-record/qualifications/qualifications.component.html
index a89447f802..a32ca67113 100644
--- a/src/app/features/workers/training-qualifications-record/qualifications/qualifications.component.html
+++ b/src/app/features/workers/training-qualifications-record/qualifications/qualifications.component.html
@@ -1,8 +1,10 @@
 <ng-container *ngIf="qualifications?.length">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-one-half">
-      <h2 class="govuk-heading-m">Qualifications({{ qualifications.length }})</h2>
-      <p>Last updated on {{ lastUpdated | date: 'd MMMM y' }}</p>
+      <h2 class="govuk-heading-m">Qualifications ({{ qualifications.length }})</h2>
+    </div>
+    <div class="govuk-grid-column-one-half govuk-util__float-right govuk-util__align-right">
+      <p>Updated {{ lastUpdated | date: 'd MMMM y' }}</p>
     </div>
   </div>
 
diff --git a/src/app/features/workers/training-qualifications-record/qualifications/qualifications.component.spec.ts b/src/app/features/workers/training-qualifications-record/qualifications/qualifications.component.spec.ts
deleted file mode 100644
index 86155a514e..0000000000
--- a/src/app/features/workers/training-qualifications-record/qualifications/qualifications.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { QualificationsComponent } from './qualifications.component';
-
-describe('QualificationsComponent', () => {
-  let component: QualificationsComponent;
-  let fixture: ComponentFixture<QualificationsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [QualificationsComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(QualificationsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/training-qualifications-record/training-and-qualifications-record.component.html b/src/app/features/workers/training-qualifications-record/training-and-qualifications-record.component.html
index 5fd66b37d1..49048cde17 100644
--- a/src/app/features/workers/training-qualifications-record/training-and-qualifications-record.component.html
+++ b/src/app/features/workers/training-qualifications-record/training-and-qualifications-record.component.html
@@ -19,7 +19,7 @@ <h1 class="govuk-heading-l">
     </div>
   </div>
   <app-tabs>
-    <app-tab [alert]="trainingAlert === 1" [redAlert]="trainingAlert === 2" [title]="'Training'">
+    <app-tab [alert]="trainingAlert === trainingStatusService.EXPIRING" [redAlert]="trainingAlert === trainingStatusService.EXPIRED || trainingAlert == trainingStatusService.MISSING" [title]="'Training'">
       <app-training [workplace]="workplace" [worker]="worker"
         (trainingChanged)="trainingAndQualificationsChangedHandler($event)"></app-training>
     </app-tab>
@@ -28,4 +28,4 @@ <h1 class="govuk-heading-l">
         (qualificationsChanged)="trainingAndQualificationsChangedHandler($event)"></app-qualifications>
     </app-tab>
   </app-tabs>
-</ng-container>
\ No newline at end of file
+</ng-container>
diff --git a/src/app/features/workers/training-qualifications-record/training-and-qualifications-record.component.ts b/src/app/features/workers/training-qualifications-record/training-and-qualifications-record.component.ts
index bb815b624d..9da9912e55 100644
--- a/src/app/features/workers/training-qualifications-record/training-and-qualifications-record.component.ts
+++ b/src/app/features/workers/training-qualifications-record/training-and-qualifications-record.component.ts
@@ -8,9 +8,9 @@ import { BreadcrumbService } from '@core/services/breadcrumb.service';
 import { EstablishmentService } from '@core/services/establishment.service';
 import { PermissionsService } from '@core/services/permissions/permissions.service';
 import { WorkerService } from '@core/services/worker.service';
-import * as moment from 'moment';
 import { Subscription } from 'rxjs';
 import { take } from 'rxjs/operators';
+import { TrainingStatusService } from '@core/services/trainingStatus.service';
 
 @Component({
   selector: 'app-training-and-qualifications-record',
@@ -25,7 +25,6 @@ export class TrainingAndQualificationsRecordComponent implements OnInit, OnDestr
   public trainingAlert: number;
   public qualificationsCount: number;
   public trainingCount: number;
-
   private subscriptions: Subscription = new Subscription();
 
   constructor(
@@ -34,7 +33,8 @@ export class TrainingAndQualificationsRecordComponent implements OnInit, OnDestr
     private establishmentService: EstablishmentService,
     private permissionsService: PermissionsService,
     private route: ActivatedRoute,
-    private workerService: WorkerService
+    private workerService: WorkerService,
+    private trainingStatusService: TrainingStatusService,
   ) {}
 
   ngOnInit() {
@@ -55,7 +55,7 @@ export class TrainingAndQualificationsRecordComponent implements OnInit, OnDestr
     this.canViewWorker = this.permissionsService.can(this.workplace.uid, 'canViewWorker');
   }
 
-  //This method is used to set training & qualifications list and their counts and alret flag
+  // This method is used to set training & qualifications list and their counts and alert flag
   public setTrainingAndQualifications() {
     this.subscriptions.add(
       this.workerService.worker$.pipe(take(1)).subscribe(
@@ -64,7 +64,7 @@ export class TrainingAndQualificationsRecordComponent implements OnInit, OnDestr
           this.qualificationsCount = 0;
           this.trainingCount = 0;
           this.trainingAndQualsCount = 0;
-          //get qualification count
+          // get qualification count
           this.workerService.getQualifications(this.workplace.uid, this.worker.uid).subscribe(
             qual => {
               this.qualificationsCount = qual.qualifications.length;
@@ -73,58 +73,28 @@ export class TrainingAndQualificationsRecordComponent implements OnInit, OnDestr
               console.error(error.error);
             }
           );
-          //get trainging count and flag
+          // get training count and flag
           this.workerService
             .getTrainingRecords(this.workplace.uid, this.worker.uid)
             .pipe(take(1))
             .subscribe(
               training => {
                 this.trainingCount = training.count;
-                this.trainingAlert = this.getTrainingFlag(training.training);
+                this.trainingAlert = this.trainingStatusService.getAggregatedStatus(training.training);
               },
               error => {
                 console.error(error.error);
               }
             );
-        },
+          },
         error => {
           console.error(error.error);
         }
       )
     );
   }
-  /**
-   * Function used to set training alert flag over the traing and qualifications tab
-   * @param {traingRecords} list of trainging record
-   * @return {number} 0 for up-to-date, 1 for expiring soon and 2 for expired.
-   */
-  public getTrainingFlag(traingRecords) {
-    let expired = false;
-    let expiring = false;
 
-    const currentDate = moment();
-    //check traingin status
-    traingRecords.forEach(training => {
-      if (training.expires) {
-        const expiringDate = moment(training.expires);
-        const daysDiffrence = expiringDate.diff(currentDate, 'days');
-        if (daysDiffrence < 0) {
-          expired = true;
-        } else if (daysDiffrence >= 0 && daysDiffrence <= 90) {
-          expiring = true;
-        }
-      }
-    });
-    // return for flag value
-    if (expired) {
-      return 2;
-    } else if (expiring) {
-      return 1;
-    } else {
-      return 0;
-    }
-  }
-  //event handler from traingin and qualification component.
+  //event handler from training and qualification component.
   public trainingAndQualificationsChangedHandler(refresh) {
     if (refresh) {
       this.setTrainingAndQualifications();
diff --git a/src/app/features/workers/training-qualifications-record/training/training.component.html b/src/app/features/workers/training-qualifications-record/training/training.component.html
index 3790e129e2..bd358e1875 100644
--- a/src/app/features/workers/training-qualifications-record/training/training.component.html
+++ b/src/app/features/workers/training-qualifications-record/training/training.component.html
@@ -1,8 +1,10 @@
 <ng-container *ngIf="trainingRecords.length">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-one-half">
-      <h2 class="govuk-heading-m">Training({{ trainingRecords.length }})</h2>
-      <p>Last updated on {{ lastUpdated | date: 'd MMMM y' }}</p>
+      <h2 class="govuk-heading-m">Training ({{ trainingCount }})</h2>
+    </div>
+    <div class="govuk-grid-column-one-half govuk-util__float-right govuk-util__align-right">
+      <p>Updated {{ lastUpdated | date: 'd MMMM y' }}</p>
     </div>
   </div>
 
@@ -11,7 +13,7 @@ <h2 class="govuk-heading-m">Training({{ trainingRecords.length }})</h2>
       <tr class="govuk-table__row">
         <th class="govuk-table__header govuk-!-width-one-quarter" scope="col">Training category</th>
         <th class="govuk-table__header govuk-!-width-one-half" scope="col">Training name</th>
-        <th class="govuk-table__header" scope="col">Expiry Date</th>
+        <th class="govuk-table__header" scope="col">Status</th>
         <th class="govuk-table__header" scope="col"></th>
       </tr>
     </thead>
@@ -23,10 +25,15 @@ <h2 class="govuk-heading-m">Training({{ trainingRecords.length }})</h2>
           </td>
           <td class="govuk-table__cell">{{ trainingRecord.title }}</td>
           <td class="govuk-table__cell">
-            <span [class.govuk-util__bold]="trainingRecord.trainingStatus === 2"
-              >{{ trainingRecord.expires ? (trainingRecord.expires | date: 'dd M y') : '-' }}
-            </span>
-            <div *ngIf="trainingRecord.trainingStatus === 2" class="govuk-!-margin-bottom-1">
+            <div *ngIf="trainingRecord.trainingStatus === trainingStatusService.MISSING" class="govuk-!-margin-bottom-1">
+              <img
+                src="/assets/images/flag-red.svg"
+                alt="Missing"
+                class="govuk-!-margin-right-1 govuk-util__vertical-align-top"
+              />
+              Missing
+            </div>
+            <div *ngIf="trainingRecord.trainingStatus === trainingStatusService.EXPIRED" class="govuk-!-margin-bottom-1">
               <img
                 src="/assets/images/flag-red.svg"
                 alt="expired"
@@ -34,7 +41,7 @@ <h2 class="govuk-heading-m">Training({{ trainingRecords.length }})</h2>
               />
               Expired
             </div>
-            <div *ngIf="trainingRecord.trainingStatus === 1">
+            <div *ngIf="trainingRecord.trainingStatus === trainingStatusService.EXPIRING">
               <img
                 src="/assets/images/flag-orange.svg"
                 alt="expiring"
@@ -45,7 +52,7 @@ <h2 class="govuk-heading-m">Training({{ trainingRecords.length }})</h2>
           </td>
           <td class="govuk-table__cell govuk-!-font-weight-regular">
             <a
-              *ngIf="canEditWorker"
+              *ngIf="canEditWorker && !trainingRecord.missing "
               class="govuk-link--no-visited-state"
               href="#"
               (click)="toggleDetails(trainingRecord.uid, $event)"
@@ -56,10 +63,16 @@ <h2 class="govuk-heading-m">Training({{ trainingRecords.length }})</h2>
         <tr *ngIf="trainingDetails[trainingRecord.uid]" class="govuk-panel--gray ">
           <td colspan="4">
             <div class="govuk-grid-row govuk-!-margin-2">
+              <div class="govuk-grid-column-one-quarter">
+                <strong>Expiry date</strong>
+                <div>
+                  {{ trainingRecord.expires ? (trainingRecord.expires | date: 'dd MMM y') : '-' }}
+                </div>
+              </div>
               <div class="govuk-grid-column-one-quarter">
                 <strong>Date completed</strong>
                 <div>
-                  {{ trainingRecord.completed ? (trainingRecord.completed | date: 'dd M y') : '-' }}
+                  {{ trainingRecord.completed ? (trainingRecord.completed | date: 'dd MMM y') : '-' }}
                 </div>
               </div>
               <div class="govuk-grid-column-one-half govuk-!-padding-left-0">
diff --git a/src/app/features/workers/training-qualifications-record/training/training.component.spec.ts b/src/app/features/workers/training-qualifications-record/training/training.component.spec.ts
deleted file mode 100644
index cc6d05305e..0000000000
--- a/src/app/features/workers/training-qualifications-record/training/training.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TrainingComponent } from './training.component';
-
-describe('TrainingComponent', () => {
-  let component: TrainingComponent;
-  let fixture: ComponentFixture<TrainingComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [TrainingComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(TrainingComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/training-qualifications-record/training/training.component.ts b/src/app/features/workers/training-qualifications-record/training/training.component.ts
index c5ecf8656f..6e5a6a28a7 100644
--- a/src/app/features/workers/training-qualifications-record/training/training.component.ts
+++ b/src/app/features/workers/training-qualifications-record/training/training.component.ts
@@ -10,6 +10,7 @@ import { DeleteTrainingDialogComponent } from '@features/workers/delete-training
 import { orderBy } from 'lodash';
 import * as moment from 'moment';
 import { take } from 'rxjs/operators';
+import { TrainingStatusService } from '@core/services/trainingStatus.service';
 
 @Component({
   selector: 'app-training',
@@ -24,17 +25,19 @@ export class TrainingComponent implements OnInit {
   public trainingRecords: TrainingRecord[] = [];
   public trainingDetails = [];
   public trainingDetailsLabel = [];
+  public trainingCount = 0;
 
   constructor(
     private workerService: WorkerService,
     private permissionsService: PermissionsService,
     private router: Router,
-    private dialogService: DialogService
-  ) {}
+    private dialogService: DialogService,
+    private trainingStatusService: TrainingStatusService,
+  ) {
+  }
 
   ngOnInit() {
     this.fetchAllRecords();
-
     this.canEditWorker = this.permissionsService.can(this.workplace.uid, 'canEditWorker');
   }
 
@@ -42,7 +45,7 @@ export class TrainingComponent implements OnInit {
     event.preventDefault();
     const dialog = this.dialogService.open(DeleteTrainingDialogComponent, {
       nameOrId: this.worker.nameOrId,
-      trainingRecord,
+      trainingRecord
     });
     dialog.afterClosed.pipe(take(1)).subscribe(confirm => {
       if (confirm) {
@@ -56,7 +59,8 @@ export class TrainingComponent implements OnInit {
       }
     });
   }
-  //to get all training records
+
+  // to get all training records
   fetchAllRecords() {
     this.workerService
       .getTrainingRecords(this.workplace.uid, this.worker.uid)
@@ -65,41 +69,38 @@ export class TrainingComponent implements OnInit {
         training => {
           this.lastUpdated = moment(training.lastUpdated);
           this.trainingRecords = training.training;
+          this.trainingCount = training.count;
           this.trainingRecords.map(trainingRecord => {
-            trainingRecord.trainingStatus = this.getTrainingStatus(trainingRecord.expires);
+            trainingRecord.trainingStatus =  this.trainingStatusService.getTrainingStatus(trainingRecord.expires, trainingRecord.missing);
+          });
+          this.trainingRecords.sort((record1, record2) => {
+            if (record1.trainingStatus > record2.trainingStatus) {
+              return -1;
+            }
+            if (record1.trainingStatus < record2.trainingStatus) {
+              return 1;
+            }
+            if (record1.trainingCategory.category > record2.trainingCategory.category) {
+              return 1;
+            }
+            if (record1.trainingCategory.category < record2.trainingCategory.category) {
+              return -1;
+            }
+            return 0;
           });
-          this.trainingRecords = orderBy(this.trainingRecords, [trainingRecord => trainingRecord.expires], ['asc']);
         },
         error => {
           console.error(error.error);
         }
       );
+
   }
-  /**
-   * Function used to get training status by comparing expiring date
-   * @param {date} exptire date
-   * @return {number} 0 for up-to-date, 1 for expiring soon and 2 for expired.
-   */
-  public getTrainingStatus(expires) {
-    let status = 0;
-    if (expires) {
-      const expiringDate = moment(expires);
-      const currentDate = moment();
-      const daysDiffrence = expiringDate.diff(currentDate, 'days');
-      if (daysDiffrence < 0) {
-        status = 2;
-      } else if (daysDiffrence >= 0 && daysDiffrence <= 90) {
-        status = 1;
-      } else {
-        status = 0;
-      }
-    }
-    return status;
-  }
+
+
   /**
    * Function used to hadle toggle for traing details view and change training details lable
    * @param {string} training uid of clicked row
-   * @param {event} refrance of event handler
+   * @param {event} reference of event handler
    */
   public toggleDetails(uid: string, event) {
     event.preventDefault();
diff --git a/src/app/features/workers/wdf-staff-summary/wdf-staff-summary.component.html b/src/app/features/workers/wdf-staff-summary/wdf-staff-summary.component.html
index dba4d3a38f..cccdac0ba2 100644
--- a/src/app/features/workers/wdf-staff-summary/wdf-staff-summary.component.html
+++ b/src/app/features/workers/wdf-staff-summary/wdf-staff-summary.component.html
@@ -11,8 +11,10 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-4">
     </div>
   </div>
   <div class="govuk-grid-row">
-    <div class="govuk-grid-column-full govuk-!-margin-bottom-4">
-      <app-eligibility-icon [eligible]="isEligible"></app-eligibility-icon>
+    <div class="govuk-grid-column-two-thirds">
+      <p class="govuk-!-margin-bottom-4">
+        <app-eligibility-icon [eligible]="isEligible"></app-eligibility-icon>
+      </p>
     </div>
   </div>
   <div class="govuk-grid-row">
diff --git a/src/app/features/workers/wdf-staff-summary/wdf-staff-summary.component.spec.ts b/src/app/features/workers/wdf-staff-summary/wdf-staff-summary.component.spec.ts
deleted file mode 100644
index 2bf5c7c9e7..0000000000
--- a/src/app/features/workers/wdf-staff-summary/wdf-staff-summary.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WdfStaffSummaryComponent } from './wdf-staff-summary.component';
-
-describe('ReportsStaffSummaryComponent', () => {
-  let component: WdfStaffSummaryComponent;
-  let fixture: ComponentFixture<WdfStaffSummaryComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [WdfStaffSummaryComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WdfStaffSummaryComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/wdf-worker-confirmation-dialog/wdf-worker-confirmation-dialog.component.spec.ts b/src/app/features/workers/wdf-worker-confirmation-dialog/wdf-worker-confirmation-dialog.component.spec.ts
deleted file mode 100644
index d1ebdfe378..0000000000
--- a/src/app/features/workers/wdf-worker-confirmation-dialog/wdf-worker-confirmation-dialog.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WdfWorkerConfirmationDialogComponent } from './wdf-worker-confirmation-dialog.component';
-
-describe('WdfConfirmationDialogComponent', () => {
-  let component: WdfWorkerConfirmationDialogComponent;
-  let fixture: ComponentFixture<WdfWorkerConfirmationDialogComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [WdfWorkerConfirmationDialogComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WdfWorkerConfirmationDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/weekly-contracted-hours/weekly-contracted-hours.component.spec.ts b/src/app/features/workers/weekly-contracted-hours/weekly-contracted-hours.component.spec.ts
deleted file mode 100644
index 024fdaac8b..0000000000
--- a/src/app/features/workers/weekly-contracted-hours/weekly-contracted-hours.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { WeeklyContractedHoursComponent } from './weekly-contracted-hours.component';
-
-describe('AverageWeeklyHoursComponent', () => {
-  let component: WeeklyContractedHoursComponent;
-  let fixture: ComponentFixture<WeeklyContractedHoursComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [WeeklyContractedHoursComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WeeklyContractedHoursComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workers/worker-save-success/worker-save-success.component.html b/src/app/features/workers/worker-save-success/worker-save-success.component.html
index 738bfaee02..a431e2356a 100644
--- a/src/app/features/workers/worker-save-success/worker-save-success.component.html
+++ b/src/app/features/workers/worker-save-success/worker-save-success.component.html
@@ -5,7 +5,7 @@
       been saved
     </app-panel>
     <h2 class="govuk-heading-m">What you can do next?</h2>
-    <p>You can add more staff records, or return to your homepage</p>
+    <p>You can add more staff records, or go to home.</p>
     <div class="govuk-button-group">
       <a class="govuk-button" role="button" draggable="false" [routerLink]="['../../create-staff-record']">
         Add another staff record
@@ -15,9 +15,9 @@ <h2 class="govuk-heading-m">What you can do next?</h2>
         role="button"
         draggable="false"
         [routerLink]="return.url"
-        [fragment]="'staff-records'"
+        [fragment]="'home'"
       >
-        Return to {{ return.label }}
+        Go to {{ return.label }}
       </a>
     </div>
   </div>
diff --git a/src/app/features/workers/worker-save-success/worker-save-success.component.ts b/src/app/features/workers/worker-save-success/worker-save-success.component.ts
index e55a04581f..a1297f36e6 100644
--- a/src/app/features/workers/worker-save-success/worker-save-success.component.ts
+++ b/src/app/features/workers/worker-save-success/worker-save-success.component.ts
@@ -16,7 +16,7 @@ export class WorkerSaveSuccessComponent implements OnDestroy {
 
     this.return =
       workplaceUid === primaryWorkplaceUid
-        ? { url: ['/dashboard'], label: 'dashboard' }
+        ? { url: ['/dashboard'], label: 'home' }
         : { url: ['/workplace', workplaceUid], label: 'workplace' };
   }
 
diff --git a/src/app/features/workers/year-arrived-uk/year-arrived-uk.component.spec.ts b/src/app/features/workers/year-arrived-uk/year-arrived-uk.component.spec.ts
deleted file mode 100644
index 7d95cabcfd..0000000000
--- a/src/app/features/workers/year-arrived-uk/year-arrived-uk.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { YearArrivedUkComponent } from './year-arrived-uk.component';
-
-describe('YearArrivedUkComponent', () => {
-  let component: YearArrivedUkComponent;
-  let fixture: ComponentFixture<YearArrivedUkComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [YearArrivedUkComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(YearArrivedUkComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace-find-and-select/confirm-workplace-details/confirm-workplace-details.spec.ts b/src/app/features/workplace-find-and-select/confirm-workplace-details/confirm-workplace-details.spec.ts
deleted file mode 100644
index 286d16e8ef..0000000000
--- a/src/app/features/workplace-find-and-select/confirm-workplace-details/confirm-workplace-details.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ConfirmWorkplaceDetails } from './confirm-workplace-details';
-
-describe('ConfirmWorkplaceDetails', () => {
-  let component: ConfirmWorkplaceDetails;
-  let fixture: ComponentFixture<ConfirmWorkplaceDetails>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ConfirmWorkplaceDetails],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ConfirmWorkplaceDetails);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace-find-and-select/enter-workplace-address/enter-workplace-address.component.html b/src/app/features/workplace-find-and-select/enter-workplace-address/enter-workplace-address.component.html
index a7e433a4ed..5387d00609 100644
--- a/src/app/features/workplace-find-and-select/enter-workplace-address/enter-workplace-address.component.html
+++ b/src/app/features/workplace-find-and-select/enter-workplace-address/enter-workplace-address.component.html
@@ -1,53 +1,45 @@
 <app-error-summary *ngIf="submitted && form.invalid" [formErrorsMap]="formErrorsMap" [form]="form"></app-error-summary>
 
 <div class="govuk-grid-row">
+  <form #formEl novalidate (ngSubmit)="onSubmit()" [formGroup]="form">
+    <fieldset class="govuk-fieldset">
+      <legend class="govuk-fieldset__legend govuk-fieldset__legend--xl">
+        <h1 *ngIf="isWorkPlaceUpdate" class="govuk-fieldset__heading">
+          Workplace details
+        </h1>
+        <h1 *ngIf="!isWorkPlaceUpdate" class="govuk-fieldset__heading">
+          Enter your workplace address
+        </h1>
+      </legend>
 
-    <form #formEl novalidate (ngSubmit)="onSubmit()" [formGroup]="form">
-      <fieldset class="govuk-fieldset">
-        <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
-           <h1 *ngIf="isWorkPlaceUpdate" class="govuk-fieldset__heading">
-           Workplace details
-          </h1>
-          <h1 *ngIf="!isWorkPlaceUpdate" class="govuk-fieldset__heading">
-           Enter your workplace address
-            </h1>
-        </legend>
-
-        <ng-container *ngFor="let item of formControlsMap">
-          <div class="govuk-form-group" [class.govuk-form-group--error]="submitted && form.get(item.name).errors">
-            <label class="govuk-label" for="{{ item.name }}" [innerHTML]="item.label"></label>
-            <span
-              *ngIf="submitted && form.get(item.name).errors"
-              id="{{ item.name }}-error"
-              class="govuk-error-message"
-            >
-              <span class="govuk-visually-hidden">Error:</span> {{ getFirstErrorMessage(item.name) }}
-            </span>
-            <input
-              class="govuk-input govuk-input--width-{{ item.width }}"
-              [formControlName]="item.name"
-              id="{{ item.name }}"
-              name="{{ item.name }}"
-              [class.govuk-input--error]="submitted && form.get(item.name).errors"
-              type="text"
-            />
-          </div>
-        </ng-container>
-      </fieldset>
-       <ng-container *ngIf="isWorkPlaceUpdate; else workplaceAdd">
-          <button class="govuk-button" type="submit">Save and Return</button>
-      <button
-        type="button"
-        class="govuk-button govuk-button--link govuk-util__float-right"
+      <ng-container *ngFor="let item of formControlsMap">
+        <div class="govuk-form-group" [class.govuk-form-group--error]="submitted && form.get(item.name).errors">
+          <label class="govuk-label" for="{{ item.name }}" [innerHTML]="item.label"></label>
+          <span *ngIf="submitted && form.get(item.name).errors" id="{{ item.name }}-error" class="govuk-error-message">
+            <span class="govuk-visually-hidden">Error:</span> {{ getFirstErrorMessage(item.name) }}
+          </span>
+          <input
+            class="govuk-input govuk-input--width-{{ item.width }}"
+            [formControlName]="item.name"
+            id="{{ item.name }}"
+            name="{{ item.name }}"
+            [class.govuk-input--error]="submitted && form.get(item.name).errors"
+            type="text"
+          />
+        </div>
+      </ng-container>
+    </fieldset>
+    <ng-container *ngIf="isWorkPlaceUpdate; else workplaceAdd">
+      <button class="govuk-button" type="submit">Save and Return</button>
+      <a
+        href="#"
+        class="govuk-list govuk-list--inline govuk-util__float-right govuk-!-margin-top-2"
         (click)="returnToWorkPlace($event)"
+        >Exit</a
       >
-        Exit
-      </button>
-       </ng-container>
-       <ng-template #workplaceAdd>
-          <button class="govuk-button" type="submit">Continue</button>
-       </ng-template>
-
-    </form>
-
+    </ng-container>
+    <ng-template #workplaceAdd>
+      <button class="govuk-button" type="submit">Continue</button>
+    </ng-template>
+  </form>
 </div>
diff --git a/src/app/features/workplace-find-and-select/enter-workplace-address/enter-workplace-address.component.spec.ts b/src/app/features/workplace-find-and-select/enter-workplace-address/enter-workplace-address.component.spec.ts
deleted file mode 100644
index 98f4402742..0000000000
--- a/src/app/features/workplace-find-and-select/enter-workplace-address/enter-workplace-address.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { EnterWorkplaceAddress } from './enter-workplace-address';
-
-describe('EnterWorkplaceAddressComponent', () => {
-  let component: EnterWorkplaceAddress;
-  let fixture: ComponentFixture<EnterWorkplaceAddress>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [EnterWorkplaceAddress],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EnterWorkplaceAddress);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace-find-and-select/find-workplace-address/find-workplace-address.spec.ts b/src/app/features/workplace-find-and-select/find-workplace-address/find-workplace-address.spec.ts
deleted file mode 100644
index 155de0f562..0000000000
--- a/src/app/features/workplace-find-and-select/find-workplace-address/find-workplace-address.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { FindWorkplaceAddress } from './find-workplace-address';
-
-describe('FindWorkplaceAddress', () => {
-  let component: FindWorkplaceAddress;
-  let fixture: ComponentFixture<FindWorkplaceAddress>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [FindWorkplaceAddress],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(FindWorkplaceAddress);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace-find-and-select/regulated-by-cqc/regulated-by-cqc.spec.ts b/src/app/features/workplace-find-and-select/regulated-by-cqc/regulated-by-cqc.spec.ts
deleted file mode 100644
index 624c088627..0000000000
--- a/src/app/features/workplace-find-and-select/regulated-by-cqc/regulated-by-cqc.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RegulatedByCQC } from './regulated-by-cqc';
-
-describe('RegulatedByCQC', () => {
-  let component: RegulatedByCQC;
-  let fixture: ComponentFixture<RegulatedByCQC>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [RegulatedByCQC],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(RegulatedByCQC);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace-find-and-select/regulated-by-cqc/regulated-by-cqc.ts b/src/app/features/workplace-find-and-select/regulated-by-cqc/regulated-by-cqc.ts
index 824f44d0b5..47b331f593 100644
--- a/src/app/features/workplace-find-and-select/regulated-by-cqc/regulated-by-cqc.ts
+++ b/src/app/features/workplace-find-and-select/regulated-by-cqc/regulated-by-cqc.ts
@@ -28,7 +28,7 @@ export class RegulatedByCQC implements OnInit, OnDestroy, AfterViewInit {
     protected formBuilder: FormBuilder,
     protected locationService: LocationService,
     protected route: ActivatedRoute,
-    protected router: Router
+    protected router: Router,
   ) {}
 
   get regulatedByCQC() {
@@ -119,11 +119,11 @@ export class RegulatedByCQC implements OnInit, OnDestroy, AfterViewInit {
         type: [
           {
             name: 'bothAreEmpty',
-            message: 'Postcode and location ID are both empty. Please fill out one field.',
+            message: 'Please enter either your postcode or location ID.',
           },
           {
             name: 'bothHaveContent',
-            message: 'Postcode and location ID are both entered. Please fill out one field.',
+            message: 'Please enter either your postcode or location ID.',
           },
         ],
       },
@@ -206,47 +206,45 @@ export class RegulatedByCQC implements OnInit, OnDestroy, AfterViewInit {
   private save(): void {
     if (this.regulatedByCQC.value === 'yes') {
       if (this.regulatedPostcode.value.length) {
-        if(this.isCQCLocationUpdate){
+        if (this.isCQCLocationUpdate) {
           this.subscriptions.add(
-          this.locationService.getUnassignedLocationByPostCode(this.regulatedPostcode.value).subscribe(
-            (data: LocationSearchResponse) => this.onSuccess(data),
-            (error: HttpErrorResponse) => this.onError(error)
-          )
-        );
+            this.locationService.getUnassignedLocationByPostCode(this.regulatedPostcode.value).subscribe(
+              (data: LocationSearchResponse) => this.onSuccess(data),
+              (error: HttpErrorResponse) => this.onError(error),
+            ),
+          );
         } else {
           this.subscriptions.add(
-          this.locationService.getLocationByPostCode(this.regulatedPostcode.value).subscribe(
-            (data: LocationSearchResponse) => this.onSuccess(data),
-            (error: HttpErrorResponse) => this.onError(error)
-          )
-        );
+            this.locationService.getLocationByPostCode(this.regulatedPostcode.value).subscribe(
+              (data: LocationSearchResponse) => this.onSuccess(data),
+              (error: HttpErrorResponse) => this.onError(error),
+            ),
+          );
         }
-
       } else if (this.locationId.value.length) {
-         if(this.isCQCLocationUpdate){
-           this.subscriptions.add(
-          this.locationService.getUnassignedLocationByLocationId(this.locationId.value).subscribe(
-            (data: LocationSearchResponse) => this.onSuccess(data),
-            (error: HttpErrorResponse) => this.onError(error)
-          )
-        );
-         } else {
-           this.subscriptions.add(
-          this.locationService.getLocationByLocationId(this.locationId.value).subscribe(
-            (data: LocationSearchResponse) => this.onSuccess(data),
-            (error: HttpErrorResponse) => this.onError(error)
-          )
-        );
-         }
-
+        if (this.isCQCLocationUpdate) {
+          this.subscriptions.add(
+            this.locationService.getUnassignedLocationByLocationId(this.locationId.value).subscribe(
+              (data: LocationSearchResponse) => this.onSuccess(data),
+              (error: HttpErrorResponse) => this.onError(error),
+            ),
+          );
+        } else {
+          this.subscriptions.add(
+            this.locationService.getLocationByLocationId(this.locationId.value).subscribe(
+              (data: LocationSearchResponse) => this.onSuccess(data),
+              (error: HttpErrorResponse) => this.onError(error),
+            ),
+          );
+        }
       }
     } else if (this.regulatedByCQC.value === 'no') {
       if (this.nonRegulatedPostcode.value.length) {
         this.subscriptions.add(
           this.locationService.getAddressesByPostCode(this.nonRegulatedPostcode.value).subscribe(
             (data: LocationSearchResponse) => this.onSuccess(data),
-            (error: HttpErrorResponse) => this.onError(error)
-          )
+            (error: HttpErrorResponse) => this.onError(error),
+          ),
         );
       }
     }
diff --git a/src/app/features/workplace-find-and-select/select-main-service/select-main-service.component.html b/src/app/features/workplace-find-and-select/select-main-service/select-main-service.component.html
index b70ea61479..29f0160d32 100644
--- a/src/app/features/workplace-find-and-select/select-main-service/select-main-service.component.html
+++ b/src/app/features/workplace-find-and-select/select-main-service/select-main-service.component.html
@@ -6,15 +6,13 @@
 >
 </app-error-summary>
 
-<div class="govuk-grid-row">
-  <div class="govuk-grid-column-full">
-    <form #formEl novalidate (ngSubmit)="onSubmit()" [formGroup]="form" id="server-error" *ngIf="renderForm">
+<form #formEl novalidate (ngSubmit)="onSubmit()" [formGroup]="form" id="server-error" *ngIf="renderForm">
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
       <div class="govuk-form-group" [class.govuk-form-group--error]="submitted && form.invalid">
         <fieldset class="govuk-fieldset">
-          <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
-            <h1 class="govuk-fieldset__heading">
-              Select your main service
-            </h1>
+          <legend class="govuk-fieldset__legend govuk-fieldset__legend--xl">
+            <h1 class="govuk-fieldset__heading">Select your main service</h1>
           </legend>
 
           <p *ngIf="displayIntro">
@@ -91,7 +89,9 @@ <h2 class="govuk-fieldset__heading">
           </fieldset>
         </fieldset>
       </div>
-      <app-submit-exit-buttons [cta]="callToActionLabel" [return]="return"></app-submit-exit-buttons>
-    </form>
+    </div>
   </div>
-</div>
+  <div class="govuk-grid-row">
+    <app-submit-exit-buttons [cta]="callToActionLabel" [return]="return"></app-submit-exit-buttons>
+  </div>
+</form>
diff --git a/src/app/features/workplace-find-and-select/select-main-service/select-main-service.spec.ts b/src/app/features/workplace-find-and-select/select-main-service/select-main-service.spec.ts
deleted file mode 100644
index 289a2f2aea..0000000000
--- a/src/app/features/workplace-find-and-select/select-main-service/select-main-service.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SelectMainService } from './select-main-service';
-
-describe('SelectMainService', () => {
-  let component: SelectMainService;
-  let fixture: ComponentFixture<SelectMainService>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SelectMainService],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SelectMainService);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace-find-and-select/select-workplace-address/select-workplace-address.spec.ts b/src/app/features/workplace-find-and-select/select-workplace-address/select-workplace-address.spec.ts
deleted file mode 100644
index 3d6eb60cea..0000000000
--- a/src/app/features/workplace-find-and-select/select-workplace-address/select-workplace-address.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SelectWorkplaceAddress } from './select-workplace-address';
-
-describe('SelectWorkplaceAddress', () => {
-  let component: SelectWorkplaceAddress;
-  let fixture: ComponentFixture<SelectWorkplaceAddress>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SelectWorkplaceAddress],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SelectWorkplaceAddress);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace-find-and-select/select-workplace/select-workplace.spec.ts b/src/app/features/workplace-find-and-select/select-workplace/select-workplace.spec.ts
deleted file mode 100644
index 172f1c8575..0000000000
--- a/src/app/features/workplace-find-and-select/select-workplace/select-workplace.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SelectWorkplace } from './select-workplace';
-
-describe('SelectWorkplace', () => {
-  let component: SelectWorkplace;
-  let fixture: ComponentFixture<SelectWorkplace>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SelectWorkplace],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SelectWorkplace);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace-find-and-select/workplace-not-found/workplace-not-found.spec.ts b/src/app/features/workplace-find-and-select/workplace-not-found/workplace-not-found.spec.ts
deleted file mode 100644
index 7c64eacf87..0000000000
--- a/src/app/features/workplace-find-and-select/workplace-not-found/workplace-not-found.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WorkplaceNotFound } from './workplace-not-found';
-
-describe('WorkplaceNotFound', () => {
-  let component: WorkplaceNotFound;
-  let fixture: ComponentFixture<WorkplaceNotFound>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [WorkplaceNotFound],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WorkplaceNotFound);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/check-answers/check-answers.component.spec.ts b/src/app/features/workplace/check-answers/check-answers.component.spec.ts
deleted file mode 100644
index 5cad8c5f92..0000000000
--- a/src/app/features/workplace/check-answers/check-answers.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CheckAnswersComponent } from './check-answers.component';
-
-describe('CheckAnswersComponent', () => {
-  let component: CheckAnswersComponent;
-  let fixture: ComponentFixture<CheckAnswersComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ CheckAnswersComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CheckAnswersComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/confirm-leavers/confirm-leavers.component.spec.ts b/src/app/features/workplace/confirm-leavers/confirm-leavers.component.spec.ts
deleted file mode 100644
index 88d2b71a0f..0000000000
--- a/src/app/features/workplace/confirm-leavers/confirm-leavers.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ConfirmLeaversComponent } from './confirm-leavers.component';
-
-describe('ConfirmLeaversComponent', () => {
-  let component: ConfirmLeaversComponent;
-  let fixture: ComponentFixture<ConfirmLeaversComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ConfirmLeaversComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ConfirmLeaversComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/confirm-starters/confirm-starters.component.spec.ts b/src/app/features/workplace/confirm-starters/confirm-starters.component.spec.ts
deleted file mode 100644
index a1b6ad7ba6..0000000000
--- a/src/app/features/workplace/confirm-starters/confirm-starters.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ConfirmStartersComponent } from './confirm-starters.component';
-
-describe('ConfirmStartersComponent', () => {
-  let component: ConfirmStartersComponent;
-  let fixture: ComponentFixture<ConfirmStartersComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ConfirmStartersComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ConfirmStartersComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/confirm-vacancies/confirm-vacancies.component.spec.ts b/src/app/features/workplace/confirm-vacancies/confirm-vacancies.component.spec.ts
deleted file mode 100644
index c71863778b..0000000000
--- a/src/app/features/workplace/confirm-vacancies/confirm-vacancies.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ConfirmVacanciesComponent } from './confirm-vacancies.component';
-
-describe('ConfirmVacanciesComponent', () => {
-  let component: ConfirmVacanciesComponent;
-  let fixture: ComponentFixture<ConfirmVacanciesComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ConfirmVacanciesComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ConfirmVacanciesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/create-user-account/create-user-account.component.spec.ts b/src/app/features/workplace/create-user-account/create-user-account.component.spec.ts
deleted file mode 100644
index d86dbaf348..0000000000
--- a/src/app/features/workplace/create-user-account/create-user-account.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CreateUserAccountComponent } from './create-user-account.component';
-
-describe('CreateUserAccountComponent', () => {
-  let component: CreateUserAccountComponent;
-  let fixture: ComponentFixture<CreateUserAccountComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [CreateUserAccountComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CreateUserAccountComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.html b/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.html
index 6893929fc7..3af8dbd4a1 100644
--- a/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.html
+++ b/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.html
@@ -7,7 +7,7 @@
 
 <form #formEl (ngSubmit)="onSubmit()" [formGroup]="form">
   <div class="govuk-grid-row">
-    <div class="govuk-grid-column-two-thirds-from-desktop">
+    <div class="govuk-grid-column-two-thirds">
       <fieldset class="govuk-fieldset">
         <legend class="govuk-fieldset__legend govuk-fieldset__legend--xl">
           <h1 class="govuk-fieldset__heading">Sharing data with local authorities</h1>
@@ -32,43 +32,40 @@ <h1 class="govuk-fieldset__heading">Sharing data with local authorities</h1>
             </span>
           </div>
         </div>
-        <p>Add more local authorities to share your data with.</p>
-        <h2 class="govuk-heading-m">Local Authorities</h2>
-        <ng-container formArrayName="localAuthorities">
-          <div
-            class="govuk-form-group"
-            *ngFor="let localAuthorities of localAuthoritiesArray.controls; let i = index"
-            [formGroupName]="i"
-          >
-            <select
-              class="govuk-select"
-              [formControlName]="'custodianCode'"
-              id="localAuthorities-{{ i }}"
-              name="custodianCode"
-            >
-              <option [ngValue]="null">Select Local Authority</option>
-              <option *ngFor="let authority of selectableAuthorities(i)" [value]="authority.custodianCode">
-                {{ authority.name }}
-              </option>
-            </select>
-            <button
-              class="govuk-button govuk-button--link govuk-!-margin-bottom-0"
-              type="button"
-              (click)="deleteLocalAuthority($event, i)"
-            >
-              Remove
-              <span class="govuk-visually-hidden">
-                local authority {{ localAuthorities.get('custodianCode').value }}</span
-              >
-            </button>
-          </div>
-        </ng-container>
-        <button class="govuk-button govuk-button--secondary" type="button" (click)="addLocalAuthority()">
-          Add another local authority
-        </button>
       </fieldset>
     </div>
   </div>
+  <div class="govuk-grid-row  govuk-!-margin-left-0">
+    <p>Add more local authorities to share your data with.</p>
+    <h2 class="govuk-heading-m">Local authorities</h2>
+    <ng-container formArrayName="localAuthorities">
+      <div
+        class="govuk-form-group"
+        *ngFor="let localAuthorities of localAuthoritiesArray.controls; let i = index"
+        [formGroupName]="i"
+      >
+        <div class="govuk-grid-column-two-thirds">
+          <select
+            class="govuk-select govuk-!-width-full"
+            [formControlName]="'custodianCode'"
+            id="localAuthorities-{{ i }}"
+            name="custodianCode"
+          >
+            <option [ngValue]="null">Select Local authority</option>
+            <option *ngFor="let authority of selectableAuthorities(i)" [value]="authority.custodianCode">
+              {{ authority.name }}
+            </option>
+          </select>
+        </div>
+        <div class="govuk-grid-column-one-thirds govuk-!-padding-top-1">
+          <a href="#" class="govuk-list govuk-list--inline" (click)="deleteLocalAuthority($event, i)">Remove</a>
+        </div>
+      </div>
+    </ng-container>
+    <button class="govuk-button govuk-button--secondary" type="button" (click)="addLocalAuthority()">
+      Add another local authority
+    </button>
+  </div>
 
   <app-submit-button [return]="!!return" (clicked)="onSubmit($event)"></app-submit-button>
 </form>
diff --git a/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.spec.ts b/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.spec.ts
deleted file mode 100644
index 710320f86c..0000000000
--- a/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DataSharingWithLocalAuthoritiesComponent } from './data-sharing-with-local-authorities.component';
-
-describe('StaffComponent', () => {
-  let component: DataSharingWithLocalAuthoritiesComponent;
-  let fixture: ComponentFixture<DataSharingWithLocalAuthoritiesComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [DataSharingWithLocalAuthoritiesComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DataSharingWithLocalAuthoritiesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.ts b/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.ts
index 3499d4c773..8091e412b9 100644
--- a/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.ts
+++ b/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.ts
@@ -25,7 +25,7 @@ export class DataSharingWithLocalAuthoritiesComponent extends Question {
     protected backService: BackService,
     protected errorSummaryService: ErrorSummaryService,
     protected establishmentService: EstablishmentService,
-    private localAuthorityService: LocalAuthorityService
+    private localAuthorityService: LocalAuthorityService,
   ) {
     super(formBuilder, router, backService, errorSummaryService, establishmentService);
 
@@ -62,11 +62,11 @@ export class DataSharingWithLocalAuthoritiesComponent extends Question {
       this.localAuthorityService.getAuthorities().subscribe(authorities => {
         const index = findIndex(
           authorities,
-          authority => authority.custodianCode === this.primaryAuthority.custodianCode
+          authority => authority.custodianCode === this.primaryAuthority.custodianCode,
         );
         authorities.splice(index, 1);
         this.authorities = authorities;
-      })
+      }),
     );
 
     this.establishment.localAuthorities.forEach(authority => {
@@ -117,17 +117,18 @@ export class DataSharingWithLocalAuthoritiesComponent extends Question {
           !this.localAuthoritiesArray.controls.some(
             localAuth =>
               localAuth !== this.localAuthoritiesArray.controls[index] &&
-              parseInt(localAuth.get('custodianCode').value, 10) === authority.custodianCode
-          )
+              parseInt(localAuth.get('custodianCode').value, 10) === authority.custodianCode,
+          ),
       );
     }
   }
 
   protected updateEstablishment(props) {
     this.subscriptions.add(
-      this.establishmentService
-        .updateLocalAuthorities(this.establishment.uid, props)
-        .subscribe(data => this._onSuccess(data), error => this.onError(error))
+      this.establishmentService.updateLocalAuthorities(this.establishment.uid, props).subscribe(
+        data => this._onSuccess(data),
+        error => this.onError(error),
+      ),
     );
   }
 }
diff --git a/src/app/features/workplace/data-sharing/data-sharing.component.html b/src/app/features/workplace/data-sharing/data-sharing.component.html
index 65e7e6e60f..1e70ab0d0e 100644
--- a/src/app/features/workplace/data-sharing/data-sharing.component.html
+++ b/src/app/features/workplace/data-sharing/data-sharing.component.html
@@ -25,29 +25,29 @@ <h1 class="govuk-heading-xl">Sharing your data</h1>
     <app-details *ngIf="establishment.isRegulated" [title]="'What do we share with CQC?'">
       <p>We share all data, including individual worker records, with the exception of:</p>
       <ul class="govuk-list govuk-list--bullet">
-        <li>Record ID</li>
-        <li>Pay</li>
-        <li>Sickness absence</li>
-        <li>Date of birth</li>
-        <li>National Insurance number</li>
-        <li>Ethnicity</li>
-        <li>Nationality</li>
-        <li>Country of birth</li>
-        <li>Year of arrival in UK</li>
-        <li>Hours worked in the last 7 days</li>
+        <li>record ID</li>
+        <li>pay</li>
+        <li>sickness absence</li>
+        <li>date of birth</li>
+        <li>national Insurance number</li>
+        <li>ethnicity</li>
+        <li>nationality</li>
+        <li>country of birth</li>
+        <li>year of arrival in UK</li>
+        <li>hours worked in the last 7 days</li>
       </ul>
       <p>CQC cannot identify workers through this process</p>
     </app-details>
     <app-details [title]="'What do we share with local authorities?'">
       <p>We will share the following data with your local authority:</p>
       <ul class="govuk-list govuk-list--bullet">
-        <li>Your unique workplace reference</li>
-        <li>Workplace name</li>
-        <li>Address</li>
-        <li>Main service</li>
-        <li>Number of staff</li>
-        <li>Percentage of worker records completed</li>
-        <li>When your account was last updated</li>
+        <li>your unique workplace reference</li>
+        <li>workplace name</li>
+        <li>address</li>
+        <li>main service</li>
+        <li>number of staff</li>
+        <li>percentage of worker records completed</li>
+        <li>when your account was last updated</li>
       </ul>
     </app-details>
   </div>
diff --git a/src/app/features/workplace/data-sharing/data-sharing.component.spec.ts b/src/app/features/workplace/data-sharing/data-sharing.component.spec.ts
deleted file mode 100644
index 2de9193e06..0000000000
--- a/src/app/features/workplace/data-sharing/data-sharing.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DataSharingComponent } from './data-sharing.component';
-
-describe('StaffComponent', () => {
-  let component: DataSharingComponent;
-  let fixture: ComponentFixture<DataSharingComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [DataSharingComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DataSharingComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/delete-workplace-dialog/delete-workplace-dialog.component.spec.ts b/src/app/features/workplace/delete-workplace-dialog/delete-workplace-dialog.component.spec.ts
deleted file mode 100644
index 7917627768..0000000000
--- a/src/app/features/workplace/delete-workplace-dialog/delete-workplace-dialog.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DeleteWorkplaceDialogComponent } from './delete-workplace-dialog.component';
-
-describe('DeleteWorkplaceDialogComponent', () => {
-  let component: DeleteWorkplaceDialogComponent;
-  let fixture: ComponentFixture<DeleteWorkplaceDialogComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ DeleteWorkplaceDialogComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DeleteWorkplaceDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/edit-workplace/edit-workplace.component.spec.ts b/src/app/features/workplace/edit-workplace/edit-workplace.component.spec.ts
deleted file mode 100644
index 91b7b01948..0000000000
--- a/src/app/features/workplace/edit-workplace/edit-workplace.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { EditWorkplaceComponent } from './edit-workplace.component';
-
-describe('EditWorkplaceComponent', () => {
-  let component: EditWorkplaceComponent;
-  let fixture: ComponentFixture<EditWorkplaceComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ EditWorkplaceComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EditWorkplaceComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/enter-workplace-address/enter-workplace-address.component.spec.ts b/src/app/features/workplace/enter-workplace-address/enter-workplace-address.component.spec.ts
deleted file mode 100644
index 7c850aed84..0000000000
--- a/src/app/features/workplace/enter-workplace-address/enter-workplace-address.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { EnterWorkplaceAddressComponent } from './enter-workplace-address.component';
-
-describe('EnterWorkplaceAddressComponent', () => {
-  let component: EnterWorkplaceAddressComponent;
-  let fixture: ComponentFixture<EnterWorkplaceAddressComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ EnterWorkplaceAddressComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EnterWorkplaceAddressComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/leavers/leavers.component.html b/src/app/features/workplace/leavers/leavers.component.html
index 835733c51a..da08a69d33 100644
--- a/src/app/features/workplace/leavers/leavers.component.html
+++ b/src/app/features/workplace/leavers/leavers.component.html
@@ -8,12 +8,14 @@
 
 <form #formEl novalidate (ngSubmit)="onSubmit()" [formGroup]="form">
   <fieldset class="govuk-fieldset">
-    <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
-      <h1 class="govuk-fieldset__heading">Staff who have left in the last 12 months</h1>
-    </legend>
-
-    <p class="govuk-hint">This should only be for permanent or temporary staff.</p>
-
+    <div class="govuk-grid-row">
+      <div class="govuk-grid-column-two-thirds">
+        <legend class="govuk-fieldset__legend govuk-fieldset__legend--xl">
+          <h1 class="govuk-fieldset__heading">Staff who have left in the last 12 months</h1>
+          <p class="govuk-hint">This should only be for permanent or temporary staff.</p>
+        </legend>
+      </div>
+    </div>
     <ng-container formArrayName="leavers">
       <div class="govuk-grid-row">
         <div class="govuk-grid-column-two-thirds govuk-form-group govuk-!-margin-bottom-0">
@@ -30,6 +32,11 @@ <h1 class="govuk-fieldset__heading">Staff who have left in the last 12 months</h
       >
         <div class="govuk-grid-row govuk-!-margin-bottom-6">
           <div class="govuk-grid-column-two-thirds">
+            <span *ngIf="submitted" id="leaver-{{ i }}-error" class="govuk-error-message">
+              <ng-container *ngIf="submitted && leaver.get('jobRole').invalid">
+                {{ getFormErrorMessage('leavers.jobRole', 'required') }}
+              </ng-container>
+            </span>
             <select
               class="govuk-select govuk-!-width-full"
               [class.govuk-select--error]="submitted && leaver.get('jobRole').invalid"
@@ -44,6 +51,17 @@ <h1 class="govuk-fieldset__heading">Staff who have left in the last 12 months</h
             </select>
           </div>
           <div class="govuk-grid-column-one-third">
+            <span *ngIf="submitted" id="record-total-{{ i }}-error" class="govuk-error-message">
+              <ng-container *ngIf="submitted && leaver.get('total').invalid">
+                <span *ngIf="leaver.get('total').errors.required">
+                  {{ getFormErrorMessage('leavers.total', 'required') }}</span
+                >
+                <span *ngIf="leaver.get('total').errors.min"> {{ getFormErrorMessage('leavers.total', 'min') }}</span>
+                <span *ngIf="leaver.get('total').errors.max">
+                  {{ getFormErrorMessage('leavers.total', 'max') }}
+                </span>
+              </ng-container>
+            </span>
             <input
               class="govuk-input govuk-!-width-one-half"
               [class.govuk-input--error]="submitted && leaver.get('total').invalid"
@@ -52,14 +70,13 @@ <h1 class="govuk-fieldset__heading">Staff who have left in the last 12 months</h
               name="total"
               type="number"
             />
-            <button
+            <a
               *ngIf="leavers.length > 1"
-              class="govuk-button govuk-button--link govuk-!-margin-bottom-0 govuk-!-margin-left-3"
-              type="button"
+              href="#"
+              class="govuk-list govuk-list--inline govuk-!-margin-left-3"
               (click)="removeLeaver($event, i)"
+              >Remove</a
             >
-              Remove
-            </button>
           </div>
         </div>
       </div>
diff --git a/src/app/features/workplace/leavers/leavers.component.spec.ts b/src/app/features/workplace/leavers/leavers.component.spec.ts
deleted file mode 100644
index c5dd5c72aa..0000000000
--- a/src/app/features/workplace/leavers/leavers.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { LeaversComponent } from './leavers.component';
-
-describe('LeaversComponent', () => {
-  let component: LeaversComponent;
-  let fixture: ComponentFixture<LeaversComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [LeaversComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(LeaversComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/leavers/leavers.component.ts b/src/app/features/workplace/leavers/leavers.component.ts
index 7ae3c053e8..7a140221d7 100644
--- a/src/app/features/workplace/leavers/leavers.component.ts
+++ b/src/app/features/workplace/leavers/leavers.component.ts
@@ -37,7 +37,7 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy {
     protected backService: BackService,
     protected errorSummaryService: ErrorSummaryService,
     protected establishmentService: EstablishmentService,
-    private jobService: JobService
+    private jobService: JobService,
   ) {
     super(formBuilder, router, backService, errorSummaryService, establishmentService);
 
@@ -71,7 +71,7 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy {
         this.leavers.reset([], { emitEvent: false });
 
         this.form.get('leaversKnown').setValue(value, { emitEvent: false });
-      })
+      }),
     );
 
     this.subscriptions.add(
@@ -82,7 +82,7 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy {
           .setValidators([Validators.required, Validators.min(this.minTotal), Validators.max(this.maxTotal)]);
 
         this.form.get('leaversKnown').setValue(null, { emitEvent: false });
-      })
+      }),
     );
   }
 
@@ -102,14 +102,14 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy {
       this.jobService
         .getJobs()
         .pipe(take(1))
-        .subscribe(jobs => (this.jobs = jobs))
+        .subscribe(jobs => (this.jobs = jobs)),
     );
   }
 
   private prefill(): void {
     if (Array.isArray(this.establishment.leavers) && this.establishment.leavers.length) {
       this.establishment.leavers.forEach(leaver =>
-        this.leavers.push(this.createLeaverControl(leaver.jobId, leaver.total))
+        this.leavers.push(this.createLeaverControl(leaver.jobId, leaver.total)),
       );
     } else {
       this.leavers.push(this.createLeaverControl());
@@ -130,7 +130,7 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy {
         type: [
           {
             name: 'required',
-            message: 'Job Role is required',
+            message: 'Job role is required.',
           },
         ],
       },
@@ -139,15 +139,15 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy {
         type: [
           {
             name: 'required',
-            message: 'Total is required',
+            message: 'Enter number of leavers.',
           },
           {
             name: 'min',
-            message: `Total must be ${this.minTotal} or above`,
+            message: `Leavers must be ${this.minTotal} or above.`,
           },
           {
             name: 'max',
-            message: `Total must be ${this.maxTotal} or lower`,
+            message: `Leavers must be ${this.maxTotal} or lower.`,
           },
         ],
       },
@@ -158,8 +158,8 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy {
     return this.jobs.filter(
       job =>
         !this.leavers.controls.some(
-          leaver => leaver !== this.leavers.controls[index] && parseInt(leaver.get('jobRole').value, 10) === job.id
-        )
+          leaver => leaver !== this.leavers.controls[index] && parseInt(leaver.get('jobRole').value, 10) === job.id,
+        ),
     );
   }
 
@@ -200,14 +200,15 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy {
 
   protected updateEstablishment(props: UpdateJobsRequest): void {
     this.subscriptions.add(
-      this.establishmentService
-        .updateJobs(this.establishment.uid, props)
-        .subscribe(data => this._onSuccess(data), error => this.onError(error))
+      this.establishmentService.updateJobs(this.establishment.uid, props).subscribe(
+        data => this._onSuccess(data),
+        error => this.onError(error),
+      ),
     );
   }
 
   protected onSuccess(): void {
-    if (this.establishment.leavers && Array.isArray(this.establishment.leavers)) {
+    if (this.establishment.leavers && Array.isArray(this.establishment.leavers) && !this.return) {
       this.router.navigate(['/workplace', this.establishment.uid, 'confirm-leavers']);
       this.submitAction.action = null;
     } else {
diff --git a/src/app/features/workplace/other-services/other-services.component.html b/src/app/features/workplace/other-services/other-services.component.html
index 9b22f7b110..c09678fd8f 100644
--- a/src/app/features/workplace/other-services/other-services.component.html
+++ b/src/app/features/workplace/other-services/other-services.component.html
@@ -11,7 +11,7 @@
     <div class="govuk-grid-column-two-thirds-from-desktop">
       <fieldset class="govuk-fieldset">
         <legend class="govuk-fieldset__legend govuk-fieldset__legend--xl">
-          <h1 class="govuk-fieldset__heading">Your services</h1>
+          <h1 class="govuk-fieldset__heading">Other services</h1>
         </legend>
 
         <p>You told us your main service is {{ establishment.mainService.name }}. Do you provide any other services?</p>
diff --git a/src/app/features/workplace/other-services/other-services.component.spec.ts b/src/app/features/workplace/other-services/other-services.component.spec.ts
deleted file mode 100644
index fa99047bc1..0000000000
--- a/src/app/features/workplace/other-services/other-services.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { OtherServicesComponent } from './other-services.component';
-
-describe('OtherServicesComponent', () => {
-  let component: OtherServicesComponent;
-  let fixture: ComponentFixture<OtherServicesComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [OtherServicesComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(OtherServicesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/question/question.component.spec.ts b/src/app/features/workplace/question/question.component.spec.ts
deleted file mode 100644
index 0485659cdc..0000000000
--- a/src/app/features/workplace/question/question.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { Question } from './question.component';
-
-describe('Question', () => {
-  let component: Question;
-  let fixture: ComponentFixture<Question>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [Question],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(Question);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/regulated-by-cqc/regulated-by-cqc.component.html b/src/app/features/workplace/regulated-by-cqc/regulated-by-cqc.component.html
index f7d020ebe6..0ba78a2cb2 100644
--- a/src/app/features/workplace/regulated-by-cqc/regulated-by-cqc.component.html
+++ b/src/app/features/workplace/regulated-by-cqc/regulated-by-cqc.component.html
@@ -16,8 +16,11 @@ <h1 class="govuk-fieldset__heading">
       </legend>
 
       <div class="govuk-form-group" [class.govuk-form-group--error]="submitted && (form.invalid || serverError)">
-        <span *ngIf="submitted && regulatedByCQC.errors" id="regulatedByCQC-error" class="govuk-error-message">
-          <span class="govuk-visually-hidden">Error:</span> {{ getFirstErrorMessage('regulatedByCQC') }}
+        <span *ngIf="submitted" id="regulated-error" class="govuk-error-message">
+          <span *ngIf="regulatedByCQC.errors" id="regulatedByCQC-error">{{
+            getFirstErrorMessage('regulatedByCQC')
+          }}</span>
+          <span *ngIf="group.errors" id="group-error"> {{ getFirstErrorMessage('group') }}</span>
         </span>
 
         <!-- group & conditional content -->
diff --git a/src/app/features/workplace/regulated-by-cqc/regulated-by-cqc.component.spec.ts b/src/app/features/workplace/regulated-by-cqc/regulated-by-cqc.component.spec.ts
deleted file mode 100644
index 0c2fec3ed4..0000000000
--- a/src/app/features/workplace/regulated-by-cqc/regulated-by-cqc.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RegulatedByCqcComponent } from './regulated-by-cqc.component';
-
-describe('RegulatedByCqcComponent', () => {
-  let component: RegulatedByCqcComponent;
-  let fixture: ComponentFixture<RegulatedByCqcComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [RegulatedByCqcComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(RegulatedByCqcComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/select-main-service/select-main-service.component.spec.ts b/src/app/features/workplace/select-main-service/select-main-service.component.spec.ts
deleted file mode 100644
index 1fbd112375..0000000000
--- a/src/app/features/workplace/select-main-service/select-main-service.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SelectMainServiceComponent } from './select-main-service.component';
-
-describe('SelectMainServiceComponent', () => {
-  let component: SelectMainServiceComponent;
-  let fixture: ComponentFixture<SelectMainServiceComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ SelectMainServiceComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SelectMainServiceComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/select-workplace/select-workplace.component.spec.ts b/src/app/features/workplace/select-workplace/select-workplace.component.spec.ts
deleted file mode 100644
index af238c8dae..0000000000
--- a/src/app/features/workplace/select-workplace/select-workplace.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SelectWorkplaceComponent } from './select-workplace.component';
-
-describe('SelectWorkplaceComponent', () => {
-  let component: SelectWorkplaceComponent;
-  let fixture: ComponentFixture<SelectWorkplaceComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [SelectWorkplaceComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SelectWorkplaceComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/service-users/service-users.component.html b/src/app/features/workplace/service-users/service-users.component.html
index d4c7a60d2e..2300c86fc9 100644
--- a/src/app/features/workplace/service-users/service-users.component.html
+++ b/src/app/features/workplace/service-users/service-users.component.html
@@ -11,7 +11,7 @@
     <div class="govuk-grid-column-two-thirds-from-desktop">
       <fieldset class="govuk-fieldset">
         <legend class="govuk-fieldset__legend govuk-fieldset__legend--xl">
-          <h1 class="govuk-fieldset__heading">Who are your service users?</h1>
+          <h1 class="govuk-fieldset__heading">Who uses your service?</h1>
         </legend>
         <p>Select all that apply.</p>
         <div class="govuk-form-group" *ngFor="let group of serviceUserGroups">
@@ -61,7 +61,7 @@ <h2 class="govuk-fieldset__heading">
                       {{ getFormErrorMessage('serviceUsers-' + service.id + '-otherService', 'maxlength') }}
                     </span>
                     <input
-                      class="govuk-input govuk-!-width-one-third"
+                      class="govuk-input govuk-!-width-one-half"
                       [class.govuk-input--error]="
                         submitted && form.get('serviceUsers-' + service.id + '-otherService').invalid
                       "
diff --git a/src/app/features/workplace/service-users/service-users.component.spec.ts b/src/app/features/workplace/service-users/service-users.component.spec.ts
deleted file mode 100644
index 5c63dc3145..0000000000
--- a/src/app/features/workplace/service-users/service-users.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ServiceUsersComponent } from './service-users.component';
-
-describe('ServiceUsersComponent', () => {
-  let component: ServiceUsersComponent;
-  let fixture: ComponentFixture<ServiceUsersComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ServiceUsersComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ServiceUsersComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/services-capacity/services-capacity.component.spec.ts b/src/app/features/workplace/services-capacity/services-capacity.component.spec.ts
deleted file mode 100644
index 8f1678bbef..0000000000
--- a/src/app/features/workplace/services-capacity/services-capacity.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ServicesCapacityComponent } from './services-capacity.component';
-
-describe('ServicesCapacityComponent', () => {
-  let component: ServicesCapacityComponent;
-  let fixture: ComponentFixture<ServicesCapacityComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ServicesCapacityComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ServicesCapacityComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/start/start.component.spec.ts b/src/app/features/workplace/start/start.component.spec.ts
deleted file mode 100644
index 01270a2d58..0000000000
--- a/src/app/features/workplace/start/start.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { StartComponent } from './start.component';
-
-describe('StartComponent', () => {
-  let component: StartComponent;
-  let fixture: ComponentFixture<StartComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ StartComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(StartComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/starters/starters.component.html b/src/app/features/workplace/starters/starters.component.html
index fc902e8f5c..339b20f1f9 100644
--- a/src/app/features/workplace/starters/starters.component.html
+++ b/src/app/features/workplace/starters/starters.component.html
@@ -8,16 +8,18 @@
 
 <form #formEl novalidate (ngSubmit)="onSubmit()" [formGroup]="form">
   <fieldset class="govuk-fieldset">
-    <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
-      <h1 class="govuk-fieldset__heading">Add new starters in the last 12 months</h1>
-    </legend>
-
-    <p class="govuk-hint">This should only be for permanent or temporary staff.</p>
-
+    <div class="govuk-grid-row">
+      <div class="govuk-grid-column-two-thirds">
+        <legend class="govuk-fieldset__legend govuk-fieldset__legend--xl">
+          <h1 class="govuk-fieldset__heading">Add new starters in the last 12 months</h1>
+          <p class="govuk-hint">This should only be for permanent or temporary staff.</p>
+        </legend>
+      </div>
+    </div>
     <ng-container formArrayName="starterRecords">
       <div class="govuk-grid-row">
         <div class="govuk-grid-column-two-thirds govuk-form-group govuk-!-margin-bottom-0">
-          <label for="jobId-0" class="govuk-label">Job Role</label>
+          <label for="jobId-0" class="govuk-label">Job role</label>
         </div>
         <div class="govuk-grid-column-one-third">
           <label for="total-0" class="govuk-label">Number of new starters</label>
@@ -30,6 +32,11 @@ <h1 class="govuk-fieldset__heading">Add new starters in the last 12 months</h1>
       >
         <div class="govuk-grid-row govuk-!-margin-bottom-6">
           <div class="govuk-grid-column-two-thirds">
+            <span *ngIf="submitted" id="record-{{ i }}-error" class="govuk-error-message">
+              <ng-container *ngIf="submitted && record.get('jobId').invalid">
+                {{ getFormErrorMessage('starterRecords.jobId', 'required') }}
+              </ng-container>
+            </span>
             <select
               class="govuk-select govuk-!-width-full"
               [class.govuk-select--error]="submitted && record.get('jobId').invalid"
@@ -44,6 +51,19 @@ <h1 class="govuk-fieldset__heading">Add new starters in the last 12 months</h1>
             </select>
           </div>
           <div class="govuk-grid-column-one-third">
+            <span *ngIf="submitted" id="record-total-{{ i }}-error" class="govuk-error-message">
+              <ng-container *ngIf="submitted && record.get('total').invalid">
+                <span *ngIf="record.get('total').errors.required">
+                  {{ getFormErrorMessage('starterRecords.total', 'required') }}</span
+                >
+                <span *ngIf="record.get('total').errors.min">
+                  {{ getFormErrorMessage('starterRecords.total', 'min') }}</span
+                >
+                <span *ngIf="record.get('total').errors.max">
+                  {{ getFormErrorMessage('starterRecords.total', 'max') }}
+                </span>
+              </ng-container>
+            </span>
             <input
               class="govuk-input govuk-!-width-one-half"
               [class.govuk-input--error]="submitted && record.get('total').invalid"
@@ -52,14 +72,13 @@ <h1 class="govuk-fieldset__heading">Add new starters in the last 12 months</h1>
               name="total"
               type="number"
             />
-            <button
+            <a
               *ngIf="starterRecords.length > 1"
-              class="govuk-button govuk-button--link govuk-!-margin-bottom-0 govuk-!-margin-left-3"
-              type="button"
+              href="#"
+              class="govuk-list govuk-list--inline govuk-!-margin-left-3"
               (click)="removeRecord($event, i)"
+              >Remove</a
             >
-              Remove
-            </button>
           </div>
         </div>
       </div>
diff --git a/src/app/features/workplace/starters/starters.component.spec.ts b/src/app/features/workplace/starters/starters.component.spec.ts
deleted file mode 100644
index 3cd2b1c79c..0000000000
--- a/src/app/features/workplace/starters/starters.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { StartersComponent } from './starters.component';
-
-describe('StartersComponent', () => {
-  let component: StartersComponent;
-  let fixture: ComponentFixture<StartersComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [StartersComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(StartersComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/starters/starters.component.ts b/src/app/features/workplace/starters/starters.component.ts
index 1ae45ca736..072a4d3501 100644
--- a/src/app/features/workplace/starters/starters.component.ts
+++ b/src/app/features/workplace/starters/starters.component.ts
@@ -36,7 +36,7 @@ export class StartersComponent extends Question {
     protected backService: BackService,
     protected errorSummaryService: ErrorSummaryService,
     protected establishmentService: EstablishmentService,
-    private jobService: JobService
+    private jobService: JobService,
   ) {
     super(formBuilder, router, backService, errorSummaryService, establishmentService);
 
@@ -74,7 +74,7 @@ export class StartersComponent extends Question {
         this.starterRecords.reset([], { emitEvent: false });
 
         this.form.get('noRecordsReason').setValue(value, { emitEvent: false });
-      })
+      }),
     );
 
     this.subscriptions.add(
@@ -85,7 +85,7 @@ export class StartersComponent extends Question {
           .setValidators([Validators.required, Validators.min(this.minStarters), Validators.max(this.maxStarters)]);
 
         this.form.get('noRecordsReason').setValue(null, { emitEvent: false });
-      })
+      }),
     );
   }
 
@@ -105,14 +105,14 @@ export class StartersComponent extends Question {
       this.jobService
         .getJobs()
         .pipe(take(1))
-        .subscribe(jobs => (this.jobs = jobs))
+        .subscribe(jobs => (this.jobs = jobs)),
     );
   }
 
   private prefill(): void {
     if (Array.isArray(this.establishment.starters) && this.establishment.starters.length) {
       this.establishment.starters.forEach(starter =>
-        this.starterRecords.push(this.createRecordItem(starter.jobId, starter.total))
+        this.starterRecords.push(this.createRecordItem(starter.jobId, starter.total)),
       );
     } else {
       this.starterRecords.push(this.createRecordItem());
@@ -133,7 +133,7 @@ export class StartersComponent extends Question {
         type: [
           {
             name: 'required',
-            message: 'Job Role is required',
+            message: 'Job role is required.',
           },
         ],
       },
@@ -142,15 +142,15 @@ export class StartersComponent extends Question {
         type: [
           {
             name: 'required',
-            message: 'Total is required',
+            message: 'Enter number of new starters.',
           },
           {
             name: 'min',
-            message: `Total must be ${this.minStarters} or above`,
+            message: `New starters must be ${this.minStarters} or above.`,
           },
           {
             name: 'max',
-            message: `Total must be ${this.maxStarters} or lower`,
+            message: `New starters must be ${this.maxStarters} or lower.`,
           },
         ],
       },
@@ -162,8 +162,8 @@ export class StartersComponent extends Question {
       job =>
         !this.starterRecords.controls.some(
           starter =>
-            starter !== this.starterRecords.controls[index] && parseInt(starter.get('jobId').value, 10) === job.id
-        )
+            starter !== this.starterRecords.controls[index] && parseInt(starter.get('jobId').value, 10) === job.id,
+        ),
     );
   }
 
@@ -215,14 +215,15 @@ export class StartersComponent extends Question {
 
   protected updateEstablishment(props: UpdateJobsRequest): void {
     this.subscriptions.add(
-      this.establishmentService
-        .updateJobs(this.establishment.uid, props)
-        .subscribe(data => this._onSuccess(data), error => this.onError(error))
+      this.establishmentService.updateJobs(this.establishment.uid, props).subscribe(
+        data => this._onSuccess(data),
+        error => this.onError(error),
+      ),
     );
   }
 
   protected onSuccess(): void {
-    if (this.establishment.starters && Array.isArray(this.establishment.starters)) {
+    if (this.establishment.starters && Array.isArray(this.establishment.starters) && !this.return) {
       this.router.navigate(['/workplace', this.establishment.uid, 'confirm-starters']);
       this.submitAction.action = null;
     } else {
diff --git a/src/app/features/workplace/success/success.component.spec.ts b/src/app/features/workplace/success/success.component.spec.ts
deleted file mode 100644
index b28e98a5fe..0000000000
--- a/src/app/features/workplace/success/success.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SuccessComponent } from './success.component';
-
-describe('SuccessComponent', () => {
-  let component: SuccessComponent;
-  let fixture: ComponentFixture<SuccessComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ SuccessComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SuccessComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/type-of-employer/type-of-employer.component.spec.ts b/src/app/features/workplace/type-of-employer/type-of-employer.component.spec.ts
deleted file mode 100644
index cef05c21a7..0000000000
--- a/src/app/features/workplace/type-of-employer/type-of-employer.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TypeOfEmployerComponent } from './type-of-employer.component';
-
-describe('TypeOfEmployerComponent', () => {
-  let component: TypeOfEmployerComponent;
-  let fixture: ComponentFixture<TypeOfEmployerComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [TypeOfEmployerComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(TypeOfEmployerComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/user-account-change-primary-dialog/user-account-change-primary-dialog.component.spec.ts b/src/app/features/workplace/user-account-change-primary-dialog/user-account-change-primary-dialog.component.spec.ts
deleted file mode 100644
index 90f1ee3f2e..0000000000
--- a/src/app/features/workplace/user-account-change-primary-dialog/user-account-change-primary-dialog.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { UserAccountChangePrimaryDialogComponent } from './user-account-change-primary-dialog.component';
-
-describe('UserAccountChangePrimaryDialogComponent', () => {
-  let component: UserAccountChangePrimaryDialogComponent;
-  let fixture: ComponentFixture<UserAccountChangePrimaryDialogComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ UserAccountChangePrimaryDialogComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(UserAccountChangePrimaryDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/user-account-delete-dialog/user-account-delete-dialog.component.html b/src/app/features/workplace/user-account-delete-dialog/user-account-delete-dialog.component.html
index cb07f4016e..009d88a873 100644
--- a/src/app/features/workplace/user-account-delete-dialog/user-account-delete-dialog.component.html
+++ b/src/app/features/workplace/user-account-delete-dialog/user-account-delete-dialog.component.html
@@ -1,12 +1,10 @@
-<h1 id="dialogHeading" class="govuk-heading-l">You are about to permanently delete {{ data.user.fullname }}.</h1>
+<h1 id="dialogHeading" class="govuk-heading-l">You are about to delete this user account.</h1>
 
 <p>This will delete all the information stored in the account.</p>
 
 <p>
-  <strong>This action cannot be undone.</strong>
+  <strong>Once deleted,the user will have no accessto the account.</strong>
 </p>
 
-<button (click)="close(true)" class="govuk-button">Delete account</button>
-<button (click)="close(false)" class="govuk-button govuk-button--link govuk-util__float-right">
-  Cancel
-</button>
+<button (click)="close($event, true)" class="govuk-button">Delete account</button>
+<a href="#" class="govuk-list govuk-list--inline govuk-util__float-right" (click)="close($event, false)">Cancel</a>
diff --git a/src/app/features/workplace/user-account-delete-dialog/user-account-delete-dialog.component.spec.ts b/src/app/features/workplace/user-account-delete-dialog/user-account-delete-dialog.component.spec.ts
deleted file mode 100644
index 09d93e813a..0000000000
--- a/src/app/features/workplace/user-account-delete-dialog/user-account-delete-dialog.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { UserAccountDeleteDialogComponent } from './user-account-delete-dialog.component';
-
-describe('UserAccountDeleteDialogComponent', () => {
-  let component: UserAccountDeleteDialogComponent;
-  let fixture: ComponentFixture<UserAccountDeleteDialogComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ UserAccountDeleteDialogComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(UserAccountDeleteDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/user-account-delete-dialog/user-account-delete-dialog.component.ts b/src/app/features/workplace/user-account-delete-dialog/user-account-delete-dialog.component.ts
index 6d310c0a93..34e944a4d1 100644
--- a/src/app/features/workplace/user-account-delete-dialog/user-account-delete-dialog.component.ts
+++ b/src/app/features/workplace/user-account-delete-dialog/user-account-delete-dialog.component.ts
@@ -10,12 +10,13 @@ import { Dialog, DIALOG_DATA } from '@core/services/dialog.service';
 export class UserAccountDeleteDialogComponent extends DialogComponent {
   constructor(
     @Inject(DIALOG_DATA) public data: { user: UserDetails },
-    public dialog: Dialog<UserAccountDeleteDialogComponent>
+    public dialog: Dialog<UserAccountDeleteDialogComponent>,
   ) {
     super(data, dialog);
   }
 
-  public close(deleteConfirmed: boolean) {
+  public close(event: Event, deleteConfirmed: boolean) {
+    event.preventDefault();
     this.dialog.close(deleteConfirmed);
   }
 }
diff --git a/src/app/features/workplace/user-account-edit-details/user-account-edit-details.component.spec.ts b/src/app/features/workplace/user-account-edit-details/user-account-edit-details.component.spec.ts
deleted file mode 100644
index 46207d6ec5..0000000000
--- a/src/app/features/workplace/user-account-edit-details/user-account-edit-details.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { UserAccountEditDetailsComponent } from './user-account-edit-details.component';
-
-describe('UserAccountEditDetailsComponent', () => {
-  let component: UserAccountEditDetailsComponent;
-  let fixture: ComponentFixture<UserAccountEditDetailsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [UserAccountEditDetailsComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(UserAccountEditDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/user-account-edit-permissions/user-account-edit-permissions.component.html b/src/app/features/workplace/user-account-edit-permissions/user-account-edit-permissions.component.html
index 26ee004c01..c7ab3db96f 100644
--- a/src/app/features/workplace/user-account-edit-permissions/user-account-edit-permissions.component.html
+++ b/src/app/features/workplace/user-account-edit-permissions/user-account-edit-permissions.component.html
@@ -44,7 +44,7 @@ <h1 class="govuk-fieldset__heading">Permissions</h1>
                       [formControlName]="'primary'"
                     />
                     <label class="govuk-label govuk-checkboxes__label" for="primary">
-                      Make this user a Primary User
+                      Make this user a primary user
                     </label>
                   </div>
                 </div>
diff --git a/src/app/features/workplace/user-account-edit-permissions/user-account-edit-permissions.component.spec.ts b/src/app/features/workplace/user-account-edit-permissions/user-account-edit-permissions.component.spec.ts
deleted file mode 100644
index 70e3269dba..0000000000
--- a/src/app/features/workplace/user-account-edit-permissions/user-account-edit-permissions.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { UserAccountEditPermissionsComponent } from './user-account-edit-permissions.component';
-
-describe('UserAccountEditPermissionsComponent', () => {
-  let component: UserAccountEditPermissionsComponent;
-  let fixture: ComponentFixture<UserAccountEditPermissionsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ UserAccountEditPermissionsComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(UserAccountEditPermissionsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/user-account-saved/user-account-saved.component.spec.ts b/src/app/features/workplace/user-account-saved/user-account-saved.component.spec.ts
deleted file mode 100644
index dee3533bb2..0000000000
--- a/src/app/features/workplace/user-account-saved/user-account-saved.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { UserAccountSavedComponent } from './user-account-saved.component';
-
-describe('UserAccountSavedComponent', () => {
-  let component: UserAccountSavedComponent;
-  let fixture: ComponentFixture<UserAccountSavedComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ UserAccountSavedComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(UserAccountSavedComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/user-account-view/user-account-view.component.html b/src/app/features/workplace/user-account-view/user-account-view.component.html
index d01e274d00..0c353b459e 100644
--- a/src/app/features/workplace/user-account-view/user-account-view.component.html
+++ b/src/app/features/workplace/user-account-view/user-account-view.component.html
@@ -5,15 +5,30 @@ <h1 class="govuk-heading-l">Account details</h1>
   </div>
   <div class="govuk-grid-column-two-thirds-from-desktop">
     <div class="govuk-button-heading-group">
-      <button *ngIf="canResendActivationLink" class="govuk-button govuk-button--link" (click)="resendActivationLink()">
-        Resend account set up link
-      </button>
-      <button *ngIf="canDeleteUser" class="govuk-button govuk-button--link" (click)="onDeleteUser()">
+      <a
+        class="govuk-list govuk-list--inline govuk-!-margin-right-9"
+        *ngIf="canResendActivationLink"
+        draggable="false"
+        role="button"
+        href="#"
+        (click)="resendActivationLink($event)"
+      >
+        Resend account set up link</a
+      >
+
+      <a
+        class="govuk-list govuk-list--inline govuk__flex govuk__align-items-center govuk-util__float-right"
+        *ngIf="canDeleteUser"
+        draggable="false"
+        role="button"
+        href="#"
+        (click)="onDeleteUser($event)"
+      >
         <img src="/assets/images/bin.svg" alt="" />
         <span class="govuk-!-margin-left-1">
-          Delete <span class="govuk-visually-hidden">{{ user.fullname }}'s</span> user account
-        </span>
-      </button>
+          Delete user account
+        </span></a
+      >
     </div>
   </div>
 </div>
@@ -28,7 +43,9 @@ <h1 class="govuk-heading-l">Account details</h1>
         <dt class="govuk-summary-list__key">
           Permissions
         </dt>
-        <dd class="govuk-summary-list__value">{{ user.isPrimary ? 'Primary' : '' }} {{ user.role }}</dd>
+        <dd class="govuk-summary-list__value">
+          {{ user.isPrimary ? 'Primary' : '' }} {{ user.role === 'Read' ? 'Read only' : user.role }}
+        </dd>
         <dd *ngIf="canEditUser" class="govuk-summary-list__actions">
           <a [routerLink]="['permissions']">
             Change
diff --git a/src/app/features/workplace/user-account-view/user-account-view.component.spec.ts b/src/app/features/workplace/user-account-view/user-account-view.component.spec.ts
deleted file mode 100644
index 6990ec59b0..0000000000
--- a/src/app/features/workplace/user-account-view/user-account-view.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { UserAccountViewComponent } from '@features/workplace/user-account-view/user-account-view.component';
-
-describe('UserAccountViewComponent', () => {
-  let component: UserAccountViewComponent;
-  let fixture: ComponentFixture<UserAccountViewComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [UserAccountViewComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(UserAccountViewComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/user-account-view/user-account-view.component.ts b/src/app/features/workplace/user-account-view/user-account-view.component.ts
index 0360610cca..a6cf0cc3d6 100644
--- a/src/app/features/workplace/user-account-view/user-account-view.component.ts
+++ b/src/app/features/workplace/user-account-view/user-account-view.component.ts
@@ -43,7 +43,7 @@ export class UserAccountViewComponent implements OnInit, OnDestroy {
     private permissionsService: PermissionsService,
     private route: ActivatedRoute,
     private router: Router,
-    private userService: UserService
+    private userService: UserService,
   ) {
     this.user = this.route.snapshot.data.user;
     this.establishment = this.route.parent.snapshot.data.establishment;
@@ -57,20 +57,17 @@ export class UserAccountViewComponent implements OnInit, OnDestroy {
     this.subscriptions.add(
       this.userService
         .getAllUsersForEstablishment(this.establishment.uid)
-        .pipe(
-          take(1),
-          withLatestFrom(this.userService.loggedInUser$)
-        )
+        .pipe(take(1), withLatestFrom(this.userService.loggedInUser$))
         .subscribe(([users, loggedInUser]) => {
           this.loggedInUser = loggedInUser;
           this.setPermissions(users, loggedInUser);
-        })
+        }),
     );
 
     this.subscriptions.add(
       this.userService.returnUrl$.pipe(take(1)).subscribe(returnUrl => {
         this.return = returnUrl ? returnUrl : { url: ['/workplace', this.establishment.uid] };
-      })
+      }),
     );
   }
 
@@ -78,7 +75,8 @@ export class UserAccountViewComponent implements OnInit, OnDestroy {
     this.subscriptions.unsubscribe();
   }
 
-  public resendActivationLink() {
+  public resendActivationLink(evet: Event) {
+    event.preventDefault();
     this.subscriptions.add(
       this.userService.resendActivationLink(this.user.uid).subscribe(
         () => {
@@ -93,12 +91,13 @@ export class UserAccountViewComponent implements OnInit, OnDestroy {
             type: 'warning',
             message: 'There was an error resending account set up link.',
           });
-        }
-      )
+        },
+      ),
     );
   }
 
-  public onDeleteUser() {
+  public onDeleteUser(event: Event) {
+    event.preventDefault();
     const dialog = this.dialogService.open(UserAccountDeleteDialogComponent, { user: this.user });
     dialog.afterClosed.subscribe(deleteConfirmed => {
       if (deleteConfirmed) {
@@ -115,7 +114,7 @@ export class UserAccountViewComponent implements OnInit, OnDestroy {
             ...this.loggedInUser,
             ...{ isPrimary: true },
           })
-          .subscribe(data => (this.userService.loggedInUser = data))
+          .subscribe(data => (this.userService.loggedInUser = data)),
       );
     }
 
@@ -130,8 +129,8 @@ export class UserAccountViewComponent implements OnInit, OnDestroy {
             type: 'warning',
             message: 'There was an error deleting the user.',
           });
-        }
-      )
+        },
+      ),
     );
   }
 
diff --git a/src/app/features/workplace/vacancies/vacancies.component.html b/src/app/features/workplace/vacancies/vacancies.component.html
index d086e680c5..3ede97b821 100644
--- a/src/app/features/workplace/vacancies/vacancies.component.html
+++ b/src/app/features/workplace/vacancies/vacancies.component.html
@@ -8,16 +8,18 @@
 
 <form #formEl novalidate (ngSubmit)="onSubmit()" [formGroup]="form">
   <fieldset class="govuk-fieldset">
-    <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
-      <h1 class="govuk-fieldset__heading">Add current staff vacancies</h1>
-    </legend>
-
-    <p class="govuk-hint">This should only be for permanent or temporary staff.</p>
-
+    <div class="govuk-grid-row">
+      <div class="govuk-grid-column-two-thirds">
+        <legend class="govuk-fieldset__legend govuk-fieldset__legend--xl">
+          <h1 class="govuk-fieldset__heading">Add current staff vacancies</h1>
+          <p class="govuk-hint">This should only be for permanent or temporary staff.</p>
+        </legend>
+      </div>
+    </div>
     <ng-container formArrayName="vacancies">
       <div class="govuk-grid-row">
         <div class="govuk-grid-column-two-thirds govuk-form-group govuk-!-margin-bottom-0">
-          <label for="jobRole-0" class="govuk-label">Job Role</label>
+          <label for="jobRole-0" class="govuk-label">Job role</label>
         </div>
         <div class="govuk-grid-column-one-third">
           <label for="total-0" class="govuk-label">Number of vacancies</label>
@@ -30,6 +32,11 @@ <h1 class="govuk-fieldset__heading">Add current staff vacancies</h1>
       >
         <div class="govuk-grid-row govuk-!-margin-bottom-6">
           <div class="govuk-grid-column-two-thirds">
+            <span *ngIf="submitted" id="vacancy-{{ i }}-error" class="govuk-error-message">
+              <ng-container *ngIf="submitted && vacancy.get('jobRole').invalid">
+                {{ getFormErrorMessage('vacancies.jobRole', 'required') }}
+              </ng-container>
+            </span>
             <select
               class="govuk-select govuk-!-width-full"
               [class.govuk-select--error]="submitted && vacancy.get('jobRole').invalid"
@@ -43,7 +50,21 @@ <h1 class="govuk-fieldset__heading">Add current staff vacancies</h1>
               </option>
             </select>
           </div>
+
           <div class="govuk-grid-column-one-third">
+            <span *ngIf="submitted" id="vacancy-total-{{ i }}-error" class="govuk-error-message">
+              <ng-container *ngIf="submitted && vacancy.get('total').invalid">
+                <span *ngIf="vacancy.get('total').errors.required">
+                  {{ getFormErrorMessage('vacancies.total', 'required') }}</span
+                >
+                <span *ngIf="vacancy.get('total').errors.min">
+                  {{ getFormErrorMessage('vacancies.total', 'min') }}</span
+                >
+                <span *ngIf="vacancy.get('total').errors.max">
+                  {{ getFormErrorMessage('vacancies.total', 'max') }}
+                </span>
+              </ng-container>
+            </span>
             <input
               class="govuk-input govuk-!-width-one-half"
               [class.govuk-input--error]="submitted && vacancy.get('total').invalid"
@@ -52,14 +73,13 @@ <h1 class="govuk-fieldset__heading">Add current staff vacancies</h1>
               name="total"
               type="number"
             />
-            <button
+            <a
               *ngIf="vacanciesArray.length > 1"
-              class="govuk-button govuk-button--link govuk-!-margin-bottom-0 govuk-!-margin-left-3"
-              type="button"
+              href="#"
+              class="govuk-list govuk-list--inline govuk-!-margin-left-3"
               (click)="removeVacancy($event, i)"
+              >Remove</a
             >
-              Remove
-            </button>
           </div>
         </div>
       </div>
diff --git a/src/app/features/workplace/vacancies/vacancies.component.spec.ts b/src/app/features/workplace/vacancies/vacancies.component.spec.ts
deleted file mode 100644
index b2902f215b..0000000000
--- a/src/app/features/workplace/vacancies/vacancies.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { VacanciesComponent } from './vacancies.component';
-
-describe('VacanciesComponent', () => {
-  let component: VacanciesComponent;
-  let fixture: ComponentFixture<VacanciesComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [VacanciesComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(VacanciesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/vacancies/vacancies.component.ts b/src/app/features/workplace/vacancies/vacancies.component.ts
index 8eeaf88d21..6452fc2a6a 100644
--- a/src/app/features/workplace/vacancies/vacancies.component.ts
+++ b/src/app/features/workplace/vacancies/vacancies.component.ts
@@ -38,7 +38,7 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy {
     protected backService: BackService,
     protected errorSummaryService: ErrorSummaryService,
     protected establishmentService: EstablishmentService,
-    private jobService: JobService
+    private jobService: JobService,
   ) {
     super(formBuilder, router, backService, errorSummaryService, establishmentService);
 
@@ -72,7 +72,7 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy {
         this.vacanciesArray.reset([], { emitEvent: false });
 
         this.form.get('vacanciesKnown').setValue(value, { emitEvent: false });
-      })
+      }),
     );
 
     this.subscriptions.add(
@@ -83,7 +83,7 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy {
           .setValidators([Validators.required, Validators.min(this.minVacancies), Validators.max(this.maxVacancies)]);
 
         this.form.get('vacanciesKnown').setValue(null, { emitEvent: false });
-      })
+      }),
     );
   }
 
@@ -105,14 +105,14 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy {
       this.jobService
         .getJobs()
         .pipe(take(1))
-        .subscribe(jobs => (this.jobs = jobs))
+        .subscribe(jobs => (this.jobs = jobs)),
     );
   }
 
   private prefill(): void {
     if (Array.isArray(this.establishment.vacancies) && this.establishment.vacancies.length) {
       this.establishment.vacancies.forEach(vacancy =>
-        this.vacanciesArray.push(this.createVacancyControl(vacancy.jobId, vacancy.total))
+        this.vacanciesArray.push(this.createVacancyControl(vacancy.jobId, vacancy.total)),
       );
     } else {
       this.vacanciesArray.push(this.createVacancyControl());
@@ -133,7 +133,7 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy {
         type: [
           {
             name: 'required',
-            message: 'Job Role is required',
+            message: 'Job role is required.',
           },
         ],
       },
@@ -142,15 +142,15 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy {
         type: [
           {
             name: 'required',
-            message: 'Total is required',
+            message: 'Enter number of vacancies.',
           },
           {
             name: 'min',
-            message: `Total must be ${this.minVacancies} or above`,
+            message: `Vacancies must be ${this.minVacancies} or above`,
           },
           {
             name: 'max',
-            message: `Total must be ${this.maxVacancies} or lower`,
+            message: `Vacancies must be ${this.maxVacancies} or lower`,
           },
         ],
       },
@@ -162,8 +162,8 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy {
       job =>
         !this.vacanciesArray.controls.some(
           vacancy =>
-            vacancy !== this.vacanciesArray.controls[index] && parseInt(vacancy.get('jobRole').value, 10) === job.id
-        )
+            vacancy !== this.vacanciesArray.controls[index] && parseInt(vacancy.get('jobRole').value, 10) === job.id,
+        ),
     );
   }
 
@@ -204,14 +204,15 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy {
 
   protected updateEstablishment(props: UpdateJobsRequest): void {
     this.subscriptions.add(
-      this.establishmentService
-        .updateJobs(this.establishment.uid, props)
-        .subscribe(data => this._onSuccess(data), error => this.onError(error))
+      this.establishmentService.updateJobs(this.establishment.uid, props).subscribe(
+        data => this._onSuccess(data),
+        error => this.onError(error),
+      ),
     );
   }
 
   protected onSuccess(): void {
-    if (this.establishment.vacancies && Array.isArray(this.establishment.vacancies)) {
+    if (this.establishment.vacancies && Array.isArray(this.establishment.vacancies) && !this.return) {
       this.router.navigate(['/workplace', this.establishment.uid, 'confirm-vacancies']);
       this.submitAction.action = null;
     } else {
diff --git a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html
new file mode 100644
index 0000000000..0acd6f5ac4
--- /dev/null
+++ b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html
@@ -0,0 +1,136 @@
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-one-half">
+    <h1 class="govuk-heading-l">
+      <span class="govuk-caption-xl govuk-!-margin-bottom-3"> {{ workplceName }}</span>
+      Mandatory training ({{ mandatoryTrainings.length }})
+    </h1>
+  </div>
+  <div class="govuk-grid-column-one-half govuk-!-margin-top-9">
+    <p class="govuk-util__float-right">Last updated {{ lastUpdated | date: 'd MMMM y' }}</p>
+  </div>
+</div>
+<app-trianing-link-panel></app-trianing-link-panel>
+<ng-container *ngIf="!mandatoryTrainings || mandatoryTrainings?.length === 0">
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+      <app-inset-text [color]="'todo'">
+        You have not added any mandatory training for your workplace.
+        <br><a [routerLink]="['/add-mandatory-training']">Manage mandatory training
+        </a>
+      </app-inset-text>
+      <p>Select the training you want to make mandatory for your workplace. Mandatory training can be set for all job
+        roles or selected job roles only.</p>
+    </div>
+  </div>
+</ng-container>
+<ng-container *ngIf="mandatoryTrainings?.length">
+  <app-training-info-panel [workplace]="workplace" [totalExpiredTraining]="totalExpiredTraining"
+    [totalExpiringTraining]="totalExpiringTraining" [totalMissingMandatoryTraining]="totalMissingMandatoryTraining">
+  </app-training-info-panel>
+  <table class="govuk-table">
+    <thead class="govuk-table__head">
+      <tr class="govuk-table__row">
+        <th class="govuk-table__header govuk-!-width-two-thirds" scope="col">Training category</th>
+        <th class="govuk-table__header govuk-table-custom-width" scope="col">Status</th>
+        <th class="govuk-table__header" scope="col">Quantity</th>
+        <th class="govuk-table__header" scope="col"></th>
+      </tr>
+    </thead>
+    <tbody class="govuk-table__body">
+      <ng-container *ngFor="let mandatoryTraining of mandatoryTrainings">
+        <tr class="govuk-table__row">
+          <td class="govuk-table__cell govuk-!-font-weight-regular">
+            {{ mandatoryTraining.category }}
+          </td>
+
+          <td class="govuk-table__cell">
+            <div *ngIf="mandatoryTraining.catExpiredTrainingCount > 0" class="govuk-!-margin-bottom-1">
+              <img src="/assets/images/flag-red.svg" alt="expired"
+                class="govuk-!-margin-right-1 govuk-util__vertical-align-top" />
+              {{ mandatoryTraining.catExpiredTrainingCount }}
+              Expired
+            </div>
+            <div *ngIf="mandatoryTraining.catExpiringTrainingCount > 0" class="govuk-!-margin-bottom-1">
+              <img src="/assets/images/flag-orange.svg" alt="expiring"
+                class="govuk-!-margin-right-1 govuk-util__vertical-align-top" />
+              {{ mandatoryTraining.catExpiringTrainingCount }} Expiring soon
+            </div>
+            <div *ngIf="mandatoryTraining.catMissingMandatoryTrainingCount > 0">
+              <img src="/assets/images/flag-red.svg" alt="missing mandatory training"
+                class="govuk-!-margin-right-1 govuk-util__vertical-align-top" />
+              {{ mandatoryTraining.catMissingMandatoryTrainingCount }}
+              Missing
+            </div>
+            <div *ngIf="mandatoryTraining.upToDateTrainingCount > 0"
+              class="govuk-!-padding-left-1 govuk-!-margin-left-6">
+              {{ mandatoryTraining.upToDateTrainingCount }} Up-to-date
+            </div>
+          </td>
+          <td class="govuk-table__cell">
+            {{ mandatoryTraining.quantity }}
+          </td>
+          <td class="govuk-table__cell govuk-!-font-weight-regular">
+            <a *ngIf="canEditWorker && mandatoryTraining.workers.length > 0" class="govuk-link--no-visited-state"
+              href="#" (click)="toggleDetails(mandatoryTraining.trainingCategoryId, $event)">{{
+                mandatoryTrainingsDetailsLabel[mandatoryTraining.trainingCategoryId]
+                  ? mandatoryTrainingsDetailsLabel[mandatoryTraining.trainingCategoryId]
+                  : 'Open'
+              }}</a>
+          </td>
+        </tr>
+        <tr *ngIf="mandatoryAllTrainingsDetails[mandatoryTraining.trainingCategoryId]"
+          class="govuk-panel--gray govuk-!-margin-2">
+          <td colspan="5">
+            <div class="govuk-!-margin-2">
+              <table class="govuk-table">
+                <thead class="govuk-table__head">
+                  <tr class="govuk-table__row">
+                    <th class="govuk-table__header govuk-!-width-one-third" scope="col">Worker ID</th>
+                    <th class="govuk-table__header govuk-!-width-one-third" scope="col">Job role</th>
+                    <th class="govuk-table__header govuk-!-width-one-third" scope="col">Status</th>
+                  </tr>
+                </thead>
+                <tbody class="govuk-table__body">
+                  <ng-container *ngFor="let worker of mandatoryTraining.workers">
+                    <tr class="govuk-table__row">
+                      <td class="govuk-table__cell govuk-!-font-weight-regular">
+                        <a class="govuk-link--no-visited-state" [routerLink]="getWorkerRecordPath(worker)">{{
+                          worker.NameOrIdValue
+                        }}</a>
+                      </td>
+                      <td class="govuk-table__cell govuk-!-font-weight-regular">
+                        {{ worker.mainJob?.title }}
+                      </td>
+                      <td class="govuk-table__cell govuk-!-font-weight-regular">
+                        <div *ngIf="worker.expiredTrainingCount > 0" class="govuk-!-margin-bottom-1">
+                          <img src="/assets/images/flag-red.svg" alt="expired"
+                            class="govuk-!-margin-right-1 govuk-util__vertical-align-top" />
+                          {{ worker.expiredTrainingCount }}
+                          Expired
+                        </div>
+                        <div *ngIf="worker.expiringTrainingCount > 0" class="govuk-!-margin-bottom-1">
+                          <img src="/assets/images/flag-orange.svg" alt="expiring"
+                            class="govuk-!-margin-right-1 govuk-util__vertical-align-top" />
+                          {{ worker.expiringTrainingCount }} Expiring soon
+                        </div>
+                        <div *ngIf="worker.missingMandatoryTrainingCount > 0">
+                          <img src="/assets/images/flag-red.svg" alt="missing mandatory training"
+                            class="govuk-!-margin-right-1 govuk-util__vertical-align-top" />
+                          {{ worker.missingMandatoryTrainingCount }}
+                          Missing
+                        </div>
+                        <div
+                          *ngIf="worker.expiredTrainingCount === 0 && worker.expiringTrainingCount === 0 && worker.missingMandatoryTrainingCount === 0">
+                          Up-to-date</div>
+                      </td>
+                    </tr>
+                  </ng-container>
+                </tbody>
+              </table>
+            </div>
+          </td>
+        </tr>
+      </ng-container>
+    </tbody>
+  </table>
+</ng-container>
diff --git a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts
new file mode 100644
index 0000000000..3f78fe768e
--- /dev/null
+++ b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts
@@ -0,0 +1,127 @@
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { JourneyType } from '@core/breadcrumb/breadcrumb.model';
+import { Qualification } from '@core/model/qualification.model';
+import { Worker } from '@core/model/worker.model';
+import { BreadcrumbService } from '@core/services/breadcrumb.service';
+import { EstablishmentService } from '@core/services/establishment.service';
+import { PermissionsService } from '@core/services/permissions/permissions.service';
+import { WorkplaceService } from '@core/services/workplace.service';
+import * as moment from 'moment';
+import { Subscription } from 'rxjs';
+
+@Component({
+  selector: 'app-view-all-mandatory-training',
+  templateUrl: './view-all-mandatory-training.component.html',
+})
+export class ViewAllMandatoryTrainingComponent implements OnInit, OnDestroy {
+  @Input() wdfView = false;
+  public canEditWorker: boolean;
+  public lastUpdated: moment.Moment;
+  public mandatoryTrainings;
+  public qualifications: Qualification[];
+  public mandatoryTrainingsDetails = [];
+  public mandatoryAllTrainingsDetails = [];
+  public mandatoryTrainingsDetailsLabel = [];
+  public establishmentId: number;
+  public establishmentUid: string;
+  public workplceName: string;
+  public totalMissingMandatoryTrainingCount: number = 0;
+  public totalExpiredTraining = 0;
+  public totalExpiringTraining = 0;
+  public totalMissingMandatoryTraining = 0;
+  private subscriptions: Subscription = new Subscription();
+
+  constructor(
+    private permissionsService: PermissionsService,
+    private establishmentService: EstablishmentService,
+    private breadcrumbService: BreadcrumbService,
+    private workplaceService: WorkplaceService,
+  ) {}
+
+  ngOnInit() {
+    this.breadcrumbService.show(JourneyType.MANDATORY_TRAINING);
+    this.subscriptions.add(
+      this.establishmentService.establishment$.subscribe(data => {
+        if (data && data.id) {
+          this.establishmentId = data.id;
+          this.establishmentUid = data.uid;
+          this.workplceName = data.name;
+          this.canEditWorker = this.permissionsService.can(data.uid, 'canEditWorker');
+          this.fetchAllRecords();
+        }
+      }),
+    );
+  }
+
+  public getWorkerRecordPath(worker: Worker) {
+    const path = ['/workplace', this.establishmentUid, 'training-and-qualifications-record', worker.uid, 'training'];
+    return this.wdfView ? [...path, ...['wdf-summary']] : path;
+  }
+
+  /**
+   * Function will fetch all the workers mandatory training record.
+   */
+
+  public fetchAllRecords() {
+    this.subscriptions.add(
+      this.workplaceService.getAllMandatoryTrainings(this.establishmentId).subscribe(data => {
+        this.lastUpdated = moment(data.lastUpdated);
+        this.mandatoryTrainings = data.mandatoryTraining;
+        this.mandatoryTrainings.forEach(training => {
+          let mandatoryTrainingObj = {
+            trainingCategoryId: '',
+            category: '',
+            status: '',
+            quantity: '',
+            workers: '',
+            catMissingMandatoryTrainingCount: 0,
+            catExpiredTrainingCount: 0,
+            catExpiringTrainingCount: 0,
+            catTrainingCount: 0,
+            upToDateTrainingCount: 0,
+          };
+
+          mandatoryTrainingObj.trainingCategoryId = training.trainingCategoryId;
+          mandatoryTrainingObj.category = training.category;
+          mandatoryTrainingObj.quantity = training.workers.length;
+          if (training.workers && training.workers.length > 0) {
+            mandatoryTrainingObj.workers = training.workers;
+            training.workers.forEach(worker => {
+              mandatoryTrainingObj.catMissingMandatoryTrainingCount += worker.missingMandatoryTrainingCount;
+              mandatoryTrainingObj.catExpiredTrainingCount += worker.expiredTrainingCount;
+              mandatoryTrainingObj.catExpiringTrainingCount += worker.expiringTrainingCount;
+              mandatoryTrainingObj.catTrainingCount += worker.trainingCount;
+              if (
+                worker.missingMandatoryTrainingCount === 0 &&
+                worker.expiredTrainingCount === 0 &&
+                worker.expiringTrainingCount === 0
+              ) {
+                mandatoryTrainingObj.upToDateTrainingCount++;
+              }
+            });
+          }
+          this.totalExpiredTraining += mandatoryTrainingObj.catExpiredTrainingCount;
+          this.totalExpiringTraining += mandatoryTrainingObj.catExpiringTrainingCount;
+          this.totalMissingMandatoryTraining += mandatoryTrainingObj.catMissingMandatoryTrainingCount;
+          this.mandatoryTrainingsDetails.push(mandatoryTrainingObj);
+        });
+        this.mandatoryTrainings = this.mandatoryTrainingsDetails;
+      }),
+    );
+  }
+
+  /**
+   * Function used to handle toggle for worker details view and change the lable
+   * @param {number} id of clicked row
+   * @param {event} refrance of event handler
+   */
+  public toggleDetails(id: number, event) {
+    event.preventDefault();
+    this.mandatoryAllTrainingsDetails[id] = !this.mandatoryAllTrainingsDetails[id];
+    this.mandatoryTrainingsDetailsLabel[id] = this.mandatoryTrainingsDetailsLabel[id] === 'Close' ? 'Open' : 'Close';
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.unsubscribe();
+  }
+}
diff --git a/src/app/features/workplace/view-my-workplaces/view-my-workplaces.component.spec.ts b/src/app/features/workplace/view-my-workplaces/view-my-workplaces.component.spec.ts
deleted file mode 100644
index b251d295b6..0000000000
--- a/src/app/features/workplace/view-my-workplaces/view-my-workplaces.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ViewMyWorkplacesComponent } from './view-my-workplaces.component';
-
-describe('ViewMyWorkplacesComponent', () => {
-  let component: ViewMyWorkplacesComponent;
-  let fixture: ComponentFixture<ViewMyWorkplacesComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ViewMyWorkplacesComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ViewMyWorkplacesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/view-workplace/view-workplace.component.spec.ts b/src/app/features/workplace/view-workplace/view-workplace.component.spec.ts
deleted file mode 100644
index 3815199d67..0000000000
--- a/src/app/features/workplace/view-workplace/view-workplace.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ViewWorkplaceComponent } from './view-workplace.component';
-
-describe('WorkplaceSummaryComponent', () => {
-  let component: ViewWorkplaceComponent;
-  let fixture: ComponentFixture<ViewWorkplaceComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ViewWorkplaceComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ViewWorkplaceComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/wdf-workplace-confirmation-dialog/wdf-workplace-confirmation-dialog.component.spec.ts b/src/app/features/workplace/wdf-workplace-confirmation-dialog/wdf-workplace-confirmation-dialog.component.spec.ts
deleted file mode 100644
index 06eec7153a..0000000000
--- a/src/app/features/workplace/wdf-workplace-confirmation-dialog/wdf-workplace-confirmation-dialog.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WdfWorkplaceConfirmationDialogComponent } from './wdf-workplace-confirmation-dialog.component';
-
-describe('WdfWorkplaceConfirmationDialogComponent', () => {
-  let component: WdfWorkplaceConfirmationDialogComponent;
-  let fixture: ComponentFixture<WdfWorkplaceConfirmationDialogComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ WdfWorkplaceConfirmationDialogComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WdfWorkplaceConfirmationDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/workplace-info-panel/workplace-info-panel.component.html b/src/app/features/workplace/workplace-info-panel/workplace-info-panel.component.html
index b2c3a82f65..d0965bb99d 100644
--- a/src/app/features/workplace/workplace-info-panel/workplace-info-panel.component.html
+++ b/src/app/features/workplace/workplace-info-panel/workplace-info-panel.component.html
@@ -19,7 +19,7 @@
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-one-quarter">
         <p class="govuk-!-margin-bottom-1">
-          <strong>Data Owner</strong>
+          <strong>Data owner</strong>
         </p>
         <p class="govuk-!-margin-bottom-0">
           {{ workplace.dataOwner }}
@@ -32,14 +32,14 @@
         </p>
         <p class="govuk-!-margin-bottom-0">
           {{ workplace.dataPermissions | dataViewPermissions }}
-          <span class="govuk-util__float-right">
+          <span class="govuk-util__float-right" *ngIf="canChangePermissionsForSubsidiary">
             <ng-container *ngIf="workplace.dataOwnershipRequested; else dataPermissions">
               <a (click)="cancelChangeDataOwnerRequest($event)" href="#">Data request pending</a>
             </ng-container>
             <ng-template #dataPermissions>
               <ng-container *ngIf="workplace.dataOwner === dataOwner.Parent; else workplaceIsDataOwner">
                 <ng-container *ngIf="primaryWorkplace.isParent; else notParent">
-                  <a (click)="setDataPermissions($event)" href="#">Data permissions</a>
+                  <a (click)="setDataPermissions($event)" href="#">Set data permissions</a>
                 </ng-container>
                 <ng-template #notParent>
                   <a (click)="onChangeDataOwner($event)" href="#">Change data owner</a>
diff --git a/src/app/features/workplace/workplace-info-panel/workplace-info-panel.component.spec.ts b/src/app/features/workplace/workplace-info-panel/workplace-info-panel.component.spec.ts
deleted file mode 100644
index bde5f21a21..0000000000
--- a/src/app/features/workplace/workplace-info-panel/workplace-info-panel.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WorkplaceInfoPanelComponent } from './workplace-info-panel.component';
-
-describe('WorkplaceInfoPanelComponent', () => {
-  let component: WorkplaceInfoPanelComponent;
-  let fixture: ComponentFixture<WorkplaceInfoPanelComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [WorkplaceInfoPanelComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WorkplaceInfoPanelComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/workplace-not-found/workplace-not-found.component.html b/src/app/features/workplace/workplace-not-found/workplace-not-found.component.html
index 46ceeb366c..994259b04a 100644
--- a/src/app/features/workplace/workplace-not-found/workplace-not-found.component.html
+++ b/src/app/features/workplace/workplace-not-found/workplace-not-found.component.html
@@ -1,14 +1,14 @@
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds-from-desktop">
     <h1>
-      We could not find your workplace in our CQC database.
+      CQC ID. Workplace not found.
     </h1>
 
-    <p>To continue, you can :</p>
+    <p>To continue, you can:</p>
     <ul class="govuk-list govuk-list--bullet">
-      <li><a [routerLink]="['/workplace', workplace.uid, 'regulated-by-cqc']">go back and try again</a>.</li>
+      <li><a [routerLink]="['/workplace', workplace.uid, 'regulated-by-cqc']">go back and try again</a></li>
 
-      <li><a [routerLink]="['/dashboard']" [fragment]="'workplace'">go to home</a>.</li>
+      <li><a [routerLink]="['/dashboard']" [fragment]="'workplace'">go to home</a></li>
       <li>
         contact the ASC-WDS Support Team on 0113 241 0969 or email us at
         <a href="mailto:ascwds-support@skillsforcare.org.uk">ascwds-support@skillsforcare.org.uk</a>
diff --git a/src/app/features/workplace/workplace-not-found/workplace-not-found.component.spec.ts b/src/app/features/workplace/workplace-not-found/workplace-not-found.component.spec.ts
deleted file mode 100644
index 1c59c4e426..0000000000
--- a/src/app/features/workplace/workplace-not-found/workplace-not-found.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WorkplaceNotFoundComponent } from './workplace-not-found.component';
-
-describe('WorkplaceNotFoundComponent', () => {
-  let component: WorkplaceNotFoundComponent;
-  let fixture: ComponentFixture<WorkplaceNotFoundComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ WorkplaceNotFoundComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WorkplaceNotFoundComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/features/workplace/workplace-routing.module.ts b/src/app/features/workplace/workplace-routing.module.ts
index d952285fab..912c2f853f 100644
--- a/src/app/features/workplace/workplace-routing.module.ts
+++ b/src/app/features/workplace/workplace-routing.module.ts
@@ -43,6 +43,7 @@ import {
 } from './user-account-edit-permissions/user-account-edit-permissions.component';
 import { VacanciesComponent } from './vacancies/vacancies.component';
 import { WorkplaceNotFoundComponent } from './workplace-not-found/workplace-not-found.component';
+import { ViewAllMandatoryTrainingComponent } from './view-all-mandatory-trainings/view-all-mandatory-training.component';
 
 const routes: Routes = [
   {
@@ -51,6 +52,10 @@ const routes: Routes = [
     canActivate: [ParentGuard],
     data: { title: 'View My Workplaces' },
   },
+  {
+    path: 'view-all-mandatory-training',
+    component: ViewAllMandatoryTrainingComponent,
+  },
   {
     path: 'start-screen',
     data: { title: 'Start' },
diff --git a/src/app/features/workplace/workplace.module.ts b/src/app/features/workplace/workplace.module.ts
index 4e9b1ba3c0..7d6ee0b8c6 100644
--- a/src/app/features/workplace/workplace.module.ts
+++ b/src/app/features/workplace/workplace.module.ts
@@ -19,7 +19,6 @@ import {
   DataSharingWithLocalAuthoritiesComponent,
 } from './data-sharing-with-local-authorities/data-sharing-with-local-authorities.component';
 import { DataSharingComponent } from './data-sharing/data-sharing.component';
-import { DeleteWorkplaceDialogComponent } from './delete-workplace-dialog/delete-workplace-dialog.component';
 import { EditWorkplaceComponent } from './edit-workplace/edit-workplace.component';
 import { EnterWorkplaceAddressComponent } from './enter-workplace-address/enter-workplace-address.component';
 import { LeaversComponent } from './leavers/leavers.component';
@@ -43,9 +42,6 @@ import {
 import { VacanciesComponent } from './vacancies/vacancies.component';
 import { ViewMyWorkplacesComponent } from './view-my-workplaces/view-my-workplaces.component';
 import { ViewWorkplaceComponent } from './view-workplace/view-workplace.component';
-import {
-  WdfWorkplaceConfirmationDialogComponent,
-} from './wdf-workplace-confirmation-dialog/wdf-workplace-confirmation-dialog.component';
 import { WorkplaceInfoPanelComponent } from './workplace-info-panel/workplace-info-panel.component';
 import { WorkplaceNotFoundComponent } from './workplace-not-found/workplace-not-found.component';
 import { WorkplaceRoutingModule } from './workplace-routing.module';
@@ -60,7 +56,6 @@ import { WorkplaceRoutingModule } from './workplace-routing.module';
     CreateUserAccountComponent,
     DataSharingComponent,
     DataSharingWithLocalAuthoritiesComponent,
-    DeleteWorkplaceDialogComponent,
     EditWorkplaceComponent,
     LeaversComponent,
     OtherServicesComponent,
@@ -79,7 +74,6 @@ import { WorkplaceRoutingModule } from './workplace-routing.module';
     ViewMyWorkplacesComponent,
     ViewWorkplaceComponent,
     WorkplaceInfoPanelComponent,
-    WdfWorkplaceConfirmationDialogComponent,
     SelectMainServiceComponent,
     UserAccountEditDetailsComponent,
     RegulatedByCqcComponent,
@@ -89,10 +83,8 @@ import { WorkplaceRoutingModule } from './workplace-routing.module';
   ],
   providers: [DialogService, WorkplaceResolver, UserAccountResolver],
   entryComponents: [
-    DeleteWorkplaceDialogComponent,
     UserAccountChangePrimaryDialogComponent,
     UserAccountDeleteDialogComponent,
-    WdfWorkplaceConfirmationDialogComponent,
   ],
 })
 export class WorkplaceModule {}
diff --git a/src/app/shared/components/alert/alert.component.spec.ts b/src/app/shared/components/alert/alert.component.spec.ts
deleted file mode 100644
index 2f12824f6d..0000000000
--- a/src/app/shared/components/alert/alert.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { AlertComponent } from '@shared/components/alert/alert.component';
-
-describe('AlertComponent', () => {
-  let component: AlertComponent;
-  let fixture: ComponentFixture<AlertComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [AlertComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AlertComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/auto-suggest/auto-suggest.component.spec.ts b/src/app/shared/components/auto-suggest/auto-suggest.component.spec.ts
deleted file mode 100644
index f87e0db796..0000000000
--- a/src/app/shared/components/auto-suggest/auto-suggest.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AutoSuggestComponent } from './auto-suggest.component';
-
-describe('AutoSuggestComponent', () => {
-  let component: AutoSuggestComponent;
-  let fixture: ComponentFixture<AutoSuggestComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [AutoSuggestComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AutoSuggestComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/back-link/back-link.component.spec.ts b/src/app/shared/components/back-link/back-link.component.spec.ts
deleted file mode 100644
index d13dedb421..0000000000
--- a/src/app/shared/components/back-link/back-link.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BackLinkComponent } from './back-link.component';
-
-describe('BackLinkComponent', () => {
-  let component: BackLinkComponent;
-  let fixture: ComponentFixture<BackLinkComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [BackLinkComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(BackLinkComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/breadcrumbs/breadcrumbs.component.spec.ts b/src/app/shared/components/breadcrumbs/breadcrumbs.component.spec.ts
deleted file mode 100644
index 175ef83757..0000000000
--- a/src/app/shared/components/breadcrumbs/breadcrumbs.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BreadcrumbsComponent } from './breadcrumbs.component';
-
-describe('BreadcrumbsComponent', () => {
-  let component: BreadcrumbsComponent;
-  let fixture: ComponentFixture<BreadcrumbsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ BreadcrumbsComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(BreadcrumbsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/cancel-data-owner-dialog/cancel-data-owner-dialog.component.spec.ts b/src/app/shared/components/cancel-data-owner-dialog/cancel-data-owner-dialog.component.spec.ts
deleted file mode 100644
index c0aaf09d2e..0000000000
--- a/src/app/shared/components/cancel-data-owner-dialog/cancel-data-owner-dialog.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CancelDataOwnerDialogComponent } from './cancel-data-owner-dialog.component';
-
-describe('CancelDataOwnerDialogComponent', () => {
-  let component: CancelDataOwnerDialogComponent;
-  let fixture: ComponentFixture<CancelDataOwnerDialogComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [CancelDataOwnerDialogComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CancelDataOwnerDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/change-data-owner-dialog/change-data-owner-dialog.component.html b/src/app/shared/components/change-data-owner-dialog/change-data-owner-dialog.component.html
index bc199b09f7..485b0b78a3 100644
--- a/src/app/shared/components/change-data-owner-dialog/change-data-owner-dialog.component.html
+++ b/src/app/shared/components/change-data-owner-dialog/change-data-owner-dialog.component.html
@@ -49,7 +49,10 @@ <h1 id="dialogHeading" class="govuk-fieldset__heading">
   </p>
 
   <button type="submit" (click)="changeOwnership()" class="govuk-button">Save and return</button>
-  <button type="button" (click)="close(null)" class="govuk-button govuk-button--link govuk-util__float-right">
-    Exit
-  </button>
+  <a
+    href="#"
+    class="govuk-list govuk-list--inline govuk-util__float-right govuk-!-margin-top-2"
+    (click)="close($event, null)"
+    >Cancel</a
+  >
 </form>
diff --git a/src/app/shared/components/change-data-owner-dialog/change-data-owner-dialog.component.spec.ts b/src/app/shared/components/change-data-owner-dialog/change-data-owner-dialog.component.spec.ts
deleted file mode 100644
index b94804982c..0000000000
--- a/src/app/shared/components/change-data-owner-dialog/change-data-owner-dialog.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ChangeDataOwnerDialogComponent } from './change-data-owner-dialog.component';
-
-describe('ChangeDataOwnerDialogComponent', () => {
-  let component: ChangeDataOwnerDialogComponent;
-  let fixture: ComponentFixture<ChangeDataOwnerDialogComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ChangeDataOwnerDialogComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ChangeDataOwnerDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/change-data-owner-dialog/change-data-owner-dialog.component.ts b/src/app/shared/components/change-data-owner-dialog/change-data-owner-dialog.component.ts
index de6d320e8e..733a7456d2 100644
--- a/src/app/shared/components/change-data-owner-dialog/change-data-owner-dialog.component.ts
+++ b/src/app/shared/components/change-data-owner-dialog/change-data-owner-dialog.component.ts
@@ -36,7 +36,7 @@ export class ChangeDataOwnerDialogComponent extends DialogComponent implements O
     private errorSummaryService: ErrorSummaryService,
     private establishmentService: EstablishmentService,
     private formBuilder: FormBuilder,
-    public dialog: Dialog<ChangeDataOwnerDialogComponent>
+    public dialog: Dialog<ChangeDataOwnerDialogComponent>,
   ) {
     super(data, dialog);
   }
@@ -89,7 +89,8 @@ export class ChangeDataOwnerDialogComponent extends DialogComponent implements O
     });
   }
 
-  close(confirm: boolean) {
+  close(event: Event, confirm: boolean) {
+    event.preventDefault();
     this.dialog.close(confirm);
   }
 
@@ -134,7 +135,7 @@ export class ChangeDataOwnerDialogComponent extends DialogComponent implements O
         this.establishmentService.changeOwnership(this.workplace.uid, requestedPermission).subscribe(
           data => {
             if (data) {
-              this.close(true);
+              this.close(event, true);
             }
           },
           error => {
@@ -142,8 +143,8 @@ export class ChangeDataOwnerDialogComponent extends DialogComponent implements O
             if (error.error.message) {
               this.serverError = error.error.message;
             }
-          }
-        )
+          },
+        ),
       );
     }
   }
diff --git a/src/app/shared/components/character-count/character-count.component.spec.ts b/src/app/shared/components/character-count/character-count.component.spec.ts
deleted file mode 100644
index 7c11b5ea28..0000000000
--- a/src/app/shared/components/character-count/character-count.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CharacterCountComponent } from './character-count.component';
-
-describe('CharacterCountComponent', () => {
-  let component: CharacterCountComponent;
-  let fixture: ComponentFixture<CharacterCountComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [CharacterCountComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CharacterCountComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/date-picker/date-picker.component.spec.ts b/src/app/shared/components/date-picker/date-picker.component.spec.ts
deleted file mode 100644
index c996b3c72b..0000000000
--- a/src/app/shared/components/date-picker/date-picker.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DatePickerComponent } from './date-picker.component';
-
-describe('DatePickerComponent', () => {
-  let component: DatePickerComponent;
-  let fixture: ComponentFixture<DatePickerComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [DatePickerComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DatePickerComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/error-summary/error-summary.component.spec.ts b/src/app/shared/components/error-summary/error-summary.component.spec.ts
deleted file mode 100644
index 4dd304c1e4..0000000000
--- a/src/app/shared/components/error-summary/error-summary.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ErrorSummaryComponent } from './error-summary.component';
-
-describe('ErrorSummaryComponent', () => {
-  let component: ErrorSummaryComponent;
-  let fixture: ComponentFixture<ErrorSummaryComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ErrorSummaryComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ErrorSummaryComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/error-summary/error-summary.component.ts b/src/app/shared/components/error-summary/error-summary.component.ts
index 0ebc0acceb..37cb1b57fa 100644
--- a/src/app/shared/components/error-summary/error-summary.component.ts
+++ b/src/app/shared/components/error-summary/error-summary.component.ts
@@ -87,7 +87,20 @@ export class ErrorSummaryComponent implements OnInit, OnDestroy {
 
           const formGroupControls: AbstractControl = formGroup[`controls`];
           if (formGroupControls) {
-            Object.keys(formGroupControls).forEach(i => this.collectError(formGroupControls[i], `${key}.${i}`));
+            Object.keys(formGroupControls).forEach(i => {
+              if (formGroupControls[i] instanceof FormArray) {
+                formGroupControls[i].controls.forEach(frmGroup => {
+                  const frmGroupControls: AbstractControl = frmGroup[`controls`];
+                  if (frmGroupControls) {
+                    Object.keys(frmGroupControls).forEach(j => {
+                      this.collectError(frmGroupControls[j], `${i}.${j}`);
+                    });
+                  }
+                });
+              } else {
+                this.collectError(formGroupControls[i], `${key}.${i}`);
+              }
+            });
           }
         });
       }
diff --git a/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.html b/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.html
new file mode 100644
index 0000000000..01791983c1
--- /dev/null
+++ b/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.html	
@@ -0,0 +1,22 @@
+<app-error-summary *ngIf="serverError" [serverError]="serverError"> </app-error-summary>
+<div class="govuk-form-group">
+  <fieldset class="govuk-fieldset">
+    <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
+      <h1 id="dialogHeading" class="govuk-fieldset__heading">
+        Are you sure you want to unlock {{data.username}}'s account?
+      </h1>
+    </legend>
+  </fieldset>
+</div>
+<p>
+  <strong>They will be able to login again with 1 more attempt before being locked again.</strong>
+</p>
+
+<button type="button" (click)="closeDialogWindow(null)" class="govuk-button">Close</button>
+<button
+  type="button"
+  (click)="unlockUser(data)"
+  class="govuk-button govuk-button--warning govuk-util__float-right"
+>
+  Unlock account
+</button>
diff --git a/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.ts b/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.ts
new file mode 100644
index 0000000000..52104a5cc9
--- /dev/null
+++ b/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.ts	
@@ -0,0 +1,90 @@
+import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
+import { DialogComponent } from '@core/components/dialog.component';
+import { ErrorDefinition } from '@core/model/errorSummary.model';
+import { DataPermissions } from '@core/model/my-workplaces.model';
+import { AlertService } from '@core/services/alert.service';
+import { Dialog, DIALOG_DATA } from '@core/services/dialog.service';
+import { ErrorSummaryService } from '@core/services/error-summary.service';
+import { RegistrationsService } from '@core/services/registrations.service';
+import { Subscription } from 'rxjs';
+
+@Component({
+  selector: 'app-admin-unlock-confirmation',
+  templateUrl: './admin-unlock-confirmation.html',
+})
+export class AdminUnlockConfirmationDialogComponent extends DialogComponent implements OnInit, OnDestroy {
+  public dataPermissions: DataPermissions[];
+  protected subscriptions: Subscription = new Subscription();
+  public serverError: string;
+  public serverErrorsMap: Array<ErrorDefinition>;
+
+  constructor(
+    @Inject(DIALOG_DATA) public data,
+    private errorSummaryService: ErrorSummaryService,
+    private registrationsService: RegistrationsService,
+    public dialog: Dialog<AdminUnlockConfirmationDialogComponent>,
+    private alertService: AlertService
+  ) {
+    super(data, dialog);
+  }
+
+  ngOnInit() {
+    this.setupServerErrorsMap();
+    console.log(this.data);
+  }
+
+  // setup server error message
+  private setupServerErrorsMap(): void {
+    this.serverErrorsMap = [
+      {
+        name: 503,
+        message: 'We could not unlock the users account. You can try again or contact us.',
+      },
+      {
+        name: 400,
+        message: 'Unable to unlock account.',
+      },
+      {
+        name: 404,
+        message: 'Send request to unlock service not found. You can try again or contact us.',
+      },
+    ];
+  }
+
+  /**
+   * Function is used to close dialog window after successful confirmation
+   * @param {any} true to close dialog after response or null to close without action
+   * @return {void}
+   */
+  public closeDialogWindow(confirm: any) {
+    this.dialog.close(confirm);
+  }
+
+  /**
+   * Unlock a users account
+   * @param {string}
+   * @return {void}
+   */
+  public unlockUser(data: any) {
+    this.registrationsService.unlockAccount({
+      username: data.username
+    }).subscribe(
+      result => {
+        data.removeUnlock();
+        this.alertService.addAlert({
+          type: 'success',
+          message: `User account has been unlocked.`,
+        });
+        this.closeDialogWindow(true);
+      },
+      error => {
+        this.serverError = this.errorSummaryService.getServerErrorMessage(error.status, this.serverErrorsMap);
+      }
+    );
+  }
+
+
+  public ngOnDestroy(): void {
+    this.subscriptions.unsubscribe();
+  }
+}
diff --git a/src/app/shared/components/link-to-parent-remove/link-to-parent-remove-dialog.component.html b/src/app/shared/components/link-to-parent-remove/link-to-parent-remove-dialog.component.html
index 45c4c096ab..c7b6adecec 100644
--- a/src/app/shared/components/link-to-parent-remove/link-to-parent-remove-dialog.component.html
+++ b/src/app/shared/components/link-to-parent-remove/link-to-parent-remove-dialog.component.html
@@ -11,6 +11,9 @@ <h1 id="dialogHeading" class="govuk-fieldset__heading">
 </div>
 
 <button type="button" (click)="removeLinkToParent($event)" class="govuk-button">Continue</button>
-<button type="button" (click)="close(null)" class="govuk-button govuk-button--secondary govuk-util__float-right">
-  Close
-</button>
+<a
+  href="#"
+  class="govuk-list govuk-list--inline govuk-util__float-right govuk-!-margin-top-2"
+  (click)="close($event, null)"
+  >Cancel</a
+>
diff --git a/src/app/shared/components/link-to-parent-remove/link-to-parent-remove-dialog.component.ts b/src/app/shared/components/link-to-parent-remove/link-to-parent-remove-dialog.component.ts
index 3c69725146..406bd2dbe5 100644
--- a/src/app/shared/components/link-to-parent-remove/link-to-parent-remove-dialog.component.ts
+++ b/src/app/shared/components/link-to-parent-remove/link-to-parent-remove-dialog.component.ts
@@ -28,7 +28,7 @@ export class LinkToParentRemoveDialogComponent extends DialogComponent implement
     private alertService: AlertService,
     private permissionsService: PermissionsService,
     private ref: ChangeDetectorRef,
-    public dialog: Dialog<LinkToParentRemoveDialogComponent>
+    public dialog: Dialog<LinkToParentRemoveDialogComponent>,
   ) {
     super(data, dialog);
   }
@@ -56,7 +56,8 @@ export class LinkToParentRemoveDialogComponent extends DialogComponent implement
     ];
   }
 
-  close(returnToClose: any) {
+  close(event: Event, returnToClose: any) {
+    event.preventDefault();
     this.dialog.close(returnToClose);
   }
   //sned request to backend for delink to parent
@@ -67,12 +68,12 @@ export class LinkToParentRemoveDialogComponent extends DialogComponent implement
         .removeParentAssociation(this.workplace.uid, { parentWorkplaceUId: this.workplace.parentUid })
         .subscribe(
           data => {
-            this.close({ closeFrom: 'remove-link' });
+            this.close(event, { closeFrom: 'remove-link' });
           },
           error => {
             this.serverError = this.errorSummaryService.getServerErrorMessage(error.status, this.serverErrorsMap);
-          }
-        )
+          },
+        ),
     );
   }
 
diff --git a/src/app/shared/components/link-to-parent/link-to-parent-dialog.component.html b/src/app/shared/components/link-to-parent/link-to-parent-dialog.component.html
index b89195a7ce..3f9f64a4d5 100644
--- a/src/app/shared/components/link-to-parent/link-to-parent-dialog.component.html
+++ b/src/app/shared/components/link-to-parent/link-to-parent-dialog.component.html
@@ -62,11 +62,10 @@ <h1 id="dialogHeading" class="govuk-fieldset__heading">
   </p>
 
   <button type="submit" (click)="sendRequestToParent()" class="govuk-button">Send request</button>
-  <button
-    type="button"
-    (click)="closeDialogWindow(null)"
-    class="govuk-button govuk-button--secondary govuk-util__float-right"
+  <a
+    href="#"
+    class="govuk-list govuk-list--inline govuk-util__float-right govuk-!-margin-top-2"
+    (click)="closeDialogWindow($event, null)"
+    >Cancel</a
   >
-    Close
-  </button>
 </form>
diff --git a/src/app/shared/components/link-to-parent/link-to-parent-dialog.component.ts b/src/app/shared/components/link-to-parent/link-to-parent-dialog.component.ts
index 5e0b541d52..64f18846a0 100644
--- a/src/app/shared/components/link-to-parent/link-to-parent-dialog.component.ts
+++ b/src/app/shared/components/link-to-parent/link-to-parent-dialog.component.ts
@@ -35,7 +35,7 @@ export class LinkToParentDialogComponent extends DialogComponent implements OnIn
     private errorSummaryService: ErrorSummaryService,
     public dialog: Dialog<LinkToParentDialogComponent>,
     private alertService: AlertService,
-    private router: Router
+    private router: Router,
   ) {
     super(data, dialog);
     this.parentNameOrPostCodeValidator = this.parentNameOrPostCodeValidator.bind(this);
@@ -62,8 +62,8 @@ export class LinkToParentDialogComponent extends DialogComponent implements OnIn
           if (error.error.message) {
             this.serverError = error.error.message;
           }
-        }
-      )
+        },
+      ),
     );
   }
 
@@ -158,7 +158,8 @@ export class LinkToParentDialogComponent extends DialogComponent implements OnIn
    * @param {any} true to close dialog after response or null to close without action
    * @return {void}
    */
-  public closeDialogWindow(confirm: any) {
+  public closeDialogWindow(event: Event, confirm: any) {
+    event.preventDefault();
     this.dialog.close(confirm);
   }
 
@@ -186,13 +187,13 @@ export class LinkToParentDialogComponent extends DialogComponent implements OnIn
                 type: 'success',
                 message: `Request to link to ${parentName} has been sent.`,
               });
-              this.closeDialogWindow(true);
+              this.closeDialogWindow(event, true);
             }
           },
           error => {
             this.serverError = this.errorSummaryService.getServerErrorMessage(error.status, this.serverErrorsMap);
-          }
-        )
+          },
+        ),
       );
     }
   }
@@ -209,7 +210,7 @@ export class LinkToParentDialogComponent extends DialogComponent implements OnIn
       if (parentNameOrPostCode.value !== null) {
         const parentNameOrPostCodeLowerCase = parentNameOrPostCode.value.toLowerCase();
         return this.availableParentWorkPlaces.some(
-          wp => wp.parentNameAndPostalcode.toLowerCase() === parentNameOrPostCodeLowerCase
+          wp => wp.parentNameAndPostalcode.toLowerCase() === parentNameOrPostCodeLowerCase,
         )
           ? null
           : { validNameOrPostCode: true };
@@ -233,7 +234,7 @@ export class LinkToParentDialogComponent extends DialogComponent implements OnIn
           wp =>
             wp.parentName.toLowerCase().startsWith(parentNameOrPostCodeLowerCase) ||
             wp.postcode.toLowerCase().startsWith(parentNameOrPostCodeLowerCase) ||
-            wp.parentNameAndPostalcode.toLowerCase().startsWith(parentNameOrPostCodeLowerCase)
+            wp.parentNameAndPostalcode.toLowerCase().startsWith(parentNameOrPostCodeLowerCase),
         )
         .filter(wp => wp.parentNameAndPostalcode.toLowerCase() !== parentNameOrPostCodeLowerCase)
         .map(wp => wp.parentNameAndPostalcode);
@@ -250,7 +251,7 @@ export class LinkToParentDialogComponent extends DialogComponent implements OnIn
   public getParentUidOrName(nameAndPostCode: string, nameOrUid: string) {
     if (nameAndPostCode) {
       const filterArray = this.availableParentWorkPlaces.filter(
-        wp => wp.parentNameAndPostalcode.toLowerCase() === nameAndPostCode.toLowerCase()
+        wp => wp.parentNameAndPostalcode.toLowerCase() === nameAndPostCode.toLowerCase(),
       );
       if (nameOrUid === 'uid') {
         return filterArray[0].uid;
diff --git a/src/app/shared/components/ownership-change-message/ownership-change-message-dialog.component.html b/src/app/shared/components/ownership-change-message/ownership-change-message-dialog.component.html
index fc7a9ee707..cf0c89e952 100644
--- a/src/app/shared/components/ownership-change-message/ownership-change-message-dialog.component.html
+++ b/src/app/shared/components/ownership-change-message/ownership-change-message-dialog.component.html
@@ -17,6 +17,9 @@ <h1 id="dialogHeading" class="govuk-fieldset__heading">
 >
   Send a request to change ownership of data
 </a>
-<button type="button" (click)="close(null)" class="govuk-button govuk-button--secondary govuk-util__float-right">
-  Close
-</button>
+<a
+  href="#"
+  class="govuk-list govuk-list--inline govuk-util__float-right govuk-!-margin-top-2"
+  (click)="close($event, null)"
+  >Cancel</a
+>
diff --git a/src/app/shared/components/ownership-change-message/ownership-change-message-dialog.component.ts b/src/app/shared/components/ownership-change-message/ownership-change-message-dialog.component.ts
index ac8b15a5dc..97e287ce14 100644
--- a/src/app/shared/components/ownership-change-message/ownership-change-message-dialog.component.ts
+++ b/src/app/shared/components/ownership-change-message/ownership-change-message-dialog.component.ts
@@ -16,7 +16,7 @@ export class OwnershipChangeMessageDialogComponent extends DialogComponent imple
   constructor(
     @Inject(DIALOG_DATA) public data,
     private establishmentService: EstablishmentService,
-    public dialog: Dialog<OwnershipChangeMessageDialogComponent>
+    public dialog: Dialog<OwnershipChangeMessageDialogComponent>,
   ) {
     super(data, dialog);
   }
@@ -25,13 +25,14 @@ export class OwnershipChangeMessageDialogComponent extends DialogComponent imple
     this.workplace = this.data;
   }
 
-  close(returnToClose: any) {
+  close(event: Event, returnToClose: any) {
+    event.preventDefault();
     this.dialog.close(returnToClose);
   }
 
   public ownershipChangeMessage($event: Event) {
     $event.preventDefault();
-    this.close({ closeFrom: 'ownership-change' });
+    this.close(event, { closeFrom: 'ownership-change' });
   }
 
   public ngOnDestroy(): void {
diff --git a/src/app/shared/components/reject-request-dialog/reject-request-dialog.component.html b/src/app/shared/components/reject-request-dialog/reject-request-dialog.component.html
index cf2a32aec4..313726830c 100644
--- a/src/app/shared/components/reject-request-dialog/reject-request-dialog.component.html
+++ b/src/app/shared/components/reject-request-dialog/reject-request-dialog.component.html
@@ -63,7 +63,10 @@ <h1 id="dialogHeading" class="govuk-fieldset__heading">
     </fieldset>
   </div>
   <button type="submit" (click)="rejectNotificationRequest()" class="govuk-button">Continue</button>
-  <button type="button" (click)="close(null)" class="govuk-button govuk-button--link govuk-util__float-right">
-    Exit
-  </button>
+  <a
+    href="#"
+    class="govuk-list govuk-list--inline govuk-util__float-right govuk-!-margin-top-2"
+    (click)="close($event, null)"
+    >Cancel</a
+  >
 </form>
diff --git a/src/app/shared/components/reject-request-dialog/reject-request-dialog.component.ts b/src/app/shared/components/reject-request-dialog/reject-request-dialog.component.ts
index ace5dfb04f..31185dc9fc 100644
--- a/src/app/shared/components/reject-request-dialog/reject-request-dialog.component.ts
+++ b/src/app/shared/components/reject-request-dialog/reject-request-dialog.component.ts
@@ -27,7 +27,7 @@ export class RejectRequestDialogComponent extends DialogComponent implements OnI
     @Inject(DIALOG_DATA) public data,
     private errorSummaryService: ErrorSummaryService,
     private formBuilder: FormBuilder,
-    public dialog: Dialog<RejectRequestDialogComponent>
+    public dialog: Dialog<RejectRequestDialogComponent>,
   ) {
     super(data, dialog);
   }
@@ -51,7 +51,8 @@ export class RejectRequestDialogComponent extends DialogComponent implements OnI
     });
   }
 
-  close(returnToClose: any) {
+  close(event: Event, returnToClose: any) {
+    event.preventDefault();
     this.dialog.close(returnToClose);
   }
 
@@ -108,7 +109,7 @@ export class RejectRequestDialogComponent extends DialogComponent implements OnI
 
   public rejectNotificationRequest() {
     if (this.form.valid) {
-      this.close({ rejectionReason: this.form.value.reason });
+      this.close(event, { rejectionReason: this.form.value.reason });
     }
   }
 
diff --git a/src/app/shared/components/set-data-permission/set-data-permission-dialog.component.html b/src/app/shared/components/set-data-permission/set-data-permission-dialog.component.html
index 3150bf00e7..d39ca9e957 100644
--- a/src/app/shared/components/set-data-permission/set-data-permission-dialog.component.html
+++ b/src/app/shared/components/set-data-permission/set-data-permission-dialog.component.html
@@ -29,7 +29,11 @@ <h1 id="dialogHeading" class="govuk-fieldset__heading">
   </div>
 
   <button type="submit" (click)="setPermissions()" class="govuk-button">Set Permissions</button>
-  <button type="button" (click)="close(null)" class="govuk-button govuk-button--secondary govuk-util__float-right">
-    Cancel
-  </button>
+
+  <a
+    href="#"
+    class="govuk-list govuk-list--inline govuk-util__float-right govuk-!-margin-top-2"
+    (click)="close($event, null)"
+    >Cancel</a
+  >
 </form>
diff --git a/src/app/shared/components/set-data-permission/set-data-permission-dialog.component.ts b/src/app/shared/components/set-data-permission/set-data-permission-dialog.component.ts
index c5944f5c16..9f3cf01500 100644
--- a/src/app/shared/components/set-data-permission/set-data-permission-dialog.component.ts
+++ b/src/app/shared/components/set-data-permission/set-data-permission-dialog.component.ts
@@ -30,7 +30,7 @@ export class SetDataPermissionDialogComponent extends DialogComponent implements
     private establishmentService: EstablishmentService,
     private formBuilder: FormBuilder,
     private errorSummaryService: ErrorSummaryService,
-    public dialog: Dialog<SetDataPermissionDialogComponent>
+    public dialog: Dialog<SetDataPermissionDialogComponent>,
   ) {
     super(data, dialog);
   }
@@ -80,7 +80,8 @@ export class SetDataPermissionDialogComponent extends DialogComponent implements
     this.submitted = true;
   }
 
-  close(confirm: boolean) {
+  close(event: Event, confirm: boolean) {
+    event.preventDefault();
     this.dialog.close(confirm);
   }
 
@@ -94,13 +95,13 @@ export class SetDataPermissionDialogComponent extends DialogComponent implements
         data => {
           if (data) {
             this.workplace.dataPermissions = data.dataPermissions;
-            this.close(true);
+            this.close(event, true);
           }
         },
         error => {
           this.serverError = this.errorSummaryService.getServerErrorMessage(error.status, this.serverErrorsMap);
-        }
-      )
+        },
+      ),
     );
   }
 
diff --git a/src/app/shared/components/staff-record-summary/basic-record/basic-record.component.spec.ts b/src/app/shared/components/staff-record-summary/basic-record/basic-record.component.spec.ts
deleted file mode 100644
index fd5499bf73..0000000000
--- a/src/app/shared/components/staff-record-summary/basic-record/basic-record.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BasicRecordComponent } from './basic-record.component';
-
-describe('BasicRecordComponent', () => {
-  let component: BasicRecordComponent;
-  let fixture: ComponentFixture<BasicRecordComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [BasicRecordComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(BasicRecordComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/staff-record-summary/employment/employment.component.html b/src/app/shared/components/staff-record-summary/employment/employment.component.html
index e8f54d7f58..7467099414 100644
--- a/src/app/shared/components/staff-record-summary/employment/employment.component.html
+++ b/src/app/shared/components/staff-record-summary/employment/employment.component.html
@@ -226,7 +226,7 @@ <h2 class="govuk-heading-m">Employment</h2>
     </dt>
     <dd class="govuk-summary-list__value">
       <app-summary-record-value [wdfView]="wdfView" [wdfValue]="worker.wdf?.zeroHoursContract">
-        {{ worker.zeroHoursContract | closedEndedAnswer }}
+        {{ worker.zeroHoursContract || '-' | closedEndedAnswer }}
       </app-summary-record-value>
     </dd>
     <dd *ngIf="canEditWorker" class="govuk-summary-list__actions">
diff --git a/src/app/shared/components/staff-record-summary/employment/employment.component.spec.ts b/src/app/shared/components/staff-record-summary/employment/employment.component.spec.ts
deleted file mode 100644
index 23906b5828..0000000000
--- a/src/app/shared/components/staff-record-summary/employment/employment.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { EmploymentComponent } from './employment.component';
-
-describe('EmploymentComponent', () => {
-  let component: EmploymentComponent;
-  let fixture: ComponentFixture<EmploymentComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [EmploymentComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EmploymentComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/staff-record-summary/personal-details/personal-details.component.html b/src/app/shared/components/staff-record-summary/personal-details/personal-details.component.html
index b6d98205b8..dd0331e654 100644
--- a/src/app/shared/components/staff-record-summary/personal-details/personal-details.component.html
+++ b/src/app/shared/components/staff-record-summary/personal-details/personal-details.component.html
@@ -72,7 +72,7 @@ <h2 class="govuk-heading-m">Personal</h2>
 
     <dd class="govuk-summary-list__value">
       <app-summary-record-value [wdfView]="wdfView" [wdfValue]="worker.wdf?.gender">
-        {{ worker.gender | closedEndedAnswer }}
+        {{ worker.gender || '-' | closedEndedAnswer }}
       </app-summary-record-value>
     </dd>
     <dd *ngIf="canEditWorker" class="govuk-summary-list__actions">
@@ -94,7 +94,7 @@ <h2 class="govuk-heading-m">Personal</h2>
       Disability
     </dt>
     <dd class="govuk-summary-list__value">
-      {{ worker.disability | closedEndedAnswer }}
+      {{ worker.disability || '-' | closedEndedAnswer }}
     </dd>
     <dd *ngIf="canEditWorker" class="govuk-summary-list__actions">
       <a [routerLink]="getRoutePath('disability')" (click)="setReturn()">
diff --git a/src/app/shared/components/staff-record-summary/personal-details/personal-details.component.spec.ts b/src/app/shared/components/staff-record-summary/personal-details/personal-details.component.spec.ts
deleted file mode 100644
index 9015488d68..0000000000
--- a/src/app/shared/components/staff-record-summary/personal-details/personal-details.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { PersonalDetailsComponent } from './personal-details.component';
-
-describe('PersonalDetailsComponent', () => {
-  let component: PersonalDetailsComponent;
-  let fixture: ComponentFixture<PersonalDetailsComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [PersonalDetailsComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(PersonalDetailsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/staff-record-summary/qualifications-and-training/qualifications-and-training.component.html b/src/app/shared/components/staff-record-summary/qualifications-and-training/qualifications-and-training.component.html
index 6c483fc2e9..928106eba8 100644
--- a/src/app/shared/components/staff-record-summary/qualifications-and-training/qualifications-and-training.component.html
+++ b/src/app/shared/components/staff-record-summary/qualifications-and-training/qualifications-and-training.component.html
@@ -1,4 +1,4 @@
-<dl class="govuk-summary-list govuk-summary-list">
+<dl class="govuk-summary-list govuk-summary-list--no-top-border">
   <div class="govuk-summary-list__row">
     <dt class="govuk-summary-list__key">
       Started or completed Care Certificate
@@ -30,7 +30,7 @@
     </dt>
     <dd class="govuk-summary-list__value">
       <app-summary-record-value [wdfView]="wdfView" [wdfValue]="worker.wdf?.qualificationInSocialCare">
-        {{ worker.qualificationInSocialCare | closedEndedAnswer }}
+        {{ worker.qualificationInSocialCare || '-' | closedEndedAnswer }}
       </app-summary-record-value>
     </dd>
     <dd *ngIf="canEditWorker" class="govuk-summary-list__actions">
@@ -76,7 +76,7 @@
     </dt>
     <dd class="govuk-summary-list__value">
       <app-summary-record-value [wdfView]="wdfView" [wdfValue]="worker.wdf?.otherQualification">
-        {{ worker.otherQualification | closedEndedAnswer }}
+        {{ worker.otherQualification || '-' | closedEndedAnswer }}
       </app-summary-record-value>
     </dd>
     <dd *ngIf="canEditWorker" class="govuk-summary-list__actions">
@@ -121,7 +121,7 @@
       Completing apprenticeship training
     </dt>
     <dd class="govuk-summary-list__value">
-      {{ worker.apprenticeshipTraining | closedEndedAnswer }}
+      {{ worker.apprenticeshipTraining || '-' | closedEndedAnswer }}
     </dd>
     <dd class="govuk-summary-list__actions">
       <a *ngIf="canEditWorker" [routerLink]="getRoutePath('apprenticeship-training')" (click)="setReturn()">
diff --git a/src/app/shared/components/staff-record-summary/qualifications-and-training/qualifications-and-training.component.spec.ts b/src/app/shared/components/staff-record-summary/qualifications-and-training/qualifications-and-training.component.spec.ts
deleted file mode 100644
index 1bd2c373d5..0000000000
--- a/src/app/shared/components/staff-record-summary/qualifications-and-training/qualifications-and-training.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { QualificationsAndTrainingComponent } from './qualifications-and-training.component';
-
-describe('QualificationsAndTrainingComponent', () => {
-  let component: QualificationsAndTrainingComponent;
-  let fixture: ComponentFixture<QualificationsAndTrainingComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [QualificationsAndTrainingComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(QualificationsAndTrainingComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/staff-record-summary/staff-record-summary.component.spec.ts b/src/app/shared/components/staff-record-summary/staff-record-summary.component.spec.ts
deleted file mode 100644
index 0542fe421a..0000000000
--- a/src/app/shared/components/staff-record-summary/staff-record-summary.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { StaffRecordSummaryComponent } from './staff-record-summary.component';
-
-describe('StaffRecordSummaryComponent', () => {
-  let component: StaffRecordSummaryComponent;
-  let fixture: ComponentFixture<StaffRecordSummaryComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [StaffRecordSummaryComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(StaffRecordSummaryComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/staff-records-tab/staff-records-tab.component.spec.ts b/src/app/shared/components/staff-records-tab/staff-records-tab.component.spec.ts
deleted file mode 100644
index f9cda7ca00..0000000000
--- a/src/app/shared/components/staff-records-tab/staff-records-tab.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { StaffRecordsTabComponent } from './staff-records-tab.component';
-
-describe('StaffRecordsTabComponent', () => {
-  let component: StaffRecordsTabComponent;
-  let fixture: ComponentFixture<StaffRecordsTabComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [StaffRecordsTabComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(StaffRecordsTabComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/staff-summary/staff-summary.component.spec.ts b/src/app/shared/components/staff-summary/staff-summary.component.spec.ts
deleted file mode 100644
index 080d7ec5df..0000000000
--- a/src/app/shared/components/staff-summary/staff-summary.component.spec.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { EligibilityIconComponent } from '../eligibility-icon/eligibility-icon.component';
-import { StaffSummaryComponent } from './staff-summary.component';
-
-describe('StaffSummaryComponent', () => {
-  let component: StaffSummaryComponent;
-  let fixture: ComponentFixture<StaffSummaryComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [RouterTestingModule],
-      declarations: [StaffSummaryComponent, EligibilityIconComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(StaffSummaryComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/submit-button/submit-button.component.html b/src/app/shared/components/submit-button/submit-button.component.html
index 249a7c98b0..dfc0994087 100644
--- a/src/app/shared/components/submit-button/submit-button.component.html
+++ b/src/app/shared/components/submit-button/submit-button.component.html
@@ -1,33 +1,30 @@
 <div class="govuk-button-group">
   <ng-container *ngIf="!return; else summary">
     <button type="submit" class="govuk-button" (click)="onClick($event, 'continue', true)">Save and continue</button>
-    <button
-      type="button"
-      class="govuk-button govuk-button--link govuk-!-margin-left-8"
+    <a
+      href="#"
+      class="govuk-list govuk-list--inline govuk-!-margin-left-8 govuk-!-margin-top-2"
       (click)="onClick($event, 'summary', false)"
+      >View record summary</a
     >
-      View record summary
-    </button>
     <span class="govuk-visually-hidden">or</span>
-    <button
-      type="button"
-      class="govuk-button govuk-button--link govuk-util__float-right"
+    <a
+      href="#"
+      class="govuk-list govuk-list--inline govuk-util__float-right govuk-!-margin-top-2"
       (click)="onClick($event, 'exit', false)"
+      >Exit</a
     >
-      Exit
-    </button>
   </ng-container>
   <ng-template #summary>
     <button type="submit" class="govuk-button" (click)="onClick($event, 'return', true)">
       Save and return
     </button>
     <span class="govuk-visually-hidden">or</span>
-    <button
-      type="button"
-      class="govuk-button govuk-button--link govuk-util__float-right"
+    <a
+      href="#"
+      class="govuk-list govuk-list--inline govuk-util__float-right govuk-!-margin-top-2"
       (click)="onClick($event, 'return', false)"
+      >Exit</a
     >
-      Exit
-    </button>
   </ng-template>
 </div>
diff --git a/src/app/shared/components/submit-exit-buttons/submit-exit-buttons.component.html b/src/app/shared/components/submit-exit-buttons/submit-exit-buttons.component.html
index 4b9a39e746..e67cfcde2a 100644
--- a/src/app/shared/components/submit-exit-buttons/submit-exit-buttons.component.html
+++ b/src/app/shared/components/submit-exit-buttons/submit-exit-buttons.component.html
@@ -12,7 +12,7 @@
       [fragment]="return.fragment"
       role="button"
       draggable="false"
-      class="govuk-button govuk-button--link govuk-util__float-right"
+      class="govuk-list govuk-list--inline govuk-util__float-right"
     >
       Exit
     </a>
diff --git a/src/app/shared/components/tabs/tabs.component.spec.ts b/src/app/shared/components/tabs/tabs.component.spec.ts
deleted file mode 100644
index b9e026fae6..0000000000
--- a/src/app/shared/components/tabs/tabs.component.spec.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { TabComponent } from './tab.component';
-import { TabsComponent } from './tabs.component';
-
-describe('TabsComponent', () => {
-  let component: TabsComponent;
-  let tab: TabComponent;
-  let fixture: ComponentFixture<TabsComponent>;
-  let tabFix: ComponentFixture<TabComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [RouterTestingModule],
-      declarations: [TabsComponent, TabComponent],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(TabsComponent);
-    tabFix = TestBed.createComponent(TabComponent);
-    tab = tabFix.componentInstance;
-    component = fixture.componentInstance;
-    tab.title = 'Test';
-    tab.active = true;
-    tab.alert = false;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/shared/components/tabs/tabs.component.ts b/src/app/shared/components/tabs/tabs.component.ts
index 2ca626f9c9..581ab6f938 100644
--- a/src/app/shared/components/tabs/tabs.component.ts
+++ b/src/app/shared/components/tabs/tabs.component.ts
@@ -1,6 +1,8 @@
 import { Location } from '@angular/common';
-import { AfterContentInit, Component, ContentChildren, ElementRef, QueryList, ViewChild } from '@angular/core';
+import { AfterContentInit, Component, ContentChildren, ElementRef, OnDestroy, QueryList, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { WorkerService } from '@core/services/worker.service';
+import { Subscription } from 'rxjs';
 
 import { TabComponent } from './tab.component';
 
@@ -8,13 +10,27 @@ import { TabComponent } from './tab.component';
   selector: 'app-tabs',
   templateUrl: './tabs.component.html',
 })
-export class TabsComponent implements AfterContentInit {
+export class TabsComponent implements AfterContentInit, OnDestroy {
   private currentTab: number;
+  private subscriptions: Subscription = new Subscription();
   @ContentChildren(TabComponent) tabs: QueryList<TabComponent>;
 
   @ViewChild('tablist', { static: false }) tablist: ElementRef;
 
-  constructor(private location: Location, private route: ActivatedRoute) {}
+  constructor(private location: Location, private route: ActivatedRoute, private workerService: WorkerService) {
+
+    //handle tab changes home page link
+    this.subscriptions.add(
+      this.workerService.tabChanged.subscribe((displayStaffTab: boolean) => {
+        let activeTabs: any[] = [];
+        if (this.tabs) {
+          activeTabs = this.tabs.filter(tab => tab.active)
+        }
+        if (displayStaffTab && activeTabs.length !== 0) {
+          this.selectTab(null, 2); //2 for staff tab;
+        }
+      }));
+  }
 
   ngAfterContentInit() {
     const hash = this.route.snapshot.fragment;
@@ -24,7 +40,6 @@ export class TabsComponent implements AfterContentInit {
         this.selectTab(null, activeTab, false);
       }
     }
-
     const activeTabs = this.tabs.filter(tab => tab.active);
 
     if (activeTabs.length === 0) {
@@ -86,4 +101,9 @@ export class TabsComponent implements AfterContentInit {
   private unselectTabs() {
     this.tabs.toArray().forEach(t => (t.active = false));
   }
+
+  ngOnDestroy() {
+    this.subscriptions.unsubscribe();
+  }
+
 }
diff --git a/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.html b/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.html
index 45c3e8e5b4..21319128b4 100644
--- a/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.html
+++ b/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.html
@@ -48,7 +48,16 @@
           {{ worker.expiredTrainingCount }}
           Expired
         </div>
-        <div *ngIf="worker.expiringTrainingCount > 0">
+        <div *ngIf="worker.missingMandatoryTrainingCount > 0" class="govuk-!-margin-bottom-1">
+          <img
+            src="/assets/images/flag-red.svg"
+            alt="missing mandatory training"
+            class="govuk-!-margin-right-1 govuk-util__vertical-align-top"
+          />
+          {{ worker.missingMandatoryTrainingCount }}
+          Missing
+        </div>
+        <div *ngIf="worker.expiringTrainingCount > 0"  class="govuk-!-margin-bottom-1">
           <img
             src="/assets/images/flag-orange.svg"
             alt="expiring"
@@ -56,7 +65,7 @@
           />
           {{ worker.expiringTrainingCount }} Expiring soon
         </div>
-        <div *ngIf="worker.expiredTrainingCount === 0 && worker.expiringTrainingCount === 0">Up-to-date</div>
+        <div *ngIf="worker.expiredTrainingCount === 0 && worker.expiringTrainingCount === 0 && worker.missingMandatoryTrainingCount === 0">Up-to-date</div>
       </td>
     </tr>
   </tbody>
diff --git a/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.ts b/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.ts
index 77c56835c0..75db372466 100644
--- a/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.ts
+++ b/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.ts
@@ -16,9 +16,7 @@ export class TrainingAndQualificationsSummaryComponent implements OnInit {
   public workersData: Array<Worker>;
   public sortTrainingAndQualsOptions;
   public sortByDefault: string;
-
   constructor(private permissionsService: PermissionsService) {}
-
   public getWorkerTrainingAndQualificationsPath(worker: Worker) {
     const path = ['/workplace', this.workplace.uid, 'training-and-qualifications-record', worker.uid, 'training'];
     return this.wdfView ? [...path, ...['wdf-summary']] : path;
@@ -54,15 +52,27 @@ export class TrainingAndQualificationsSummaryComponent implements OnInit {
         break;
       }
       case '2_asc': {
-        this.workers = orderBy(this.workers, ['expiredTrainingCount', 'expiringTrainingCount'], ['asc', 'asc']);
+        this.workers = orderBy(
+          this.workers,
+          ['expiredTrainingCount', 'expiringTrainingCount', 'missingMandatoryTrainingCount'],
+          ['asc', 'asc', 'asc'],
+        );
         break;
       }
       case '2_dsc': {
-        this.workers = orderBy(this.workers, ['expiredTrainingCount', 'expiringTrainingCount'], ['desc', 'desc']);
+        this.workers = orderBy(
+          this.workers,
+          ['expiredTrainingCount', 'expiringTrainingCount', 'missingMandatoryTrainingCount'],
+          ['desc', 'desc', 'desc'],
+        );
         break;
       }
       default: {
-        this.workers = orderBy(this.workers, ['expiredTrainingCount', 'expiringTrainingCount'], ['desc', 'desc']);
+        this.workers = orderBy(
+          this.workers,
+          ['expiredTrainingCount', 'expiringTrainingCount', 'missingMandatoryTrainingCount'],
+          ['desc', 'desc', 'desc'],
+        );
         break;
       }
     }
diff --git a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html
index 4096346561..090755bb6f 100644
--- a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html
+++ b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html
@@ -1,21 +1,7 @@
 <div class="govuk-grid-row">
-  <div class="govuk-grid-column-two-thirds">
-    <h2 class="govuk-heading-m">Training and qualifications ({{ totalRecords || 0 }})</h2>
-  </div>
-  <div class="govuk-grid-column-one-third">
-    <a
-      class="govuk-list govuk-list--inline govuk-list govuk__flex govuk__align-items-center"
-      role="button"
-      draggable="false"
-      href="/download/{{ now | date: 'yyyy-MM-dd' }}-training-report.xls"
-      (click)="downloadTrainingReport($event)"
-    >
-      <img alt="" src="/assets/images/icon-download.svg" /><span class="govuk-!-margin-left-1">
-        Download Training Report
-      </span>
-    </a>
-  </div>
+  <h2 class="govuk-heading-m govuk-!-margin-left-1">Training and qualifications ({{ totalRecords || 0 }})</h2>
 </div>
+<app-trianing-link-panel></app-trianing-link-panel>
 <ng-container *ngIf="workers; else noStaffRecords">
   <div class="govuk-grid-row" *ngIf="totalRecords === 0">
     <div class="govuk-grid-column-two-thirds">
@@ -32,6 +18,7 @@ <h3>Click on a staff name to add a record.</h3>
     [workplace]="workplace"
     [totalExpiredTraining]="totalExpiredTraining"
     [totalExpiringTraining]="totalExpiringTraining"
+    [totalMissingMandatoryTraining]="missingMandatoryTraining"
   ></app-training-info-panel>
 
   <app-training-and-qualifications-summary
diff --git a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts
index 1039e4c8c9..d000d6bfa7 100644
--- a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts
+++ b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts
@@ -1,11 +1,8 @@
-import { HttpResponse } from '@angular/common/http';
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { Establishment } from '@core/model/establishment.model';
 import { Worker } from '@core/model/worker.model';
 import { EstablishmentService } from '@core/services/establishment.service';
-import { ReportService } from '@core/services/report.service';
 import { WorkerService } from '@core/services/worker.service';
-import { saveAs } from 'file-saver';
 import { Subscription } from 'rxjs';
 
 @Component({
@@ -20,14 +17,13 @@ export class TrainingAndQualificationsTabComponent implements OnInit, OnDestroy
   public totalRecords;
   public totalExpiredTraining;
   public totalExpiringTraining;
+  public missingMandatoryTraining;
   public totalStaff: number;
-  constructor(
-    private workerService: WorkerService,
-    private establishmentService: EstablishmentService,
-    private reportService: ReportService
-  ) {}
+  public isShowAllTrainings: boolean;
+  constructor(private workerService: WorkerService, protected establishmentService: EstablishmentService) {}
 
   ngOnInit() {
+    this.establishmentService.isMandatoryTrainingView.next(false);
     this.subscriptions.add(
       this.workerService.getAllWorkers(this.workplace.uid).subscribe(
         workers => {
@@ -35,36 +31,33 @@ export class TrainingAndQualificationsTabComponent implements OnInit, OnDestroy
           this.totalRecords = 0;
           this.totalExpiredTraining = 0;
           this.totalExpiringTraining = 0;
+          this.missingMandatoryTraining = 0;
           this.workers.forEach((worker: Worker) => {
-            this.totalRecords += worker.trainingCount + worker.qualificationCount;
+            let totalTrainingRecord = worker.trainingCount;
+            this.totalRecords += totalTrainingRecord + worker.qualificationCount;
             this.totalExpiredTraining += worker.expiredTrainingCount;
             this.totalExpiringTraining += worker.expiringTrainingCount;
+            this.missingMandatoryTraining += worker.missingMandatoryTrainingCount;
           });
         },
         error => {
           console.error(error.error);
-        }
-      )
+        },
+      ),
     );
   }
-  //Download Training Report
-  public downloadTrainingReport(event: Event) {
-    event.preventDefault();
-    this.subscriptions.add(
-      this.reportService.getTrainingReport(this.workplace.uid).subscribe(
-        response => this.saveFile(response),
-        () => {}
-      )
-    );
+
+  public showAllTrainings() {
+    this.isShowAllTrainings = true;
+    this.missingMandatoryTraining = 0;
+    this.totalExpiredTraining = 0;
+    this.totalExpiringTraining = 0;
   }
-  //set content type and save file
-  private saveFile(response: HttpResponse<Blob>) {
-    const filenameRegEx = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
-    const header = response.headers.get('content-disposition');
-    const filenameMatches = header && header.match(filenameRegEx);
-    const filename = filenameMatches && filenameMatches.length > 1 ? filenameMatches[1] : null;
-    const blob = new Blob([response.body], { type: 'text/plain;charset=utf-8' });
-    saveAs(blob, filename);
+
+  public mandatoryTrainingChangedHandler($event) {
+    this.missingMandatoryTraining = $event;
+    this.totalExpiredTraining = 0;
+    this.totalExpiringTraining = 0;
   }
   ngOnDestroy() {
     this.subscriptions.unsubscribe();
diff --git a/src/app/shared/components/training-info-panel/training-info-panel.component.html b/src/app/shared/components/training-info-panel/training-info-panel.component.html
index 0b519dac5e..c57a61b79e 100644
--- a/src/app/shared/components/training-info-panel/training-info-panel.component.html
+++ b/src/app/shared/components/training-info-panel/training-info-panel.component.html
@@ -6,6 +6,13 @@
       {{ totalExpiredTraining }}
     </dd>
   </ng-container>
+  <ng-container *ngIf="totalMissingMandatoryTraining > 0">
+    <dt>Missing</dt>
+    <dd>
+      <img src="/assets/images/flag-red.svg" alt="Missing" />
+      {{ totalMissingMandatoryTraining }}
+    </dd>
+  </ng-container>
   <ng-container *ngIf="totalExpiringTraining > 0">
     <dt>Expiring soon</dt>
     <dd>
diff --git a/src/app/shared/components/training-info-panel/training-info-panel.component.ts b/src/app/shared/components/training-info-panel/training-info-panel.component.ts
index 94a1e15871..751606f769 100644
--- a/src/app/shared/components/training-info-panel/training-info-panel.component.ts
+++ b/src/app/shared/components/training-info-panel/training-info-panel.component.ts
@@ -9,6 +9,7 @@ export class TainingInfoPanelComponent implements OnInit {
   @Input() workplace: Establishment;
   @Input() totalExpiredTraining = 0;
   @Input() totalExpiringTraining = 0;
+  @Input() totalMissingMandatoryTraining = 0;
 
   constructor() {}
 
diff --git a/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.component.ts b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.component.ts
new file mode 100644
index 0000000000..1dad1b721d
--- /dev/null
+++ b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.component.ts
@@ -0,0 +1,63 @@
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { saveAs } from 'file-saver';
+import { Subscription } from 'rxjs';
+import { HttpResponse } from '@angular/common/http';
+import { ReportService } from '@core/services/report.service';
+import { EstablishmentService } from '@core/services/establishment.service';
+import { Router } from '@angular/router';
+
+@Component({
+  selector: 'app-trianing-link-panel',
+  templateUrl: './trianing-link-panel.component.html',
+})
+export class TrainingLinkPanelComponent implements OnInit, OnDestroy {
+  private subscriptions: Subscription = new Subscription();
+  public establishmentUid: string;
+  public url: string;
+  public fromStaffRecord: boolean;
+
+  constructor(
+    private reportService: ReportService,
+    private establishmentService: EstablishmentService,
+    private router: Router,
+  ) {}
+
+  ngOnInit() {
+    this.url = this.router.url;
+    if (this.url.includes('view-all-mandatory-training')) {
+      this.fromStaffRecord = true;
+      this.establishmentService.isMandatoryTrainingView.next(true);
+    }
+    this.subscriptions.add(
+      this.establishmentService.establishment$.subscribe(data => {
+        if (data && data.id) {
+          this.establishmentUid = data.uid;
+        }
+      }),
+    );
+  }
+
+  //Download Training Report
+  public downloadTrainingReport(event: Event) {
+    event.preventDefault();
+    this.subscriptions.add(
+      this.reportService.getTrainingReport(this.establishmentUid).subscribe(
+        response => this.saveFile(response),
+        () => {},
+      ),
+    );
+  }
+
+  //set content type and save file
+  private saveFile(response: HttpResponse<Blob>) {
+    const filenameRegEx = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
+    const header = response.headers.get('content-disposition');
+    const filenameMatches = header && header.match(filenameRegEx);
+    const filename = filenameMatches && filenameMatches.length > 1 ? filenameMatches[1] : null;
+    const blob = new Blob([response.body], { type: 'text/plain;charset=utf-8' });
+    saveAs(blob, filename);
+  }
+  ngOnDestroy() {
+    this.subscriptions.unsubscribe();
+  }
+}
diff --git a/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html
new file mode 100644
index 0000000000..d61fdcf827
--- /dev/null
+++ b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html
@@ -0,0 +1,43 @@
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-one-third">
+    <ng-container *ngIf="!fromStaffRecord; else noStaffRecords">
+      <a
+        class="govuk-list govuk-list--inline"
+        role="button"
+        draggable="false"
+        [routerLink]="['/workplace/view-all-mandatory-training']"
+        >View mandatory training</a
+      >
+    </ng-container>
+    <ng-template #noStaffRecords>
+      <a
+        class="govuk-list govuk-list--inline"
+        role="button"
+        draggable="false"
+        [routerLink]="['/dashboard']"
+        [fragment]="'training-and-qualifications'"
+        >View training and qualifications</a
+      >
+    </ng-template>
+  </div>
+  <div class="govuk-grid-column-one-third">
+    <a
+      class="govuk-list govuk-list--inline govuk-util__float-right govuk-!-margin-right-5"
+      [routerLink]="['/add-mandatory-training']"
+      >Manage mandatory training
+    </a>
+  </div>
+  <div class="govuk-grid-column-one-third">
+    <a
+      class="govuk-list govuk-list--inline govuk-list govuk__flex govuk__align-items-center"
+      role="button"
+      draggable="false"
+      href="/download/{{ now | date: 'yyyy-MM-dd' }}-training-report.xls"
+      (click)="downloadTrainingReport($event)"
+    >
+      <img alt="" src="/assets/images/icon-download.svg" /><span class="govuk-!-margin-left-1">
+        Download training report
+      </span>
+    </a>
+  </div>
+</div>
diff --git a/src/app/shared/components/user-accounts-summary/user-accounts-summary.component.ts b/src/app/shared/components/user-accounts-summary/user-accounts-summary.component.ts
index 543d902a19..d7e48f1bdd 100644
--- a/src/app/shared/components/user-accounts-summary/user-accounts-summary.component.ts
+++ b/src/app/shared/components/user-accounts-summary/user-accounts-summary.component.ts
@@ -31,13 +31,13 @@ export class UserAccountsSummaryComponent implements OnInit, OnDestroy {
             this.users = orderBy(
               users,
               ['status', 'isPrimary', 'role', (user: UserDetails) => user.fullname.toLowerCase()],
-              ['desc', 'desc', 'asc', 'asc']
+              ['desc', 'desc', 'asc', 'asc'],
             );
             this.canAddUser =
               this.permissionsService.can(this.workplace.uid, 'canAddUser') && this.userSlotsAvailable(users);
           });
         }
-      })
+      }),
     );
   }
 
@@ -46,7 +46,7 @@ export class UserAccountsSummaryComponent implements OnInit, OnDestroy {
   }
 
   public getUserType(user: UserDetails) {
-    return user.isPrimary ? 'Primary' : user.role;
+    return user.isPrimary ? 'Primary' : user.role === 'Read' ? 'Read only' : user.role;
   }
 
   public isPending(user: UserDetails) {
diff --git a/src/app/shared/components/workplace-summary/workplace-summary.component.html b/src/app/shared/components/workplace-summary/workplace-summary.component.html
index 50b2639581..b97791a0e0 100644
--- a/src/app/shared/components/workplace-summary/workplace-summary.component.html
+++ b/src/app/shared/components/workplace-summary/workplace-summary.component.html
@@ -2,34 +2,33 @@
   <div class="govuk-summary-list__row">
     <dt class="govuk-summary-list__key">
       <div>
-          Workplace name
+        Workplace name
       </div>
       <div *ngIf="workplace && workplace.address" class="govuk-!-padding-top-2">
-          Workplace address
+        Workplace address
       </div>
     </dt>
     <dd class="govuk-summary-list__value">
       <div>
-          {{ workplace.name }}
+        {{ workplace.name }}
       </div>
       <div *ngIf="workplace" class="govuk-!-padding-top-2">
-          <div *ngIf="workplace.address1">{{ workplace.address1 }}</div>
-          <div *ngIf="workplace.address2">{{ workplace.address2 }}</div>
-          <div *ngIf="workplace.address3">{{ workplace.address3 }}</div>
-          <div *ngIf="workplace.town">{{ workplace.town }}</div>
-          <div *ngIf="workplace.county">{{ workplace.county }}</div>
-          <div *ngIf="workplace.postcode">{{ workplace.postcode }}</div>
+        <div *ngIf="workplace.address1">{{ workplace.address1 }}</div>
+        <div *ngIf="workplace.address2">{{ workplace.address2 }}</div>
+        <div *ngIf="workplace.address3">{{ workplace.address3 }}</div>
+        <div *ngIf="workplace.town">{{ workplace.town }}</div>
+        <div *ngIf="workplace.county">{{ workplace.county }}</div>
+        <div *ngIf="workplace.postcode">{{ workplace.postcode }}</div>
       </div>
     </dd>
     <dd *ngIf="canEditEstablishment" class="govuk-summary-list__actions">
-       <a [routerLink]="['/workplace', workplace.uid, 'update-workplace-details']" (click)="setReturn()">
+      <a [routerLink]="['/workplace', workplace.uid, 'update-workplace-details']" (click)="setReturn()">
         <span *ngIf="!workplace.name">
           Provide information
         </span>
         <span *ngIf="workplace.name">
           Change
         </span>
-
       </a>
     </dd>
   </div>
@@ -203,7 +202,7 @@
       </ng-container>
       <ng-template #sharing>
         <p *ngIf="workplace.share.with.includes('CQC')">Care Quality Commission (CQC)</p>
-        <p *ngIf="workplace.share.with.includes('Local Authority')">Local Authorities</p>
+        <p *ngIf="workplace.share.with.includes('Local Authority')">Local authorities</p>
       </ng-template>
     </dd>
     <dd *ngIf="canEditEstablishment" class="govuk-summary-list__actions">
@@ -222,7 +221,7 @@
 
   <div *ngIf="workplace.share.with.includes('Local Authority')" class="govuk-summary-list__row">
     <dt class="govuk-summary-list__key">
-      Local Authorities shared with
+      Local authorities shared with
     </dt>
     <dd class="govuk-summary-list__value">
       <ng-container *ngIf="workplace.localAuthorities?.length === 0; else localAuthorities">
@@ -265,9 +264,7 @@
               <li *ngFor="let vacancy of workplace.vacancies">{{ vacancy.total }} {{ vacancy.title }}</li>
             </ul>
           </ng-container>
-          <ng-container *ngIf="!isArray(workplace.vacancies)">
-            {{ workplace.vacancies }}
-          </ng-container>
+          <ng-container *ngIf="!isArray(workplace.vacancies)">{{ workplace.vacancies }} </ng-container>
         </ng-template>
       </app-summary-record-value>
     </dd>
diff --git a/src/app/shared/pipes/first-error.pipe.ts b/src/app/shared/pipes/first-error.pipe.ts
new file mode 100644
index 0000000000..7290b4bdb0
--- /dev/null
+++ b/src/app/shared/pipes/first-error.pipe.ts
@@ -0,0 +1,17 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({name: 'getFirstError'})
+export class FirstErrorPipe implements PipeTransform {
+  transform(errors: any, error?: any): boolean {
+    if (!errors) {
+      return false;
+    }
+
+    const names = Object.keys(errors);
+    if (names && names.length > 0) {
+      return errors[names[0]] === error;
+    }
+
+    return false;
+  }
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 66eba77138..f9a1a66f88 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -5,7 +5,7 @@ import { RouterModule } from '@angular/router';
 import { AlertComponent } from '@shared/components/alert/alert.component';
 import { SummaryRecordValueComponent } from '@shared/components/summary-record-value/summary-record-value.component';
 import { WorkplaceTabComponent } from '@shared/components/workplace-tab/workplace-tab.component';
-
+import { DialogService } from '@core/services/dialog.service';
 import { AutoSuggestComponent } from './components/auto-suggest/auto-suggest.component';
 import { BackLinkComponent } from './components/back-link/back-link.component';
 import { BreadcrumbsComponent } from './components/breadcrumbs/breadcrumbs.component';
@@ -17,17 +17,12 @@ import { DetailsComponent } from './components/details/details.component';
 import { EligibilityIconComponent } from './components/eligibility-icon/eligibility-icon.component';
 import { ErrorSummaryComponent } from './components/error-summary/error-summary.component';
 import { InsetTextComponent } from './components/inset-text/inset-text.component';
-import {
-  LinkToParentCancelDialogComponent,
-} from './components/link-to-parent-cancel/link-to-parent-cancel-dialog.component';
-import {
-  LinkToParentRemoveDialogComponent,
-} from './components/link-to-parent-remove/link-to-parent-remove-dialog.component';
+import { OverlayModule } from '@angular/cdk/overlay';
+import { LinkToParentCancelDialogComponent } from './components/link-to-parent-cancel/link-to-parent-cancel-dialog.component';
+import { LinkToParentRemoveDialogComponent } from './components/link-to-parent-remove/link-to-parent-remove-dialog.component';
 import { LinkToParentDialogComponent } from './components/link-to-parent/link-to-parent-dialog.component';
 import { MessagesComponent } from './components/messages/messages.component';
-import {
-  OwnershipChangeMessageDialogComponent,
-} from './components/ownership-change-message/ownership-change-message-dialog.component';
+import { OwnershipChangeMessageDialogComponent } from './components/ownership-change-message/ownership-change-message-dialog.component';
 import { PanelComponent } from './components/panel/panel.component';
 import { PhaseBannerComponent } from './components/phase-banner/phase-banner.component';
 import { ProgressComponent } from './components/progress/progress.component';
@@ -36,9 +31,7 @@ import { SetDataPermissionDialogComponent } from './components/set-data-permissi
 import { BasicRecordComponent } from './components/staff-record-summary/basic-record/basic-record.component';
 import { EmploymentComponent } from './components/staff-record-summary/employment/employment.component';
 import { PersonalDetailsComponent } from './components/staff-record-summary/personal-details/personal-details.component';
-import {
-  QualificationsAndTrainingComponent,
-} from './components/staff-record-summary/qualifications-and-training/qualifications-and-training.component';
+import { QualificationsAndTrainingComponent } from './components/staff-record-summary/qualifications-and-training/qualifications-and-training.component';
 import { StaffRecordSummaryComponent } from './components/staff-record-summary/staff-record-summary.component';
 import { StaffRecordsTabComponent } from './components/staff-records-tab/staff-records-tab.component';
 import { StaffSummaryComponent } from './components/staff-summary/staff-summary.component';
@@ -49,12 +42,8 @@ import { SummaryListComponent } from './components/summary-list/summary-list.com
 import { TabComponent } from './components/tabs/tab.component';
 import { TabsComponent } from './components/tabs/tabs.component';
 import { TotalStaffPanelComponent } from './components/total-staff-panel/total-staff-panel.component';
-import {
-  TrainingAndQualificationsSummaryComponent,
-} from './components/training-and-qualifications-summary/training-and-qualifications-summary.component';
-import {
-  TrainingAndQualificationsTabComponent,
-} from './components/training-and-qualifications-tab/training-and-qualifications-tab.component';
+import { TrainingAndQualificationsSummaryComponent } from './components/training-and-qualifications-summary/training-and-qualifications-summary.component';
+import { TrainingAndQualificationsTabComponent } from './components/training-and-qualifications-tab/training-and-qualifications-tab.component';
 import { TainingInfoPanelComponent } from './components/training-info-panel/training-info-panel.component';
 import { UserAccountsSummaryComponent } from './components/user-accounts-summary/user-accounts-summary.component';
 import { WdfConfirmationPanelComponent } from './components/wdf-confirmation-panel/wdf-confirmation-panel.component';
@@ -71,9 +60,14 @@ import { SelectRecordTypePipe } from './pipes/select-record-type.pipe';
 import { WorkerDaysPipe } from './pipes/worker-days.pipe';
 import { WorkerPayPipe } from './pipes/worker-pay.pipe';
 import { WorkplacePermissionsBearerPipe } from './pipes/workplace-permissions-bearer.pipe';
+import { ViewAllMandatoryTrainingComponent } from '@features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component';
+import { TrainingLinkPanelComponent } from './components/trianing-link-panel/trianing-link-panel.component.component';
+import {
+  DeleteWorkplaceDialogComponent,
+} from '@features/workplace/delete-workplace-dialog/delete-workplace-dialog.component';
 
 @NgModule({
-  imports: [CommonModule, ReactiveFormsModule, RouterModule],
+  imports: [CommonModule, ReactiveFormsModule, RouterModule, OverlayModule],
   declarations: [
     AbsoluteNumberPipe,
     AlertComponent,
@@ -113,6 +107,7 @@ import { WorkplacePermissionsBearerPipe } from './pipes/workplace-permissions-be
     SummaryRecordValueComponent,
     TabComponent,
     TabsComponent,
+    TrainingLinkPanelComponent,
     TotalStaffPanelComponent,
     UserAccountsSummaryComponent,
     WdfConfirmationPanelComponent,
@@ -132,6 +127,8 @@ import { WorkplacePermissionsBearerPipe } from './pipes/workplace-permissions-be
     LinkToParentCancelDialogComponent,
     LinkToParentRemoveDialogComponent,
     OwnershipChangeMessageDialogComponent,
+    ViewAllMandatoryTrainingComponent,
+    DeleteWorkplaceDialogComponent
   ],
   exports: [
     AlertComponent,
@@ -179,6 +176,7 @@ import { WorkplacePermissionsBearerPipe } from './pipes/workplace-permissions-be
     WorkplaceSummaryComponent,
     WorkplaceTabComponent,
     OrderOtherPipe,
+    TrainingLinkPanelComponent,
     LongDatePipe,
     RejectRequestDialogComponent,
     SetDataPermissionDialogComponent,
@@ -189,8 +187,12 @@ import { WorkplacePermissionsBearerPipe } from './pipes/workplace-permissions-be
     LinkToParentCancelDialogComponent,
     LinkToParentRemoveDialogComponent,
     OwnershipChangeMessageDialogComponent,
+    ViewAllMandatoryTrainingComponent,
+    DeleteWorkplaceDialogComponent
   ],
+  providers: [DialogService],
   entryComponents: [
+    DeleteWorkplaceDialogComponent,
     ChangeDataOwnerDialogComponent,
     CancelDataOwnerDialogComponent,
     RejectRequestDialogComponent,
@@ -198,7 +200,7 @@ import { WorkplacePermissionsBearerPipe } from './pipes/workplace-permissions-be
     LinkToParentDialogComponent,
     LinkToParentCancelDialogComponent,
     LinkToParentRemoveDialogComponent,
-    OwnershipChangeMessageDialogComponent,
+    OwnershipChangeMessageDialogComponent
   ],
 })
 export class SharedModule {}
diff --git a/src/assets/images/envelope.svg b/src/assets/images/envelope.svg
new file mode 100644
index 0000000000..3a8f0d29db
--- /dev/null
+++ b/src/assets/images/envelope.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="34px" height="21px" viewBox="0 0 34 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Envelope</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Homepage" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Homepage-1.0" transform="translate(-898.000000, -358.000000)" stroke="#0A5DBD">
+            <g id="Envelope" transform="translate(899.000000, 358.000000)">
+                <g id="Group-6">
+                    <rect id="Rectangle" stroke-width="2.5" x="1.25" y="1.25" width="29.5" height="18.5"></rect>
+                    <polyline id="Path-2" stroke-width="2" points="0.5 1 16 13 31.5 1"></polyline>
+                    <line x1="2" y1="18.5" x2="12" y2="10.5" id="Path-4" stroke-width="2"></line>
+                    <line x1="21" y1="18.5" x2="30" y2="10.5" id="Path-4" stroke-width="2" transform="translate(25.500000, 14.500000) scale(-1, 1) translate(-25.500000, -14.500000) "></line>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/scss/components/_footer.scss b/src/assets/scss/components/_footer.scss
index 580513c840..4702c07640 100644
--- a/src/assets/scss/components/_footer.scss
+++ b/src/assets/scss/components/_footer.scss
@@ -1,6 +1,7 @@
 footer {
   background: govuk-colour('white');
   border-top: 3px solid $govuk-brand-colour;
+  margin-top: govuk-px-to-rem(100);
 
   a.govuk-footer__link {
     @include govuk-focusable-fill;
diff --git a/src/assets/scss/components/_notifications.scss b/src/assets/scss/components/_notifications.scss
index baebe1f2a5..e975890d00 100644
--- a/src/assets/scss/components/_notifications.scss
+++ b/src/assets/scss/components/_notifications.scss
@@ -13,12 +13,14 @@
 
   &__count {
     color: govuk-colour('white');
-    background: govuk-colour('red');
+    background: #d4351c;
     border-radius: 50%;
     padding: 3px;
     display: inline-block;
     min-width: 20px;
     text-align: center;
+    margin-left: 8px;
+    margin-right: 6px;
   }
 }
 
diff --git a/src/assets/scss/components/_summary-list.scss b/src/assets/scss/components/_summary-list.scss
index 580353f12a..4a5f6eeb98 100644
--- a/src/assets/scss/components/_summary-list.scss
+++ b/src/assets/scss/components/_summary-list.scss
@@ -1,3 +1,6 @@
+.govuk-summary-list {
+  margin-bottom: 0px;
+}
 .govuk-summary-list--wrap-border {
   border: 1px solid $govuk-border-colour;
   border-width: 1px 0;
@@ -12,9 +15,12 @@
   }
 }
 .govuk-summary-list--top-border {
-  .govuk-summary-list__value {
-    vertical-align: middle;
+  .govuk-summary-list__key,
+  .govuk-summary-list__value,
+  .govuk-summary-list__actions {
+    vertical-align: top;
   }
+
   .govuk-summary-list__row:first-child {
     .govuk-summary-list__key,
     .govuk-summary-list__value,
@@ -25,6 +31,13 @@
   }
 }
 
+.govuk-summary-list--no-top-border {
+  .govuk-summary-list__key,
+  .govuk-summary-list__value,
+  .govuk-summary-list__actions {
+    vertical-align: top;
+  }
+}
 .govuk-summary-list__value--confirm {
   font-weight: bold;
 }
@@ -41,12 +54,15 @@
 .govuk-summary-list--contains-warnings {
   .govuk-summary-list__key {
     width: 30%;
+    vertical-align: top;
   }
   .govuk-summary-list__value {
     width: 40%;
+    vertical-align: top;
   }
   .govuk-summary-list__actions {
     width: 30%;
+    vertical-align: top;
   }
 
   .govuk-summary-list__row--warning {
@@ -69,3 +85,11 @@
     }
   }
 }
+.govuk-summary-list--wide-key {
+  .govuk-summary-list__key {
+    width: 40%;
+  }
+  .govuk-summary-list__value {
+    width: 60%;
+  }
+}
diff --git a/src/assets/scss/components/_tables.scss b/src/assets/scss/components/_tables.scss
index e205b409a3..e622cb4dfc 100644
--- a/src/assets/scss/components/_tables.scss
+++ b/src/assets/scss/components/_tables.scss
@@ -4,7 +4,7 @@ $error_row_padding: $govuk-gutter-half;
 
 .govuk-table__row {
   .govuk-table__cell:first-of-type {
-    padding-left: $error_row_padding / 2;
+    padding-left: 0;
   }
 
   .govuk-table__cell:last-of-type {
@@ -80,3 +80,6 @@ $error_row_padding: $govuk-gutter-half;
     height: 100%;
   }
 }
+.govuk-table-custom-width {
+  width: 20% !important;
+}
diff --git a/src/assets/scss/modules/_utils.scss b/src/assets/scss/modules/_utils.scss
index 47700bec4e..1a95c25692 100644
--- a/src/assets/scss/modules/_utils.scss
+++ b/src/assets/scss/modules/_utils.scss
@@ -12,6 +12,10 @@
   text-align: center;
 }
 
+.govuk-util__align-justify {
+  text-align: justify;
+}
+
 .govuk-util__light-bg {
   background: $mercury;
 }
@@ -83,3 +87,6 @@
 .govuk-line-height__normal {
   line-height: normal;
 }
+.govuk-max-width {
+  max-width: calc(100vh - 274px);
+}
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
new file mode 100644
index 0000000000..ffe8aed766
--- /dev/null
+++ b/src/environments/environment.test.ts
@@ -0,0 +1,3 @@
+export const environment = {
+  production: false
+};
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 7b4f817adb..7ed6ef6d4a 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -3,7 +3,7 @@
 // The list of file replacements can be found in `angular.json`.
 
 export const environment = {
-  production: false
+  production: true
 };
 
 /*