diff --git a/aggregator/package-lock.json b/aggregator/package-lock.json
index 063fa48..1b2e653 100644
--- a/aggregator/package-lock.json
+++ b/aggregator/package-lock.json
@@ -169,269 +169,169 @@
       }
     },
     "hapi": {
-      "version": "15.2.0",
-      "resolved": "https://registry.npmjs.org/hapi/-/hapi-15.2.0.tgz",
-      "integrity": "sha1-VwTKLAS2OGwDyvnukB8d4IAxbSM=",
+      "version": "18.1.0",
+      "resolved": "https://registry.npmjs.org/hapi/-/hapi-18.1.0.tgz",
+      "integrity": "sha512-nSU1VLyTAgp7P5gy47QzJIP2JAb+wOFvJIV3gnL0lFj/mD+HuTXhyUsDYXjF/dhADMVXVEz31z6SUHBJhtsvGA==",
       "requires": {
-        "accept": "2.x.x",
-        "ammo": "2.x.x",
-        "boom": "4.x.x",
-        "call": "3.x.x",
-        "catbox": "7.x.x",
-        "catbox-memory": "2.x.x",
-        "cryptiles": "3.x.x",
-        "heavy": "4.x.x",
-        "hoek": "4.x.x",
-        "iron": "4.x.x",
-        "items": "2.x.x",
-        "joi": "9.x.x",
-        "mimos": "3.x.x",
-        "podium": "^1.2.x",
-        "shot": "3.x.x",
-        "statehood": "5.x.x",
-        "subtext": "^4.3.x",
-        "topo": "2.x.x"
+        "accept": "3.x.x",
+        "ammo": "3.x.x",
+        "boom": "7.x.x",
+        "bounce": "1.x.x",
+        "call": "5.x.x",
+        "catbox": "10.x.x",
+        "catbox-memory": "4.x.x",
+        "heavy": "6.x.x",
+        "hoek": "6.x.x",
+        "joi": "14.x.x",
+        "mimos": "4.x.x",
+        "podium": "3.x.x",
+        "shot": "4.x.x",
+        "somever": "2.x.x",
+        "statehood": "6.x.x",
+        "subtext": "6.x.x",
+        "teamwork": "3.x.x",
+        "topo": "3.x.x"
       },
       "dependencies": {
         "accept": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/accept/-/accept-2.1.2.tgz",
-          "integrity": "sha1-VRh07Y8saLJwe/8qsl/hNT5GHWs=",
-          "requires": {
-            "boom": "3.x.x",
-            "hoek": "4.x.x"
-          }
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/accept/-/accept-3.1.3.tgz",
+          "integrity": "sha512-OgOEAidVEOKPup+Gv2+2wdH2AgVKI9LxsJ4hicdJ6cY0faUuZdZoi56kkXWlHp9qicN1nWQLmW5ZRGk+SBS5xg=="
         },
         "ammo": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/ammo/-/ammo-2.0.2.tgz",
-          "integrity": "sha1-NmxV97xPLyQhjtOk3UuN8TXC5so=",
-          "requires": {
-            "boom": "3.x.x",
-            "hoek": "4.x.x"
-          }
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/ammo/-/ammo-3.0.3.tgz",
+          "integrity": "sha512-vo76VJ44MkUBZL/BzpGXaKzMfroF4ZR6+haRuw9p+eSWfoNaH2AxVc8xmiEPC08jhzJSeM6w7/iMUGet8b4oBQ=="
+        },
+        "b64": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/b64/-/b64-4.1.2.tgz",
+          "integrity": "sha512-+GUspBxlH3CJaxMUGUE1EBoWM6RKgWiYwUDal0qdf8m3ArnXNN1KzKVo5HOnE/FSq4HHyWf3TlHLsZI8PKQgrQ=="
         },
         "boom": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-4.0.0.tgz",
-          "integrity": "sha1-fllGkmTq3bdP7fvBsWUk1pppRXc=",
-          "requires": {
-            "hoek": "4.x.x"
-          }
+          "version": "7.3.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-7.3.0.tgz",
+          "integrity": "sha512-Swpoyi2t5+GhOEGw8rEsKvTxFLIDiiKoUc2gsoV6Lyr43LHBIzch3k2MvYUs8RTROrIkVJ3Al0TkaOGjnb+B6A=="
+        },
+        "bounce": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/bounce/-/bounce-1.2.3.tgz",
+          "integrity": "sha512-3G7B8CyBnip5EahCZJjnvQ1HLyArC6P5e+xcolo13BVI9ogFaDOsNMAE7FIWliHtIkYI8/nTRCvCY9tZa3Mu4g=="
+        },
+        "bourne": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/bourne/-/bourne-1.1.1.tgz",
+          "integrity": "sha512-Ou0l3W8+n1FuTOoIfIrCk9oF9WVWc+9fKoAl67XQr9Ws0z7LgILRZ7qtc9xdT4BveSKtnYXfKPgn8pFAqeQRew=="
         },
         "call": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/call/-/call-3.0.3.tgz",
-          "integrity": "sha1-5HSN27t/Qa5AzuBV+LJwtzO/fI0=",
-          "requires": {
-            "boom": "3.x.x",
-            "hoek": "4.x.x"
-          }
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/call/-/call-5.0.3.tgz",
+          "integrity": "sha512-eX16KHiAYXugbFu6VifstSdwH6aMuWWb4s0qvpq1nR1b+Sf+u68jjttg8ixDBEldPqBi30bDU35OJQWKeTLKxg=="
         },
         "catbox": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/catbox/-/catbox-7.1.2.tgz",
-          "integrity": "sha1-RnIbHJmWdRP9e36UUXBqBe3+1a0=",
-          "requires": {
-            "boom": "3.x.x",
-            "hoek": "4.x.x",
-            "joi": "9.x.x"
-          }
+          "version": "10.0.6",
+          "resolved": "https://registry.npmjs.org/catbox/-/catbox-10.0.6.tgz",
+          "integrity": "sha512-gQWCnF/jbHcfwGbQ4FQxyRiAwLRipqWTTXjpq7rTqqdcsnZosFa0L3LsCZcPTF33QIeMMkS7QmFBHt6QdzGPvg=="
         },
         "catbox-memory": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/catbox-memory/-/catbox-memory-2.0.3.tgz",
-          "integrity": "sha1-36qcFj+tND2a3W18H9x7Qps2nDg=",
-          "requires": {
-            "hoek": "4.x.x"
-          }
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/catbox-memory/-/catbox-memory-4.0.1.tgz",
+          "integrity": "sha512-ZmqNiLsYCIu9qvBJ/MQbznDV2bFH5gFiH67TgIJgSSffJFtTXArT+MM3AvJQlby9NSkLHOX4eH/uuUqnch/Ldw=="
+        },
+        "content": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/content/-/content-4.0.6.tgz",
+          "integrity": "sha512-lR9ND3dXiMdmsE84K6l02rMdgiBVmtYWu1Vr/gfSGHcIcznBj2QxmSdUgDuNFOA+G9yrb1IIWkZ7aKtB6hDGyA=="
         },
         "cryptiles": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.0.2.tgz",
-          "integrity": "sha1-7M30qFuHVPFdC1Mg1Kt41A0PokQ=",
-          "requires": {
-            "boom": "3.x.x"
-          }
+          "version": "4.1.3",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-4.1.3.tgz",
+          "integrity": "sha512-gT9nyTMSUC1JnziQpPbxKGBbUg8VL7Zn2NB4E1cJYvuXdElHrwxrV9bmltZGDzet45zSDGyYceueke1TjynGzw=="
         },
         "heavy": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/heavy/-/heavy-4.0.2.tgz",
-          "integrity": "sha1-27Zs2l8BellPxsgwHfaZnqjVM/A=",
-          "requires": {
-            "boom": "3.x.x",
-            "hoek": "4.x.x",
-            "joi": "9.x.x"
-          }
+          "version": "6.1.2",
+          "resolved": "https://registry.npmjs.org/heavy/-/heavy-6.1.2.tgz",
+          "integrity": "sha512-cJp884bqhiebNcEHydW0g6V1MUGYOXRPw9c7MFiHQnuGxtbWuSZpsbojwb2kxb3AA1/Rfs8CNiV9MMOF8pFRDg=="
         },
         "hoek": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.0.2.tgz",
-          "integrity": "sha1-e5afTIoa+KOMosZmxmv6bEL+LN0="
+          "version": "6.1.2",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-6.1.2.tgz",
+          "integrity": "sha512-6qhh/wahGYZHFSFw12tBbJw5fsAhhwrrG/y3Cs0YMTv2WzMnL0oLPnQJjv1QJvEfylRSOFuP+xCu+tdx0tD16Q=="
         },
         "iron": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/iron/-/iron-4.0.3.tgz",
-          "integrity": "sha1-DA0yUmYdihxhS+2e07B32A6g/Xg=",
-          "requires": {
-            "boom": "3.x.x",
-            "cryptiles": "3.x.x",
-            "hoek": "4.x.x"
-          }
-        },
-        "items": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/items/-/items-2.1.1.tgz",
-          "integrity": "sha1-i9FtnIOxlSneWuoyGsqtp4NkoZg="
+          "version": "5.0.6",
+          "resolved": "https://registry.npmjs.org/iron/-/iron-5.0.6.tgz",
+          "integrity": "sha512-zYUMOSkEXGBdwlV/AXF9zJC0aLuTJUKHkGeYS5I2g225M5i6SrxQyGJGhPgOR8BK1omL6N5i6TcwfsXbP8/Exw=="
         },
         "joi": {
-          "version": "9.0.4",
-          "resolved": "https://registry.npmjs.org/joi/-/joi-9.0.4.tgz",
-          "integrity": "sha1-iNZIkJFavrEnzXVwJxFtUN8+aN8=",
-          "requires": {
-            "hoek": "4.x.x",
-            "isemail": "2.x.x",
-            "items": "2.x.x",
-            "moment": "2.x.x",
-            "topo": "2.x.x"
-          },
-          "dependencies": {
-            "isemail": {
-              "version": "2.2.1",
-              "resolved": "https://registry.npmjs.org/isemail/-/isemail-2.2.1.tgz",
-              "integrity": "sha1-A1PT2aYpUQgMJiwqoKQrjqjp4qY="
-            },
-            "moment": {
-              "version": "2.14.1",
-              "resolved": "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz",
-              "integrity": "sha1-s1snxH5X7S3ccAU9awe+zbKRdBw="
-            }
-          }
+          "version": "14.3.1",
+          "resolved": "https://registry.npmjs.org/joi/-/joi-14.3.1.tgz",
+          "integrity": "sha512-LQDdM+pkOrpAn4Lp+neNIFV3axv1Vna3j38bisbQhETPMANYRbFJFUyOZcOClYvM/hppMhGWuKSFEK9vjrB+bQ=="
+        },
+        "mime-db": {
+          "version": "1.37.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
+          "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
         },
         "mimos": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/mimos/-/mimos-3.0.3.tgz",
-          "integrity": "sha1-uRCQcq03jCty9qAQHEPd+ys2ZB8=",
-          "requires": {
-            "hoek": "4.x.x",
-            "mime-db": "1.x.x"
-          },
-          "dependencies": {
-            "mime-db": {
-              "version": "1.23.0",
-              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz",
-              "integrity": "sha1-oxtAcK2uon1zLqMzdApk0OyaZlk="
-            }
-          }
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/mimos/-/mimos-4.0.2.tgz",
+          "integrity": "sha512-5XBsDqBqzSN88XPPH/TFpOalWOjHJM5Z2d3AMx/30iq+qXvYKd/8MPhqBwZDOLtoaIWInR3nLzMQcxfGK9djXA=="
+        },
+        "nigel": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/nigel/-/nigel-3.0.4.tgz",
+          "integrity": "sha512-3SZCCS/duVDGxFpTROHEieC+itDo4UqL9JNUyQJv3rljudQbK6aqus5B4470OxhESPJLN93Qqxg16rH7DUjbfQ=="
+        },
+        "pez": {
+          "version": "4.0.5",
+          "resolved": "https://registry.npmjs.org/pez/-/pez-4.0.5.tgz",
+          "integrity": "sha512-HvL8uiFIlkXbx/qw4B8jKDCWzo7Pnnd65Uvanf9OOCtb20MRcb9gtTVBf9NCnhETif1/nzbDHIjAWC/sUp7LIQ=="
         },
         "podium": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/podium/-/podium-1.2.3.tgz",
-          "integrity": "sha1-XJW3zC9ch90yTgrUqTY6xi1ms3E=",
-          "requires": {
-            "hoek": "4.x.x",
-            "items": "2.x.x",
-            "joi": "9.x.x"
-          }
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/podium/-/podium-3.2.0.tgz",
+          "integrity": "sha512-rbwvxwVkI6gRRlxZQ1zUeafrpGxZ7QPHIheinehAvGATvGIPfWRkaTeWedc5P4YjXJXEV8ZbBxPtglNylF9hjw=="
         },
         "shot": {
-          "version": "3.3.2",
-          "resolved": "https://registry.npmjs.org/shot/-/shot-3.3.2.tgz",
-          "integrity": "sha1-aRwmEXWd7MIEh7INJcwpnznl+bc=",
-          "requires": {
-            "hoek": "4.x.x",
-            "joi": "9.x.x"
-          }
+          "version": "4.0.7",
+          "resolved": "https://registry.npmjs.org/shot/-/shot-4.0.7.tgz",
+          "integrity": "sha512-RKaKAGKxJ11EjJl0cf2fYVSsd4KB5Cncb9J0v7w+0iIaXpxNqFWTYNDNhBX7f0XSyDrjOH9a4OWZ9Gp/ZML+ew=="
+        },
+        "somever": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/somever/-/somever-2.0.0.tgz",
+          "integrity": "sha512-9JaIPP+HxwYGqCDqqK3tRaTqdtQHoK6Qy3IrXhIt2q5x8fs8RcfU7BMWlFTCOgFazK8p88zIv1tHQXvAwtXMyw=="
         },
         "statehood": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/statehood/-/statehood-5.0.0.tgz",
-          "integrity": "sha1-ziKFqr6uOYrofLunRhhLdZm4+jE=",
-          "requires": {
-            "boom": "3.x.x",
-            "cryptiles": "3.x.x",
-            "hoek": "4.x.x",
-            "iron": "4.x.x",
-            "items": "2.x.x",
-            "joi": "9.x.x"
-          }
+          "version": "6.0.9",
+          "resolved": "https://registry.npmjs.org/statehood/-/statehood-6.0.9.tgz",
+          "integrity": "sha512-jbFg1+MYEqfC7ABAoWZoeF4cQUtp3LUvMDUGExL76cMmleBHG7I6xlZFsE8hRi7nEySIvutHmVlLmBe9+2R5LQ=="
         },
         "subtext": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/subtext/-/subtext-4.3.0.tgz",
-          "integrity": "sha1-36yQSS7DVmn9bgDG5dk4sG18z7s=",
-          "requires": {
-            "boom": "4.x.x",
-            "content": "3.x.x",
-            "hoek": "4.x.x",
-            "pez": "2.x.x",
-            "wreck": "10.x.x"
-          },
-          "dependencies": {
-            "content": {
-              "version": "3.0.2",
-              "resolved": "https://registry.npmjs.org/content/-/content-3.0.2.tgz",
-              "integrity": "sha1-8di0w6uyHqTA4hc/Q6wCKaTtbRw=",
-              "requires": {
-                "boom": "3.x.x"
-              }
-            },
-            "pez": {
-              "version": "2.1.2",
-              "resolved": "https://registry.npmjs.org/pez/-/pez-2.1.2.tgz",
-              "integrity": "sha1-0dEjcXkqVYluI+IeUJxAle0IHbI=",
-              "requires": {
-                "b64": "3.x.x",
-                "boom": "3.x.x",
-                "content": "3.x.x",
-                "hoek": "4.x.x",
-                "nigel": "2.x.x"
-              },
-              "dependencies": {
-                "b64": {
-                  "version": "3.0.2",
-                  "resolved": "https://registry.npmjs.org/b64/-/b64-3.0.2.tgz",
-                  "integrity": "sha1-ep1gRmrfe43hFMvfZRpf38yQiU0="
-                },
-                "nigel": {
-                  "version": "2.0.2",
-                  "resolved": "https://registry.npmjs.org/nigel/-/nigel-2.0.2.tgz",
-                  "integrity": "sha1-k6GGb7DFLYc5CqdeKxYfS1x15bE=",
-                  "requires": {
-                    "hoek": "4.x.x",
-                    "vise": "2.x.x"
-                  },
-                  "dependencies": {
-                    "vise": {
-                      "version": "2.0.2",
-                      "resolved": "https://registry.npmjs.org/vise/-/vise-2.0.2.tgz",
-                      "integrity": "sha1-awjo+0y3bjpQzW3Q7DczjoEaDTk=",
-                      "requires": {
-                        "hoek": "4.x.x"
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "wreck": {
-              "version": "10.0.0",
-              "resolved": "https://registry.npmjs.org/wreck/-/wreck-10.0.0.tgz",
-              "integrity": "sha1-mKuIL4XhalJjMlB/EB9aeEEWIng=",
-              "requires": {
-                "boom": "4.x.x",
-                "hoek": "4.x.x"
-              }
-            }
-          }
+          "version": "6.0.12",
+          "resolved": "https://registry.npmjs.org/subtext/-/subtext-6.0.12.tgz",
+          "integrity": "sha512-yT1wCDWVgqvL9BIkWzWqgj5spUSYo/Enu09iUV8t2ZvHcr2tKGTGg2kc9tUpVEsdhp1ihsZeTAiDqh0TQciTPQ=="
+        },
+        "teamwork": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/teamwork/-/teamwork-3.0.3.tgz",
+          "integrity": "sha512-OCB56z+G70iA1A1OFoT+51TPzfcgN0ks75uN3yhxA+EU66WTz2BevNDK4YzMqfaL5tuAvxy4iFUn35/u8pxMaQ=="
         },
         "topo": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/topo/-/topo-2.0.2.tgz",
-          "integrity": "sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI=",
-          "requires": {
-            "hoek": "4.x.x"
-          }
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/topo/-/topo-3.0.3.tgz",
+          "integrity": "sha512-IgpPtvD4kjrJ7CRA3ov2FhWQADwv+Tdqbsf1ZnPUSAtCJ9e1Z44MmoSGDXGk4IppoZA7jd/QRkNddlLJWlUZsQ=="
+        },
+        "vise": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/vise/-/vise-3.0.2.tgz",
+          "integrity": "sha512-X52VtdRQbSBXdjcazRiY3eRgV3vTQ0B+7Wh8uC9cVv7lKfML5m9+9NHlbcgCY0R9EAqD1v/v7o9mhGh2A3ANFg=="
+        },
+        "wreck": {
+          "version": "14.1.3",
+          "resolved": "https://registry.npmjs.org/wreck/-/wreck-14.1.3.tgz",
+          "integrity": "sha512-hb/BUtjX3ObbwO3slCOLCenQ4EP8e+n8j6FmTne3VhEFp5XV1faSJojiyxVSvw34vgdeTG5baLTl4NmjwokLlw=="
         }
       }
     },
diff --git a/aggregator/package.json b/aggregator/package.json
index df964fb..6ea1736 100644
--- a/aggregator/package.json
+++ b/aggregator/package.json
@@ -9,7 +9,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "hapi": "^15.2.0",
+    "hapi": "^18.1.0",
     "moment": "^2.15.1",
     "request": "^2.75.0",
     "request-promise": "^4.2.2"