diff --git a/.codecov.yml b/.codecov.yml
new file mode 100644
index 000000000..2767ed675
--- /dev/null
+++ b/.codecov.yml
@@ -0,0 +1,169 @@
+codecov:
+  #token: uuid  # Your private repository token
+  #url: "http"  # for Codecov Enterprise customers
+  #slug: "owner/repo"  # for Codecov Enterprise customers
+  #branch: master  # override the default branch
+  #bot: username  # set user whom will be the consumer of oauth requests
+  #ci:  # Custom CI domains if Codecov does not identify them automatically
+  #  - ci.domain.com
+  #  - !provider  # ignore these providers when checking if CI passed
+  #               # ex. You may test on Travis, Circle, and AppVeyor, but only need
+  #               # to check if Travis passes. Therefore add: !circle and !appveyor
+  notify:
+    #after_n_builds: null      # number of expected builds to recieve before sending notifications
+    #                          # after: check ci status unless disabled via require_ci_to_pass
+    require_ci_to_pass: yes   # yes: will delay sending notifications until all ci is finished
+                              # no: will send notifications without checking ci status and wait till "after_n_builds" are uploaded
+    #countdown: null           # number of seconds to wait before first ci build check
+    #delay: null               # number of seconds to wait between ci build checks
+
+coverage:
+  precision: 2  # 2 = xx.xx%, 0 = xx%
+  round: nearest # down|up|nearest - default down
+  # range: 50...60 # default 70...90. red...green
+
+  #notify:
+  #  irc:
+  #    default:
+  #      server: "chat.freenode.net"|encrypted
+  #      branches: null  # all branches by default
+  #      threshold: 1%
+  #      message: "Coverage {{changed}} for {{owner}}/{{repo}}"  # customize the message
+  #      flags: null
+  #      paths: null
+  #
+  #  slack:
+  #    default:
+  #      url: "http"|encrypted
+  #      threshold: 1%
+  #      branches: null  # all branches by default
+  #      message: "Coverage {{changed}} for {{owner}}/{{repo}}"  # customize the message
+  #      attachments: "sunburst, diff"
+  #      only_pulls: false
+  #      flags: null
+  #      paths: null
+  #
+  #  email:
+  #    default:
+  #      to:
+  #        - example@domain.com
+  #        - &author
+  #      threshold: 1%
+  #      only_pulls: false
+  #      layout: header, diff, trends
+  #      flags: null
+  #      paths: null
+  #
+  #  hipchat:
+  #    default:
+  #      url: "http"|encrypted
+  #      room: name|id
+  #      threshold: 1%
+  #      token: encrypted
+  #      branches: null  # all branches by default
+  #      notify: false  # if the hipchat message is silent or loud (default false)
+  #      message: "Coverage {{changed}} for {{owner}}/{{repo}}"  # customize the message
+  #      flags: null
+  #      paths: null
+  #
+  #  gitter:
+  #    url: "http"|encrypted
+  #    threshold: 1%
+  #    branches: null  # all branches by default
+  #    message: "Coverage {{changed}} for {{owner}}/{{repo}}"  # customize the message
+  #
+  #  webhooks:
+  #    _name_:
+  #      url: "http"|encrypted
+  #      threshold: 1%
+  #      branches: null  # all branches by default
+
+  status:
+    project:
+      default: false  # disable the default status that measures entire project
+      backend:  # declare a new status context "backend"
+        against: parent
+        target: auto
+        threshold: null
+        #threshold: 1%
+        base: auto
+        if_no_uploads: error
+        if_not_found: success
+        if_ci_failed: error
+        only_pulls: false
+        #branches:
+        #  - master
+        #flags:
+        #  - integration
+        paths: 
+          - backend/  # only include coverage in "backend/" folder
+      webapp:  # declare a new status context "frontend"
+        against: parent
+        target: auto
+        threshold: null
+        #threshold: 1%
+        base: auto
+        if_no_uploads: error
+        if_not_found: success
+        if_ci_failed: error
+        only_pulls: false
+        #branches:
+        #  - master
+        #flags:
+        #  - integration
+        paths:
+          - webapp/ # only include coverage in "webapp/" folder
+
+    patch:
+      default: false
+    #    against: parent
+    #    target: 80%
+    #    branches: null
+    #    if_no_uploads: success
+    #    if_not_found: success
+    #    if_ci_failed: error
+    #    only_pulls: false
+    #    flags:
+    #      - integration
+    #    paths:
+    #      - folder
+    
+    #changes:
+    #  default:
+    #    against: parent
+    #    branches: null
+    #    if_no_uploads: error
+    #    if_not_found: success
+    #    if_ci_failed: error
+    #    only_pulls: false
+    #    flags:
+    #      - integration
+    #    paths:
+    #      - folder
+
+  #flags:
+  #  integration:
+  #    branches:
+  #      - master
+  #    ignore:
+  #      - app/ui
+
+  #ignore: # files and folders for processing
+  #  - tests/*
+  
+  #fixes:
+  #  - "old_path::new_path"
+
+comment:
+  # layout options are quite limited in v4.x - there have been way more options in v1.0
+  layout: reach, diff, flags, files # mostly old options: header, diff, uncovered, reach, files, tree, changes, sunburst, flags
+  behavior: new # default = posts once then update, posts new if delete
+                # once = post once then updates
+                # new = delete old, post new
+                # spammy = post new
+  require_changes: false  # if true: only post the comment if coverage changes
+  require_base: no        # [yes :: must have a base report to post]
+  require_head: no        # [yes :: must have a head report to post]
+  branches: null          # branch names that can post comment
+  flags: null
+  paths: null
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 632786285..4d9a4c733 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ addons:
 
 before_install:
   - yarn global add wait-on
+  # Install Codecov
+  - yarn global add codecov
   - yarn install
   - cp cypress.env.template.json cypress.env.json
 
@@ -18,6 +20,7 @@ install:
   - wait-on http://localhost:7474 && docker-compose exec neo4j migrate
 
 script:
+  # Backend
   - docker-compose exec backend yarn run lint
   - docker-compose exec backend yarn run test:jest --ci --verbose=false
   - docker-compose exec backend yarn run db:reset
@@ -25,10 +28,14 @@ script:
   - docker-compose exec backend yarn run test:cucumber
   - docker-compose exec backend yarn run db:reset
   - docker-compose exec backend yarn run db:seed
+  # Frontend
   - docker-compose exec webapp yarn run lint
   - docker-compose exec webapp yarn run test --ci --verbose=false
   - docker-compose exec -d backend yarn run test:before:seeder
+  # Fullstack
   - CYPRESS_RETRIES=1 yarn run cypress:run
+  # Coverage
+  - codecov
 
 after_success:
   - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
diff --git a/backend/package.json b/backend/package.json
index 304e31176..fdc4c4800 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -27,7 +27,17 @@
   "jest": {
     "verbose": true,
     "collectCoverage": true,
-    "coverageReporters": ["text", "lcov"],
+    "collectCoverageFrom": [
+      "**/*.js",
+      "!**/node_modules/**",
+      "!**/test/**",
+      "!**/dist/**",
+      "!**/src/**/?(*.)+(spec|test).js?(x)"
+    ],
+    "coverageReporters": [
+      "text",
+      "lcov"
+    ],
     "testMatch": [
       "**/src/**/?(*.)+(spec|test).js?(x)"
     ]
@@ -38,7 +48,7 @@
     "apollo-client": "~2.5.1",
     "apollo-link-context": "~1.0.14",
     "apollo-link-http": "~1.5.14",
-    "apollo-server": "~2.4.8",
+    "apollo-server": "~2.5.0",
     "bcryptjs": "~2.4.3",
     "cheerio": "~1.0.0-rc.3",
     "cors": "~2.8.5",
@@ -96,4 +106,4 @@
     "nodemon": "~1.19.0",
     "supertest": "~4.0.2"
   }
-}
+}
\ No newline at end of file
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 2cdc7acf0..fd05bf36b 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -9,6 +9,13 @@
   dependencies:
     apollo-env "0.3.3"
 
+"@apollographql/apollo-tools@^0.3.6-alpha.1":
+  version "0.3.6-alpha.1"
+  resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.3.6-alpha.1.tgz#5199b36c65c2fddc4f8bc8bb97642f74e9fb00c5"
+  integrity sha512-fq74In3Vw9OmtKHze0L5/Ns/pdTZOqUeFVC6Um9NRgziVehXz/qswsh2r3+dsn82uqoa/AlvckHtd6aPPPYj9g==
+  dependencies:
+    apollo-env "0.4.1-alpha.1"
+
 "@apollographql/graphql-playground-html@^1.6.6":
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.6.tgz#022209e28a2b547dcde15b219f0c50f47aa5beb3"
@@ -1289,6 +1296,14 @@ apollo-cache-control@0.5.2:
     apollo-server-env "2.2.0"
     graphql-extensions "0.5.4"
 
+apollo-cache-control@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.6.0.tgz#df22db28f850ea90a5722f5e92654d30c96e7f91"
+  integrity sha512-66aCF6MHe0/FdD3knphwTv6CCIdb1ZxrMsiRpxP474qqyYVe2jAwBu6aJBn4emffZHZ7i6gp9dY6cPHThjnbKA==
+  dependencies:
+    apollo-server-env "2.3.0"
+    graphql-extensions "0.6.0"
+
 apollo-cache-control@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.1.1.tgz#173d14ceb3eb9e7cb53de7eb8b61bee6159d4171"
@@ -1338,6 +1353,14 @@ apollo-datasource@0.3.1:
     apollo-server-caching "0.3.1"
     apollo-server-env "2.2.0"
 
+apollo-datasource@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.4.0.tgz#f042641fd2593fa5f4f002fc30d1fb1a20284df8"
+  integrity sha512-6QkgnLYwQrW0qv+yXIf617DojJbGmza2XJXUlgnzrGGhxzfAynzEjaLyYkc8rYS1m82vjrl9EOmLHTcnVkvZAQ==
+  dependencies:
+    apollo-server-caching "0.4.0"
+    apollo-server-env "2.3.0"
+
 apollo-engine-reporting-protobuf@0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.2.1.tgz#8547efcb4078a501ddf606cbfe01a2e8c3ba1afd"
@@ -1345,6 +1368,13 @@ apollo-engine-reporting-protobuf@0.2.1:
   dependencies:
     protobufjs "^6.8.6"
 
+apollo-engine-reporting-protobuf@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.3.0.tgz#2c764c054ff9968387cf16115546e0d5b04ee9f1"
+  integrity sha512-PYowpx/E+TJT/8nKpp3JmJuKh3x1SZcxDF6Cquj0soV205TUpFFCZQMi91i5ACiEp2AkYvM/GDBIrw+rfIwzTg==
+  dependencies:
+    protobufjs "^6.8.6"
+
 apollo-engine-reporting@1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.0.7.tgz#d326b51b12b1f71a40885b8189dbcd162171c953"
@@ -1357,6 +1387,18 @@ apollo-engine-reporting@1.0.7:
     async-retry "^1.2.1"
     graphql-extensions "0.5.7"
 
+apollo-engine-reporting@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.1.0.tgz#10def3d3bf3f11ddb24765c19d9c81e30cb9d55c"
+  integrity sha512-Dj0BwgcluHL0QVUaquhAoYoLX9Z4DRP/n2REcIwO8d2iy52r+1wN5QqZLx97dEFh7CjhNjTWeysJzc8XMWKa1Q==
+  dependencies:
+    apollo-engine-reporting-protobuf "0.3.0"
+    apollo-graphql "^0.2.1-alpha.1"
+    apollo-server-core "2.5.0"
+    apollo-server-env "2.3.0"
+    async-retry "^1.2.1"
+    graphql-extensions "0.6.0"
+
 apollo-env@0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.3.3.tgz#e758ece2fbc4f81abc6f07442680ed9e314ecf6c"
@@ -1365,6 +1407,15 @@ apollo-env@0.3.3:
     core-js "3.0.0-beta.13"
     node-fetch "^2.2.0"
 
+apollo-env@0.4.1-alpha.1:
+  version "0.4.1-alpha.1"
+  resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.4.1-alpha.1.tgz#10d3ea508b8f3ba03939ef4e6ec4b2b5db77e8f1"
+  integrity sha512-4qWiaUKWh92jvKxxRsiZSjmW9YH9GWSG1W6X+S1BcC1uqtPiHsem7ExG9MMTt+UrzHsbpQLctj12xk8lI4lgCg==
+  dependencies:
+    core-js "3.0.0-beta.13"
+    node-fetch "^2.2.0"
+    sha.js "^2.4.11"
+
 apollo-errors@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/apollo-errors/-/apollo-errors-1.9.0.tgz#f1ed0ca0a6be5cd2f24e2eaa7b0860a10146ff51"
@@ -1380,6 +1431,14 @@ apollo-graphql@^0.1.0:
   dependencies:
     lodash.sortby "^4.7.0"
 
+apollo-graphql@^0.2.1-alpha.1:
+  version "0.2.1-alpha.1"
+  resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.2.1-alpha.1.tgz#a0cc0bd65e03c7e887c96c9f53421f3c6dd7b599"
+  integrity sha512-kObCSpYRHEf4IozJV+TZAXEL2Yni2DpzQckohJNYXg5/KRAF20jJ7lHxuJz+kMQrc7QO4wYGSa29HuFZH2AtQA==
+  dependencies:
+    apollo-env "0.4.1-alpha.1"
+    lodash.sortby "^4.7.0"
+
 apollo-link-context@~1.0.14:
   version "1.0.17"
   resolved "https://registry.yarnpkg.com/apollo-link-context/-/apollo-link-context-1.0.17.tgz#439272cfb43ec1891506dd175ed907845b7de36c"
@@ -1430,6 +1489,13 @@ apollo-server-caching@0.3.1:
   dependencies:
     lru-cache "^5.0.0"
 
+apollo-server-caching@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.4.0.tgz#e82917590d723c0adc1fa52900e79e93ad65e4d9"
+  integrity sha512-GTOZdbLhrSOKYNWMYgaqX5cVNSMT0bGUTZKV8/tYlyYmsB6ey7l6iId3Q7UpHS6F6OR2lstz5XaKZ+T3fDfPzQ==
+  dependencies:
+    lru-cache "^5.0.0"
+
 apollo-server-core@2.4.8:
   version "2.4.8"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.4.8.tgz#47e503a345e314222725597c889773e018d8c67a"
@@ -1456,6 +1522,32 @@ apollo-server-core@2.4.8:
     subscriptions-transport-ws "^0.9.11"
     ws "^6.0.0"
 
+apollo-server-core@2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.5.0.tgz#89fc28ba1018ebf9240bc3cc0c103fe705309023"
+  integrity sha512-7hyQ/Rt0hC38bUfxMQmLNHDBIGEBykFWo9EO0W+3o/cno/SqBKd1KKichrABVv+v+SCvZAUutX6gYS5l3G+ULQ==
+  dependencies:
+    "@apollographql/apollo-tools" "^0.3.6-alpha.1"
+    "@apollographql/graphql-playground-html" "^1.6.6"
+    "@types/ws" "^6.0.0"
+    apollo-cache-control "0.6.0"
+    apollo-datasource "0.4.0"
+    apollo-engine-reporting "1.1.0"
+    apollo-server-caching "0.4.0"
+    apollo-server-env "2.3.0"
+    apollo-server-errors "2.3.0"
+    apollo-server-plugin-base "0.4.0"
+    apollo-tracing "0.6.0"
+    fast-json-stable-stringify "^2.0.0"
+    graphql-extensions "0.6.0"
+    graphql-subscriptions "^1.0.0"
+    graphql-tag "^2.9.2"
+    graphql-tools "^4.0.0"
+    graphql-upload "^8.0.2"
+    sha.js "^2.4.11"
+    subscriptions-transport-ws "^0.9.11"
+    ws "^6.0.0"
+
 apollo-server-core@^1.3.6, apollo-server-core@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-1.4.0.tgz#4faff7f110bfdd6c3f47008302ae24140f94c592"
@@ -1473,15 +1565,28 @@ apollo-server-env@2.2.0:
     node-fetch "^2.1.2"
     util.promisify "^1.0.0"
 
+apollo-server-env@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.3.0.tgz#f0bf4484a6cc331a8c13763ded56e91beb16ba17"
+  integrity sha512-WIwlkCM/gir0CkoYWPMTCH8uGCCKB/aM074U1bKayvkFOBVO2VgG5x2kgsfkyF05IMQq2/GOTsKhNY7RnUEhTA==
+  dependencies:
+    node-fetch "^2.1.2"
+    util.promisify "^1.0.0"
+
 apollo-server-errors@2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.2.1.tgz#f68a3f845929768057da7e1c6d30517db5872205"
   integrity sha512-wY/YE3iJVMYC+WYIf8QODBjIP4jhI+oc7kiYo9mrz7LdYPKAgxr/he+NteGcqn/0Ea9K5/ZFTGJDbEstSMeP8g==
 
-apollo-server-express@2.4.8:
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.4.8.tgz#ec9eb61a87324555d49097e9fade3c7d142eb6cb"
-  integrity sha512-i60l32mfVe33jnKDPNYgUKUKu4Al0xEm2HLOSMgtJ9Wbpe/MbOx5X8M5F27fnHYdM+G5XfAErsakAyRGnQJ48Q==
+apollo-server-errors@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.0.tgz#700622b66a16dffcad3b017e4796749814edc061"
+  integrity sha512-rUvzwMo2ZQgzzPh2kcJyfbRSfVKRMhfIlhY7BzUfM4x6ZT0aijlgsf714Ll3Mbf5Fxii32kD0A/DmKsTecpccw==
+
+apollo-server-express@2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.5.0.tgz#ff6cbd3fcb8933f6316c5a5edd4db12d9a56fa65"
+  integrity sha512-2gd3VWIqji2jyDYMTTqKzVU4/znjEjugtLUmPgVl5SoBvJSMTsO7VgJv+roBubZGDK8jXXUEXr2a33RtIeHe4g==
   dependencies:
     "@apollographql/graphql-playground-html" "^1.6.6"
     "@types/accepts" "^1.3.5"
@@ -1489,7 +1594,7 @@ apollo-server-express@2.4.8:
     "@types/cors" "^2.8.4"
     "@types/express" "4.16.1"
     accepts "^1.3.5"
-    apollo-server-core "2.4.8"
+    apollo-server-core "2.5.0"
     body-parser "^1.18.3"
     cors "^2.8.4"
     graphql-subscriptions "^1.0.0"
@@ -1522,6 +1627,11 @@ apollo-server-plugin-base@0.3.7:
   resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.3.7.tgz#bfa4932fc9481bb36221545578d311db464af5a6"
   integrity sha512-hW1jaLKf9qNOxMTwRq2CSqz3eqXsZuEiCc8/mmEtOciiVBq1GMtxFf19oIYM9HQuPvQU2RWpns1VrYN59L3vbg==
 
+apollo-server-plugin-base@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.4.0.tgz#38a3c37767043873dd1b07143d4e70eecbb09562"
+  integrity sha512-iD7ARNtwnvHGd1EMPK0CuodM8d8hgDvFwTfIDzJY04QIQ6/KrBFaWhnCXJsy+HMb47GovwBbq67IK6eb2WJgBg==
+
 apollo-server-testing@~2.4.8:
   version "2.4.8"
   resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.4.8.tgz#eb929a431e059723c298919688355434d53e3ea8"
@@ -1529,13 +1639,13 @@ apollo-server-testing@~2.4.8:
   dependencies:
     apollo-server-core "2.4.8"
 
-apollo-server@~2.4.8:
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.4.8.tgz#b18ec24e6356dd2a191a6fa0f1429b07ef7c89e3"
-  integrity sha512-IU6RekO2dqrDdC+5hU6aeVvGg/2t/f01inBMjDhAn1a7hoITUXEh8Sa57TgmYEZ5uAtDuWW7cdiZN2j0cMI3/w==
+apollo-server@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.5.0.tgz#a88a550dbc5ff0c6713142d1cab3b61b4a36e483"
+  integrity sha512-85A3iAnXVP5QiXc0xvAJRyGsoxov06+8AzttKqehR4Q50UC1Is62xY5WZk58oW7fm+awpqh+sXB2F2E6tObSmg==
   dependencies:
-    apollo-server-core "2.4.8"
-    apollo-server-express "2.4.8"
+    apollo-server-core "2.5.0"
+    apollo-server-express "2.5.0"
     express "^4.0.0"
     graphql-subscriptions "^1.0.0"
     graphql-tools "^4.0.0"
@@ -1548,6 +1658,14 @@ apollo-tracing@0.5.2:
     apollo-server-env "2.2.0"
     graphql-extensions "0.5.4"
 
+apollo-tracing@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.6.0.tgz#afc2b9cbea173dc4c315a5d98053797469518083"
+  integrity sha512-OpYPHVBgcQ/HT2WLXJQWwhilzR1rrl01tZeMU2N7yinsp/oyKngF5aUSMtuvX1k/T3abilQo+w10oAQlBCGdPA==
+  dependencies:
+    apollo-server-env "2.3.0"
+    graphql-extensions "0.6.0"
+
 apollo-tracing@^0.1.0:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.1.4.tgz#5b8ae1b01526b160ee6e552a7f131923a9aedcc7"
@@ -3693,6 +3811,13 @@ graphql-extensions@0.5.7:
   dependencies:
     "@apollographql/apollo-tools" "^0.3.3"
 
+graphql-extensions@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.6.0.tgz#3ee3aa57fe213f90aec5cd31275f6d04767c6a23"
+  integrity sha512-SshzmbD68fHXRv2q3St29olMOxHDLQ5e9TOh+Tz2BYxinrfhjFaPNcEefiK/vF295wW827Y58bdO11Xmhf8J+Q==
+  dependencies:
+    "@apollographql/apollo-tools" "^0.3.6-alpha.1"
+
 graphql-extensions@^0.0.x, graphql-extensions@~0.0.9:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.0.10.tgz#34bdb2546d43f6a5bc89ab23c295ec0466c6843d"
diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml
index 8af3226e7..bc627a67a 100644
--- a/docker-compose.travis.yml
+++ b/docker-compose.travis.yml
@@ -11,6 +11,9 @@ services:
     build:
       context: webapp
       target: build-and-test
+    volumes:
+    #/nitro-web
+       - ./webapp/coverage:/nitro-web/coverage
     environment:
       - GRAPHQL_URI=http://backend:4000
   backend:
@@ -18,6 +21,8 @@ services:
     build:
       context: backend
       target: builder
+    volumes:
+       - ./backend/coverage:/nitro-backend/coverage
     ports:
       - 4001:4001
       - 4123:4123
diff --git a/webapp/.babelrc b/webapp/.babelrc
index fbd5b7451..b23873e12 100644
--- a/webapp/.babelrc
+++ b/webapp/.babelrc
@@ -1,4 +1,7 @@
 {
+  "plugins": [
+    "@babel/plugin-syntax-dynamic-import"
+  ],
   "presets": [
     [
       "@babel/preset-env",
@@ -21,4 +24,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/webapp/package.json b/webapp/package.json
index cbcb8dd1b..d96385c53 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -18,20 +18,32 @@
   "jest": {
     "verbose": true,
     "collectCoverage": true,
-    "coverageReporters": ["text", "lcov"],
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "vue"
+    "collectCoverageFrom": [
+      "**/*.{js,vue}",
+      "!**/node_modules/**",
+      "!**/.nuxt/**",
+      "!**/?(*.)+(spec|test).js?(x)"
+    ],
+    "coverageReporters": [
+      "text",
+      "lcov"
     ],
     "transform": {
       ".*\\.(vue)$": "vue-jest",
       "^.+\\.js$": "<rootDir>/node_modules/babel-jest"
     },
+    "moduleFileExtensions": [
+      "js",
+      "json",
+      "vue"
+    ],
     "moduleNameMapper": {
       "^@/(.*)$": "<rootDir>/src/$1",
       "^~/(.*)$": "<rootDir>/$1"
-    }
+    },
+    "testMatch": [
+      "**/?(*.)+(spec|test).js?(x)"
+    ]
   },
   "dependencies": {
     "@human-connection/styleguide": "0.5.15",
@@ -46,7 +58,7 @@
     "cross-env": "~5.2.0",
     "date-fns": "2.0.0-alpha.27",
     "express": "~4.16.4",
-    "graphql": "~14.2.1",
+    "graphql": "~14.3.0",
     "jsonwebtoken": "~8.5.1",
     "linkify-it": "~2.1.0",
     "nuxt": "~2.6.3",
@@ -63,6 +75,7 @@
   },
   "devDependencies": {
     "@babel/core": "~7.4.4",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "~7.4.4",
     "@vue/cli-shared-utils": "~3.7.0",
     "@vue/eslint-config-prettier": "~4.0.1",
@@ -86,4 +99,4 @@
     "vue-jest": "~3.0.4",
     "vue-svg-loader": "~0.12.0"
   }
-}
+}
\ No newline at end of file
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index d1aa462e7..f4db3be3e 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -5098,10 +5098,10 @@ graphql-upload@^8.0.2:
     http-errors "^1.7.1"
     object-path "^0.11.4"
 
-graphql@^14.0.2, graphql@~14.2.1:
-  version "14.2.1"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.2.1.tgz#779529bf9a01e7207b977a54c20670b48ca6e95c"
-  integrity sha512-2PL1UbvKeSjy/lUeJqHk+eR9CvuErXoCNwJI4jm3oNFEeY+9ELqHNKO1ZuSxAkasPkpWbmT/iMRMFxd3cEL3tQ==
+graphql@^14.0.2, graphql@~14.3.0:
+  version "14.3.0"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.3.0.tgz#34dd36faa489ff642bcd25df6c3b4f988a1a2f3e"
+  integrity sha512-MdfI4v7kSNC3NhB7cF8KNijDsifuWO2XOtzpyququqaclO8wVuChYv+KogexDwgP5sp7nFI9Z6N4QHgoLkfjrg==
   dependencies:
     iterall "^1.2.2"