diff --git a/.dockerignore b/.dockerignore
index 9ab72ab06d..a0536b9e6a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,7 +4,6 @@
 .makeflags
 .node-gyp
 .npm
-counterfactual
 modules/**/.cache
 modules/**/.config
 modules/**/.git
diff --git a/.github/workflows/cd-master.yml b/.github/workflows/cd-master.yml
new file mode 100644
index 0000000000..3d4572a682
--- /dev/null
+++ b/.github/workflows/cd-master.yml
@@ -0,0 +1,151 @@
+name: CD Master
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    env:
+      DOCKER_USER: ${{ secrets.DOCKER_USER }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Cache node modules
+      uses: actions/cache@v1
+      with:
+        path: .npm
+        key: npm-${{ hashFiles('package-lock.json') }}
+        restore-keys: npm-
+    - run: make pull
+    - run: make release
+    - run: make build-report
+    - run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+    - run: make push-commit
+
+  test-node:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - run: make node
+    - run: make test-node
+
+  test-cf:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - run: make cf-core
+    - run: make test-cf
+
+  test-ssh:
+    env:
+      RINKEBY_DOMAINNAME: rinkeby.indra.connext.network
+      MAINNET_DOMAINNAME: indra.connext.network
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: test connection to rinkeby
+      uses: ./ops/ssh-action/
+      with:
+        HOST: ubuntu@${{ env.RINKEBY_DOMAINNAME }}
+        SSH_KEY: ${{ secrets.SSH_KEY }}
+        CMD: "echo Successfully connected to $RINKEBY_DOMAINNAME: `hostname`;"
+    - name: test connection to mainnet
+      uses: ./ops/ssh-action/
+      with:
+        HOST: ubuntu@${{ env.MAINNET_DOMAINNAME }}
+        SSH_KEY: ${{ secrets.SSH_KEY }}
+        CMD: "echo Successfully connected to $MAINNET_DOMAINNAME: `hostname`;"
+
+  test-bot:
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+    - uses: actions/checkout@v1
+    - run: make pull
+    - run: make start-test
+    - run: make test-bot
+
+  test-bot-farm:
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+    - uses: actions/checkout@v1
+    - run: make pull
+    - run: make start-test
+    - run: make test-bot-farm
+
+  test-daicard:
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+    - uses: actions/checkout@v1
+    - run: make pull
+    - run: make start-test
+    - run: make test-daicard
+
+  push:
+    env:
+      DOCKER_USER: ${{ secrets.DOCKER_USER }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    needs: [test-node, test-cf, test-bot, test-bot-farm, test-daicard]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+    - run: make pull
+    - run: make push-release
+
+  deploy-rinkeby:
+    env:
+      INDRA_ADMIN_TOKEN: ${{ secrets.INDRA_ADMIN_TOKEN }}
+      RINKEBY_DOMAINNAME: rinkeby.indra.connext.network
+      RINKEBY_ETH_PROVIDER: ${{ secrets.RINKEBY_ETH_PROVIDER }}
+    needs: [push, test-ssh]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: deploy to rinkeby
+      uses: ./ops/ssh-action/
+      with:
+        HOST: ubuntu@${{ env.RINKEBY_DOMAINNAME }}
+        SSH_KEY: ${{ secrets.SSH_KEY }}
+        CMD: "
+          git checkout --force master;
+          git reset --hard $GITHUB_SHA;
+          export INDRA_MODE=release;
+          export INDRA_ETH_PROVIDER=$RINKEBY_ETH_PROVIDER;
+          export INDRA_DOMAINNAME=$RINKEBY_DOMAINNAME;
+          export INDRA_ADMIN_TOKEN=$INDRA_ADMIN_TOKEN;
+          make restart-prod;
+          docker container prune -f;
+          docker image ls -q | xargs docker image rm || true;
+        "
+
+  deploy-mainnet:
+    env:
+      INDRA_ADMIN_TOKEN: ${{ secrets.INDRA_ADMIN_TOKEN }}
+      MAINNET_DOMAINNAME: indra.connext.network
+      MAINNET_ETH_PROVIDER: ${{ secrets.MAINNET_ETH_PROVIDER }}
+    needs: [push, test-ssh]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: deploy to prod (mainnet)
+      uses: ./ops/ssh-action/
+      with:
+        HOST: ubuntu@${{ env.MAINNET_DOMAINNAME }}
+        SSH_KEY: ${{ secrets.SSH_KEY }}
+        CMD: "
+          git checkout --force master;
+          git reset --hard $GITHUB_SHA;
+          export INDRA_MODE=release;
+          export INDRA_ETH_PROVIDER=$MAINNET_ETH_PROVIDER;
+          export INDRA_DOMAINNAME=$MAINNET_DOMAINNAME;
+          export INDRA_ADMIN_TOKEN=$INDRA_ADMIN_TOKEN;
+          make restart-prod;
+          docker container prune -f;
+          docker image ls -q | xargs docker image rm || true;
+        "
diff --git a/.github/workflows/cd-staging.yml b/.github/workflows/cd-staging.yml
new file mode 100644
index 0000000000..c5ffa83f07
--- /dev/null
+++ b/.github/workflows/cd-staging.yml
@@ -0,0 +1,104 @@
+name: CD Staging
+
+on:
+  push:
+    branches:
+      - staging
+
+jobs:
+  build:
+    env:
+      DOCKER_USER: ${{ secrets.DOCKER_USER }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Cache node modules
+      uses: actions/cache@v1
+      with:
+        path: .npm
+        key: npm-${{ hashFiles('package-lock.json') }}
+        restore-keys: npm-
+    - run: make pull
+    - run: make staging
+    - run: make build-report
+    - run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+    - run: make push-commit
+
+  test-node:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - run: make node
+    - run: make test-node
+
+  test-cf:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - run: make cf-core
+    - run: make test-cf
+
+  test-ssh:
+    env:
+      STAGING_DOMAINNAME: staging.indra.connext.network
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: test connection to staging
+      uses: ./ops/ssh-action/
+      with:
+        HOST: ubuntu@${{ env.STAGING_DOMAINNAME }}
+        SSH_KEY: ${{ secrets.SSH_KEY }}
+        CMD: "echo Successfully connected to $STAGING_DOMAINNAME: `hostname`;"
+
+  test-bot:
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+    - uses: actions/checkout@v1
+    - run: make pull
+    - run: make start-test
+    - run: make test-bot
+
+  test-bot-farm:
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+    - uses: actions/checkout@v1
+    - run: make pull
+    - run: make start-test
+    - run: make test-bot-farm
+
+  test-daicard:
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+    - uses: actions/checkout@v1
+    - run: make pull
+    - run: make start-test
+    - run: make test-daicard
+
+  deploy-staging:
+    env:
+      RINKEBY_ETH_PROVIDER: ${{ secrets.RINKEBY_ETH_PROVIDER }}
+      STAGING_DOMAINNAME: staging.indra.connext.network
+    needs: [test-node, test-cf, test-bot, test-bot-farm, test-daicard, test-ssh]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: deploy to staging
+      uses: ./ops/ssh-action/
+      with:
+        HOST: ubuntu@${{ env.STAGING_DOMAINNAME }}
+        SSH_KEY: ${{ secrets.SSH_KEY }}
+        CMD: "
+          git checkout --force staging;
+          git reset --hard $GITHUB_SHA;
+          export INDRA_MODE=staging;
+          export INDRA_ETH_PROVIDER=$RINKEBY_ETH_PROVIDER;
+          export INDRA_DOMAINNAME=$STAGING_DOMAINNAME;
+          make restart-prod;
+          docker container prune -f;
+          docker image ls -q | xargs docker image rm || true;
+        "
diff --git a/.github/workflows/cd-tests.yml b/.github/workflows/cd-tests.yml
new file mode 100644
index 0000000000..92da077635
--- /dev/null
+++ b/.github/workflows/cd-tests.yml
@@ -0,0 +1,68 @@
+name: CD Tests
+
+on:
+  push:
+    branches-ignore:
+      - master
+      - staging
+
+jobs:
+  build:
+    env:
+      DOCKER_USER: ${{ secrets.DOCKER_USER }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Cache node modules
+      uses: actions/cache@v1
+      with:
+        path: .npm
+        key: npm-${{ hashFiles('package-lock.json') }}
+        restore-keys: npm-
+    - run: make pull
+    - run: make staging
+    - run: make build-report
+    - run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+    - run: make push-commit
+
+  test-node:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - run: make node
+    - run: make test-node
+
+  test-cf:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - run: make cf-core
+    - run: make test-cf
+
+  test-bot:
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+    - uses: actions/checkout@v1
+    - run: make pull
+    - run: make start-test
+    - run: make test-bot
+
+  test-bot-farm:
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+    - uses: actions/checkout@v1
+    - run: make pull
+    - run: make start-test
+    - run: make test-bot-farm
+
+  test-daicard:
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+    - uses: actions/checkout@v1
+    - run: make pull
+    - run: make start-test
+    - run: make test-daicard
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
deleted file mode 100644
index be15943ef4..0000000000
--- a/.github/workflows/cd.yml
+++ /dev/null
@@ -1,207 +0,0 @@
-name: CD
-
-on: [push]
-
-jobs:
-  test-ssh:
-    env:
-      KEY: $HOME/.ssh/id_rsa
-      SSH_DIR: $HOME/.ssh
-      SSH_KEY: ${{ secrets.SSH_KEY }}
-      STAGING_DOMAINNAME: staging.indra.connext.network
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: setup ssh stuff
-      run: |
-        mkdir -p $SSH_DIR
-        rm -f $KEY $SSH_DIR/known_hosts
-        touch $KEY $SSH_DIR/known_hosts
-        echo '-----BEGIN RSA PRIVATE KEY-----' >> $KEY
-        echo $SSH_KEY >> $KEY
-        echo '-----END RSA PRIVATE KEY-----' >> $KEY
-        chmod 400 $KEY
-        ssh-keygen -lf $KEY
-        ssh-keyscan -t rsa $STAGING_DOMAINNAME >> $SSH_DIR/known_hosts
-        ssh -i $KEY -o StrictHostKeyChecking=no ubuntu@$STAGING_DOMAINNAME hostname
-    - name: ssh test
-      run: |
-        ssh -i $KEY ubuntu@$STAGING_DOMAINNAME "bash -s" <<EOF
-          set -e
-          echo "we're in"
-          hostname
-          exit
-        EOF
-
-  test-node:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - run: make dev
-    - run: make build-report
-    - run: make test-node
-
-  test-cf:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - run: make dev
-    - run: make build-report
-    - run: make test-cf
-
-  test-bot:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - run: make prod
-    - run: make build-report
-    - run: make start-test
-    - run: make test-bot
-
-  test-daicard:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - run: make prod
-    - run: make build-report
-    - run: make start-test
-    - run: make test-daicard
-
-  push-latest:
-    env:
-      DOCKER_USER: ${{ secrets.DOCKER_USER }}
-      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-    if: endsWith(github.ref, '/staging')
-    needs: [test-node, test-cf, test-bot, test-daicard]
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-    - run: make prod
-    - run: make build-report
-    - run: make push-latest
-
-  push-versioned:
-    env:
-      DOCKER_USER: ${{ secrets.DOCKER_USER }}
-      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-    if: endsWith(github.ref, '/master')
-    needs: [test-node, test-cf, test-bot, test-daicard]
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-    - run: make prod
-    - run: make build-report
-    - run: make push-versioned
-
-  deploy-staging:
-    env:
-      INDRA_ADMIN_TOKEN: ${{ secrets.INDRA_ADMIN_TOKEN }}
-      KEY: $HOME/.ssh/id_rsa
-      RINKEBY_ETH_PROVIDER: ${{ secrets.RINKEBY_ETH_PROVIDER }}
-      SSH_DIR: $HOME/.ssh
-      SSH_KEY: ${{ secrets.SSH_KEY }}
-      STAGING_DOMAINNAME: staging.indra.connext.network
-    if: endsWith(github.ref, '/staging')
-    needs: [push-latest]
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: setup ssh stuff
-      run: |
-        mkdir -p $SSH_DIR
-        rm -f $KEY $SSH_DIR/known_hosts
-        touch $KEY $SSH_DIR/known_hosts
-        echo '-----BEGIN RSA PRIVATE KEY-----' >> $KEY
-        echo $SSH_KEY >> $KEY
-        echo '-----END RSA PRIVATE KEY-----' >> $KEY
-        chmod 400 $KEY
-        ssh-keygen -lf $KEY
-        ssh-keyscan -t rsa $STAGING_DOMAINNAME >> $SSH_DIR/known_hosts
-        ssh -i $KEY -o StrictHostKeyChecking=no ubuntu@$STAGING_DOMAINNAME hostname
-    - name: deploy to staging
-      run: |
-        ssh -i $KEY ubuntu@$STAGING_DOMAINNAME "bash -s" <<EOF
-          set -e
-          git clone https://github.com/ConnextProject/indra.git || true
-          cd indra
-          git checkout --force staging
-          git fetch
-          git reset --hard $GITHUB_SHA
-          export INDRA_MODE="staging"
-          export INDRA_ETH_PROVIDER=$RINKEBY_ETH_PROVIDER
-          export INDRA_DOMAINNAME="$STAGING_DOMAINNAME"
-          export INDRA_ADMIN_TOKEN="$INDRA_ADMIN_TOKEN"
-          make restart-prod
-          docker container prune -f
-          docker image ls -q | xargs docker image rm || true
-          exit
-        EOF
-
-
-  deploy-prod:
-    env:
-      INDRA_ADMIN_TOKEN: ${{ secrets.INDRA_ADMIN_TOKEN }}
-      KEY: $HOME/.ssh/id_rsa
-      MAINNET_DOMAINNAME: indra.connext.network
-      MAINNET_ETH_PROVIDER: ${{ secrets.MAINNET_ETH_PROVIDER }}
-      RINKEBY_DOMAINNAME: rinkeby.indra.connext.network
-      RINKEBY_ETH_PROVIDER: ${{ secrets.RINKEBY_ETH_PROVIDER }}
-      SSH_DIR: $HOME/.ssh
-      SSH_KEY: ${{ secrets.SSH_KEY }}
-    if: endsWith(github.ref, '/master')
-    needs: [push-versioned]
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: setup ssh stuff
-      run: |
-        mkdir -p $SSH_DIR
-        rm -f $KEY $SSH_DIR/known_hosts
-        touch $KEY $SSH_DIR/known_hosts
-        echo '-----BEGIN RSA PRIVATE KEY-----' >> $KEY
-        echo $SSH_KEY >> $KEY
-        echo '-----END RSA PRIVATE KEY-----' >> $KEY
-        chmod 400 $KEY
-        ssh-keygen -lf $KEY
-        ssh-keyscan -t rsa $RINKEBY_DOMAINNAME >> $SSH_DIR/known_hosts
-        ssh-keyscan -t rsa $MAINNET_DOMAINNAME >> $SSH_DIR/known_hosts
-        ssh -i $KEY -o StrictHostKeyChecking=no ubuntu@$RINKEBY_DOMAINNAME hostname
-        ssh -i $KEY -o StrictHostKeyChecking=no ubuntu@$MAINNET_DOMAINNAME hostname
-    - name: deploy to prod (rinkeby)
-      run: |
-        ssh -i $KEY ubuntu@$RINKEBY_DOMAINNAME "bash -s" <<EOF
-          set -e
-          git clone https://github.com/ConnextProject/indra.git || true
-          cd indra
-          git checkout --force staging
-          git fetch
-          git reset --hard $GITHUB_SHA
-          export INDRA_MODE="staging"
-          export INDRA_ETH_PROVIDER=$RINKEBY_ETH_PROVIDER
-          export INDRA_DOMAINNAME="$RINKEBY_DOMAINNAME"
-          export INDRA_ADMIN_TOKEN="$INDRA_ADMIN_TOKEN"
-          make restart-prod
-          docker container prune -f
-          docker image ls -q | xargs docker image rm || true
-          exit
-        EOF
-    - name: deploy to prod (mainnet)
-      run: |
-        ssh -i $KEY ubuntu@$MAINNET_DOMAINNAME "bash -s" <<EOF
-          set -e
-          git clone https://github.com/ConnextProject/indra.git || true
-          cd indra
-          git checkout --force staging
-          git fetch
-          git reset --hard $GITHUB_SHA
-          export INDRA_MODE="staging"
-          export INDRA_ETH_PROVIDER=$MAINNET_ETH_PROVIDER
-          export INDRA_DOMAINNAME="$MAINNET_DOMAINNAME"
-          export INDRA_ADMIN_TOKEN="$INDRA_ADMIN_TOKEN"
-          make restart-prod
-          docker container prune -f
-          docker image ls -q | xargs docker image rm || true
-          exit
-        EOF
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
new file mode 100644
index 0000000000..13c1f61bc9
--- /dev/null
+++ b/.github/workflows/ci-tests.yml
@@ -0,0 +1,37 @@
+name: CI Tests
+
+on:
+  push:
+    branches-ignore:
+      - master
+      - staging
+
+jobs:
+  test-cf:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Cache node modules
+      uses: actions/cache@v1
+      with:
+        path: .npm
+        key: npm-${{ hashFiles('package-lock.json') }}
+        restore-keys: npm-
+    - run: make cf-core
+    - run: make test-cf
+
+  test-bot:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Cache node modules
+      uses: actions/cache@v1
+      with:
+        path: .npm
+        key: npm-${{ hashFiles('package-lock.json') }}
+        restore-keys: npm-
+    - run: make pull
+    - run: make
+    - run: make start-headless
+    - run: make build-report
+    - run: make test-bot
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index ae11af826d..0000000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches-ignore:
-      - master
-      - staging
-
-jobs:
-  quick-test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - run: make clean && make reset
-    - run: make start-headless
-    - run: make build-report
-    - run: make test-bot
-    - run: make stop
diff --git a/.gitignore b/.gitignore
index 546f49cfad..b0ccfc9b67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 .jest.cache
 .node-gyp
 .npm
-.payment-bot-db
+.bot-store
 modules/**/.cache
 modules/**/.config
 modules/**/.node-gyp
@@ -25,6 +25,7 @@ package.json.lerna_backup
 yarn-debug.log*
 yarn-error.log*
 ops/*.log
+ops/**/*.log
 .deploy-indra.patch
 .state-before.json
 .*.log
diff --git a/Makefile b/Makefile
index a8f227de96..9f86d67076 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 project=indra
-registry=docker.io/connextproject
+registry=connextproject
 
 # Specify make-specific variables (VPATH = prerequisite search path)
 flags=.makeflags
@@ -9,23 +9,29 @@ SHELL=/bin/bash
 find_options=-type f -not -path "*/node_modules/*" -not -name "*.swp" -not -path "*/.*" -not -name "*.log"
 
 version=$(shell cat package.json | grep '"version":' | awk -F '"' '{print $$4}')
+commit=$(shell git rev-parse HEAD | head -c 8)
 solc_version=$(shell cat package.json | grep '"solc"' | awk -F '"' '{print $$4}')
 
+# Pool of images to pull cached layers from during docker build steps
+cache_from=$(shell if [[ -n "${GITHUB_WORKFLOW}" ]]; then echo "--cache-from=$(project)_database:$(commit),$(project)_database:latest,$(project)_ethprovider:$(commit),$(project)_ethprovider:latest,$(project)_node:$(commit),$(project)_node:latest,$(project)_proxy:$(commit),$(project)_proxy:latest,$(project)_relay:$(commit),$(project)_relay:latest,$(project)_bot:$(commit),$(project)_bot:latest,$(project)_builder:latest"; else echo ""; fi)
+
 # Get absolute paths to important dirs
 cwd=$(shell pwd)
 bot=$(cwd)/modules/payment-bot
 cf-adjudicator-contracts=$(cwd)/modules/cf-adjudicator-contracts
 cf-apps=$(cwd)/modules/cf-apps
-cf-funding-protocol-contracts=$(cwd)/modules/cf-funding-protocol-contracts
 cf-core=$(cwd)/modules/cf-core
+cf-funding-protocol-contracts=$(cwd)/modules/cf-funding-protocol-contracts
 client=$(cwd)/modules/client
 contracts=$(cwd)/modules/contracts
 daicard=$(cwd)/modules/daicard
 dashboard=$(cwd)/modules/dashboard
 database=$(cwd)/modules/database
+ethprovider=$(cwd)/ops/ethprovider
 messaging=$(cwd)/modules/messaging
 node=$(cwd)/modules/node
 proxy=$(cwd)/modules/proxy
+ssh-action=$(cwd)/ops/ssh-action
 types=$(cwd)/modules/types
 
 # Setup docker run time
@@ -44,15 +50,17 @@ log_finish=@echo $$((`date "+%s"` - `cat $(startTime)`)) > $(totalTime); rm $(st
 $(shell mkdir -p .makeflags $(node)/dist)
 
 ########################################
-# Begin Phony Rules
-.PHONY: default all dev prod start start-prod stop restart restart-prod clean reset push-latest push-versioned backup
+# Alias & Control Shortcuts
 
 default: dev
-all: dev prod
-dev: database node types client payment-bot indra-proxy ws-tcp-relay
-prod: database node-prod indra-proxy-prod ws-tcp-relay daicard-proxy
+all: dev staging release
+dev: database ethprovider node client payment-bot-staging indra-proxy ws-tcp-relay
+staging: daicard-proxy database indra-proxy-prod node-staging payment-bot-staging ws-tcp-relay ethprovider
+release: daicard-proxy database indra-proxy-prod node-release payment-bot-release ws-tcp-relay
 
-start-headless: database node client payment-bot
+start: start-daicard
+
+start-headless: dev
 	INDRA_UI=headless bash ops/start-dev.sh
 
 start-daicard: dev
@@ -61,12 +69,16 @@ start-daicard: dev
 start-dashboard: dev
 	INDRA_UI=dashboard bash ops/start-dev.sh
 
-start: start-daicard
+start-test:
+	INDRA_ETH_PROVIDER=http://localhost:8545 INDRA_MODE=test bash ops/start-prod.sh
+
+start-prod: prod
+	bash ops/start-prod.sh
 
 stop:
 	bash ops/stop.sh
 
-restart-headless: database node client payment-bot
+restart-headless: dev
 	bash ops/stop.sh
 	INDRA_UI=headless bash ops/start-dev.sh
 
@@ -80,9 +92,6 @@ restart-dashboard: dev
 
 restart: restart-daicard
 
-start-prod: prod
-	bash ops/start-prod.sh
-
 restart-prod:
 	bash ops/stop.sh
 	bash ops/start-prod.sh
@@ -119,14 +128,27 @@ reset: stop
 	rm -rf $(bot)/.payment-bot-db/*
 	rm -rf $(flags)/deployed-contracts
 
-push-latest: prod
-	bash ops/push-images.sh latest database node proxy relay
-
-push-prod: push-versioned
-push-versioned: prod
-	bash ops/push-images.sh $(version) database node proxy relay
-
-deployed-contracts: contracts
+push-commit: staging
+	bash ops/push-images.sh commit bot database ethprovider node proxy relay
+
+push-release:
+	bash ops/push-images.sh release database node proxy relay
+
+pull:
+	docker pull $(registry)/$(project)_bot:$(commit) && docker tag $(registry)/$(project)_bot:$(commit) $(project)_bot:$(commit) || true
+	docker pull $(registry)/$(project)_database:$(commit) && docker tag $(registry)/$(project)_database:$(commit) $(project)_database:$(commit) || true
+	docker pull $(registry)/$(project)_ethprovider:$(commit) && docker tag $(registry)/$(project)_ethprovider:$(commit) $(project)_ethprovider:$(commit) || true
+	docker pull $(registry)/$(project)_node:$(commit) && docker tag $(registry)/$(project)_node:$(commit) $(project)_node:$(commit) || true
+	docker pull $(registry)/$(project)_proxy:$(commit) && docker tag $(registry)/$(project)_proxy:$(commit) $(project)_proxy:$(commit) || true
+	docker pull $(registry)/$(project)_relay:$(commit) && docker tag $(registry)/$(project)_relay:$(commit) $(project)_relay:$(commit) || true
+	docker pull $(registry)/$(project)_bot:latest && docker tag $(registry)/$(project)_bot:latest $(project)_bot:latest || true
+	docker pull $(registry)/$(project)_database:latest && docker tag $(registry)/$(project)_database:latest $(project)_database:latest || true
+	docker pull $(registry)/$(project)_ethprovider:latest && docker tag $(registry)/$(project)_ethprovider:latest $(project)_ethprovider:latest || true
+	docker pull $(registry)/$(project)_node:latest && docker tag $(registry)/$(project)_node:latest $(project)_node:latest || true
+	docker pull $(registry)/$(project)_proxy:latest && docker tag $(registry)/$(project)_proxy:latest $(project)_proxy:latest || true
+	docker pull $(registry)/$(project)_relay:latest && docker tag $(registry)/$(project)_relay:latest $(project)_relay:latest || true
+
+deployed-contracts: ethprovider
 	bash ops/deploy-contracts.sh ganache
 	touch $(flags)/$@
 
@@ -139,14 +161,11 @@ dls:
 	@docker container ls -a
 
 ########################################
-# Begin Test Rules
+# Test Runner Shortcuts
 
 test: test-node
 watch: watch-node
 
-start-test: prod deployed-contracts
-	INDRA_ETH_PROVIDER=http://localhost:8545 INDRA_MODE=test bash ops/start-prod.sh
-
 test-cf: cf-core
 	bash ops/test-cf.sh
 
@@ -164,7 +183,7 @@ test-dashboard:
 watch-ui: node-modules
 	bash ops/test-ui.sh --watch
 
-test-bot: payment-bot
+test-bot:
 	bash ops/test-bot.sh
 
 test-bot-farm:
@@ -180,97 +199,123 @@ watch-node: node-modules
 	bash ops/test-node.sh --watch
 
 ########################################
-# Begin Real Rules
+# Docker Images
 
-builder: ops/builder.dockerfile
+daicard-proxy: $(shell find $(proxy) $(find_options))
 	$(log_start)
-	docker build --file ops/builder.dockerfile --build-arg SOLC_VERSION=$(solc_version) --tag $(project)_builder:latest .
+	docker build --file $(proxy)/daicard.io/prod.dockerfile $(cache_from) --tag daicard_proxy:latest .
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-cf-adjudicator-contracts: node-modules $(shell find $(cf-adjudicator-contracts)/contracts $(cf-adjudicator-contracts)/waffle.json $(find_options))
+database: node-modules $(shell find $(database) $(find_options))
 	$(log_start)
-	$(docker_run) "cd modules/cf-adjudicator-contracts && npm run build"
+	docker build --file $(database)/db.dockerfile $(cache_from) --tag $(project)_database:latest $(database)
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-cf-apps: node-modules cf-adjudicator-contracts $(shell find $(cf-apps)/contracts $(cf-apps)/waffle.json $(find_options))
+ethprovider: contracts cf-adjudicator-contracts cf-funding-protocol-contracts cf-apps $(shell find $(ethprovider) $(find_options))
 	$(log_start)
-	$(docker_run) "cd modules/cf-apps && npm run build"
+	docker build --file $(ethprovider)/Dockerfile $(cache_from) --tag $(project)_ethprovider:latest .
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-cf-core: node-modules types cf-adjudicator-contracts cf-apps cf-funding-protocol-contracts $(shell find $(cf-core)/src $(cf-core)/test $(cf-core)/tsconfig.json $(find_options))
+node-release: node $(node)/ops/Dockerfile $(node)/ops/entry.sh
 	$(log_start)
-	$(docker_run) "cd modules/cf-core && npm run build:ts"
+	docker build --file $(node)/ops/Dockerfile $(cache_from) --tag $(project)_node:latest .
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-cf-funding-protocol-contracts: node-modules $(shell find $(cf-funding-protocol-contracts)/contracts $(cf-funding-protocol-contracts)/waffle.json $(find_options))
+node-staging: node $(node)/ops/Dockerfile $(node)/ops/entry.sh
 	$(log_start)
-	$(docker_run) "cd modules/cf-funding-protocol-contracts && npm run build"
+	$(docker_run) "cd modules/node && npm run build-bundle"
+	docker build --file $(node)/ops/Dockerfile $(cache_from) --tag $(project)_node:latest .
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-client: cf-core contracts types messaging $(shell find $(client)/src $(client)/tsconfig.json $(find_options))
+payment-bot-release: payment-bot-js $(shell find $(bot)/ops $(find_options))
 	$(log_start)
-	$(docker_run) "cd modules/client && npm run build"
+	docker build --file $(bot)/ops/release.dockerfile $(cache_from) --tag $(project)_bot:latest .
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-contracts: node-modules $(shell find $(contracts)/contracts $(contracts)/waffle.json $(find_options))
+payment-bot-staging: payment-bot-js $(shell find $(bot)/ops $(find_options))
 	$(log_start)
-	$(docker_run) "cd modules/contracts && npm run build"
+	docker build --file $(bot)/ops/staging.dockerfile $(cache_from) --tag $(project)_bot:latest .
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-daicard-prod: node-modules client $(shell find $(daicard)/src $(find_options))
+indra-proxy: ws-tcp-relay $(shell find $(proxy) $(find_options))
 	$(log_start)
-	$(docker_run) "cd modules/daicard && npm run build"
+	docker build --file $(proxy)/indra.connext.network/dev.dockerfile $(cache_from) --tag $(project)_proxy:dev .
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-dashboard-prod: node-modules client $(shell find $(dashboard)/src $(find_options))
+indra-proxy-prod: daicard-prod dashboard-prod ws-tcp-relay $(shell find $(proxy) $(find_options))
 	$(log_start)
-	$(docker_run) "cd modules/dashboard && npm run build"
+	docker build --file $(proxy)/indra.connext.network/prod.dockerfile $(cache_from) --tag $(project)_proxy:latest .
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-daicard-proxy: $(shell find $(proxy) $(find_options))
+ssh-action: $(shell find $(ssh-action) $(find_options))
 	$(log_start)
-	docker build --file $(proxy)/daicard.io/prod.dockerfile --tag daicard_proxy:latest .
+	docker build --file $(ssh-action)/Dockerfile --tag $(project)_ssh_action $(ssh-action)
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-database: node-modules $(shell find $(database) $(find_options))
+ws-tcp-relay: ops/ws-tcp-relay.dockerfile
 	$(log_start)
-	docker build --file $(database)/db.dockerfile --tag $(project)_database:latest $(database)
+	docker build --file ops/ws-tcp-relay.dockerfile $(cache_from) --tag $(project)_relay:latest .
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-messaging: node-modules types $(shell find $(messaging)/src $(find_options))
+########################################
+# Contracts
+
+cf-adjudicator-contracts: node-modules $(shell find $(cf-adjudicator-contracts)/contracts $(cf-adjudicator-contracts)/waffle.json $(find_options))
 	$(log_start)
-	$(docker_run) "cd modules/messaging && npm run build"
+	$(docker_run) "cd modules/cf-adjudicator-contracts && npm run build"
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-node: cf-core contracts types messaging $(shell find $(node)/src $(node)/migrations $(find_options))
+cf-apps: node-modules cf-adjudicator-contracts $(shell find $(cf-apps)/contracts $(cf-apps)/waffle.json $(find_options))
 	$(log_start)
-	$(docker_run) "cd modules/node && npm run build"
+	$(docker_run) "cd modules/cf-apps && npm run build"
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-node-modules: builder package.json $(shell ls modules/**/package.json)
+cf-core: node-modules types cf-adjudicator-contracts cf-apps cf-funding-protocol-contracts $(shell find $(cf-core)/src $(cf-core)/test $(cf-core)/tsconfig.json $(find_options))
 	$(log_start)
-	$(docker_run) "lerna bootstrap --hoist"
-	$(docker_run) "cd node_modules/eccrypto && npm run install"
+	$(docker_run) "cd modules/cf-core && npm run build:ts"
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-node-prod: node $(node)/ops/prod.dockerfile $(node)/ops/entry.sh
+cf-funding-protocol-contracts: node-modules $(shell find $(cf-funding-protocol-contracts)/contracts $(cf-funding-protocol-contracts)/waffle.json $(find_options))
 	$(log_start)
-	docker build --file $(node)/ops/prod.dockerfile --tag $(project)_node:latest .
+	$(docker_run) "cd modules/cf-funding-protocol-contracts && npm run build"
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-payment-bot: node-modules client types $(shell find $(bot)/src $(find_options))
+contracts: node-modules $(shell find $(contracts)/contracts $(contracts)/waffle.json $(find_options))
 	$(log_start)
-	$(docker_run) "cd modules/payment-bot && npm run build"
+	$(docker_run) "cd modules/contracts && npm run build"
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-indra-proxy: ws-tcp-relay $(shell find $(proxy) $(find_options))
+########################################
+# JS & bundles
+
+client: cf-core contracts types messaging $(shell find $(client)/src $(client)/tsconfig.json $(find_options))
 	$(log_start)
-	docker build --file $(proxy)/indra.connext.network/dev.dockerfile --tag $(project)_proxy:dev .
+	$(docker_run) "cd modules/client && npm run build"
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-indra-proxy-prod: daicard-prod dashboard-prod ws-tcp-relay $(shell find $(proxy) $(find_options))
+daicard-prod: node-modules client $(shell find $(daicard)/src $(find_options))
 	$(log_start)
-	docker build --file $(proxy)/indra.connext.network/prod.dockerfile --tag $(project)_proxy:latest .
+	$(docker_run) "cd modules/daicard && npm run build"
+	$(log_finish) && mv -f $(totalTime) $(flags)/$@
+
+dashboard-prod: node-modules client $(shell find $(dashboard)/src $(find_options))
+	$(log_start)
+	$(docker_run) "cd modules/dashboard && npm run build"
+	$(log_finish) && mv -f $(totalTime) $(flags)/$@
+
+messaging: node-modules types $(shell find $(messaging)/src $(find_options))
+	$(log_start)
+	$(docker_run) "cd modules/messaging && npm run build"
+	$(log_finish) && mv -f $(totalTime) $(flags)/$@
+
+node: cf-core contracts types messaging $(shell find $(node)/src $(node)/migrations $(find_options))
+	$(log_start)
+	$(docker_run) "cd modules/node && npm run build"
+	$(log_finish) && mv -f $(totalTime) $(flags)/$@
+
+payment-bot-js: node-modules client types $(shell find $(bot)/src $(bot)/ops $(find_options))
+	$(log_start)
+	$(docker_run) "cd modules/payment-bot && npm run build-bundle"
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
 types: node-modules $(shell find $(types)/src $(find_options))
@@ -278,7 +323,16 @@ types: node-modules $(shell find $(types)/src $(find_options))
 	$(docker_run) "cd modules/types && npm run build"
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
 
-ws-tcp-relay: ops/ws-tcp-relay.dockerfile
+########################################
+# Common Prerequisites
+
+node-modules: builder package.json $(shell ls modules/**/package.json)
+	$(log_start)
+	$(docker_run) "lerna bootstrap --hoist --no-progress"
+	$(docker_run) "cd node_modules/eccrypto && npm run install"
+	$(log_finish) && mv -f $(totalTime) $(flags)/$@
+
+builder: ops/builder.dockerfile
 	$(log_start)
-	docker build --file ops/ws-tcp-relay.dockerfile --tag $(project)_relay:latest .
+	docker build --file ops/builder.dockerfile --build-arg SOLC_VERSION=$(solc_version) $(cache_from) --tag $(project)_builder:latest .
 	$(log_finish) && mv -f $(totalTime) $(flags)/$@
diff --git a/address-book.json b/address-book.json
index 89bcbae7d0..d1ea1ea106 100644
--- a/address-book.json
+++ b/address-book.json
@@ -158,58 +158,58 @@
   "4447": {
     "ChallengeRegistry": {
       "address": "0x8CdaF0CD259887258Bc13a92C0a6dA92698644C0",
-      "bytecode": "0xea96e0d7a6fb989583b40bea3347a8a27a86108cbed0176f21ec859a2b2e99f1",
-      "txHash": "0x3a90f2a4804566a50128ab45834bd1910a31d3e3e68a93c606bd85e91605278c"
+      "bytecode": "0xc04a7621ecd7d0a4b7eaeb2f90f7110fae0e11408fcba6b1c80b562e9b10fa19",
+      "txHash": "0x4579a2d2b0da40d8a81e27e99a3c87f44f0258312f39be152e6b28fb3b729ee4"
     },
     "ConditionalTransactionDelegateTarget": {
       "address": "0xF12b5dd4EAD5F743C6BaA640B0216200e89B60Da",
-      "bytecode": "0xad8c13e0e34236f64adfa6281549abe0da2556134d889afedf6fcc753386d04a",
-      "txHash": "0x20be47a3605eb3434a84eb250bcbf18e0c72377e79937d4bc4dd2dbce5eb0cdf"
+      "bytecode": "0x7c8afbe2d9ecfd08e10893ed3597c4150be274bec56641834a167aacd1f0735e",
+      "txHash": "0x647dbf71541ee27ac546893e60a625a47adc2c30110a4748a5d233f95a522f3b"
     },
     "CoinBalanceRefundApp": {
       "address": "0x345cA3e014Aaf5dcA488057592ee47305D9B3e10",
-      "bytecode": "0x95e46b9abd669cfe967415e05ac6aedac11f10ab853c78158a5bc5184abe98f5",
-      "txHash": "0x094002082f78236a8489153dab4dddad3768039450e820e0a474948df3d63840"
+      "bytecode": "0x857184a59704f27af21e1bc24df1e2f504d4530ef75f4b7d80c35f089c32ac90",
+      "txHash": "0x8bca6972144d0f7ec5384f4c09153915543f24ec11b15fb4777edee098b8ebe5"
     },
     "MultiAssetMultiPartyCoinTransferInterpreter": {
       "address": "0xf25186B5081Ff5cE73482AD761DB0eB0d25abfBF",
-      "bytecode": "0x5a007defd65701437d07472f38997dd1b0b133f48743640798b07ec436af1a35",
-      "txHash": "0x8a7d940bc2234364fb2666d5e89070cc262a358f43ff41fcfee7c97272b8eb91"
+      "bytecode": "0xe59f0ff1a3d5fbb590d6db2422109bc352775f6027a760b22266702d23ea960f",
+      "txHash": "0x45b058e94552e45af512d0dfc0983d9bbac69166a6eb0bdbab7a97e418dce3e7"
     },
     "IdentityApp": {
       "address": "0x8f0483125FCb9aaAEFA9209D8E9d7b9C8B9Fb90F",
-      "bytecode": "0x7c45ddc1dce24dc72e88cb95435252e9d2688af51051c1ba753f83a360731a82",
-      "txHash": "0x3b0f842a8bbc47d758df2c720eae3144f626536318a85745c8c39d46f09dface"
+      "bytecode": "0x24f8a8a88a2296d898cbaa39cdc16b51074e9fb2601edc7aad0eec4fdb785b7b",
+      "txHash": "0xacbfd138ed07863ecd3d32551a95ec0812cd9a1421d73dd63dc63dffbc8f8c94"
     },
     "MinimumViableMultisig": {
       "address": "0x9FBDa871d559710256a2502A2517b794B482Db40",
-      "bytecode": "0x130acbad80baa996439abb38e9ac3c0380e3138eb95e37e5c4242202b9ba56f5",
-      "txHash": "0xd1927534ea22604ea6293cb54f60b2051c23978d7818661c6cc4c4ab66f7cc41"
+      "bytecode": "0x959d8577b1cac2b9854ed0115353688b67b82a48784206e03a53b9126a6e8454",
+      "txHash": "0xfe76a329bc932b6cee0f315b9ef51dc91760e64df90aef9a8df3c215402c0d81"
     },
     "ProxyFactory": {
       "address": "0x2C2B9C9a4a25e24B174f26114e8926a9f2128FE4",
-      "bytecode": "0x2170a9f41e1d5bb10628953a0998286b8da4e98d85a8fd9800ed719ffee39e86",
-      "txHash": "0x4b5f6772d8a2dc41b7b37c3308f9c123ed993388bb76340d100f792822845693"
+      "bytecode": "0xf64315170bfd95e0c799e454f18e6cad1268beb9a584c8fc0f70b6bace2c07cc",
+      "txHash": "0xa5f3602d3c28aa8945148e9cd2c141692789639a2f8d0be9b6108de3eed77379"
     },
     "SingleAssetTwoPartyCoinTransferInterpreter": {
       "address": "0x30753E4A8aad7F8597332E813735Def5dD395028",
-      "bytecode": "0xc2a031e4642a2eb692a1c6f6e5be6aad0f8ef62fea075f4d287a86f8db93500a",
-      "txHash": "0xb9d451f5add42523a28b15f4b83dac010a88e18c2e719a66fa5ceba27a1e0854"
+      "bytecode": "0x36645fe19e4e83d403aa4b002e1323311dd0949e5854883a83e98fcee7f1a344",
+      "txHash": "0x6d4f0c0925d94326a15c03bee631eba395c88864cfe190b0a4613a55528c583e"
     },
     "TimeLockedPassThrough": {
       "address": "0xFB88dE099e13c3ED21F80a7a1E49f8CAEcF10df6",
-      "bytecode": "0x7307c76d3a18b99d95b2800e698b72bbc75d9f83606820b22818ae5695afc82e",
-      "txHash": "0x8f29873546260c7de907a4cb5d881eb19a2811cc2978f9110a3fb393987ee126"
+      "bytecode": "0x595b06820f89dd129fed81494e21d861cd2f30f97526ddd06610c298a6c0f5c8",
+      "txHash": "0x9e054c12519066196d0ed271858e1057320e39b69049ba66ba99faf9ecc48548"
     },
     "TwoPartyFixedOutcomeInterpreter": {
       "address": "0xAa588d3737B611baFD7bD713445b314BD453a5C8",
-      "bytecode": "0x7a3ef85d20d4203ac7d07eb2076de3fc5c503719bb8ea5034cc572be460d3233",
-      "txHash": "0x8fa55c422abe070cc96909ad7f2a68cbaf942a8c8df7cd3fabeaad136b9a338b"
+      "bytecode": "0x243929a6b30cf6b9bea3d4771ec6b00d5142f342a89ccc4e6a9e9f625766ebf6",
+      "txHash": "0xdce6deac316ca5438b63268bf87f93012601d2d3fc8a349e67854f4853d54616"
     },
     "TwoPartyFixedOutcomeFromVirtualAppInterpreter": {
       "address": "0xf204a4Ef082f5c04bB89F7D5E6568B796096735a",
-      "bytecode": "0xf7e264460ab490e6e733d003c6caeebdd39bed6dffef1e9272afe85d8a78ce48",
-      "txHash": "0x492b9dd4c67e94c86947803832710748422ac9b3c9cd3e5de6cf553eefc06eee"
+      "bytecode": "0x84aaead490035829937016a667f7c246118cacdce3016746a9e5d84fa0828d00",
+      "txHash": "0x9f67a930b4c4547d8bc03313a117b4829b82bbc6daa70e85b8e44681d2f1ea45"
     },
     "SimpleLinkedTransferApp": {
       "address": "0x75c35C980C0d37ef46DF04d31A140b65503c0eEd",
diff --git a/cypress/tests/daicard.js b/cypress/tests/daicard.js
index 63cc8f03a3..04a0621a6a 100644
--- a/cypress/tests/daicard.js
+++ b/cypress/tests/daicard.js
@@ -148,7 +148,9 @@ describe("Daicard", () => {
     });
   });
 
-  describe("Withdraw then Deposit then Withdraw", () => {
+  // Skipping because multisig's faulty replay protection causes this to fail
+  // See point A2 of Heiko's audit for more info
+  describe.skip("Withdraw then Deposit then Withdraw", () => {
     it(`should withdraw eth to a valid address the second time`, () => {
       my.deposit(depositEth).then(tokensDeposited => {
         my.getOnchainEtherBalance().then(balanceBefore => {
diff --git a/modules/dashboard/.env b/modules/dashboard/.env
index c96eedfb74..f7f1afff8a 100644
--- a/modules/dashboard/.env
+++ b/modules/dashboard/.env
@@ -1 +1,2 @@
 PUBLIC_URL=/dashboard
+SKIP_PREFLIGHT_CHECK=true
diff --git a/modules/node/ops/prod.dockerfile b/modules/node/ops/Dockerfile
similarity index 72%
rename from modules/node/ops/prod.dockerfile
rename to modules/node/ops/Dockerfile
index 3ac53166d5..8968ae3172 100644
--- a/modules/node/ops/prod.dockerfile
+++ b/modules/node/ops/Dockerfile
@@ -1,16 +1,18 @@
 FROM node:12.13.0-alpine3.9
 WORKDIR /root
 ENV HOME /root
-RUN apk add --update --no-cache bash git
+RUN apk add --update --no-cache bash curl g++ gcc git jq make python
+RUN npm config set unsafe-perm true
+RUN npm install -g npm@6.12.0
 
 COPY modules/node/package.json package.json
 RUN npm install > /dev/null 2>&1
 
 # https://github.com/moby/moby/issues/37965#issuecomment-426853382
-COPY modules/node/ops ops
-RUN true
 COPY ops/wait-for.sh ops/wait-for.sh
 RUN true
+COPY modules/node/ops ops
+RUN true
 COPY modules/node/dist dist
 
 ENTRYPOINT ["bash", "ops/entry.sh"]
diff --git a/modules/node/ops/entry.sh b/modules/node/ops/entry.sh
index bdb1654896..2ec8776b98 100644
--- a/modules/node/ops/entry.sh
+++ b/modules/node/ops/entry.sh
@@ -54,6 +54,6 @@ then
     ./src/main.ts
 else
   echo "Starting indra node in prod-mode"
-  exec node dist/src/main.js
+  exec node --no-deprecation dist/src/main.js
 fi
 
diff --git a/modules/node/ops/webpack.config.js b/modules/node/ops/webpack.config.js
new file mode 100644
index 0000000000..4572c29d45
--- /dev/null
+++ b/modules/node/ops/webpack.config.js
@@ -0,0 +1,55 @@
+const path = require('path');
+const webpack = require('webpack');
+
+module.exports = {
+  mode: "development",
+  target: 'node',
+  externals: {
+    'eccrypto': 'commonjs eccrypto',
+    '@nestjs/microservices': 'commonjs @nestjs/microservices',
+    '@nestjs/common': 'commonjs @nestjs/common',
+    'pg': 'commonjs pg',
+  },
+
+  resolve: {
+    extensions: [ '.js', '.ts', '.json' ],
+    symlinks: false
+  },
+
+  entry: path.join(__dirname, '../src/main.ts'),
+
+  output: {
+    path: path.join(__dirname, '../dist/src'),
+    filename: 'main.js',
+  },
+
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            presets: ['@babel/env'],
+          },
+        },
+      },
+      {
+        test: /\.ts$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'ts-loader',
+          options: {
+            configFile: path.join(__dirname, '../tsconfig.json')
+          },
+        },
+      },
+    ],
+  },
+
+  plugins: [
+    // new webpack.IgnorePlugin({ resourceRegExp: /eccrypto/ })
+  ]
+  // stats: { warnings: false, },
+};
diff --git a/modules/node/package.json b/modules/node/package.json
index 4ae3d0b44d..074c853895 100644
--- a/modules/node/package.json
+++ b/modules/node/package.json
@@ -1,12 +1,13 @@
 {
   "name": "indra-node",
-	"version": "2.3.18",
+	"version": "2.3.19",
   "description": "",
   "author": "",
   "license": "MIT",
   "main": "dist/main.js",
   "scripts": {
     "build": "tsc -p tsconfig.json",
+    "build-bundle": "webpack --config ops/webpack.config.js",
     "format": "prettier --write \"src/**/*.ts\"",
     "start": "ts-node -r tsconfig-paths/register src/main.ts",
     "start:dev": "concurrently --handle-input \"wait-on dist/main.js && nodemon\" \"tsc -w -p tsconfig.json\" ",
@@ -57,6 +58,8 @@
     "ts-node": "8.5.4",
     "tsconfig-paths": "3.9.0",
     "typescript": "3.5.3",
-    "wait-on": "3.3.0"
+    "wait-on": "3.3.0",
+    "webpack": "4.41.0",
+    "webpack-cli": "3.3.10"
   }
 }
diff --git a/modules/payment-bot/ops/entry.sh b/modules/payment-bot/ops/entry.sh
new file mode 100644
index 0000000000..6cb8b4624c
--- /dev/null
+++ b/modules/payment-bot/ops/entry.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+set -e
+
+project="indra"
+cwd="`pwd`"
+user="$1"
+shift
+args="$@"
+
+#echo "Starting payment bot with args: $args"
+
+identifier=1
+while [ "$1" != "" ]; do
+  case $1 in
+    -i | --identifier ) shift
+                        identifier=$1
+                        ;;
+  esac
+  shift
+done
+
+if [[ "$identifier" == 1 ]]
+then mnemonic="humble sense shrug young vehicle assault destroy cook property average silent travel"
+elif [[ "$identifier" == 2 ]]
+then mnemonic="roof traffic soul urge tenant credit protect conduct enable animal cinnamon adult"
+fi
+
+export DB_FILENAME="${DB_FILENAME:-/store/$identifier.json}"
+export ECCRYPTO_NO_FALLBACK=true
+export ETH_RPC_URL="${ETH_RPC_URL:-http://172.17.0.1:8545}"
+export NODE_URL="${NODE_URL:-nats://172.17.0.1:4222}"
+export PISA_CONTRACT_ADDRESS="${PISA_CONTRACT_ADDRESS:-0x0000000000000000000000000000000000000000}"
+export PISA_URL="${PISA_URL:-http://172.17.0.1:5487}"
+export WEBDIS_URL="${REDIS_URL:-redis://172.17.0.1:6379}"
+export MNEMONIC="${MNEMONIC:-$mnemonic}"
+
+#echo "Waiting for ethprovider (${ETH_RPC_URL#*://}) to wake up.."
+bash wait-for.sh ${ETH_RPC_URL#*://} 2> /dev/null
+#echo "Good morning"
+
+mkdir -p ${DB_FILENAME%/*}
+touch $DB_FILENAME
+node --no-deprecation dist/index.js "$args"
+chown -R $user . || true
diff --git a/modules/payment-bot/ops/release.dockerfile b/modules/payment-bot/ops/release.dockerfile
new file mode 100644
index 0000000000..85f3b848f5
--- /dev/null
+++ b/modules/payment-bot/ops/release.dockerfile
@@ -0,0 +1,19 @@
+FROM node:12.13.0-alpine3.9
+WORKDIR /root
+ENV HOME /root
+RUN apk add --update --no-cache bash curl g++ gcc git jq make python
+RUN npm config set unsafe-perm true
+RUN npm install -g npm@6.12.0
+
+COPY modules/payment-bot/package.json package.json
+RUN npm install > /dev/null 2>&1
+
+# https://github.com/moby/moby/issues/37965#issuecomment-426853382
+COPY ops/wait-for.sh wait-for.sh
+RUN true
+COPY modules/payment-bot/ops/entry.sh entry.sh
+RUN true
+COPY modules/payment-bot/dist dist
+
+ENTRYPOINT ["bash", "entry.sh"]
+
diff --git a/modules/payment-bot/ops/staging.dockerfile b/modules/payment-bot/ops/staging.dockerfile
new file mode 100644
index 0000000000..f7b7668f84
--- /dev/null
+++ b/modules/payment-bot/ops/staging.dockerfile
@@ -0,0 +1,18 @@
+FROM node:12.13.0-alpine3.9
+WORKDIR /root
+ENV HOME /root
+RUN apk add --update --no-cache bash curl g++ gcc git jq make python
+RUN npm config set unsafe-perm true
+RUN npm install -g npm@6.12.0
+
+RUN npm install eccrypto
+
+# https://github.com/moby/moby/issues/37965#issuecomment-426853382
+COPY ops/wait-for.sh wait-for.sh
+RUN true
+COPY modules/payment-bot/ops/entry.sh entry.sh
+RUN true
+COPY modules/payment-bot/dist dist
+
+ENTRYPOINT ["bash", "entry.sh"]
+
diff --git a/modules/payment-bot/ops/webpack.config.js b/modules/payment-bot/ops/webpack.config.js
new file mode 100644
index 0000000000..ecba211749
--- /dev/null
+++ b/modules/payment-bot/ops/webpack.config.js
@@ -0,0 +1,52 @@
+const path = require('path');
+const webpack = require('webpack');
+
+module.exports = {
+  mode: "development",
+  target: 'node',
+  externals: {
+    eccrypto: 'commonjs eccrypto'
+  },
+
+  resolve: {
+    extensions: [ '.js', '.ts', '.json' ],
+    symlinks: false
+  },
+
+  entry: path.join(__dirname, '../src/index.ts'),
+
+  output: {
+    path: path.join(__dirname, '../dist'),
+    filename: 'index.js',
+  },
+
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            presets: ['@babel/env'],
+          },
+        },
+      },
+      {
+        test: /\.ts$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'ts-loader',
+          options: {
+            configFile: path.join(__dirname, '../tsconfig.json')
+          },
+        },
+      },
+    ],
+  },
+
+  plugins: [
+    // new webpack.IgnorePlugin({ resourceRegExp: /eccrypto/ })
+  ]
+  // stats: { warnings: false, },
+};
diff --git a/modules/payment-bot/package.json b/modules/payment-bot/package.json
index 2e0aed7237..3c779efef3 100644
--- a/modules/payment-bot/package.json
+++ b/modules/payment-bot/package.json
@@ -5,6 +5,7 @@
   "main": "index.js",
   "scripts": {
     "build": "tsc --project tsconfig.json",
+    "build-bundle": "webpack --config ops/webpack.config.js",
     "start:bot1": "env-cmd -e devbot1 ts-node src/",
     "start:bot2": "env-cmd -e devbot2 ts-node src/"
   },
@@ -12,6 +13,7 @@
   "license": "MIT",
   "dependencies": {
     "@connext/client": "1.4.1",
+    "@connext/types": "1.4.1",
     "commander": "4.0.1",
     "dotenv": "8.2.0",
     "ethers": "4.0.40",
@@ -20,10 +22,12 @@
     "uuid": "3.3.3"
   },
   "devDependencies": {
-    "@connext/types": "1.4.1",
     "@types/node-fetch": "2.5.4",
     "env-cmd": "10.0.1",
+    "ts-loader": "6.2.1",
     "ts-node": "8.5.4",
-    "typescript": "3.5.3"
+    "typescript": "3.5.3",
+    "webpack": "4.41.0",
+    "webpack-cli": "3.3.10"
   }
 }
diff --git a/ops/builder.dockerfile b/ops/builder.dockerfile
index 1e075d27e2..a0f85260fa 100644
--- a/ops/builder.dockerfile
+++ b/ops/builder.dockerfile
@@ -5,7 +5,8 @@ WORKDIR /root
 ENV HOME /root
 RUN apk add --update --no-cache bash curl g++ gcc git jq make python
 RUN npm config set unsafe-perm true
-RUN npm install -g lerna npm@6.12.0
+RUN npm install -g npm@6.12.0
+RUN npm install -g lerna@3.19.0
 COPY --from=solc /usr/local/bin/solc /usr/local/bin/solc
 RUN true
 COPY ops /ops
diff --git a/ops/deploy-contracts.sh b/ops/deploy-contracts.sh
index e94f475e57..768343d6f5 100644
--- a/ops/deploy-contracts.sh
+++ b/ops/deploy-contracts.sh
@@ -1,20 +1,22 @@
 #!/bin/bash
 set -e
 
+ETH_NETWORK="${1:-ganache}"
+version="${2:-latest}"
+
+cwd="`pwd`"
 project="indra"
+registry="connextproject"
+
 name=${project}_contract_deployer
-cwd="`pwd`"
+log="$cwd/ops/ethprovider/ganache.log"
+image="${project}_ethprovider:$version"
 
 ########################################
 # Setup env vars
 
 INFURA_KEY=$INFURA_KEY
 
-if [[ -n "$1" ]]
-then ETH_NETWORK="$1"
-else ETH_NETWORK="${ETH_NETWORK:-ganache}"
-fi
-
 if [[ "$ETH_NETWORK" == "ganache" ]]
 then ETH_PROVIDER="http://localhost:8545"
 fi
@@ -63,6 +65,8 @@ then
   fi
 fi
 
+touch $log
+
 ########################################
 # Remove this deployer service when we're done
 
@@ -84,44 +88,34 @@ if [[ "$ETH_NETWORK" != "ganache" ]]
 then SECRET_ENV="--env=ETH_MNEMONIC_FILE=/run/secrets/$ETH_MNEMONIC_FILE --secret=$ETH_MNEMONIC_FILE"
 fi
 
-# Ensure contract artifacts are up-to-date first
-make contracts
-
 echo
-echo "Deploying contract deployer..."
+echo "Deploying contract deployer (image: $image)..."
+
+if [[ "`docker image ls -q $image`" == "" ]]
+then
+  echo "Image $image does not exist locally, trying $registry/$image"
+  image=$registry/$image
+  if [[ "`docker image ls -q $image`" == "" ]]
+  then docker pull $image || (echo "Image does not exist" && exit 1)
+  fi
+fi
 
 id="`
-docker service create \
-  --detach \
-  --name="$name" \
-  --env="ETH_MNEMONIC=$ETH_MNEMONIC" \
-  --env="ETH_NETWORK=$ETH_NETWORK" \
-  --env="ETH_PROVIDER=$ETH_PROVIDER" \
-  --env="INFURA_KEY=$INFURA_KEY" \
-  --mount="type=volume,source=${project}_chain_dev,target=/data" \
-  --mount="type=bind,source=$cwd,target=/root" \
-  --restart-condition="none" \
-  $SECRET_ENV \
-  --entrypoint "bash" \
-  ${project}_builder -c '
-    if [[ "$ETH_NETWORK" == "ganache" ]]
-    then
-      echo "Starting Ganache.."
-      mkdir -p /data
-      ./node_modules/.bin/ganache-cli \
-        --db="/data" \
-        --gasPrice="10000000000" \
-        --host="0.0.0.0" \
-        --mnemonic="$ETH_MNEMONIC" \
-        --networkId="4447" \
-        --port="8545" \
-         > ops/ganache.log &
-      bash /ops/wait-for.sh localhost:8545 2> /dev/null
-    fi
-    touch address-book.json
-    node ops/migrate-contracts.js
-  ' 2> /dev/null
+  docker service create \
+    --detach \
+    --name="$name" \
+    --env="ETH_MNEMONIC=$ETH_MNEMONIC" \
+    --env="ETH_NETWORK=$ETH_NETWORK" \
+    --env="ETH_PROVIDER=$ETH_PROVIDER" \
+    --env="INFURA_KEY=$INFURA_KEY" \
+    --mount="type=volume,source=${project}_chain_dev,target=/data" \
+    --mount="type=bind,source=$log,target=/root/ganache.log" \
+    --mount="type=bind,source=$cwd/address-book.json,target=/root/address-book.json" \
+    --restart-condition="none" \
+    $SECRET_ENV \
+    $image deploy 2> /dev/null
 `"
+
 echo "Success! Deployer service started with id: $id"
 echo
 
diff --git a/ops/ethprovider/Dockerfile b/ops/ethprovider/Dockerfile
new file mode 100644
index 0000000000..9e26e5cf93
--- /dev/null
+++ b/ops/ethprovider/Dockerfile
@@ -0,0 +1,28 @@
+FROM node:12.13.0-alpine3.9
+WORKDIR /root
+ENV HOME /root
+RUN apk add --update --no-cache bash curl g++ gcc git jq make python
+RUN npm config set unsafe-perm true
+RUN npm install -g npm@6.12.0
+
+COPY ops/ethprovider/package.json package.json
+RUN npm install
+
+COPY ops/wait-for.sh wait-for.sh
+RUN true
+COPY ops/ethprovider/entry.sh entry.sh
+RUN true
+COPY ops/ethprovider/migrate-contracts.js migrate-contracts.js
+RUN true
+COPY address-book.json address-book.json
+RUN true
+COPY modules/cf-adjudicator-contracts cf-adjudicator-contracts
+RUN true
+COPY modules/cf-funding-protocol-contracts cf-funding-protocol-contracts
+RUN true
+COPY modules/cf-apps cf-apps
+RUN true
+COPY modules/contracts contracts
+
+ENV PATH="./node_modules/.bin:${PATH}"
+ENTRYPOINT ["bash", "entry.sh"]
diff --git a/ops/ethprovider/entry.sh b/ops/ethprovider/entry.sh
new file mode 100644
index 0000000000..4a286beca0
--- /dev/null
+++ b/ops/ethprovider/entry.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+set -e
+
+echo "Ethprovider entrypoint activated!"
+
+if [[ "$1" == "start" ]]
+then
+  echo "Starting Ganache.."
+  mkdir -p /data
+  exec ganache-cli \
+    --db="/data" \
+    --gasPrice="10000000000" \
+    --host="0.0.0.0" \
+    --mnemonic="$ETH_MNEMONIC" \
+    --networkId="4447" \
+    --port="8545"
+elif [[ "$1" == "deploy" ]]
+then
+  echo "Deploying contracts.."
+  if [[ "$ETH_NETWORK" == "ganache" ]]
+  then
+    echo "Starting Ganache.."
+    mkdir -p /data
+    ganache-cli \
+      --db="/data" \
+      --gasPrice="10000000000" \
+      --host="0.0.0.0" \
+      --mnemonic="$ETH_MNEMONIC" \
+      --networkId="4447" \
+      --port="8545" \
+       > ganache.log &
+    bash wait-for.sh localhost:8545 2> /dev/null
+  fi
+  touch address-book.json
+  node migrate-contracts.js
+else
+  echo "Exiting. No command given, expected: start or deploy"
+fi
diff --git a/ops/migrate-contracts.js b/ops/ethprovider/migrate-contracts.js
similarity index 96%
rename from ops/migrate-contracts.js
rename to ops/ethprovider/migrate-contracts.js
index 25964c7335..e442342ef2 100644
--- a/ops/migrate-contracts.js
+++ b/ops/ethprovider/migrate-contracts.js
@@ -15,15 +15,15 @@ console.log(`Core contracts: ${JSON.stringify(coreContracts)}`);
 const artifacts = {}
 for (const contract of coreContracts) {
   try {
-    artifacts[contract] = require(`@connext/cf-adjudicator-contracts/build/${contract}.json`)
+    artifacts[contract] = require(`./cf-adjudicator-contracts/build/${contract}.json`)
     console.log(`Imported adjudicator contract: ${contract}`)
   } catch (e) {
-    artifacts[contract] = require(`@connext/cf-funding-protocol-contracts/build/${contract}.json`)
+    artifacts[contract] = require(`./cf-funding-protocol-contracts/build/${contract}.json`)
     console.log(`Imported funding contract: ${contract}`)
   }
 }
 for (const contract of appContracts) {
-  artifacts[contract] = require(`../modules/contracts/build/${contract}.json`)
+  artifacts[contract] = require(`./contracts/build/${contract}.json`)
 }
 
 const { EtherSymbol, Zero } = eth.constants
@@ -67,7 +67,6 @@ const getSavedData = (contractName, property) => {
 // Write addressBook to disk
 const saveAddressBook = (addressBook) => {
   try {
-    fs.unlinkSync(addressBookPath)
     fs.writeFileSync(addressBookPath, JSON.stringify(addressBook,null,2))
   } catch (e) {
     console.log(`Error saving artifacts: ${e}`)
diff --git a/ops/ethprovider/package.json b/ops/ethprovider/package.json
new file mode 100644
index 0000000000..2485a9c422
--- /dev/null
+++ b/ops/ethprovider/package.json
@@ -0,0 +1,11 @@
+{
+	"name": "@connext/ethprovider",
+	"version": "1.0.0",
+	"devDependencies": {
+		"@connext/types": "1.3.10",
+		"ethers": "4.0.40",
+		"ganache-cli": "6.7.0",
+		"openzeppelin-solidity": "2.3.0",
+		"solc": "0.5.11"
+	}
+}
diff --git a/ops/payment-bot.sh b/ops/payment-bot.sh
index efa1b8d6f9..d080f8b415 100644
--- a/ops/payment-bot.sh
+++ b/ops/payment-bot.sh
@@ -37,33 +37,15 @@ while [ "$1" != "" ]; do
     shift
 done
 
-DB_FILENAME="${DB_FILENAME:-.payment-bot-db/$identifier.json}"
-ETH_RPC_URL="${ETH_RPC_URL:-http://172.17.0.1:8545}"
-NODE_URL="${NODE_URL:-nats://172.17.0.1:4222}"
-WEBDIS_URL="${REDIS_URL:-redis://172.17.0.1:6379}"
-PISA_URL="${PISA_URL:-http://172.17.0.1:5487}"
-PISA_CONTRACT_ADDRESS="${PISA_CONTRACT_ADDRESS:-0x0000000000000000000000000000000000000000}"
-
 # Damn I forget where I copy/pasted this witchcraft from, yikes.
 # It's supposed to find out whether we're calling this script from a shell & can print stuff
 # Or whether it's running in the background of another script and can't attach to a screen
 test -t 0 -a -t 1 -a -t 2 && interactive="--interactive"
 
-if [ -z "$mnemonic" ] && [ "$identifier" == 1 ]
-then
-  mnemonic="humble sense shrug young vehicle assault destroy cook property average silent travel"
-elif [ -z "$mnemonic" ] && [ "$identifier" == 2 ]
-then
-  mnemonic="roof traffic soul urge tenant credit protect conduct enable animal cinnamon adult"
-fi
-
 ########################################
 ## Launch payment bot
 
 docker run \
-  --entrypoint="bash" \
-  --env="DB_FILENAME=$DB_FILENAME" \
-  --env="ECCRYPTO_NO_FALLBACK=true" \
   --env="ETH_RPC_URL=$ETH_RPC_URL" \
   --env="MNEMONIC=$mnemonic" \
   --env="NODE_URL=$NODE_URL" \
@@ -74,13 +56,5 @@ docker run \
   --name="${project}_payment_bot_$identifier" \
   --rm \
   --tty \
-  --user="`id -u`:`id -g`" \
-  --volume="`pwd`:/root" \
-  --workdir="/root" \
-  ${project}_builder -c '
-    set -e
-    cd modules/payment-bot
-    mkdir -p ${DB_FILENAME%/*}
-    touch $DB_FILENAME
-    node dist/index.js '"$args"'
-  '
+  --volume="$cwd/.bot-store:/store" \
+  ${project}_bot "`id -u`:`id -g`" $args
diff --git a/ops/push-images.sh b/ops/push-images.sh
index 193053cc88..080fc21e5d 100644
--- a/ops/push-images.sh
+++ b/ops/push-images.sh
@@ -1,29 +1,41 @@
 #!/usr/bin/env bash
 set -e
 
-project="indra"
 organization="connextproject"
-
-registry=docker.io/$organization
+project="indra"
 registry_url="https://index.docker.io/v1/repositories/$organization"
-version="$1"
+
+commit=`git rev-parse HEAD | head -c 8`
+release=`cat package.json | grep '"version":' | awk -F '"' '{print $$4}'`
+
+version="$1" # one of "commit" or "release"
 shift
 images=$@
 
+if [[ "$version" == "commit" ]]
+then version=$commit
+elif [[ "$version" == "release" ]]
+then version=$release
+else echo 'First arg should either be "commit" or "release" followed by images to push' && exit 1
+fi
+
 function safePush {
   image=${project}_$1
-  echo;echo "Pushing $registry/$image:$version"
-  if [[ "$version" == "latest" ]]
-  then
-    docker tag $image:$version ${registry}/$image:$version
-    docker push $registry/$image:$version
-  elif [[ -n "`curl -sflL "$registry_url/$image/tags/$version"`" ]]
+  echo;echo "Pushing $organization/$image:$version"
+  if [[ -n "`curl -sflL "$registry_url/$image/tags/$version"`" ]]
   then
-    echo "Image $registry/$image:$version already exists on docker hub, Aborting push"
+    echo "Image $organization/$image:$version already exists on docker hub, Aborting push"
     return
   else
-    docker tag $image:latest ${registry}/$image:$version
-    docker push $registry/$image:$version
+    # latest -> commit -> release (we shouldn't ever use latest image to directly tag release)
+    if [[ "$version" == "$commit" ]]
+    then docker tag $image:latest $organization/$image:$version
+    else docker tag $image:$commit $organization/$image:$version
+    fi
+    docker push $organization/$image:$version
+    # latest images are used as cache for build steps, keep them up-to-date
+    docker tag $organization/$image:$version $organization/$image:latest
+    docker push $organization/$image:latest
   fi
 }
 
diff --git a/ops/ssh-action/Dockerfile b/ops/ssh-action/Dockerfile
new file mode 100644
index 0000000000..3af53a0771
--- /dev/null
+++ b/ops/ssh-action/Dockerfile
@@ -0,0 +1,4 @@
+FROM alpine:3.10
+RUN apk add bash openssh
+COPY entry.sh /entry.sh
+ENTRYPOINT ["bash", "/entry.sh"]
diff --git a/ops/ssh-action/action.yml b/ops/ssh-action/action.yml
new file mode 100644
index 0000000000..f6d1342c11
--- /dev/null
+++ b/ops/ssh-action/action.yml
@@ -0,0 +1,17 @@
+name: 'SSH Action'
+description: 'Run a command on a remote server via SSH'
+inputs:
+  SSH_KEY:
+    description: 'SSH private key'
+    required: true
+  HOST:
+    description: 'user@domainname:port of server to connect to'
+    required: true
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
+  args:
+    - ${{ inputs.HOST }}
+    - ${{ inputs.SSH_KEY }}
+    - ${{ inputs.CMD }}
+
diff --git a/ops/ssh-action/entry.sh b/ops/ssh-action/entry.sh
new file mode 100644
index 0000000000..b4e5b1fde7
--- /dev/null
+++ b/ops/ssh-action/entry.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+set -e -o pipefail
+
+HOST="$1"
+SSH_KEY="$2"
+CMD="$3"
+
+SSH_DIR="$HOME/.ssh"
+KEY_FILE="$SSH_DIR/id_rsa"
+KEY_FOOTER='-----END RSA PRIVATE KEY-----'
+KEY_HEADER='-----BEGIN RSA PRIVATE KEY-----'
+
+echo "ssh-action activated!"
+echo "Executing command \"$CMD\" on host $HOST"
+
+mkdir -p $SSH_DIR
+rm -f $KEY_FILE $SSH_DIR/known_hosts
+touch $KEY_FILE $SSH_DIR/known_hosts
+
+# Env vars strip out newlines so a naively loaded ssh key will be improperly formatted
+# Replace any existing header/footers with manually added ones that include proper newlines
+echo $KEY_HEADER >> $KEY_FILE
+echo $SSH_KEY | sed "s/$KEY_HEADER//" | sed "s/$KEY_FOOTER//" | tr -d '\n ' >> $KEY_FILE
+echo >> $KEY_FILE
+echo $KEY_FOOTER >> $KEY_FILE
+chmod 400 $KEY_FILE
+
+# Manually substitute env var values into CMD
+subbed_cmd=$CMD
+for var in `env`;
+do
+  if [[ "$var" == *"|"* ]]
+  then echo "Warning, env var ${var%=*} contains a | character, skipping" && continue
+  fi
+  subbed_cmd="`echo $subbed_cmd | sed 's|$'"${var%=*}"'|'"${var#*=}"'|g'`"
+done
+
+echo "Loaded ssh key with fingerprint:"
+ssh-keygen -lf $KEY_FILE
+
+exec ssh -i $KEY_FILE -o StrictHostKeyChecking=no $HOST "bash -s" <<EOF
+  set -e;
+  # Run CMD in an up-to-date indra repo
+  git clone https://github.com/ConnextProject/indra.git || true;
+  cd indra;
+  git fetch --all --prune --tags;
+  $subbed_cmd
+  exit;
+EOF
diff --git a/ops/start-dev.sh b/ops/start-dev.sh
index cc49e8bdd6..e5a3b48d9f 100644
--- a/ops/start-dev.sh
+++ b/ops/start-dev.sh
@@ -49,7 +49,7 @@ pg_user="$project"
 builder_image="${project}_builder"
 ui_image="$builder_image"
 database_image="postgres:9-alpine"
-ethprovider_image="trufflesuite/ganache-cli:v6.4.5"
+ethprovider_image="${project}_ethprovider"
 nats_image="nats:2.0.0-linux"
 node_image="$builder_image"
 proxy_image="${project}_proxy:dev"
@@ -197,7 +197,9 @@ services:
 
   ethprovider:
     image: $ethprovider_image
-    command: ["--db=/data", "--mnemonic=$eth_mnemonic", "--networkId=4447", "-b 15"]
+    command: "start"
+    environment:
+      ETH_MNEMONIC: $eth_mnemonic
     networks:
       - $project
     ports:
diff --git a/ops/start-prod.sh b/ops/start-prod.sh
index 1e8a077b52..ea6b137fb9 100644
--- a/ops/start-prod.sh
+++ b/ops/start-prod.sh
@@ -4,8 +4,6 @@ set -e
 # turn on swarm mode if it's not already on
 docker swarm init 2> /dev/null || true
 
-registry="docker.io/connextproject"
-
 ####################
 # External Env Vars
 
@@ -15,7 +13,7 @@ INDRA_DOMAINNAME="${INDRA_DOMAINNAME:-localhost}"
 INDRA_EMAIL="${INDRA_EMAIL:-noreply@gmail.com}" # for notifications when ssl certs expire
 INDRA_ETH_PROVIDER="${INDRA_ETH_PROVIDER}"
 INDRA_LOGDNA_KEY="${INDRA_LOGDNA_KEY:-abc123}"
-INDRA_MODE="${INDRA_MODE:-staging}" # set to "prod" to use versioned docker images
+INDRA_MODE="${INDRA_MODE:-staging}" # One of: release, staging, test
 INDRA_ADMIN_TOKEN="${INDRA_ADMIN_TOKEN:-cxt1234}" # pass this in through CI
 
 ####################
@@ -76,6 +74,37 @@ pg_password_file="/run/secrets/$db_secret"
 pg_port="5432"
 pg_user="$project"
 
+redis_url="redis://redis:6379"
+
+########################################
+## Docker Image Config
+
+registry="docker.io/connextproject"
+
+if [[ "$INDRA_MODE" == "test" || "$INDRA_MODE" == "staging" ]]
+then version="`git rev-parse HEAD | head -c 8`"
+elif [[ "$INDRA_MODE" == "prod" ]]
+then version="`cat package.json | jq .version | tr -d '"'`"
+else echo "Unknown mode ($INDRA_MODE) for domain: $INDRA_DOMAINNAME. Aborting" && exit 1
+fi
+
+ethprovider_image="$registry/${project}_ethprovider:$version"
+database_image="$registry/${project}_database:$version"
+logdna_image="logdna/logspout:1.2.0"
+nats_image="nats:2.0.0-linux"
+node_image="$registry/${project}_node:$version"
+proxy_image="$registry/${project}_proxy:$version"
+redis_image="redis:5-alpine"
+relay_image="$registry/${project}_relay:$version"
+
+pull_if_unavailable "$database_image"
+pull_if_unavailable "$logdna_image"
+pull_if_unavailable "$nats_image"
+pull_if_unavailable "$node_image"
+pull_if_unavailable "$proxy_image"
+pull_if_unavailable "$redis_image"
+pull_if_unavailable "$relay_image"
+
 ########################################
 ## Ethereum Config
 
@@ -94,64 +123,34 @@ elif [[ "$chainId" == "4" ]]
 then eth_network_name="rinkeby"
 elif [[ "$chainId" == "42" ]]
 then eth_network_name="kovan"
-elif [[ "$chainId" == "$ganache_chain_id" && "$INDRA_MODE" == "test" ]]
+elif [[ "$chainId" == "$ganache_chain_id" ]]
 then
   eth_network_name="ganache"
   eth_mnemonic="candy maple cake sugar pudding cream honey rich smooth crumble sweet treat"
   eth_mnemonic_name="${project}_mnemonic_$eth_network_name"
   new_secret "$eth_mnemonic_name" "$eth_mnemonic"
   eth_volume="chain_dev:"
-  ethprovider_image="trufflesuite/ganache-cli:v6.4.5"
-  pull_if_unavailable "$ethprovider_image"
   number_of_services=$(( $number_of_services + 1 ))
   ethprovider_service="
   ethprovider:
-    command: [\"--db=/data\", \"--mnemonic=$eth_mnemonic\", \"--networkId=$ganache_chain_id\"]
     image: $ethprovider_image
+    command: \"start\"
+    environment:
+      ETH_MNEMONIC: $eth_mnemonic
     ports:
       - 8545:8545
     volumes:
       - $eth_volume/data
   "
   INDRA_ETH_PROVIDER="http://ethprovider:8545"
+  pull_if_unavailable "$ethprovider_image"
+  bash ops/deploy-contracts.sh ganache $version
 else echo "Eth network \"$chainId\" is not supported for $INDRA_MODE-mode deployments" && exit 1
 fi
 
 eth_mnemonic_name="${project}_mnemonic_$eth_network_name"
 eth_contract_addresses="`cat address-book.json | tr -d ' \n\r'`"
 
-########################################
-## Docker Image Config
-
-redis_url="redis://redis:6379"
-
-database_image="postgres:9-alpine"
-nats_image="nats:2.0.0-linux"
-redis_image="redis:5-alpine"
-pull_if_unavailable "$database_image"
-pull_if_unavailable "$nats_image"
-pull_if_unavailable "$redis_image"
-if [[ "$INDRA_DOMAINNAME" != "localhost" ]]
-then
-  if [[ "$INDRA_MODE" == "prod" ]]
-  then version="`cat package.json | jq .version | tr -d '"'`"
-  elif [[ "$INDRA_MODE" == "staging" ]]
-  then version="latest"
-  else echo "Unknown mode ($INDRA_MODE) for domain: $INDRA_DOMAINNAME. Aborting" && exit 1
-  fi
-  database_image="$registry/${project}_database:$version"
-  node_image="$registry/${project}_node:$version"
-  proxy_image="$registry/${project}_proxy:$version"
-  relay_image="$registry/${project}_relay:$version"
-  pull_if_unavailable "$database_image"
-  pull_if_unavailable "$node_image"
-  pull_if_unavailable "$proxy_image"
-  pull_if_unavailable "$relay_image"
-else # local/testing mode, don't use images from registry
-  node_image="${project}_node:latest"
-  proxy_image="${project}_proxy:latest"
-  relay_image="${project}_relay:latest"
-fi
 
 ########################################
 ## Deploy according to configuration
@@ -264,7 +263,7 @@ services:
       - "6379:6379"
 
   logdna:
-    image: logdna/logspout:latest
+    image: $logdna_image
     environment:
       LOGDNA_KEY: $INDRA_LOGDNA_KEY
     volumes:
diff --git a/ops/test-bot-farm.sh b/ops/test-bot-farm.sh
index c7aaae42db..269739508b 100644
--- a/ops/test-bot-farm.sh
+++ b/ops/test-bot-farm.sh
@@ -1,5 +1,5 @@
 #!/user/bin/env bash
-set -e
+set -e -o pipefail
 
 # Turn on swarm mode if it's not already on
 docker swarm init 2> /dev/null || true
@@ -17,6 +17,10 @@ eth_rpc="${ETH_RPC_URL:-http://localhost:8545}"
 sugar_daddy="candy maple cake sugar pudding cream honey rich smooth crumble sweet treat"
 divider="\n########################################"
 
+if [[ ! -d "./node_modules/ethers" || ! -d "./node_modules/openzeppelin-solidity" ]]
+then npm i --no-save ethers openzeppelin-solidity
+fi
+
 ########################################
 ## Helper Functions
 
@@ -26,7 +30,7 @@ function cleanup {
   echo "Shutting down recipient bots: $botIds"
   if [[ -n "$botIds" ]]
   then echo "$botIds" | xargs docker container stop
-  else echo "nvmd none are running" && exit 0
+  else echo "nvmd none are running"
   fi
 }
 trap cleanup EXIT SIGINT
diff --git a/ops/test-bot.sh b/ops/test-bot.sh
index f201021612..6d137519c2 100644
--- a/ops/test-bot.sh
+++ b/ops/test-bot.sh
@@ -7,10 +7,7 @@ divider="\n########################################"
 
 id="xpub6DXwZMmWUq4bRZ3LtaBYwu47XV4Td19pnngok2Y7DnRzcCJSKCmD1AcLJDbZZf5dzZpvHqYzmRaKf7Gd2MV9qDvWwwN7VpBPNXQCZCbfyoK"
 
-# hardcode the mnemonics to the prefunded ones found in
-# `migrate-contracts.js`
-mnemonic1="humble sense shrug young vehicle assault destroy cook property average silent travel"
-mnemonic2="roof traffic soul urge tenant credit protect conduct enable animal cinnamon adult"
+# mnemonics are hard-coded in the payment boy entry.sh (same as funded ones in migrate-contracts.js)
 
 # Generate some random hex chunks to use in link payments
 # For regular links
@@ -63,35 +60,35 @@ touch $recipientLog $senderLog
 checkInstalledApps
 
 echo -e "$divider";echo "Requesting eth collateral for recipient bot"
-bash ops/payment-bot.sh -i 1 -q -m "$mnemonic1" | tee -a $recipientLog
+bash ops/payment-bot.sh -i 1 -q | tee -a $recipientLog
 
 echo -e "$divider";echo "Requesting token collateral for recipient bot"
-bash ops/payment-bot.sh -i 1 -q -a -m "$mnemonic1" | tee -a $recipientLog
+bash ops/payment-bot.sh -i 1 -q -a | tee -a $recipientLog
 
 echo -e "$divider";echo "Depositing eth into sender bot"
-bash ops/payment-bot.sh -i 2 -d 0.1 -m "$mnemonic2" | tee -a $senderLog
+bash ops/payment-bot.sh -i 2 -d 0.1 | tee -a $senderLog
 
 echo -e "$divider";echo "Depositing tokens into sender bot"
-bash ops/payment-bot.sh -i 2 -d 0.1 -a -m "$mnemonic2" | tee -a $senderLog
+bash ops/payment-bot.sh -i 2 -d 0.1 -a | tee -a $senderLog
 
 echo -e "$divider";echo "Removing sender's state to trigger a restore"
-rm modules/payment-bot/.payment-bot-db/2.json
+rm -f modules/payment-bot/.payment-bot-db/2.json
 bash ops/payment-bot.sh -i 2 | tee -a $senderLog
 
 echo -e "$divider";echo "Skipping sync transfer tests for now.."
 #echo -e "$divider";echo "Starting recipient bot in background, waiting for payments"
 #rm -f ops/recipient-bot.log
-#bash ops/payment-bot.sh -i 1 -a $tokenAddress -m "$mnemonic1" -o &> ops/recipient-bot.log &
+#bash ops/payment-bot.sh -i 1 -a $tokenAddress -o &> ops/recipient-bot.log &
 #sleep 3 # give recipient a sec to get set up
 #echo -e "$divider";echo "Sending eth to recipient bot"
-#bash ops/payment-bot.sh -i 2 -t 0.025 -c $id -m "$mnemonic2"
+#bash ops/payment-bot.sh -i 2 -t 0.025 -c $id 
 #echo -e "$divider";echo "Sending tokens to recipient bot"
-#bash ops/payment-bot.sh -i 2 -t 0.05 -c $id -a $tokenAddress -m "$mnemonic2"
+#bash ops/payment-bot.sh -i 2 -t 0.05 -c $id -a $tokenAddress 
 #echo -e "$divider";echo "Stopping recipient listener so it can redeem a link payment"
 #cleanup
 
 echo -e "$divider";echo "Generating an async payment & leaving the sender running so it can uninstall the app after"
-bash ops/payment-bot.sh -i 2 -a -n 0.01 -c $id -p "$paymentId2" -h "$preImage2" -m "$mnemonic2" -o | tee -a $senderLog &
+bash ops/payment-bot.sh -i 2 -a -n 0.01 -c $id -p "$paymentId2" -h "$preImage2" -o | tee -a $senderLog &
 sleep 10
 
 echo -e "$divider";echo "Redeeming async payment"
@@ -103,11 +100,11 @@ cleanup
 checkInstalledApps
 
 echo -e "$divider";echo "Generating a link payment & leaving the sender running so it can uninstall the app after"
-bash ops/payment-bot.sh -i 2 -a -l 0.01 -p "$paymentId1" -h "$preImage1" -m "$mnemonic2" -o | tee -a $senderLog &
+bash ops/payment-bot.sh -i 2 -a -l 0.01 -p "$paymentId1" -h "$preImage1" -o | tee -a $senderLog &
 sleep 10
 
 echo -e "$divider";echo "Redeeming link payment"
-bash ops/payment-bot.sh -i 1 -a -y 0.01 -p "$paymentId1" -h "$preImage1" -m "$mnemonic1" | tee -a $recipientLog
+bash ops/payment-bot.sh -i 1 -a -y 0.01 -p "$paymentId1" -h "$preImage1" | tee -a $recipientLog
 
 echo -e "$divider";echo "Giving the sender a few seconds to finish uninstalling.."
 sleep 2
diff --git a/ops/test-ui.sh b/ops/test-ui.sh
index 075a31fcac..30c42b7461 100644
--- a/ops/test-ui.sh
+++ b/ops/test-ui.sh
@@ -5,7 +5,10 @@ project="indra"
 cypress="node_modules/.bin/cypress"
 ui="${1:-daicard}"
 
-# Make sure cypress is installed while we wait for the recipient bot to do it's thing
+# Make sure bare minimum dependencies are installed
+if [[ ! -f "$cypress" || ! -d "./node_modules/ethers" ]]
+then npm i --no-save bn.js cypress ethers openzeppelin-solidity
+fi
 $cypress install
 
 ########################################
diff --git a/package-lock.json b/package-lock.json
index edb6b41cb8..ecdc0be306 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9196,6 +9196,11 @@
 			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
 			"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
 		},
+		"detect-file": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+			"integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc="
+		},
 		"detect-indent": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz",
@@ -23566,6 +23571,14 @@
 				"fill-range": "^2.1.0"
 			}
 		},
+		"expand-tilde": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+			"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+			"requires": {
+				"homedir-polyfill": "^1.0.1"
+			}
+		},
 		"expect": {
 			"version": "24.9.0",
 			"resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
@@ -24247,157 +24260,17 @@
 				"path-exists": "^4.0.0"
 			}
 		},
-		"flat": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
-			"integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
-			"requires": {
-				"is-buffer": "~2.0.3"
-			}
-		},
-		"flat-cache": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-			"integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-			"requires": {
-				"flatted": "^2.0.0",
-				"rimraf": "2.6.3",
-				"write": "1.0.3"
-			},
-			"dependencies": {
-				"rimraf": {
-					"version": "2.6.3",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				}
-			}
-		},
-		"flatted": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
-			"integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="
-		},
-		"flatten": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
-			"integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg=="
-		},
-		"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==",
-			"requires": {
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.3.6"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-				},
-				"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==",
-					"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"
-					}
-				},
-				"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"
-					}
-				}
-			}
-		},
-		"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"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-				}
-			}
-		},
-		"for-in": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
-		},
-		"for-own": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-			"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-			"requires": {
-				"for-in": "^1.0.1"
-			}
-		},
-		"forever-agent": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-		},
-		"fork-ts-checker-webpack-plugin": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz",
-			"integrity": "sha512-zEhg7Hz+KhZlBhILYpXy+Beu96gwvkROWJiTXOCyOOMMrdBIRPvsBpBqgTI4jfJGrJXcqGwJR8zsBGDmzY0jsA==",
+		"findup-sync": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+			"integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
 			"requires": {
-				"babel-code-frame": "^6.22.0",
-				"chalk": "^2.4.1",
-				"chokidar": "^2.0.4",
-				"micromatch": "^3.1.10",
-				"minimatch": "^3.0.4",
-				"semver": "^5.6.0",
-				"tapable": "^1.0.0",
-				"worker-rpc": "^0.1.0"
+				"detect-file": "^1.0.0",
+				"is-glob": "^4.0.0",
+				"micromatch": "^3.0.4",
+				"resolve-dir": "^1.0.1"
 			},
 			"dependencies": {
-				"anymatch": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-					"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-					"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=",
-							"requires": {
-								"remove-trailing-separator": "^1.0.1"
-							}
-						}
-					}
-				},
 				"arr-diff": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -24435,25 +24308,6 @@
 						}
 					}
 				},
-				"chokidar": {
-					"version": "2.1.8",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-					"integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-					"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": "2.6.9",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -24599,25 +24453,6 @@
 						}
 					}
 				},
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-					"requires": {
-						"is-glob": "^3.1.0",
-						"path-dirname": "^1.0.0"
-					},
-					"dependencies": {
-						"is-glob": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-							"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-							"requires": {
-								"is-extglob": "^2.1.0"
-							}
-						}
-					}
-				},
 				"is-accessor-descriptor": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
@@ -24714,54 +24549,524 @@
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
 					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-				},
-				"normalize-path": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-					"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
 				}
 			}
 		},
-		"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==",
+		"flat": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
+			"integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
 			"requires": {
-				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.6",
-				"mime-types": "^2.1.12"
+				"is-buffer": "~2.0.3"
 			}
 		},
-		"formidable": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz",
-			"integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg=="
-		},
-		"forwarded": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-			"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
-		},
-		"fragment-cache": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-			"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+		"flat-cache": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+			"integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
 			"requires": {
-				"map-cache": "^0.2.2"
+				"flatted": "^2.0.0",
+				"rimraf": "2.6.3",
+				"write": "1.0.3"
+			},
+			"dependencies": {
+				"rimraf": {
+					"version": "2.6.3",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+					"requires": {
+						"glob": "^7.1.3"
+					}
+				}
 			}
 		},
-		"fresh": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-			"integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+		"flatted": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
+			"integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="
 		},
-		"from2": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-			"integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+		"flatten": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
+			"integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg=="
+		},
+		"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==",
 			"requires": {
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.0"
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.3.6"
+			},
+			"dependencies": {
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+				},
+				"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==",
+					"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"
+					}
+				},
+				"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"
+					}
+				}
+			}
+		},
+		"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"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+				}
+			}
+		},
+		"for-in": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
+		},
+		"for-own": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+			"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+			"requires": {
+				"for-in": "^1.0.1"
+			}
+		},
+		"forever-agent": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+		},
+		"fork-ts-checker-webpack-plugin": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz",
+			"integrity": "sha512-zEhg7Hz+KhZlBhILYpXy+Beu96gwvkROWJiTXOCyOOMMrdBIRPvsBpBqgTI4jfJGrJXcqGwJR8zsBGDmzY0jsA==",
+			"requires": {
+				"babel-code-frame": "^6.22.0",
+				"chalk": "^2.4.1",
+				"chokidar": "^2.0.4",
+				"micromatch": "^3.1.10",
+				"minimatch": "^3.0.4",
+				"semver": "^5.6.0",
+				"tapable": "^1.0.0",
+				"worker-rpc": "^0.1.0"
+			},
+			"dependencies": {
+				"anymatch": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+					"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+					"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=",
+							"requires": {
+								"remove-trailing-separator": "^1.0.1"
+							}
+						}
+					}
+				},
+				"arr-diff": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+					"integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+				},
+				"array-unique": {
+					"version": "0.3.2",
+					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+					"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+				},
+				"braces": {
+					"version": "2.3.2",
+					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+					"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=",
+							"requires": {
+								"is-extendable": "^0.1.0"
+							}
+						}
+					}
+				},
+				"chokidar": {
+					"version": "2.1.8",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+					"integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+					"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": "2.6.9",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"requires": {
+						"ms": "2.0.0"
+					}
+				},
+				"expand-brackets": {
+					"version": "2.1.4",
+					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+					"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": {
+						"define-property": {
+							"version": "0.2.5",
+							"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+							"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+							"requires": {
+								"is-descriptor": "^0.1.0"
+							}
+						},
+						"extend-shallow": {
+							"version": "2.0.1",
+							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+							"requires": {
+								"is-extendable": "^0.1.0"
+							}
+						},
+						"is-accessor-descriptor": {
+							"version": "0.1.6",
+							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+							"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=",
+									"requires": {
+										"is-buffer": "^1.1.5"
+									}
+								}
+							}
+						},
+						"is-data-descriptor": {
+							"version": "0.1.4",
+							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+							"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=",
+									"requires": {
+										"is-buffer": "^1.1.5"
+									}
+								}
+							}
+						},
+						"is-descriptor": {
+							"version": "0.1.6",
+							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+							"requires": {
+								"is-accessor-descriptor": "^0.1.6",
+								"is-data-descriptor": "^0.1.4",
+								"kind-of": "^5.0.0"
+							}
+						},
+						"kind-of": {
+							"version": "5.1.0",
+							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+						}
+					}
+				},
+				"extglob": {
+					"version": "2.0.4",
+					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+					"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=",
+							"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=",
+							"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=",
+					"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=",
+							"requires": {
+								"is-extendable": "^0.1.0"
+							}
+						}
+					}
+				},
+				"glob-parent": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+					"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+					"requires": {
+						"is-glob": "^3.1.0",
+						"path-dirname": "^1.0.0"
+					},
+					"dependencies": {
+						"is-glob": {
+							"version": "3.1.0",
+							"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+							"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+							"requires": {
+								"is-extglob": "^2.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==",
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-buffer": {
+					"version": "1.1.6",
+					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+					"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+				},
+				"is-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==",
+					"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==",
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
+					}
+				},
+				"is-extglob": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+				},
+				"is-glob": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+					"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+					"requires": {
+						"is-extglob": "^2.1.1"
+					}
+				},
+				"is-number": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+					"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=",
+							"requires": {
+								"is-buffer": "^1.1.5"
+							}
+						}
+					}
+				},
+				"isobject": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+					"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+				},
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+				},
+				"micromatch": {
+					"version": "3.1.10",
+					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+					"requires": {
+						"arr-diff": "^4.0.0",
+						"array-unique": "^0.3.2",
+						"braces": "^2.3.1",
+						"define-property": "^2.0.2",
+						"extend-shallow": "^3.0.2",
+						"extglob": "^2.0.4",
+						"fragment-cache": "^0.2.1",
+						"kind-of": "^6.0.2",
+						"nanomatch": "^1.2.9",
+						"object.pick": "^1.3.0",
+						"regex-not": "^1.0.0",
+						"snapdragon": "^0.8.1",
+						"to-regex": "^3.0.2"
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+				},
+				"normalize-path": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+					"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+				}
+			}
+		},
+		"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=="
+		},
+		"forwarded": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+			"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+		},
+		"fragment-cache": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+			"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+			"requires": {
+				"map-cache": "^0.2.2"
+			}
+		},
+		"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=",
+			"requires": {
+				"inherits": "^2.0.1",
+				"readable-stream": "^2.0.0"
 			},
 			"dependencies": {
 				"isarray": {
@@ -25417,13 +25722,13 @@
 			"dependencies": {
 				"ansi-regex": {
 					"version": "4.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
 					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
 					"dev": true
 				},
 				"ansi-styles": {
 					"version": "3.2.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
 					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
 					"dev": true,
 					"requires": {
@@ -25432,7 +25737,7 @@
 				},
 				"bindings": {
 					"version": "1.5.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
 					"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
 					"dev": true,
 					"requires": {
@@ -25441,7 +25746,7 @@
 				},
 				"bip66": {
 					"version": "1.1.5",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz",
 					"integrity": "sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI=",
 					"dev": true,
 					"requires": {
@@ -25450,19 +25755,19 @@
 				},
 				"bn.js": {
 					"version": "4.11.8",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
 					"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
 					"dev": true
 				},
 				"brorand": {
 					"version": "1.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
 					"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
 					"dev": true
 				},
 				"browserify-aes": {
 					"version": "1.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
 					"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
 					"dev": true,
 					"requires": {
@@ -25476,25 +25781,25 @@
 				},
 				"buffer-from": {
 					"version": "1.1.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
 					"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
 					"dev": true
 				},
 				"buffer-xor": {
 					"version": "1.0.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
 					"integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
 					"dev": true
 				},
 				"camelcase": {
 					"version": "5.3.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
 					"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
 					"dev": true
 				},
 				"cipher-base": {
 					"version": "1.0.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
 					"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
 					"dev": true,
 					"requires": {
@@ -25504,7 +25809,7 @@
 				},
 				"cliui": {
 					"version": "5.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
 					"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
 					"dev": true,
 					"requires": {
@@ -25515,7 +25820,7 @@
 				},
 				"color-convert": {
 					"version": "1.9.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
 					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
 					"dev": true,
 					"requires": {
@@ -25524,13 +25829,13 @@
 				},
 				"color-name": {
 					"version": "1.1.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
 					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
 					"dev": true
 				},
 				"create-hash": {
 					"version": "1.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
 					"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
 					"dev": true,
 					"requires": {
@@ -25543,7 +25848,7 @@
 				},
 				"create-hmac": {
 					"version": "1.1.7",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
 					"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
 					"dev": true,
 					"requires": {
@@ -25557,7 +25862,7 @@
 				},
 				"cross-spawn": {
 					"version": "6.0.5",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
 					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
 					"dev": true,
 					"requires": {
@@ -25570,13 +25875,13 @@
 				},
 				"decamelize": {
 					"version": "1.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
 					"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
 					"dev": true
 				},
 				"drbg.js": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz",
 					"integrity": "sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs=",
 					"dev": true,
 					"requires": {
@@ -25587,7 +25892,7 @@
 				},
 				"elliptic": {
 					"version": "6.5.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz",
 					"integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==",
 					"dev": true,
 					"requires": {
@@ -25602,13 +25907,13 @@
 				},
 				"emoji-regex": {
 					"version": "7.0.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
 					"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
 					"dev": true
 				},
 				"end-of-stream": {
 					"version": "1.4.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
 					"integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
 					"dev": true,
 					"requires": {
@@ -25617,7 +25922,7 @@
 				},
 				"ethereumjs-util": {
 					"version": "6.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz",
 					"integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==",
 					"dev": true,
 					"requires": {
@@ -25632,7 +25937,7 @@
 				},
 				"ethjs-util": {
 					"version": "0.1.6",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz",
 					"integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==",
 					"dev": true,
 					"requires": {
@@ -25642,7 +25947,7 @@
 				},
 				"evp_bytestokey": {
 					"version": "1.0.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
 					"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
 					"dev": true,
 					"requires": {
@@ -25652,7 +25957,7 @@
 				},
 				"execa": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
 					"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
 					"dev": true,
 					"requires": {
@@ -25667,13 +25972,13 @@
 				},
 				"file-uri-to-path": {
 					"version": "1.0.0",
-					"resolved": false,
+					"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
 				},
 				"find-up": {
 					"version": "3.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
 					"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
 					"dev": true,
 					"requires": {
@@ -25682,13 +25987,13 @@
 				},
 				"get-caller-file": {
 					"version": "2.0.5",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
 					"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
 					"dev": true
 				},
 				"get-stream": {
 					"version": "4.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
 					"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
 					"dev": true,
 					"requires": {
@@ -25697,7 +26002,7 @@
 				},
 				"hash-base": {
 					"version": "3.0.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
 					"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
 					"dev": true,
 					"requires": {
@@ -25707,7 +26012,7 @@
 				},
 				"hash.js": {
 					"version": "1.1.7",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
 					"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
 					"dev": true,
 					"requires": {
@@ -25717,7 +26022,7 @@
 				},
 				"hmac-drbg": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
 					"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
 					"dev": true,
 					"requires": {
@@ -25728,43 +26033,43 @@
 				},
 				"inherits": {
 					"version": "2.0.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
 					"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
 					"dev": true
 				},
 				"invert-kv": {
 					"version": "2.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
 					"integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
 					"dev": true
 				},
 				"is-fullwidth-code-point": {
 					"version": "2.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
 					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
 					"dev": true
 				},
 				"is-hex-prefixed": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz",
 					"integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=",
 					"dev": true
 				},
 				"is-stream": {
 					"version": "1.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
 					"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
 					"dev": true
 				},
 				"isexe": {
 					"version": "2.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
 					"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
 					"dev": true
 				},
 				"keccak": {
 					"version": "1.4.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/keccak/-/keccak-1.4.0.tgz",
 					"integrity": "sha512-eZVaCpblK5formjPjeTBik7TAg+pqnDrMHIffSvi9Lh7PQgM1+hSzakUeZFCk9DVVG0dacZJuaz2ntwlzZUIBw==",
 					"dev": true,
 					"requires": {
@@ -25776,7 +26081,7 @@
 				},
 				"lcid": {
 					"version": "2.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
 					"integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
 					"dev": true,
 					"requires": {
@@ -25785,7 +26090,7 @@
 				},
 				"locate-path": {
 					"version": "3.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
 					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
 					"dev": true,
 					"requires": {
@@ -25795,7 +26100,7 @@
 				},
 				"map-age-cleaner": {
 					"version": "0.1.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
 					"integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
 					"dev": true,
 					"requires": {
@@ -25804,7 +26109,7 @@
 				},
 				"md5.js": {
 					"version": "1.3.5",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
 					"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
 					"dev": true,
 					"requires": {
@@ -25815,7 +26120,7 @@
 				},
 				"mem": {
 					"version": "4.3.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
 					"integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
 					"dev": true,
 					"requires": {
@@ -25826,37 +26131,37 @@
 				},
 				"mimic-fn": {
 					"version": "2.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
 					"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
 					"dev": true
 				},
 				"minimalistic-assert": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
 					"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
 					"dev": true
 				},
 				"minimalistic-crypto-utils": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
 					"integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
 					"dev": true
 				},
 				"nan": {
 					"version": "2.14.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
 					"integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
 					"dev": true
 				},
 				"nice-try": {
 					"version": "1.0.5",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
 					"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
 					"dev": true
 				},
 				"npm-run-path": {
 					"version": "2.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
 					"integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
 					"dev": true,
 					"requires": {
@@ -25865,7 +26170,7 @@
 				},
 				"once": {
 					"version": "1.4.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
 					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
 					"dev": true,
 					"requires": {
@@ -25874,7 +26179,7 @@
 				},
 				"os-locale": {
 					"version": "3.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
 					"integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
 					"dev": true,
 					"requires": {
@@ -25885,25 +26190,25 @@
 				},
 				"p-defer": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
 					"integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
 					"dev": true
 				},
 				"p-finally": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
 					"integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
 					"dev": true
 				},
 				"p-is-promise": {
 					"version": "2.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
 					"integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
 					"dev": true
 				},
 				"p-limit": {
 					"version": "2.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
 					"integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
 					"dev": true,
 					"requires": {
@@ -25912,7 +26217,7 @@
 				},
 				"p-locate": {
 					"version": "3.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
 					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
 					"dev": true,
 					"requires": {
@@ -25921,25 +26226,25 @@
 				},
 				"p-try": {
 					"version": "2.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
 					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
 					"dev": true
 				},
 				"path-exists": {
 					"version": "3.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
 					"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
 					"dev": true
 				},
 				"path-key": {
 					"version": "2.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
 					"integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
 					"dev": true
 				},
 				"pump": {
 					"version": "3.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
 					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
 					"dev": true,
 					"requires": {
@@ -25949,19 +26254,19 @@
 				},
 				"require-directory": {
 					"version": "2.1.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
 					"integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
 					"dev": true
 				},
 				"require-main-filename": {
 					"version": "2.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
 					"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
 					"dev": true
 				},
 				"ripemd160": {
 					"version": "2.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
 					"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
 					"dev": true,
 					"requires": {
@@ -25971,7 +26276,7 @@
 				},
 				"rlp": {
 					"version": "2.2.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.3.tgz",
 					"integrity": "sha512-l6YVrI7+d2vpW6D6rS05x2Xrmq8oW7v3pieZOJKBEdjuTF4Kz/iwk55Zyh1Zaz+KOB2kC8+2jZlp2u9L4tTzCQ==",
 					"dev": true,
 					"requires": {
@@ -25981,13 +26286,13 @@
 				},
 				"safe-buffer": {
 					"version": "5.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
 					"integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
 					"dev": true
 				},
 				"secp256k1": {
 					"version": "3.7.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.7.1.tgz",
 					"integrity": "sha512-1cf8sbnRreXrQFdH6qsg2H71Xw91fCCS9Yp021GnUNJzWJS/py96fS4lHbnTnouLp08Xj6jBoBB6V78Tdbdu5g==",
 					"dev": true,
 					"requires": {
@@ -26003,19 +26308,19 @@
 				},
 				"semver": {
 					"version": "5.7.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
 					"integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
 					"dev": true
 				},
 				"set-blocking": {
 					"version": "2.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
 					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
 					"dev": true
 				},
 				"sha.js": {
 					"version": "2.4.11",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
 					"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
 					"dev": true,
 					"requires": {
@@ -26025,7 +26330,7 @@
 				},
 				"shebang-command": {
 					"version": "1.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
 					"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
 					"dev": true,
 					"requires": {
@@ -26034,25 +26339,25 @@
 				},
 				"shebang-regex": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
 					"integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
 					"dev": true
 				},
 				"signal-exit": {
 					"version": "3.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
 					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
 					"dev": true
 				},
 				"source-map": {
 					"version": "0.6.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
 					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 					"dev": true
 				},
 				"source-map-support": {
 					"version": "0.5.12",
-					"resolved": false,
+					"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": {
@@ -26062,7 +26367,7 @@
 				},
 				"string-width": {
 					"version": "3.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
 					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
 					"dev": true,
 					"requires": {
@@ -26073,7 +26378,7 @@
 				},
 				"strip-ansi": {
 					"version": "5.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
 					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
 					"dev": true,
 					"requires": {
@@ -26082,13 +26387,13 @@
 				},
 				"strip-eof": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
 					"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
 					"dev": true
 				},
 				"strip-hex-prefix": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz",
 					"integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=",
 					"dev": true,
 					"requires": {
@@ -26097,7 +26402,7 @@
 				},
 				"which": {
 					"version": "1.3.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
 					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
 					"dev": true,
 					"requires": {
@@ -26106,13 +26411,13 @@
 				},
 				"which-module": {
 					"version": "2.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
 					"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
 					"dev": true
 				},
 				"wrap-ansi": {
 					"version": "5.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
 					"integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
 					"dev": true,
 					"requires": {
@@ -26123,19 +26428,19 @@
 				},
 				"wrappy": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
 					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
 					"dev": true
 				},
 				"y18n": {
 					"version": "4.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
 					"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
 					"dev": true
 				},
 				"yargs": {
 					"version": "13.2.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
 					"integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
 					"dev": true,
 					"requires": {
@@ -26154,7 +26459,7 @@
 				},
 				"yargs-parser": {
 					"version": "13.1.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
 					"integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
 					"dev": true,
 					"requires": {
@@ -40078,6 +40383,14 @@
 				"react-is": "^16.7.0"
 			}
 		},
+		"homedir-polyfill": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+			"integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+			"requires": {
+				"parse-passwd": "^1.0.0"
+			}
+		},
 		"hosted-git-info": {
 			"version": "2.8.5",
 			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
@@ -46302,6 +46615,11 @@
 				"json-parse-better-errors": "^1.0.1"
 			}
 		},
+		"parse-passwd": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+			"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY="
+		},
 		"parse-path": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/parse-path/-/parse-path-4.0.1.tgz",
@@ -48337,6 +48655,48 @@
 						}
 					}
 				},
+				"acorn": {
+					"version": "6.4.0",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
+					"integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw=="
+				},
+				"arr-diff": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+					"integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+				},
+				"array-unique": {
+					"version": "0.3.2",
+					"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+					"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+				},
+				"braces": {
+					"version": "2.3.2",
+					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+					"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=",
+							"requires": {
+								"is-extendable": "^0.1.0"
+							}
+						}
+					}
+				},
 				"css-loader": {
 					"version": "2.1.1",
 					"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz",
@@ -48360,6 +48720,160 @@
 					"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
 					"integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w=="
 				},
+				"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==",
+					"requires": {
+						"esrecurse": "^4.1.0",
+						"estraverse": "^4.1.1"
+					}
+				},
+				"expand-brackets": {
+					"version": "2.1.4",
+					"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+					"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+					"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==",
+							"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=",
+							"requires": {
+								"is-descriptor": "^0.1.0"
+							}
+						},
+						"extend-shallow": {
+							"version": "2.0.1",
+							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+							"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+							"requires": {
+								"is-extendable": "^0.1.0"
+							}
+						},
+						"is-accessor-descriptor": {
+							"version": "0.1.6",
+							"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+							"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+							"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=",
+									"requires": {
+										"is-buffer": "^1.1.5"
+									}
+								}
+							}
+						},
+						"is-data-descriptor": {
+							"version": "0.1.4",
+							"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+							"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+							"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=",
+									"requires": {
+										"is-buffer": "^1.1.5"
+									}
+								}
+							}
+						},
+						"is-descriptor": {
+							"version": "0.1.6",
+							"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+							"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+							"requires": {
+								"is-accessor-descriptor": "^0.1.6",
+								"is-data-descriptor": "^0.1.4",
+								"kind-of": "^5.0.0"
+							}
+						},
+						"kind-of": {
+							"version": "5.1.0",
+							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+							"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+						}
+					}
+				},
+				"extglob": {
+					"version": "2.0.4",
+					"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+					"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+					"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=",
+							"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=",
+							"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=",
+					"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=",
+							"requires": {
+								"is-extendable": "^0.1.0"
+							}
+						}
+					}
+				},
 				"fs-extra": {
 					"version": "7.0.1",
 					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
@@ -48376,6 +48890,60 @@
 					"integrity": "sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==",
 					"optional": 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==",
+					"requires": {
+						"kind-of": "^6.0.0"
+					}
+				},
+				"is-buffer": {
+					"version": "1.1.6",
+					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+					"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+				},
+				"is-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==",
+					"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==",
+					"requires": {
+						"is-accessor-descriptor": "^1.0.0",
+						"is-data-descriptor": "^1.0.0",
+						"kind-of": "^6.0.2"
+					}
+				},
+				"is-number": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+					"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=",
+							"requires": {
+								"is-buffer": "^1.1.5"
+							}
+						}
+					}
+				},
+				"isobject": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+					"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+				},
 				"jsonfile": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -48384,6 +48952,36 @@
 						"graceful-fs": "^4.1.6"
 					}
 				},
+				"kind-of": {
+					"version": "6.0.2",
+					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+					"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+				},
+				"micromatch": {
+					"version": "3.1.10",
+					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+					"requires": {
+						"arr-diff": "^4.0.0",
+						"array-unique": "^0.3.2",
+						"braces": "^2.3.1",
+						"define-property": "^2.0.2",
+						"extend-shallow": "^3.0.2",
+						"extglob": "^2.0.4",
+						"fragment-cache": "^0.2.1",
+						"kind-of": "^6.0.2",
+						"nanomatch": "^1.2.9",
+						"object.pick": "^1.3.0",
+						"regex-not": "^1.0.0",
+						"snapdragon": "^0.8.1",
+						"to-regex": "^3.0.2"
+					}
+				},
+				"ms": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+				},
 				"normalize-path": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -48420,6 +49018,36 @@
 					"version": "6.3.0",
 					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
 					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+				},
+				"webpack": {
+					"version": "4.41.0",
+					"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.0.tgz",
+					"integrity": "sha512-yNV98U4r7wX1VJAj5kyMsu36T8RPPQntcb5fJLOsMz/pt/WrKC0Vp1bAlqPLkA1LegSwQwf6P+kAbyhRKVQ72g==",
+					"requires": {
+						"@webassemblyjs/ast": "1.8.5",
+						"@webassemblyjs/helper-module-context": "1.8.5",
+						"@webassemblyjs/wasm-edit": "1.8.5",
+						"@webassemblyjs/wasm-parser": "1.8.5",
+						"acorn": "^6.2.1",
+						"ajv": "^6.10.2",
+						"ajv-keywords": "^3.4.1",
+						"chrome-trace-event": "^1.0.2",
+						"enhanced-resolve": "^4.1.0",
+						"eslint-scope": "^4.0.3",
+						"json-parse-better-errors": "^1.0.2",
+						"loader-runner": "^2.4.0",
+						"loader-utils": "^1.2.3",
+						"memory-fs": "^0.4.1",
+						"micromatch": "^3.1.10",
+						"mkdirp": "^0.5.1",
+						"neo-async": "^2.6.1",
+						"node-libs-browser": "^2.2.1",
+						"schema-utils": "^1.0.0",
+						"tapable": "^1.1.3",
+						"terser-webpack-plugin": "^1.4.1",
+						"watchpack": "^1.6.0",
+						"webpack-sources": "^1.4.1"
+					}
 				}
 			}
 		},
@@ -49279,6 +49907,39 @@
 				"resolve-from": "^3.0.0"
 			}
 		},
+		"resolve-dir": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+			"integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+			"requires": {
+				"expand-tilde": "^2.0.0",
+				"global-modules": "^1.0.0"
+			},
+			"dependencies": {
+				"global-modules": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+					"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+					"requires": {
+						"global-prefix": "^1.0.1",
+						"is-windows": "^1.0.1",
+						"resolve-dir": "^1.0.0"
+					}
+				},
+				"global-prefix": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+					"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+					"requires": {
+						"expand-tilde": "^2.0.2",
+						"homedir-polyfill": "^1.0.1",
+						"ini": "^1.3.4",
+						"is-windows": "^1.0.1",
+						"which": "^1.2.14"
+					}
+				}
+			}
+		},
 		"resolve-from": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
@@ -52455,6 +53116,63 @@
 				}
 			}
 		},
+		"ts-loader": {
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.1.tgz",
+			"integrity": "sha512-Dd9FekWuABGgjE1g0TlQJ+4dFUfYGbYcs52/HQObE0ZmUNjQlmLAS7xXsSzy23AMaMwipsx5sNHvoEpT2CZq1g==",
+			"requires": {
+				"chalk": "^2.3.0",
+				"enhanced-resolve": "^4.0.0",
+				"loader-utils": "^1.0.2",
+				"micromatch": "^4.0.0",
+				"semver": "^6.0.0"
+			},
+			"dependencies": {
+				"braces": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+					"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==",
+					"requires": {
+						"to-regex-range": "^5.0.1"
+					}
+				},
+				"is-number": {
+					"version": "7.0.0",
+					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+				},
+				"micromatch": {
+					"version": "4.0.2",
+					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+					"integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+					"requires": {
+						"braces": "^3.0.1",
+						"picomatch": "^2.0.5"
+					}
+				},
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+				},
+				"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==",
+					"requires": {
+						"is-number": "^7.0.0"
+					}
+				}
+			}
+		},
 		"ts-mocha": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/ts-mocha/-/ts-mocha-6.0.0.tgz",
@@ -54498,6 +55216,159 @@
 				}
 			}
 		},
+		"webpack-cli": {
+			"version": "3.3.10",
+			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.10.tgz",
+			"integrity": "sha512-u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg==",
+			"requires": {
+				"chalk": "2.4.2",
+				"cross-spawn": "6.0.5",
+				"enhanced-resolve": "4.1.0",
+				"findup-sync": "3.0.0",
+				"global-modules": "2.0.0",
+				"import-local": "2.0.0",
+				"interpret": "1.2.0",
+				"loader-utils": "1.2.3",
+				"supports-color": "6.1.0",
+				"v8-compile-cache": "2.0.3",
+				"yargs": "13.2.4"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+				},
+				"cliui": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+					"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+					"requires": {
+						"string-width": "^3.1.0",
+						"strip-ansi": "^5.2.0",
+						"wrap-ansi": "^5.1.0"
+					}
+				},
+				"emoji-regex": {
+					"version": "7.0.3",
+					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+					"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+				},
+				"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==",
+					"requires": {
+						"graceful-fs": "^4.1.2",
+						"memory-fs": "^0.4.0",
+						"tapable": "^1.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"
+					}
+				},
+				"is-fullwidth-code-point": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+				},
+				"locate-path": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+					"requires": {
+						"p-locate": "^3.0.0",
+						"path-exists": "^3.0.0"
+					}
+				},
+				"p-locate": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+					"requires": {
+						"p-limit": "^2.0.0"
+					}
+				},
+				"path-exists": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+					"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+				},
+				"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"
+					}
+				},
+				"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"
+					}
+				},
+				"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"
+					}
+				},
+				"v8-compile-cache": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
+					"integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w=="
+				},
+				"wrap-ansi": {
+					"version": "5.1.0",
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+					"integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+					"requires": {
+						"ansi-styles": "^3.2.0",
+						"string-width": "^3.0.0",
+						"strip-ansi": "^5.0.0"
+					}
+				},
+				"yargs": {
+					"version": "13.2.4",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
+					"integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
+					"requires": {
+						"cliui": "^5.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.1.0"
+					}
+				},
+				"yargs-parser": {
+					"version": "13.1.1",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+					"integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+					"requires": {
+						"camelcase": "^5.0.0",
+						"decamelize": "^1.2.0"
+					}
+				}
+			}
+		},
 		"webpack-dev-middleware": {
 			"version": "3.7.2",
 			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
diff --git a/package.json b/package.json
index 7c291b4d12..8a55bf1596 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@connext/indra",
-	"version": "2.3.18",
+	"version": "2.3.19",
 	"description": "",
 	"repository": {
 		"type": "git",