diff --git a/.dockerignore b/.dockerignore
index b77cda83..ac8bba96 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,6 +2,7 @@
 .github
 .idea
 logs
+certs
 *.log
 build
 assets
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 7522267e..3777601f 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +1,4 @@
 github: hunterlong
 patreon: statping
-custom: ['https://www.nfoservers.com/donate.pl?force_recipient=1&recipient=info%40socialeck.com', 'https://opencollective.com/statping', 'https://www.buymeacoffee.com/hunterlong']
+open_collective: statping
+custom: ['https://www.nfoservers.com/donate.pl?force_recipient=1&recipient=info%40socialeck.com', 'https://www.buymeacoffee.com/hunterlong']
diff --git a/.github/workflows/dev.yml b/.github/workflows/development.yml
similarity index 52%
rename from .github/workflows/dev.yml
rename to .github/workflows/development.yml
index 7ad19d81..cdf00ff4 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/development.yml
@@ -1,4 +1,4 @@
-name: Dev Release
+name: Development Build
 on:
   push:
     branches:
@@ -7,40 +7,46 @@ on:
       - '**.md'
 
 jobs:
-  compile:
+
+  frontend:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.2'
+          go-version: 1.15.x
       - uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
-      - uses: actions/checkout@v2
+          node-version: 12.18.2
 
-      - name: Add GOBIN to PATH
+      - name: Set Version
         run: |
           echo "::add-path::$(go env GOPATH)/bin"
           echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
       - name: Install Global Dependencies
-        run: npm install -g yarn sass cross-env
+        run: npm install -g yarn sass cross-env mjml
 
       - name: Download Frontend Dependencies
-        if: steps.nodecache.outputs.cache-hit != 'true'
         working-directory: ./frontend
         run: yarn
 
       - name: Download Go mods
-        if: steps.golangcache.outputs.cache-hit != 'true'
         run: |
           go mod download
           go mod verify
           make test-deps
 
       - name: Build Frontend Statping
-        run: make clean compile
+        env:
+          VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
+          MJML_APP: ${{ secrets.MJML_APP }}
+          MJML_PRIVATE: ${{ secrets.MJML_PRIVATE }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        run: make clean generate compile
 
       - name: Upload Compiled Frontend (rice-box.go)
         uses: actions/upload-artifact@v1
@@ -48,10 +54,145 @@ jobs:
           name: static-rice-box
           path: ./source
 
-  test:
-    needs: compile
-    runs-on: ubuntu-latest
+      - name: Configure AWS credentials for Asset uploads
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-west-2
 
+      - name: Upload Static Assets to S3
+        run: |
+          tar -czvf source.tar.gz source/
+          aws s3 cp source.tar.gz s3://assets.statping.com/commit/${{ github.sha }}/
+          rm -rf source.tar.gz
+
+  build:
+    needs: frontend
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [linux]
+        arch: [386, amd64, arm-7, arm-6, arm64]
+        include:
+          - platform: darwin
+            arch: amd64
+          - platform: windows
+            arch: amd64
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Download Compiled Frontend (rice-box.go)
+        uses: actions/download-artifact@v1
+        with:
+          name: static-rice-box
+          path: ./source
+
+      - name: Configure AWS credentials for Asset uploads
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-west-2
+
+      - name: Add GOBIN to PATH
+        run: |
+          echo ::set-env name=VERSION::$(cat version.txt)
+        shell: bash
+
+      - name: Set Linux Build Flags
+        if: matrix.platform == 'linux'
+        run: |
+          echo ::set-env name=BUILD_FLAGS::'-extldflags -static'
+          echo ::set-env name=XGO_TAGS::'netgo,osusergo,linux,sqlite_omit_load_extension'
+        shell: bash
+
+      - name: Set Darwin Build Flags
+        if: matrix.platform == 'darwin'
+        run: echo ::set-env name=XGO_TAGS::'netgo,osusergo,darwin,sqlite_omit_load_extension'
+        shell: bash
+
+      - name: Set Windows Build Flags
+        if: matrix.platform == 'windows'
+        run: |
+          echo ::set-env name=BUILD_FLAGS::'-extldflags -static'
+          echo ::set-env name=XGO_TAGS::'netgo,osusergo,sqlite_omit_load_extension'
+        shell: bash
+
+      - name: Build ${{ matrix.platform }}/${{ matrix.arch }}
+        uses: crazy-max/ghaction-xgo@v1
+        env:
+          VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
+        with:
+          xgo_version: latest
+          go_version: 1.15.x
+          dest: build
+          prefix: statping
+          targets: ${{ matrix.platform }}/${{ matrix.arch }}
+          v: false
+          x: false
+          pkg: cmd
+          buildmode: pie
+          tags: ${{ env.XGO_TAGS }}
+          ldflags: -s -w -X main.VERSION=${{ env.VERSION }} -X main.COMMIT=${{ env.COMMIT }} ${{ env.BUILD_FLAGS }}
+
+      - name: Compress Linux Builds
+        if: matrix.platform == 'linux'
+        run: |
+          cd build
+          mv statping-linux-${{ matrix.arch }} statping
+          chmod +x statping
+          tar -czvf statping-linux-${{ matrix.arch }}.tar.gz statping
+          rm -rf statping
+          echo ::set-env name=compressed::statping-linux-${{ matrix.arch }}.tar.gz
+
+      - name: Compress Windows Builds
+        if: matrix.platform == 'windows'
+        run: |
+          cd build
+          mv statping-windows-4.0-${{ matrix.arch }}.exe statping.exe
+          chmod +x statping.exe
+          zip statping-windows-${{ matrix.arch }}.zip statping.exe
+          rm -rf statping.exe
+          echo ::set-env name=compressed::statping-windows-${{ matrix.arch }}.zip
+
+      - name: Compress Darwin Builds
+        if: matrix.platform == 'darwin'
+        run: |
+          cd build
+          mv statping-darwin-10.6-${{ matrix.arch }} statping
+          chmod +x statping
+          tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping
+          rm -rf statping
+          echo ::set-env name=compressed::statping-darwin-${{ matrix.arch }}.tar.gz
+
+      - name: Upload Compiled Statping Binary
+        uses: actions/upload-artifact@v1
+        with:
+          name: statping-${{ matrix.platform }}-${{ matrix.arch }}
+          path: ./build
+
+      - name: Upload Releases
+        id: upload-assets
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VERSION: ${{ env.VERSION }}
+        with:
+          tag_name: dev-v${{ env.VERSION }}
+          draft: true
+          prerelease: true
+          files: build/${{ env.compressed }}
+
+      - name: Upload Compiled Binaries to S3
+        run: |
+          aws s3 cp build/${{ env.compressed }} s3://assets.statping.com/commit/${{ github.sha }}/
+
+  test:
+    needs: frontend
+    runs-on: ubuntu-latest
     services:
       postgres:
         image: postgres:10.8
@@ -73,13 +214,13 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
+      - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.2'
+          go-version: 1.15.x
       - uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
-      - uses: actions/checkout@v2
+          node-version: 12.18.2
 
       - name: Install Global Dependencies
         run: npm install -g yarn sass newman cross-env wait-on @sentry/cli
@@ -87,7 +228,7 @@ jobs:
       - name: Setting ENV's
         run: |
           echo "::add-path::$(go env GOPATH)/bin"
-          echo "::add-path::/opt/hostedtoolcache/node/10.20.1/x64/bin"
+          echo "::add-path::/opt/hostedtoolcache/node/12.18.2/x64/bin"
           echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
@@ -100,6 +241,7 @@ jobs:
       - name: Install Statping
         env:
           VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
         run: |
           make build certs
           chmod +x statping
@@ -111,11 +253,13 @@ jobs:
           gotestsum --no-summary=skipped --format dots -- -covermode=count -coverprofile=coverage.out -p=1 ./...
         env:
           VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
           DB_CONN: sqlite3
           STATPING_DIR: ${{ github.workspace }}
           API_SECRET: demopassword123
           DISABLE_LOGS: false
           ALLOW_REPORTS: true
+          SAMPLE_DATA: true
           COVERALLS: ${{ secrets.COVERALLS }}
           DISCORD_URL: ${{ secrets.DISCORD_URL }}
           EMAIL_HOST: ${{ secrets.EMAIL_HOST }}
@@ -136,6 +280,12 @@ jobs:
           TWILIO_FROM: ${{ secrets.TWILIO_FROM }}
           TWILIO_TO: ${{ secrets.TWILIO_TO }}
           TEST_EMAIL: ${{ secrets.TEST_EMAIL }}
+          GOTIFY_URL: ${{ secrets.GOTIFY_URL }}
+          GOTIFY_TOKEN: ${{ secrets.GOTIFY_TOKEN }}
+          SNS_TOKEN: ${{ secrets.SNS_TOKEN }}
+          SNS_SECRET: ${{ secrets.SNS_SECRET }}
+          SNS_REGION: ${{ secrets.SNS_REGION }}
+          SNS_TOPIC: ${{ secrets.SNS_TOPIC }}
 
       - name: Coveralls Testing Coverage
         run: |
@@ -145,18 +295,18 @@ jobs:
           COVERALLS: ${{ secrets.COVERALLS }}
 
   test-postman-sqlite:
-    needs: compile
+    needs: frontend
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.2'
+          go-version: 1.15.x
 
       - name: Setting ENV's
         run: |
           echo "::add-path::$(go env GOPATH)/bin"
-          echo "::add-path::/opt/hostedtoolcache/node/10.20.1/x64/bin"
+          echo "::add-path::/opt/hostedtoolcache/node/12.18.2/x64/bin"
           echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
@@ -169,16 +319,15 @@ jobs:
       - name: Install Statping
         env:
           VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
         run: |
           make build
           chmod +x statping
           mv statping $(go env GOPATH)/bin/
-
       - name: Run Statping
         run: |
           API_SECRET=demosecret123 statping --port=8585 > /dev/null &
           sleep 5
-
       - name: Postman SQLite Tests
         uses: matt-ball/newman-action@master
         with:
@@ -189,7 +338,7 @@ jobs:
           delayRequest: 600
 
   test-postman-mysql:
-    needs: compile
+    needs: frontend
     runs-on: ubuntu-latest
 
     services:
@@ -206,12 +355,12 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.2'
+          go-version: 1.15.x
 
       - name: Setting ENV's
         run: |
           echo "::add-path::$(go env GOPATH)/bin"
-          echo "::add-path::/opt/hostedtoolcache/node/10.20.1/x64/bin"
+          echo "::add-path::/opt/hostedtoolcache/node/12.18.2/x64/bin"
           echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
@@ -224,16 +373,17 @@ jobs:
       - name: Install Statping
         env:
           VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
+          MJML_APP: ${{ secrets.MJML_APP }}
+          MJML_PRIVATE: ${{ secrets.MJML_PRIVATE }}
         run: |
           make build
           chmod +x statping
           mv statping $(go env GOPATH)/bin/
-
       - name: Run Statping
         run: |
           API_SECRET=demosecret123 statping --port=8585 > /dev/null &
           sleep 5
-
       - name: Postman MySQL Tests
         uses: matt-ball/newman-action@master
         with:
@@ -244,7 +394,7 @@ jobs:
           delayRequest: 600
 
   test-postman-postgres:
-    needs: compile
+    needs: frontend
     runs-on: ubuntu-latest
 
     services:
@@ -262,12 +412,12 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.2'
+          go-version: 1.15.x
 
       - name: Setting ENV's
         run: |
           echo "::add-path::$(go env GOPATH)/bin"
-          echo "::add-path::/opt/hostedtoolcache/node/10.20.1/x64/bin"
+          echo "::add-path::/opt/hostedtoolcache/node/12.18.2/x64/bin"
           echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
@@ -280,16 +430,15 @@ jobs:
       - name: Install Statping
         env:
           VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
         run: |
           make build
           chmod +x statping
           mv statping $(go env GOPATH)/bin/
-
       - name: Run Statping
         run: |
           API_SECRET=demosecret123 statping --port=8585 > /dev/null &
           sleep 5
-
       - name: Postman Postgres Tests
         uses: matt-ball/newman-action@master
         with:
@@ -300,7 +449,7 @@ jobs:
           delayRequest: 600
 
   docker-release:
-    needs: [test, test-postman-sqlite, test-postman-mysql, test-postman-postgres]
+    needs: [test, build, test-postman-sqlite, test-postman-mysql, test-postman-postgres]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Statping Repo
@@ -310,25 +459,47 @@ jobs:
         run: echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
-      - name: Base Docker Image
-        uses: elgohr/Publish-Docker-Github-Action@master
-        with:
-          name: statping/statping
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          dockerfile: Dockerfile.base
-          tags: "base"
+      - name: Set up Docker Buildx
+        uses: crazy-max/ghaction-docker-buildx@v3
 
-      - name: Dev Docker Image
-        uses: elgohr/Publish-Docker-Github-Action@master
+      - name: Docker Login
         env:
-          VERSION: ${{ env.VERSION }}
-          ARCH: amd64
-          DOCKER_CLI_EXPERIMENTAL: enabled
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        id: buildx-docker-master
         with:
-          name: statping/statping
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          dockerfile: Dockerfile
-          tags: "dev"
-          buildargs: VERSION,ARCH
+          path: /tmp/.buildx-cache
+          key: buildx-docker-master
+          restore-keys: |
+            buildx-docker-master
+      - name: Docker Build :base
+        run: make buildx-base
+
+      - name: Docker Build :dev
+        run: make buildx-dev
+
+  sentry-release:
+    needs: [test, test-postman-sqlite, test-postman-postgres, test-postman-mysql]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Statping Repo
+        uses: actions/checkout@v2
+
+      - name: Setup Sentry CLI
+        uses: mathrix-education/setup-sentry-cli@master
+        with:
+          version: latest
+          url: ${{ secrets.SENTRY_URL }}
+          token: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          organization: statping
+
+      - name: Setting ENV's
+        run: echo ::set-env name=VERSION::$(cat version.txt)
+        shell: bash
+
+      - name: Sentry Release
+        run: make sentry-release
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 38fbb862..002ba915 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -1,4 +1,4 @@
-name: Master Release
+name: Master Build
 on:
   push:
     branches:
@@ -7,40 +7,46 @@ on:
       - '**.md'
 
 jobs:
-  compile:
+
+  frontend:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.2'
+          go-version: 1.15.x
       - uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
-      - uses: actions/checkout@v2
+          node-version: 12.18.2
 
-      - name: Add GOBIN to PATH
+      - name: Set Version
         run: |
           echo "::add-path::$(go env GOPATH)/bin"
           echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
       - name: Install Global Dependencies
-        run: npm install -g yarn sass cross-env
+        run: npm install -g yarn sass cross-env mjml
 
       - name: Download Frontend Dependencies
-        if: steps.nodecache.outputs.cache-hit != 'true'
         working-directory: ./frontend
         run: yarn
 
       - name: Download Go mods
-        if: steps.golangcache.outputs.cache-hit != 'true'
         run: |
           go mod download
           go mod verify
           make test-deps
 
       - name: Build Frontend Statping
-        run: make clean compile
+        env:
+          VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
+          MJML_APP: ${{ secrets.MJML_APP }}
+          MJML_PRIVATE: ${{ secrets.MJML_PRIVATE }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        run: make clean generate compile
 
       - name: Upload Compiled Frontend (rice-box.go)
         uses: actions/upload-artifact@v1
@@ -48,10 +54,145 @@ jobs:
           name: static-rice-box
           path: ./source
 
-  test:
-    needs: compile
-    runs-on: ubuntu-latest
+      - name: Configure AWS credentials for Asset uploads
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-west-2
 
+      - name: Upload Static Assets to S3
+        run: |
+          tar -czvf source.tar.gz source/
+          aws s3 cp source.tar.gz s3://assets.statping.com/commit/${{ github.sha }}/
+          rm -rf source.tar.gz
+
+  build:
+    needs: frontend
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [linux]
+        arch: [386, amd64, arm-7, arm-6, arm64]
+        include:
+          - platform: darwin
+            arch: amd64
+          - platform: windows
+            arch: amd64
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Download Compiled Frontend (rice-box.go)
+        uses: actions/download-artifact@v1
+        with:
+          name: static-rice-box
+          path: ./source
+
+      - name: Configure AWS credentials for Asset uploads
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-west-2
+
+      - name: Add GOBIN to PATH
+        run: |
+          echo ::set-env name=VERSION::$(cat version.txt)
+        shell: bash
+
+      - name: Set Linux Build Flags
+        if: matrix.platform == 'linux'
+        run: |
+          echo ::set-env name=BUILD_FLAGS::'-extldflags -static'
+          echo ::set-env name=XGO_TAGS::'netgo,osusergo,linux,sqlite_omit_load_extension'
+        shell: bash
+
+      - name: Set Darwin Build Flags
+        if: matrix.platform == 'darwin'
+        run: echo ::set-env name=XGO_TAGS::'netgo,osusergo,darwin,sqlite_omit_load_extension'
+        shell: bash
+
+      - name: Set Windows Build Flags
+        if: matrix.platform == 'windows'
+        run: |
+          echo ::set-env name=BUILD_FLAGS::'-extldflags -static'
+          echo ::set-env name=XGO_TAGS::'netgo,osusergo,sqlite_omit_load_extension'
+        shell: bash
+
+      - name: Build ${{ matrix.platform }}/${{ matrix.arch }}
+        uses: crazy-max/ghaction-xgo@v1
+        env:
+          VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
+        with:
+          xgo_version: latest
+          go_version: 1.15.x
+          dest: build
+          prefix: statping
+          targets: ${{ matrix.platform }}/${{ matrix.arch }}
+          v: false
+          x: false
+          pkg: cmd
+          buildmode: pie
+          tags: ${{ env.XGO_TAGS }}
+          ldflags: -s -w -X main.VERSION=${{ env.VERSION }} -X main.COMMIT=${{ env.COMMIT }} ${{ env.BUILD_FLAGS }}
+
+      - name: Compress Linux Builds
+        if: matrix.platform == 'linux'
+        run: |
+          cd build
+          mv statping-linux-${{ matrix.arch }} statping
+          chmod +x statping
+          tar -czvf statping-linux-${{ matrix.arch }}.tar.gz statping
+          rm -rf statping
+          echo ::set-env name=compressed::statping-linux-${{ matrix.arch }}.tar.gz
+
+      - name: Compress Windows Builds
+        if: matrix.platform == 'windows'
+        run: |
+          cd build
+          mv statping-windows-4.0-${{ matrix.arch }}.exe statping.exe
+          chmod +x statping.exe
+          zip statping-windows-${{ matrix.arch }}.zip statping.exe
+          rm -rf statping.exe
+          echo ::set-env name=compressed::statping-windows-${{ matrix.arch }}.zip
+
+      - name: Compress Darwin Builds
+        if: matrix.platform == 'darwin'
+        run: |
+          cd build
+          mv statping-darwin-10.6-${{ matrix.arch }} statping
+          chmod +x statping
+          tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping
+          rm -rf statping
+          echo ::set-env name=compressed::statping-darwin-${{ matrix.arch }}.tar.gz
+
+      - name: Upload Compiled Statping Binary
+        uses: actions/upload-artifact@v1
+        with:
+          name: statping-${{ matrix.platform }}-${{ matrix.arch }}
+          path: ./build
+
+      - name: Upload Releases
+        id: upload-assets
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VERSION: ${{ env.VERSION }}
+        with:
+          tag_name: v${{ env.VERSION }}
+          draft: true
+          prerelease: true
+          files: build/${{ env.compressed }}
+
+      - name: Upload Compiled Binaries to S3
+        run: |
+          aws s3 cp build/${{ env.compressed }} s3://assets.statping.com/commit/${{ github.sha }}/
+
+  test:
+    needs: frontend
+    runs-on: ubuntu-latest
     services:
       postgres:
         image: postgres:10.8
@@ -73,13 +214,13 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
+      - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.2'
+          go-version: 1.15.x
       - uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
-      - uses: actions/checkout@v2
+          node-version: 12.18.2
 
       - name: Install Global Dependencies
         run: npm install -g yarn sass newman cross-env wait-on @sentry/cli
@@ -87,7 +228,7 @@ jobs:
       - name: Setting ENV's
         run: |
           echo "::add-path::$(go env GOPATH)/bin"
-          echo "::add-path::/opt/hostedtoolcache/node/10.20.1/x64/bin"
+          echo "::add-path::/opt/hostedtoolcache/node/12.18.2/x64/bin"
           echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
@@ -100,6 +241,7 @@ jobs:
       - name: Install Statping
         env:
           VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
         run: |
           make build certs
           chmod +x statping
@@ -111,11 +253,13 @@ jobs:
           gotestsum --no-summary=skipped --format dots -- -covermode=count -coverprofile=coverage.out -p=1 ./...
         env:
           VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
           DB_CONN: sqlite3
           STATPING_DIR: ${{ github.workspace }}
           API_SECRET: demopassword123
           DISABLE_LOGS: false
           ALLOW_REPORTS: true
+          SAMPLE_DATA: true
           COVERALLS: ${{ secrets.COVERALLS }}
           DISCORD_URL: ${{ secrets.DISCORD_URL }}
           EMAIL_HOST: ${{ secrets.EMAIL_HOST }}
@@ -136,6 +280,12 @@ jobs:
           TWILIO_FROM: ${{ secrets.TWILIO_FROM }}
           TWILIO_TO: ${{ secrets.TWILIO_TO }}
           TEST_EMAIL: ${{ secrets.TEST_EMAIL }}
+          GOTIFY_URL: ${{ secrets.GOTIFY_URL }}
+          GOTIFY_TOKEN: ${{ secrets.GOTIFY_TOKEN }}
+          SNS_TOKEN: ${{ secrets.SNS_TOKEN }}
+          SNS_SECRET: ${{ secrets.SNS_SECRET }}
+          SNS_REGION: ${{ secrets.SNS_REGION }}
+          SNS_TOPIC: ${{ secrets.SNS_TOPIC }}
 
       - name: Coveralls Testing Coverage
         run: |
@@ -145,18 +295,18 @@ jobs:
           COVERALLS: ${{ secrets.COVERALLS }}
 
   test-postman-sqlite:
-    needs: compile
+    needs: frontend
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.2'
+          go-version: 1.15.x
 
       - name: Setting ENV's
         run: |
           echo "::add-path::$(go env GOPATH)/bin"
-          echo "::add-path::/opt/hostedtoolcache/node/10.20.1/x64/bin"
+          echo "::add-path::/opt/hostedtoolcache/node/12.18.2/x64/bin"
           echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
@@ -169,16 +319,15 @@ jobs:
       - name: Install Statping
         env:
           VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
         run: |
           make build
           chmod +x statping
           mv statping $(go env GOPATH)/bin/
-
       - name: Run Statping
         run: |
           API_SECRET=demosecret123 statping --port=8585 > /dev/null &
           sleep 5
-
       - name: Postman SQLite Tests
         uses: matt-ball/newman-action@master
         with:
@@ -189,7 +338,7 @@ jobs:
           delayRequest: 600
 
   test-postman-mysql:
-    needs: compile
+    needs: frontend
     runs-on: ubuntu-latest
 
     services:
@@ -206,12 +355,12 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.2'
+          go-version: 1.15.x
 
       - name: Setting ENV's
         run: |
           echo "::add-path::$(go env GOPATH)/bin"
-          echo "::add-path::/opt/hostedtoolcache/node/10.20.1/x64/bin"
+          echo "::add-path::/opt/hostedtoolcache/node/12.18.2/x64/bin"
           echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
@@ -224,16 +373,17 @@ jobs:
       - name: Install Statping
         env:
           VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
+          MJML_APP: ${{ secrets.MJML_APP }}
+          MJML_PRIVATE: ${{ secrets.MJML_PRIVATE }}
         run: |
           make build
           chmod +x statping
           mv statping $(go env GOPATH)/bin/
-
       - name: Run Statping
         run: |
           API_SECRET=demosecret123 statping --port=8585 > /dev/null &
           sleep 5
-
       - name: Postman MySQL Tests
         uses: matt-ball/newman-action@master
         with:
@@ -244,7 +394,7 @@ jobs:
           delayRequest: 600
 
   test-postman-postgres:
-    needs: compile
+    needs: frontend
     runs-on: ubuntu-latest
 
     services:
@@ -262,12 +412,12 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.2'
+          go-version: 1.15.x
 
       - name: Setting ENV's
         run: |
           echo "::add-path::$(go env GOPATH)/bin"
-          echo "::add-path::/opt/hostedtoolcache/node/10.20.1/x64/bin"
+          echo "::add-path::/opt/hostedtoolcache/node/12.18.2/x64/bin"
           echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
@@ -280,16 +430,15 @@ jobs:
       - name: Install Statping
         env:
           VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
         run: |
           make build
           chmod +x statping
           mv statping $(go env GOPATH)/bin/
-
       - name: Run Statping
         run: |
           API_SECRET=demosecret123 statping --port=8585 > /dev/null &
           sleep 5
-
       - name: Postman Postgres Tests
         uses: matt-ball/newman-action@master
         with:
@@ -299,110 +448,8 @@ jobs:
           timeoutRequest: 30000
           delayRequest: 600
 
-  build-binaries:
-    needs: compile
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '1.14.2'
-      - uses: actions/checkout@v2
-
-      - name: Install cross compiling libraries
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y automake autogen build-essential ca-certificates libsqlite3-dev \
-          gcc-5-arm-linux-gnueabi g++-5-arm-linux-gnueabi libc6-dev-armel-cross linux-headers-generic \
-          gcc-5-arm-linux-gnueabihf g++-5-arm-linux-gnueabihf libc6-dev-armhf-cross            \
-          gcc-5-aarch64-linux-gnu g++-5-aarch64-linux-gnu libc6-dev-arm64-cross                \
-          gcc-5-mips-linux-gnu g++-5-mips-linux-gnu libc6-dev-mips-cross                       \
-          gcc-5-mipsel-linux-gnu g++-5-mipsel-linux-gnu libc6-dev-mipsel-cross                 \
-          gcc-5-mips64-linux-gnuabi64 g++-5-mips64-linux-gnuabi64 libc6-dev-mips64-cross       \
-          gcc-5-mips64el-linux-gnuabi64 g++-5-mips64el-linux-gnuabi64 libc6-dev-mips64el-cross \
-          gcc-5-multilib g++-5-multilib gcc-mingw-w64 g++-mingw-w64 clang llvm-dev             \
-          gcc-6-arm-linux-gnueabi g++-6-arm-linux-gnueabi libc6-dev-armel-cross                \
-          gcc-6-arm-linux-gnueabihf g++-6-arm-linux-gnueabihf libc6-dev-armhf-cross            \
-          gcc-6-aarch64-linux-gnu g++-6-aarch64-linux-gnu libc6-dev-arm64-cross                \
-          gcc-6-mips-linux-gnu g++-6-mips-linux-gnu libc6-dev-mips-cross                       \
-          gcc-6-mipsel-linux-gnu g++-6-mipsel-linux-gnu libc6-dev-mipsel-cross                 \
-          gcc-6-mips64-linux-gnuabi64 g++-6-mips64-linux-gnuabi64 libc6-dev-mips64-cross       \
-          gcc-6-mips64el-linux-gnuabi64 g++-6-mips64el-linux-gnuabi64 libc6-dev-mips64el-cross \
-          gcc-6-multilib gcc-7-multilib g++-6-multilib gcc-mingw-w64 g++-mingw-w64 clang llvm-dev \
-          libtool libxml2-dev uuid-dev libssl-dev swig openjdk-8-jdk pkg-config patch \
-          make xz-utils cpio wget zip unzip p7zip git mercurial bzr texinfo help2man cmake --no-install-recommends
-          sudo ln -s /usr/include/asm-generic/ /usr/include/asm
-
-      - name: Setting ENV's
-        run: |
-          echo "::add-path::$(go env GOPATH)/bin"
-          echo "::add-path::/opt/hostedtoolcache/node/10.20.1/x64/bin"
-          echo ::set-env name=VERSION::$(cat version.txt)
-        shell: bash
-
-      - name: Download Go mods
-        run: |
-          make test-deps
-
-      - name: Download Compiled Frontend (rice-box.go)
-        uses: actions/download-artifact@v1
-        with:
-          name: static-rice-box
-          path: ./source
-
-      - name: Build Binaries
-        env:
-          VERSION: ${{ env.VERSION }}
-          COMMIT: $GITHUB_SHA
-        run: make build-folders build-linux build-linux-arm build-darwin build-win compress-folders
-
-      - name: Upload Builds
-        uses: actions/upload-artifact@v1
-        with:
-          name: builds
-          path: ./build
-
-  upload-release:
-    needs: [test, test-postman-sqlite, test-postman-mysql, test-postman-postgres, build-binaries]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setting ENV's
-        run: |
-          echo "::add-path::$(go env GOPATH)/bin"
-          echo "::add-path::/opt/hostedtoolcache/node/10.20.1/x64/bin"
-          echo ::set-env name=VERSION::$(cat version.txt)
-        shell: bash
-
-      - name: Download Builds
-        uses: actions/download-artifact@v1
-        with:
-          name: builds
-          path: ./builds
-
-      - name: Upload Releases
-        id: upload-assets
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VERSION: ${{ env.VERSION }}
-        with:
-          tag_name: v${{ env.VERSION }}
-          draft: false
-          prerelease: true
-          files: |
-            builds/statping-linux-386.tar.gz
-            builds/statping-linux-amd64.tar.gz
-            builds/statping-linux-arm.tar.gz
-            builds/statping-linux-arm64.tar.gz
-            builds/statping-darwin-amd64.tar.gz
-            builds/statping-darwin-386.tar.gz
-            builds/statping-windows-386.zip
-            builds/statping-windows-amd64.zip
-            builds/statping-windows-arm.zip
-
   docker-release:
-    needs: upload-release
+    needs: [build, test, test-postman-sqlite, test-postman-postgres, test-postman-mysql]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Statping Repo
@@ -412,64 +459,53 @@ jobs:
         run: echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
-      - name: Base Docker Image
-        uses: elgohr/Publish-Docker-Github-Action@master
-        with:
-          name: statping/statping
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          dockerfile: Dockerfile.base
-          tags: "base"
+      - name: Set up Docker Buildx
+        uses: crazy-max/ghaction-docker-buildx@v3
 
-      - name: Latest/Version Docker Image
-        uses: elgohr/Publish-Docker-Github-Action@master
+      - name: Docker Login
         env:
-          VERSION: ${{ env.VERSION }}
-          ARCH: amd64
-          DOCKER_CLI_EXPERIMENTAL: enabled
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        id: buildx-docker
         with:
-          name: statping/statping
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          dockerfile: Dockerfile
-          tags: "latest,v${{ env.VERSION }}"
-          buildargs: VERSION,ARCH
+          path: /tmp/.buildx-cache
+          key: buildx-docker
+          restore-keys: |
+            buildx-docker
+      - name: Docker Build :base
+        run: make buildx-base
+
+      - name: Docker Build :lastest
+        run: make buildx-latest
 
   sentry-release:
-    needs: upload-release
+    needs: docker-release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Statping Repo
         uses: actions/checkout@v2
 
+      - name: Setup Sentry CLI
+        uses: mathrix-education/setup-sentry-cli@master
+        with:
+          version: latest
+          url: ${{ secrets.SENTRY_URL }}
+          token: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          organization: statping
+
       - name: Setting ENV's
         run: echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
-      - name: Sentry Backend Release
-        uses: tclindner/sentry-releases-action@v1.0.0
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_URL: ${{ secrets.SENTRY_URL }}
-          SENTRY_ORG: statping
-          SENTRY_PROJECT: backend
-        with:
-          tagName: v${{ env.VERSION }}
-          environment: production
-
-      - name: Sentry Frontend Release
-        uses: tclindner/sentry-releases-action@v1.0.0
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_URL: ${{ secrets.SENTRY_URL }}
-          SENTRY_ORG: statping
-          SENTRY_PROJECT: frontend
-        with:
-          tagName: v${{ env.VERSION }}
-          environment: production
+      - name: Sentry Release
+        run: make sentry-release
 
   homebrew-release:
-    needs: upload-release
+    needs: docker-release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Statping Repo
@@ -486,7 +522,7 @@ jobs:
         run: make publish-homebrew
 
   slack-update:
-    needs: upload-release
+    needs: docker-release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Statping Repo
@@ -497,7 +533,7 @@ jobs:
         shell: bash
 
       - name: Slack Notification
-        uses: rtCamp/action-slack-notify@v2.0.0
+        uses: rtCamp/action-slack-notify@master
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_URL }}
           SLACK_CHANNEL: dev
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 7602ac04..239851c8 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -5,9 +5,14 @@ on:
       - '*'         # matches every branch
       - '*/*'       # matches every branch containing a single '/'
       - '!master'   # excludes master
+      - '!dev'      # excludes dev
   pull_request:
     branches:
-      - dev
+      - '*'         # matches every branch
+      - '*/*'       # matches every branch containing a single '/'
+      - '!master'   # excludes master
+      - '!dev'      # excludes dev
+
 
 jobs:
   compile:
@@ -18,7 +23,7 @@ jobs:
           go-version: '1.14.2'
       - uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
+          node-version: '12.18.2'
       - uses: actions/checkout@v2
 
       - name: Add GOBIN to PATH
@@ -78,10 +83,10 @@ jobs:
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.2'
+          go-version: 1.15.x
       - uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
+          node-version: 12.18.2
       - uses: actions/checkout@v2
 
       - name: Install Global Dependencies
@@ -92,7 +97,7 @@ jobs:
       - name: Setting ENV's
         run: |
           echo "::add-path::$(go env GOPATH)/bin"
-          echo "::add-path::/opt/hostedtoolcache/node/10.20.1/x64/bin"
+          echo "::add-path::/opt/hostedtoolcache/node/12.18.2/x64/bin"
           echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
@@ -115,6 +120,7 @@ jobs:
           SASS=`which sass` gotestsum --no-summary=skipped --format dots -- -covermode=count -coverprofile=coverage.out -p=1 ./...
         env:
           VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
           DB_CONN: sqlite3
           STATPING_DIR: ${{ github.workspace }}
           API_SECRET: demopassword123
@@ -134,7 +140,7 @@ jobs:
       - name: Setting ENV's
         run: |
           echo "::add-path::$(go env GOPATH)/bin"
-          echo "::add-path::/opt/hostedtoolcache/node/10.20.1/x64/bin"
+          echo "::add-path::/opt/hostedtoolcache/node/12.18.2/x64/bin"
           echo ::set-env name=VERSION::$(cat version.txt)
         shell: bash
 
@@ -147,6 +153,7 @@ jobs:
       - name: Install Statping
         env:
           VERSION: ${{ env.VERSION }}
+          COMMIT: ${{ github.sha }}
         run: |
           make build
           chmod +x statping
diff --git a/.gitignore b/.gitignore
index a68fd1af..ccdb9205 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@ snap
 prime
 stage
 parts
+assets_backup
+certs
 releases
 core/rice-box.go
 config.yml
@@ -37,3 +39,4 @@ tmp
 /frontend/cypress/screenshots/
 /frontend/cypress/videos/
 services.yml
+statping.wiki
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf99f370..e6d693af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,97 @@
+# 0.90.69 (09-18-2020)
+- Fixed issue with service view not loading. #808 #811 #800
+
+# 0.90.68 (09-17-2020)
+- Added DB_DSN env for mysql, postgres or sqlite DSN database connection string
+- Added READ_ONLY env for a read only connection to the database
+- Added Custom OAuth OpenID toggle switch in settings (appends 'openid' in scope)
+- Fixed Custom OAuth response_type issue
+- Added Configs tab in Settings to edit the config.yml from frontend
+
+# 0.90.67 (09-14-2020)
+- Modified core settings to update config.yml on save
+- Modified Theme Editor to restart the HTTP router on create/delete (fixing 404's)
+
+# 0.90.66 (09-08-2020)
+- Added Import and Export views in Dashboard
+- Modified services list sparkline to use start/end of day timestamp
+- Modified i18n language files, added go generate script to automatically translate
+
+# 0.90.65 (09-01-2020)
+- Fixed issue with dashboard not logging in (notifier panic)
+- Modified static email templates to github.com/statping/emails
+- Modified Regenerate API function to keep API_SECRET env
+- Added DEMO_MODE env variable, if true, 'admin' cannot be deleted
+- Modified Service sparklines on Dashboard
+- Added modal popup for UI deletes/edits
+
+# 0.90.64 (08-18-2020)
+- Modified max-width for container to 1012px, larger UI
+- Added failure sparklines in the Services list view
+- Added "Update Available" alert on the top of Settings if new version is available
+- Added Version and Github Commit hash to left navigation on Settings page
+- Added "reason" for failures (will be used for more custom notification messages) [regex, lookup, timeout, connection, close, status_code]
+- Added Help page that is generated from Statping's Wiki repo on build
+- Modified Service Group failures on index page to show 90 days of failures
+- Modified Service view page, updated Latency and Ping charts, added failures below
+- Modified Service chart on index page to show ping data along with latency
+- Added AWS SNS Notifier
+- Modified dashboard services UI
+- Modified service.Failures API to include 32 failures (max)
+
+# 0.90.63 (08-17-2020)
+- Modified build process to use xgo for all arch builds
+- Modified Statping's Push Notifications server notifier to match with Firebase/gorush params
+
+# 0.90.62 (08-07-2020)
+- Added Notification logs
+- Fixed issues with Notifer After (x) failures for notifications
+- Modified notifications to not send on initial startup
+- Updated Incident UI
+- Added additional testing for notifications
+- Modified SCSS/SASS files to be generated from 1, main.scss to main.css
+- Modified index page to use /assets directory for assets, (main.css, style.css)
+- Modified index page to use CDN asset paths
+- Fixed New Checkin form
+- Modified email notifier template to be rendered from MJML (using go generate)
+- Modified database relationships with services using gorm
+- Modified "statping env" command to show user/group ID
+- Removed "js" folder when exporting assets, js files are always version of release, not static JS files
+
+# 0.90.61 (07-22-2020)
+- Modified sass layouts, organized and split up sections
+- Modified Checkins to seconds rather than milliseconds (for cronjob)
+- Modified Service View page to show data inside cards
+- Fixed issue with uptime_data sending incorrect start/end timestamps
+- Modified http cache to bypass if url has a "v" query param
+- Added "Static Services" (a fake service that requires you to update the online/offline status)
+- Added Update Static Service PATCH route (/api/services/{id})
+- Modified SASS api endpoints (base, layout, forms, mixins, mobile, variables)
+- Added additional testing
+- Modified node version from 10.x to 12.18.2
+- Modified Notifier's struct values to be NullString and NullInt to allow empty values
+- Added Search ability to Logs in UI
+- Fixed issue with Incidents and Checkins not being deleted once service is deleted
+
+# 0.90.60 (07-15-2020)
+- Added LETSENCRYPT_ENABLE (boolean) env to enable/disable letsencrypt SSL
+
+# 0.90.59 (07-14-2020)
+- Added LetsEncrypt SSL Generator by using LETSENCRYPT_HOST and LETSENCRYPT_EMAIL envs.
+- Modified JWT token key to be sha256 of API Secret
+- Modified github actions to build multi-arch Docker images
+- Added "update" command to install latest version
+- Fixed dashboard uptime_data API request to request correct start/time timestamp
+
+# 0.90.58 (07-09-2020)
+- Fixed ICMP latency/ping durations
+- Fixed webhook notifier
+- Modified file structure for Vue admin dashboard components.
+- Added Gotify notifier
+
+# 0.90.57 (07-04-2020)
+- Fixed login issue
+
 # 0.90.56 (06-25-2020)
 - Modified metrics now include service name for each service metric
 - Added switch for true/false notifier values
diff --git a/CloudronManifest.json b/CloudronManifest.json
new file mode 100644
index 00000000..7ae27752
--- /dev/null
+++ b/CloudronManifest.json
@@ -0,0 +1,19 @@
+{
+  "id": "com.statping",
+  "title": "Statping",
+  "author": "Hunter Long <info@statping.com>",
+  "description": "Monitor your web services and remote servers",
+  "tagline": "Server Monitoring",
+  "version": "0.90.61",
+  "healthCheckPath": "/health",
+  "httpPort": 8080,
+  "addons": {
+    "localstorage": {}
+  },
+  "manifestVersion": 2,
+  "website": "https://github.com/statping/statping",
+  "contactEmail": "info@statping.com",
+  "icon": "https://assets.statping.com/icon.png",
+  "tags": [ "monitoring", "uptime" ],
+  "mediaLinks": [ "https://assets.statping.com/cloudron.png" ]
+}s
diff --git a/Dockerfile b/Dockerfile
index a9846339..44866305 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,18 @@
 FROM statping/statping:base AS base
-
+ARG BUILDPLATFORM
 # Statping main Docker image that contains all required libraries
 FROM alpine:latest
 RUN apk --no-cache add libgcc libstdc++ ca-certificates curl jq && update-ca-certificates
 
 COPY --from=base /go/bin/statping /usr/local/bin/
-COPY --from=base /usr/local/bin/sass /usr/local/bin/
+COPY --from=base /root/sassc/bin/sassc /usr/local/bin/
 COPY --from=base /usr/local/share/ca-certificates /usr/local/share/
 
 WORKDIR /app
 VOLUME /app
 
 ENV IS_DOCKER=true
-ENV SASS=/usr/local/bin/sass
+ENV SASS=/usr/local/bin/sassc
 ENV STATPING_DIR=/app
 ENV PORT=8080
 
diff --git a/Dockerfile.base b/Dockerfile.base
index 90c349b3..44c8ccb5 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -1,5 +1,6 @@
-FROM node:10.17.0 AS frontend
-RUN npm install yarn -g
+FROM node:12.18.2-alpine AS frontend
+LABEL maintainer="Hunter Long (https://github.com/hunterlong)"
+ARG BUILDPLATFORM
 WORKDIR /statping
 COPY ./frontend/package.json .
 COPY ./frontend/yarn.lock .
@@ -7,20 +8,28 @@ RUN yarn install --pure-lockfile --network-timeout 1000000
 COPY ./frontend .
 RUN yarn build && yarn cache clean
 
-
 # Statping Golang BACKEND building from source
 # Creates "/go/bin/statping" and "/usr/local/bin/sass" for copying
 FROM golang:1.14-alpine AS backend
 LABEL maintainer="Hunter Long (https://github.com/hunterlong)"
 ARG VERSION
-RUN apk add --update --no-cache libstdc++ gcc g++ make git ca-certificates linux-headers wget curl jq && \
+ARG COMMIT
+ARG BUILDPLATFORM
+ARG TARGETARCH
+RUN apk add --update --no-cache libstdc++ gcc g++ make git autoconf \
+    libtool ca-certificates linux-headers wget curl jq && \
     update-ca-certificates
-RUN curl -L -s https://assets.statping.com/sass -o /usr/local/bin/sass && \
-    chmod +x /usr/local/bin/sass
+
+WORKDIR /root
+RUN git clone https://github.com/sass/sassc.git
+RUN . sassc/script/bootstrap && make -C sassc -j4
+# sassc binary: /root/sassc/bin/sassc
+
 WORKDIR /go/src/github.com/statping/statping
 ADD go.mod go.sum ./
 RUN go mod download
 ENV GO111MODULE on
+ENV CGO_ENABLED 1
 RUN go get github.com/stretchr/testify/assert && \
     go get github.com/stretchr/testify/require && \
 	go get github.com/GeertJohan/go.rice/rice && \
@@ -28,8 +37,9 @@ RUN go get github.com/stretchr/testify/assert && \
 	go get github.com/crazy-max/xgo
 COPY . .
 COPY --from=frontend /statping/dist/ ./source/dist/
-RUN make clean frontend-copy generate embed build
+RUN make clean generate embed
+RUN go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION} -X main.COMMIT=${COMMIT}" -o statping --tags "netgo linux" ./cmd
 RUN chmod a+x statping && mv statping /go/bin/statping
 # /go/bin/statping - statping binary
-# /usr/local/bin/sass - sass binary
+# /root/sassc/bin/sassc - sass binary
 # /statping - Vue frontend (from frontend)
diff --git a/Makefile b/Makefile
index 98721fcc..571873b9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,40 @@
 VERSION=$(shell cat version.txt)
+COMMIT=$(shell git rev-parse HEAD)
 SIGN_KEY=B76D61FAA6DB759466E83D9964B9C6AAE2D55278
 BINARY_NAME=statping
 GOBUILD=go build -a
 GOVERSION=1.14.0
+NODE_VERSION=12.18.2
 XGO=xgo -go $(GOVERSION) --dest=build
-BUILDVERSION=-ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=$(TRAVIS_COMMIT)"
+BUILDVERSION=-ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=${COMMIT}"
 TRVIS_SECRET=O3/2KTOV8krv+yZ1EB/7D1RQRe6NdpFUEJNJkMS/ollYqmz3x2mCO7yIgIJKCKguLXZxjM6CxJcjlCrvUwibL+8BBp7xJe4XFIOrjkPvbbVPry4HkFZCf2GfcUK6o4AByQ+RYqsW2F17Fp9KLQ1rL3OT3eLTwCAGKx3tlY8y+an43zkmo5dN64V6sawx26fh6XTfww590ey+ltgQTjf8UPNup2wZmGvMo9Hwvh/bYR/47bR6PlBh6vhlKWyotKf2Fz1Bevbu0zc35pee5YlsrHR+oSF+/nNd/dOij34BhtqQikUR+zQVy9yty8SlmneVwD3yOENvlF+8roeKIXb6P6eZnSMHvelhWpAFTwDXq2N3d/FIgrQtLxsAFTI3nTHvZgs6OoTd6dA0wkhuIGLxaL3FOeztCdxP5J/CQ9GUcTvifh5ArGGwYxRxQU6rTgtebJcNtXFISP9CEUR6rwRtb6ax7h6f1SbjUGAdxt+r2LbEVEk4ZlwHvdJ2DtzJHT5DQtLrqq/CTUgJ8SJFMkrJMp/pPznKhzN4qvd8oQJXygSXX/gz92MvoX0xgpNeLsUdAn+PL9KketfR+QYosBz04d8k05E+aTqGaU7FUCHPTLwlOFvLD8Gbv0zsC/PWgSLXTBlcqLEz5PHwPVHTcVzspKj/IyYimXpCSbvu1YOIjyc=
 PUBLISH_BODY='{ "request": { "branch": "master", "message": "Homebrew update version v${VERSION}", "config": { "env": { "VERSION": "${VERSION}", "COMMIT": "$(TRAVIS_COMMIT)" } } } }'
 TRAVIS_BUILD_CMD='{ "request": { "branch": "master", "message": "Compile master for Statping v${VERSION}", "config": { "merge_mode": "replace", "language": "go", "go": 1.14, "install": true, "sudo": "required", "services": ["docker"], "env": { "secure": "${TRVIS_SECRET}" }, "before_deploy": ["git config --local user.name \"hunterlong\"", "git config --local user.email \"info@socialeck.com\"", "git tag v$(VERSION) --force"], "deploy": [{ "provider": "releases", "api_key": "$$GITHUB_TOKEN", "file_glob": true, "file": "build/*", "skip_cleanup": true, "on": { "branch": "master" } }], "before_script": ["rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install stable", "nvm install 10.17.0", "nvm use 10.17.0 --default", "npm install -g sass yarn cross-env", "pip install --user awscli"], "script": ["make release"], "after_success": [], "after_deploy": ["make post-release"] } } }'
 TEST_DIR=$(GOPATH)/src/github.com/statping/statping
-PATH:=/usr/local/bin:$(GOPATH)/bin:$(PATH)
+PATH:=$(GOPATH)/bin:$(PATH)
 OS = freebsd linux openbsd
 ARCHS = 386 arm amd64 arm64
 
-all: clean yarn-install compile docker-base docker-vue build-all
+all: build-deps compile install test build
+
+test: clean compile
+	go test -v -p=1 -ldflags="-X main.VERSION=${VERSION} -X main.COMMIT=${COMMIT}" -coverprofile=coverage.out ./...
+
+build: clean
+	CGO_ENABLED=1 go build -a -ldflags "-s -w -X main.VERSION=${VERSION} -X main.COMMIT=${COMMIT}" -o statping --tags "netgo osusergo" ./cmd
+
+go-build: clean
+	rm -rf source/dist
+	rm -rf source/rice-box.go
+	wget https://assets.statping.com/source.tar.gz
+	tar -xvf source.tar.gz
+	go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION} -X main.COMMIT=${COMMIT}" -o statping --tags "netgo osusergo" ./cmd
+
+lint:
+	go fmt ./...
+	golint ./...
+	impi --local github.com/statping/statping/ --scheme stdLocalThirdParty ./...
+	goimports ./...
 
 up:
 	docker-compose -f docker-compose.yml -f dev/docker-compose.full.yml up -d --remove-orphans
@@ -29,9 +50,6 @@ lite: clean
 
 reup: down clean compose-build-full up
 
-test: clean compile
-	go test -v -p=1 -ldflags="-X main.VERSION=testing" -coverprofile=coverage.out ./...
-
 # build all arch's and release Statping
 release: test-deps
 	wget -O statping.gpg $(SIGN_URL)
@@ -50,7 +68,7 @@ cypress: clean
 
 test-api:
 	DB_CONN=sqlite DB_HOST=localhost DB_DATABASE=sqlite DB_PASS=none DB_USER=none statping &
-	sleep 5000 && newman run source/tmpl/postman.json -e dev/postman_environment.json --delay-request 500
+	sleep 5000 && newman run dev/postman.json -e dev/postman_environment.json --delay-request 500
 
 test-deps:
 	go get golang.org/x/tools/cmd/cover
@@ -58,6 +76,7 @@ test-deps:
 	go get github.com/GeertJohan/go.rice/rice
 	go get github.com/mattn/go-sqlite3
 	go install github.com/mattn/go-sqlite3
+	go install github.com/wellington/go-libsass
 
 deps:
 	go get -d -v -t ./...
@@ -121,14 +140,17 @@ top:
 	docker-compose -f docker-compose.yml -f dev/docker-compose.full.yml top
 
 frontend-build:
-	rm -rf source/dist && rm -rf frontend/dist
+	@echo "Removing old frontend distributions..."
+	@rm -rf source/dist && rm -rf frontend/dist
+	@echo "yarn install and build static frontend"
 	cd frontend && yarn && yarn build
-	cp -r frontend/dist source/ && cp -r frontend/src/assets/scss source/dist/
-	cp -r source/tmpl/*.* source/dist/
-	cp -r frontend/public/favicon source/dist/
-
-frontend-copy:
-	cp -r source/tmpl/*.* source/dist/
+	@cp -r frontend/dist source/
+	@cp -r frontend/src/assets/scss source/dist/
+	@cp frontend/public/favicon.ico source/dist/
+	@cp frontend/public/robots.txt source/dist/
+	@cp frontend/public/banner.png source/dist/
+	@cp -r frontend/public/favicon source/dist/
+	@echo "Frontend build complete at ./source/dist"
 
 yarn:
 	rm -rf source/dist && rm -rf frontend/dist
@@ -138,32 +160,40 @@ yarn:
 compile: frontend-build
 	rm -f source/rice-box.go
 	cd source && rice embed-go
+	make generate
 
 embed:
 	cd source && rice embed-go
 
-build:
-	$(GOBUILD) $(BUILDVERSION) -o $(BINARY_NAME) ./cmd
-
 install: build
 	mv $(BINARY_NAME) $(GOPATH)/bin/$(BINARY_NAME)
 
 install-local: build
 	mv $(BINARY_NAME) /usr/local/bin/$(BINARY_NAME)
 
+install-darwin:
+	go build -a -ldflags "-X main.VERSION=${VERSION}" -o statping --tags "netgo darwin" ./cmd
+	mv $(BINARY_NAME) /usr/local/bin/$(BINARY_NAME)
+
 generate:
-	cd source && go generate
+	go generate ./...
 
 build-all: clean compile build-folders build-linux build-linux-arm build-darwin build-win compress-folders
 
-build-win:
-	CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc-posix CXX=x86_64-w64-mingw32-g++-posix GO111MODULE="on" GOOS=windows GOARCH=amd64 \
-		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-windows-amd64/statping.exe ./cmd
-	CGO_ENABLED=1 CC=i686-w64-mingw32-gcc-posix CXX=i686-w64-mingw32-g++-posix GO111MODULE="on" GOOS=windows GOARCH=386 \
-		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-windows-386/statping.exe ./cmd
+build-deps:
+	apt install -y libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi \
+	libncurses5-dev build-essential bison flex libssl-dev bc gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
+	gcc-arm-linux-gnueabi g++-arm-linux-gnueabi libsqlite3-dev gcc-mingw-w64 gcc-mingw-w64-x86-64
 
 build-darwin:
-	GO111MODULE="on" GOOS=darwin GOARCH=amd64 go build -a -ldflags "-s -w -X main.VERSION=${VERSION}" -o releases/statping-darwin-amd64/statping --tags "netgo darwin" ./cmd
+	GO111MODULE="on" GOOS=darwin GOARCH=amd64 \
+		go build -a -ldflags "-s -w -X main.VERSION=${VERSION}" -o releases/statping-darwin-amd64/statping --tags "netgo darwin" ./cmd
+
+build-win:
+	CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ GO111MODULE="on" GOOS=windows GOARCH=amd64 \
+		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-windows-amd64/statping.exe ./cmd
+	CGO_ENABLED=1 CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ GO111MODULE="on" GOOS=windows GOARCH=386 \
+		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-windows-386/statping.exe ./cmd
 
 build-linux:
 	CGO_ENABLED=1 GO111MODULE="on" GOOS=linux GOARCH=amd64 \
@@ -172,16 +202,18 @@ build-linux:
 		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-linux-386/statping --tags "netgo linux" ./cmd
 
 build-linux-arm:
+	CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc-6 CXX=arm-linux-gnueabihf-g++-6 GO111MODULE="on" GOOS=linux GOARCH=arm GOARM=6 \
+		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-linux-arm6/statping --tags "netgo" ./cmd
 	CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc-6 CXX=arm-linux-gnueabihf-g++-6 GO111MODULE="on" GOOS=linux GOARCH=arm GOARM=7 \
-		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-linux-arm/statping ./cmd
+		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-linux-arm7/statping --tags "netgo" ./cmd
 	CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc-6 CXX=aarch64-linux-gnu-g++-6 GO111MODULE="on" GOOS=linux GOARCH=arm64 \
-		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-linux-arm64/statping ./cmd
+		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-linux-arm64/statping --tags "netgo" ./cmd
 
 build-folders:
 	mkdir build || true
 	for os in windows darwin linux;\
     do \
-        for arch in 386 amd64 arm arm64;\
+        for arch in 386 amd64 arm6 arm7 arm64;\
         do \
             mkdir -p releases/statping-$$os-$$arch/; \
         done \
@@ -191,7 +223,7 @@ compress-folders:
 	mkdir build || true
 	for os in darwin linux;\
     do \
-        for arch in 386 amd64 arm arm64;\
+        for arch in 386 amd64 arm6 arm7 arm64;\
 		do \
 			chmod +x releases/statping-$$os-$$arch/statping || true; \
 			tar -czf releases/statping-$$os-$$arch.tar.gz -C releases/statping-$$os-$$arch statping || true; \
@@ -208,26 +240,26 @@ compress-folders:
 
 # remove files for a clean compile/build
 clean:
-	rm -rf ./{logs,assets,plugins,*.db,config.yml,.sass-cache,config.yml,statping,build,.sass-cache,index.html,vendor}
-	rm -rf cmd/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log,*.html,*.json}
-	rm -rf core/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
-	rm -rf types/notifications/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
-	rm -rf handlers/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
-	rm -rf notifiers/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
-	rm -rf source/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
-	rm -rf types/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
-	rm -rf utils/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
-	rm -rf frontend/{logs,plugins,*.db,config.yml,.sass-cache,*.log}
-	rm -rf dev/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log,test/app,plugin/*.so}
-	rm -rf {parts,prime,snap,stage}
-	rm -rf frontend/cypress/videos
-	rm -f coverage.* sass
-	rm -rf **/*.db-journal
-	rm -rf *.snap
-	find . -name "*.out" -type f -delete
-	find . -name "*.cpu" -type f -delete
-	find . -name "*.mem" -type f -delete
-	rm -rf {build,releases,tmp,source/build,snap}
+	@echo "Cleaning temporary and build folders..."
+	@rm -rf ./{logs,assets,plugins,*.db,config.yml,.sass-cache,config.yml,statping,build,.sass-cache,index.html,vendor}
+	@rm -rf cmd/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log,*.html,*.json}
+	@rm -rf core/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
+	@rm -rf types/notifications/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
+	@rm -rf handlers/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
+	@rm -rf notifiers/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
+	@rm -rf source/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
+	@rm -rf types/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
+	@rm -rf utils/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
+	@rm -rf frontend/{logs,plugins,*.db,config.yml,.sass-cache,*.log}
+	@rm -rf dev/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log,test/app,plugin/*.so}
+	@rm -rf frontend/cypress/videos
+	@rm -f coverage.* sass
+	@rm -rf **/*.db-journal
+	@find . -name "*.out" -type f -delete
+	@find . -name "*.cpu" -type f -delete
+	@find . -name "*.mem" -type f -delete
+	@rm -rf {build,releases,tmp,source/build,snap,parts,prime,snap,stage}
+	@echo "Finished removing temporary and build folders"
 
 print_details:
 	@echo \==== Statping Development Instance ====
@@ -279,11 +311,14 @@ post-release: frontend-build upload_to_s3 publish-homebrew dockerhub
 publish-homebrew:
 	curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $(TRAVIS_API)" -d $(PUBLISH_BODY) https://api.travis-ci.com/repo/statping%2Fhomebrew-statping/requests
 
-upload_to_s3: travis_s3_creds
-	aws s3 cp ./source/dist/css $(ASSETS_BKT) --recursive --exclude "*" --include "*.css"
-	aws s3 cp ./source/dist/js $(ASSETS_BKT) --recursive --exclude "*" --include "*.js"
-	aws s3 cp ./source/dist/scss $(ASSETS_BKT) --recursive --exclude "*" --include "*.scss"
-	aws s3 cp ./install.sh $(ASSETS_BKT)
+upload_to_s3:
+	tar -czvf source.tar.gz source/
+	aws s3 cp source.tar.gz s3://assets.statping.com/
+	rm -rf source.tar.gz
+	aws s3 cp source/dist/css/ s3://assets.statping.com/css/ --recursive --exclude "*" --include "*.css"
+	aws s3 cp source/dist/js/ s3://assets.statping.com/js/ --recursive --exclude "*" --include "*.js"
+	aws s3 cp source/dist/scss/ s3://assets.statping.com/scss/ --recursive --exclude "*" --include "*.scss"
+	aws s3 cp install.sh s3://assets.statping.com/
 
 travis_s3_creds:
 	mkdir -p ~/.aws
@@ -296,11 +331,25 @@ valid-sign:
 	gpg --verify statping.asc
 
 sentry-release:
-	sentry-cli releases new -p backend -p frontend v${VERSION}
-	sentry-cli releases set-commits --auto v${VERSION}
-	sentry-cli releases finalize v${VERSION}
+	sentry-cli releases --org statping --project backend new v${VERSION}
+	sentry-cli releases --org statping --project backend set-commits v${VERSION} --auto
+	sentry-cli releases --org statping --project backend finalize v${VERSION}
+	sentry-cli releases --org statping --project frontend new v${VERSION}
+	sentry-cli releases --org statping --project frontend set-commits v${VERSION} --auto
+	sentry-cli releases --org statping --project frontend finalize v${VERSION}
 
-snapcraft: clean compile build-linux
+download-bins: clean
+	mkdir build || true
+	wget "https://github.com/statping/statping/releases/download/v${VERSION}/statping-linux-386.tar.gz"
+	wget "https://github.com/statping/statping/releases/download/v${VERSION}/statping-linux-amd64.tar.gz"
+	wget "https://github.com/statping/statping/releases/download/v${VERSION}/statping-linux-arm.tar.gz"
+	wget "https://github.com/statping/statping/releases/download/v${VERSION}/statping-linux-arm64.tar.gz"
+	mv statping-linux-386.tar.gz build/
+	mv statping-linux-amd64.tar.gz build/
+	mv statping-linux-arm.tar.gz build/
+	mv statping-linux-arm64.tar.gz build/
+
+snapcraft: download-bins
 	mkdir snap
 	mv snapcraft.yaml snap/
 	PWD=$(shell pwd)
@@ -331,5 +380,54 @@ certs:
 	  -keyout key.pem \
 	  -subj "/C=US/ST=California/L=Santa Monica/O=Statping/OU=Development/CN=localhost"
 
-.PHONY: all build build-all build-alpine test-all test test-api docker frontend up down print_details lite sentry-release snapcraft build-linux build-mac build-win build-all postman
+xgo-latest:
+	xgo --go $(GOVERSION) --targets=linux/amd64,linux/386,linux/arm-7,linux/arm-6,linux/arm64,windows/386,windows/amd64,darwin/386,darwin/amd64 --out='statping' --pkg='cmd' --dest=build --tags 'netgo' --ldflags='-X main.VERSION=${VERSION} -X main.COMMIT=$(COMMIT) -linkmode external -extldflags "-static"' .
+
+buildx-latest: multiarch
+	docker buildx create --name statping-latest
+	docker buildx inspect --builder statping-latest --bootstrap
+	docker buildx build --builder statping-latest --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile -t statping/statping:latest -t statping/statping:v${VERSION} --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} .
+	docker buildx rm statping-latest
+
+buildx-dev: multiarch
+	docker buildx create --name statping-dev
+	docker buildx inspect --builder statping-dev --bootstrap
+	docker buildx build --builder statping-dev --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile -t statping/statping:dev --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} .
+	docker buildx rm statping-dev
+
+buildx-base: multiarch
+	docker buildx create --name statping-base
+	docker buildx inspect --builder statping-base --bootstrap
+	docker buildx build --builder statping-base --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile.base -t statping/statping:base --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} .
+	docker buildx rm statping-base
+
+multiarch:
+	mkdir /tmp/.buildx-cache || true
+	docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+
+delve:
+	go build -gcflags "all=-N -l" -o statping ./cmd
+	dlv --listen=:2345 --headless=true --api-version=2 --accept-multiclient exec ./statping
+
+check:
+	@echo "Checking the programs required for the build are installed..."
+	@echo "go:     $(shell go version) - $(shell which go)" && go version >/dev/null 2>&1 || (echo "ERROR: go 1.14 is required."; exit 1)
+	@echo "node:   $(shell node --version) - $(shell which node)" && node --version >/dev/null 2>&1 || (echo "ERROR: node 12.x is required."; exit 1)
+	@echo "yarn:   $(shell yarn --version) - $(shell which yarn)" && yarn --version >/dev/null 2>&1 || (echo "ERROR: yarn is required."; exit 1)
+	@echo "All required programs are installed!"
+
+#sentry-release:
+#	sentry-cli releases new -p $SENTRY_PROJECT $VERSION
+#	sentry-cli releases set-commits --auto $VERSION
+#	sentry-cli releases files $VERSION upload-sourcemaps dist
+
+gen_help:
+	for file in ./statping.wiki/*.md
+	  do
+		# convert each file to html and place it in the html directory
+		# --gfm == use github flavoured markdown
+		marked -o html/$file.html $file --gfm
+	done
+
+.PHONY: all check build certs multiarch install-darwin go-build build-all buildx-base buildx-dev buildx-latest build-alpine test-all test test-api docker frontend up down print_details lite sentry-release snapcraft build-linux build-mac build-win build-all postman
 .SILENT: travis_s3_creds
diff --git a/app.json b/app.json
index 6d73c60d..a4f0abfb 100644
--- a/app.json
+++ b/app.json
@@ -2,6 +2,6 @@
   "name": "Statping",
   "description": "Statping Server Monitoring with Status Page",
   "repository": "https://github.com/statping/statping",
-  "logo": "https://raw.githubusercontent.com/statping/statping/master/source/tmpl/banner.png",
+  "logo": "https://assets.statping.com/banner.png",
   "keywords": ["statping", "server", "monitoring", "status page","golang", "go"]
 }
diff --git a/cmd/cli.go b/cmd/cli.go
index 672fb676..4f06b8e1 100644
--- a/cmd/cli.go
+++ b/cmd/cli.go
@@ -5,21 +5,23 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/pkg/errors"
+	"github.com/statping/statping/handlers"
 	"github.com/statping/statping/source"
-	"github.com/statping/statping/types/checkins"
 	"github.com/statping/statping/types/configs"
 	"github.com/statping/statping/types/core"
-	"github.com/statping/statping/types/groups"
-	"github.com/statping/statping/types/messages"
 	"github.com/statping/statping/types/services"
-	"github.com/statping/statping/types/users"
 	"github.com/statping/statping/utils"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"strings"
 	"time"
 )
 
+var (
+	importAll *bool
+)
+
 func assetsCli() error {
 	dir := utils.Directory
 	if err := utils.InitLogs(); err != nil {
@@ -34,12 +36,81 @@ func assetsCli() error {
 	return nil
 }
 
+func systemctlCli(dir string, uninstall bool, port int64) error {
+	location := "/etc/systemd/system/statping.service"
+
+	if uninstall {
+		fmt.Println("systemctl stop statping")
+		if _, _, err := utils.Command("systemctl", "stop", "statping"); err != nil {
+			log.Errorln(err)
+		}
+		fmt.Println("systemctl disable statping")
+		if _, _, err := utils.Command("systemctl", "disable", "statping"); err != nil {
+			log.Errorln(err)
+		}
+		fmt.Println("Deleting systemctl: ", location)
+		if err := utils.DeleteFile(location); err != nil {
+			log.Errorln(err)
+		}
+		return nil
+	}
+	if ok := utils.FolderExists(dir); !ok {
+		return errors.New("directory does not exist: " + dir)
+	}
+
+	binPath, err := os.Executable()
+	if err != nil {
+		return err
+	}
+
+	config := []byte(`[Unit]
+Description=Statping Server
+After=network.target
+After=systemd-user-sessions.service
+After=network-online.target
+
+[Service]
+Type=simple
+Restart=always
+Environment="STATPING_DIR=` + dir + `"
+Environment="ALLOW_REPORTS=true"
+ExecStart=` + binPath + ` --port=` + utils.ToString(port) + `
+WorkingDirectory=` + dir + `
+
+[Install]
+WantedBy=multi-user.target"
+`)
+	fmt.Println("Saving systemctl service to: ", location)
+	fmt.Printf("Using directory %s for Statping data\n", dir)
+	fmt.Printf("Running on port %d\n", port)
+	fmt.Printf("\n\n%s\n\n", string(config))
+	if err := utils.SaveFile(location, config); err != nil {
+		return err
+	}
+	fmt.Println("systemctl daemon-reload")
+	if _, _, err := utils.Command("systemctl", "daemon-reload"); err != nil {
+		return err
+	}
+	fmt.Println("systemctl enable statping")
+	if _, _, err := utils.Command("systemctl", "enable", "statping.service"); err != nil {
+		return err
+	}
+	fmt.Println("systemctl start statping")
+	if _, _, err := utils.Command("systemctl", "start", "statping"); err != nil {
+		return err
+	}
+	fmt.Println("Statping was will auto start on reboots")
+	fmt.Println("systemctl service: ", location)
+
+	return nil
+}
+
 func exportCli(args []string) error {
-	filename := fmt.Sprintf("%s/statping-%s.json", utils.Directory, time.Now().Format("01-02-2006-1504"))
+	filename := filepath.Join(utils.Directory, time.Now().Format("01-02-2006-1504")+".json")
 	if len(args) == 1 {
 		filename = fmt.Sprintf("%s/%s", utils.Directory, args)
 	}
-	var data []byte
+	var data *handlers.ExportData
 	if err := utils.InitLogs(); err != nil {
 		return err
 	}
@@ -56,10 +127,10 @@ func exportCli(args []string) error {
 	if _, err := services.SelectAllServices(false); err != nil {
 		return err
 	}
-	if data, err = ExportSettings(); err != nil {
+	if data, err = handlers.ExportSettings(); err != nil {
 		return fmt.Errorf("could not export settings: %v", err.Error())
 	}
-	if err = utils.SaveFile(filename, data); err != nil {
+	if err = utils.SaveFile(filename, data.JSON()); err != nil {
 		return fmt.Errorf("could not write file statping-export.json: %v", err.Error())
 	}
 	log.Infoln("Statping export file saved to ", filename)
@@ -73,7 +144,7 @@ func sassCli() error {
 	if err := source.Assets(); err != nil {
 		return err
 	}
-	if err := source.CompileSASS(source.DefaultScss...); err != nil {
+	if err := source.CompileSASS(); err != nil {
 		return err
 	}
 	return nil
@@ -128,6 +199,10 @@ func resetCli() error {
 
 func envCli() error {
 	fmt.Println("Statping Configuration")
+	fmt.Printf("Process ID:          %d\n", os.Getpid())
+	fmt.Printf("Running as user id:  %d\n", os.Getuid())
+	fmt.Printf("Running as group id: %d\n", os.Getgid())
+	fmt.Printf("Statping Directory:  %s\n", utils.Directory)
 	for k, v := range utils.Params.AllSettings() {
 		fmt.Printf("%s=%v\n", strings.ToUpper(k), v)
 	}
@@ -153,20 +228,54 @@ func onceCli() error {
 func importCli(args []string) error {
 	var err error
 	var data []byte
-	filename := args[1]
-	if data, err = ioutil.ReadFile(filename); err != nil {
+	if len(args) < 1 {
+		return errors.New("invalid command arguments")
+	}
+	if data, err = ioutil.ReadFile(args[0]); err != nil {
 		return err
 	}
-	var exportData ExportData
+	var exportData handlers.ExportData
 	if err = json.Unmarshal(data, &exportData); err != nil {
 		return err
 	}
 	log.Printf("=== %s ===\n", exportData.Core.Name)
-	log.Printf("Services:   %d\n", len(exportData.Services))
-	log.Printf("Checkins:   %d\n", len(exportData.Checkins))
-	log.Printf("Groups:     %d\n", len(exportData.Groups))
-	log.Printf("Messages:   %d\n", len(exportData.Messages))
-	log.Printf("Users:      %d\n", len(exportData.Users))
+	if exportData.Config != nil {
+		log.Printf("Configs:     %s\n", exportData.Config.DbConn)
+		if exportData.Config.DbUser != "" {
+			log.Printf("   - Host:   %s\n", exportData.Config.DbHost)
+			log.Printf("   - User:   %s\n", exportData.Config.DbUser)
+		}
+	}
+	if len(exportData.Services) > 0 {
+		log.Printf("Services:   %d\n", len(exportData.Services))
+	}
+	if len(exportData.Checkins) > 0 {
+		log.Printf("Checkins:   %d\n", len(exportData.Checkins))
+	}
+	if len(exportData.Groups) > 0 {
+		log.Printf("Groups:     %d\n", len(exportData.Groups))
+	}
+	if len(exportData.Messages) > 0 {
+		log.Printf("Messages:   %d\n", len(exportData.Messages))
+	}
+	if len(exportData.Incidents) > 0 {
+		log.Printf("Incidents:  %d\n", len(exportData.Incidents))
+	}
+	if len(exportData.Users) > 0 {
+		log.Printf("Users:      %d\n", len(exportData.Users))
+	}
+
+	if exportData.Config != nil {
+		if ask("Create config.yml file from Configs?") {
+			log.Printf("Database Host:   	%s\n", exportData.Config.DbHost)
+			log.Printf("Database Port:   	%d\n", exportData.Config.DbPort)
+			log.Printf("Database User:   	%s\n", exportData.Config.DbUser)
+			log.Printf("Database Password:   %s\n", exportData.Config.DbPass)
+			if err := exportData.Config.Save(utils.Directory); err != nil {
+				return err
+			}
+		}
+	}
 
 	config, err := configs.LoadConfigs(configFile)
 	if err != nil {
@@ -175,21 +284,22 @@ func importCli(args []string) error {
 	if err = configs.ConnectConfigs(config, false); err != nil {
 		return err
 	}
-	if data, err = ExportSettings(); err != nil {
-		return fmt.Errorf("could not export settings: %v", err.Error())
+	if ask("Create database rows and sample data?") {
+		if err := config.ResetCore(); err != nil {
+			return err
+		}
 	}
-
 	if ask("Import Core settings?") {
 		c := exportData.Core
 		if err := c.Update(); err != nil {
-			return err
+			log.Errorln(err)
 		}
 	}
 	for _, s := range exportData.Groups {
 		if ask(fmt.Sprintf("Import Group '%s'?", s.Name)) {
 			s.Id = 0
 			if err := s.Create(); err != nil {
-				return err
+				log.Errorln(err)
 			}
 		}
 	}
@@ -197,7 +307,7 @@ func importCli(args []string) error {
 		if ask(fmt.Sprintf("Import Service '%s'?", s.Name)) {
 			s.Id = 0
 			if err := s.Create(); err != nil {
-				return err
+				log.Errorln(err)
 			}
 		}
 	}
@@ -205,7 +315,7 @@ func importCli(args []string) error {
 		if ask(fmt.Sprintf("Import Checkin '%s'?", s.Name)) {
 			s.Id = 0
 			if err := s.Create(); err != nil {
-				return err
+				log.Errorln(err)
 			}
 		}
 	}
@@ -213,7 +323,7 @@ func importCli(args []string) error {
 		if ask(fmt.Sprintf("Import Message '%s'?", s.Title)) {
 			s.Id = 0
 			if err := s.Create(); err != nil {
-				return err
+				log.Errorln(err)
 			}
 		}
 	}
@@ -221,7 +331,7 @@ func importCli(args []string) error {
 		if ask(fmt.Sprintf("Import User '%s'?", s.Username)) {
 			s.Id = 0
 			if err := s.Create(); err != nil {
-				return err
+				log.Errorln(err)
 			}
 		}
 	}
@@ -230,6 +340,7 @@ func importCli(args []string) error {
 }
 
 func ask(format string) bool {
+
 	fmt.Printf(fmt.Sprintf(format + " [y/N]: "))
 	reader := bufio.NewReader(os.Stdin)
 	text, _ := reader.ReadString('\n')
@@ -375,15 +486,16 @@ type gitUploader struct {
 
 // ExportChartsJs renders the charts for the index page
 
-type ExportData struct {
-	Core      *core.Core          `json:"core"`
-	Services  []services.Service  `json:"services"`
-	Messages  []*messages.Message `json:"messages"`
-	Checkins  []*checkins.Checkin `json:"checkins"`
-	Users     []*users.User       `json:"users"`
-	Groups    []*groups.Group     `json:"groups"`
-	Notifiers []core.AllNotifiers `json:"notifiers"`
-}
+//type ExportData struct {
+//	Config    *configs.DbConfig   `json:"config"`
+//	Core      *core.Core          `json:"core"`
+//	Services  []services.Service  `json:"services"`
+//	Messages  []*messages.Message `json:"messages"`
+//	Checkins  []*checkins.Checkin `json:"checkins"`
+//	Users     []*users.User       `json:"users"`
+//	Groups    []*groups.Group     `json:"groups"`
+//	Notifiers []core.AllNotifiers `json:"notifiers"`
+//}
 
 // ExportSettings will export a JSON file containing all of the settings below:
 // - Core
@@ -393,28 +505,35 @@ type ExportData struct {
 // - Services
 // - Groups
 // - Messages
-func ExportSettings() ([]byte, error) {
-	c, err := core.Select()
-	if err != nil {
-		return nil, err
-	}
-	var srvs []services.Service
-	for _, s := range services.AllInOrder() {
-		s.Failures = nil
-		srvs = append(srvs, s)
-	}
-	data := ExportData{
-		Core:      c,
-		Notifiers: core.App.Notifications,
-		Checkins:  checkins.All(),
-		Users:     users.All(),
-		Services:  srvs,
-		Groups:    groups.All(),
-		Messages:  messages.All(),
-	}
-	export, err := json.Marshal(data)
-	return export, err
-}
+//func ExportSettings() ([]byte, error) {
+//	c, err := core.Select()
+//	if err != nil {
+//		return nil, err
+//	}
+//	var srvs []services.Service
+//	for _, s := range services.AllInOrder() {
+//		s.Failures = nil
+//		srvs = append(srvs, s)
+//	}
+//
+//	cfg, err := configs.LoadConfigs(configFile)
+//	if err != nil {
+//		return nil, err
+//	}
+//
+//	data := ExportData{
+//		Config:    cfg,
+//		Core:      c,
+//		Notifiers: core.App.Notifications,
+//		Checkins:  checkins.All(),
+//		Users:     users.All(),
+//		Services:  srvs,
+//		Groups:    groups.All(),
+//		Messages:  messages.All(),
+//	}
+//	export, err := json.Marshal(data)
+//	return export, err
+//}
 
 // ExportIndexHTML returns the HTML of the index page as a string
 //func ExportIndexHTML() []byte {
diff --git a/cmd/cli_test.go b/cmd/cli_test.go
index 94de537d..586db178 100644
--- a/cmd/cli_test.go
+++ b/cmd/cli_test.go
@@ -2,10 +2,12 @@ package main
 
 import (
 	"bytes"
+	"github.com/statping/statping/source"
 	"github.com/statping/statping/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"io/ioutil"
+	"os"
 	"testing"
 )
 
@@ -18,16 +20,15 @@ func init() {
 }
 
 func TestStatpingDirectory(t *testing.T) {
-	dir := utils.Directory
-	require.NotContains(t, dir, "/cmd")
-	require.NotEmpty(t, dir)
-
 	dir = utils.Params.GetString("STATPING_DIR")
 	require.NotContains(t, dir, "/cmd")
 	require.NotEmpty(t, dir)
 }
 
 func TestEnvCLI(t *testing.T) {
+	os.Setenv("API_SECRET", "demoapisecret123")
+	os.Setenv("SASS", "/usr/local/bin/sass")
+
 	cmd := rootCmd
 	b := bytes.NewBufferString("")
 	cmd.SetOut(b)
@@ -39,6 +40,12 @@ func TestEnvCLI(t *testing.T) {
 	assert.Contains(t, string(out), VERSION)
 	assert.Contains(t, utils.Directory, string(out))
 	assert.Contains(t, "SAMPLE_DATA=true", string(out))
+	assert.Contains(t, "API_SECRET=demoapisecret123", string(out))
+	assert.Contains(t, "STATPING_DIR="+dir, string(out))
+	assert.Contains(t, "SASS=/usr/local/bin/sass", string(out))
+
+	os.Unsetenv("API_SECRET")
+	os.Unsetenv("SASS")
 }
 
 func TestVersionCLI(t *testing.T) {
@@ -58,16 +65,26 @@ func TestAssetsCLI(t *testing.T) {
 	b := bytes.NewBufferString("")
 	cmd.SetOut(b)
 	cmd.SetArgs([]string{"assets"})
-	cmd.Execute()
+	err := cmd.Execute()
+	require.Nil(t, err)
 	out, err := ioutil.ReadAll(b)
 	assert.Nil(t, err)
 	assert.Contains(t, string(out), VERSION)
-	assert.FileExists(t, utils.Directory+"/assets/css/main.css")
-	assert.FileExists(t, utils.Directory+"/assets/css/style.css")
-	assert.FileExists(t, utils.Directory+"/assets/css/vendor.css")
-	assert.FileExists(t, utils.Directory+"/assets/scss/base.scss")
-	assert.FileExists(t, utils.Directory+"/assets/scss/mobile.scss")
-	assert.FileExists(t, utils.Directory+"/assets/scss/variables.scss")
+	for _, f := range source.RequiredFiles {
+		assert.FileExists(t, utils.Directory+"/assets/"+f)
+	}
+}
+
+func TestUpdateCLI(t *testing.T) {
+	cmd := rootCmd
+	b := bytes.NewBufferString("")
+	cmd.SetOut(b)
+	cmd.SetArgs([]string{"update"})
+	err := cmd.Execute()
+	require.Nil(t, err)
+	out, err := ioutil.ReadAll(b)
+	require.Nil(t, err)
+	assert.Contains(t, string(out), VERSION)
 }
 
 func TestHelpCLI(t *testing.T) {
diff --git a/cmd/commands.go b/cmd/commands.go
index df7629f7..b2850854 100644
--- a/cmd/commands.go
+++ b/cmd/commands.go
@@ -1,23 +1,70 @@
 package main
 
 import (
+	"bytes"
 	"fmt"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"github.com/statping/statping/utils"
+	"io"
 	"os"
+	"os/exec"
 )
 
 var rootCmd = &cobra.Command{
-	Use:   "statping",
-	Short: "A simple Application Status Monitor that is opensource and lightweight.",
+	Use:     "statping",
+	Version: VERSION,
+	Short:   "A simple Application Status Monitor that is opensource and lightweight.",
 	Run: func(cmd *cobra.Command, args []string) {
 		start()
 	},
 }
 
+var updateCmd = &cobra.Command{
+	Use:     "update",
+	Example: "statping update",
+	Short:   "Update to the latest version",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		log.Infoln("Updating Statping to the latest version...")
+		log.Infoln("curl -o- -L https://statping.com/install.sh | bash")
+		curl, err := exec.LookPath("curl")
+		if err != nil {
+			return err
+		}
+		bash, err := exec.LookPath("bash")
+		if err != nil {
+			return err
+		}
+
+		ree := bytes.NewBuffer(nil)
+
+		c1 := exec.Command(curl, "-o-", "-L", "https://statping.com/install.sh")
+		c2 := exec.Command(bash)
+
+		r, w := io.Pipe()
+		c1.Stdout = w
+		c2.Stdin = r
+
+		var b2 bytes.Buffer
+		c2.Stdout = &b2
+
+		c1.Start()
+		c2.Start()
+		c1.Wait()
+		w.Close()
+		c2.Wait()
+		io.Copy(ree, &b2)
+
+		log.Infoln(ree.String())
+		os.Exit(0)
+		return nil
+	},
+}
+
 var versionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "Print the version number of Statping",
+	Use:     "version",
+	Example: "statping version",
+	Short:   "Print the version number of Statping",
 	Run: func(cmd *cobra.Command, args []string) {
 		if COMMIT != "" {
 			fmt.Printf("%s (%s)\n", VERSION, COMMIT)
@@ -28,9 +75,38 @@ var versionCmd = &cobra.Command{
 	},
 }
 
+var systemctlCmd = &cobra.Command{
+	Use:     "systemctl [install/uninstall]",
+	Example: "statping systemctl install",
+	Short:   "Install or Uninstall systemctl services",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		if args[1] == "install" {
+			if len(args) < 3 {
+				return errors.New("requires 'install <working_path> <port>'")
+			}
+		}
+		port := utils.ToInt(args[2])
+		if port == 0 {
+			port = 80
+		}
+		if err := systemctlCli(args[1], args[0] == "uninstall", port); err != nil {
+			return err
+		}
+		os.Exit(0)
+		return nil
+	},
+	Args: func(cmd *cobra.Command, args []string) error {
+		if len(args) < 2 {
+			return errors.New("requires 'install <working_path>' or 'uninstall' as arguments")
+		}
+		return nil
+	},
+}
+
 var assetsCmd = &cobra.Command{
-	Use:   "assets",
-	Short: "Dump all assets used locally to be edited",
+	Use:     "assets",
+	Example: "statping assets",
+	Short:   "Dump all assets used locally to be edited",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := assetsCli(); err != nil {
 			return err
@@ -41,8 +117,9 @@ var assetsCmd = &cobra.Command{
 }
 
 var exportCmd = &cobra.Command{
-	Use:   "export",
-	Short: "Exports your Statping settings to a 'statping-export.json' file.",
+	Use:     "export",
+	Example: "statping export",
+	Short:   "Exports your Statping settings to a 'statping-export.json' file.",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := exportCli(args); err != nil {
 			return err
@@ -53,8 +130,9 @@ var exportCmd = &cobra.Command{
 }
 
 var sassCmd = &cobra.Command{
-	Use:   "sass",
-	Short: "Compile .scss files into the css directory",
+	Use:     "sass",
+	Example: "statping sass",
+	Short:   "Compile .scss files into the css directory",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := sassCli(); err != nil {
 			return err
@@ -65,8 +143,9 @@ var sassCmd = &cobra.Command{
 }
 
 var envCmd = &cobra.Command{
-	Use:   "env",
-	Short: "Return the configs that will be ran",
+	Use:     "env",
+	Example: "statping env",
+	Short:   "Return the configs that will be ran",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := envCli(); err != nil {
 			return err
@@ -77,8 +156,9 @@ var envCmd = &cobra.Command{
 }
 
 var resetCmd = &cobra.Command{
-	Use:   "reset",
-	Short: "Start a fresh copy of Statping",
+	Use:     "reset",
+	Example: "statping reset",
+	Short:   "Start a fresh copy of Statping",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := resetCli(); err != nil {
 			return err
@@ -89,8 +169,9 @@ var resetCmd = &cobra.Command{
 }
 
 var onceCmd = &cobra.Command{
-	Use:   "once",
-	Short: "Check all services 1 time and then quit",
+	Use:     "once",
+	Example: "statping once",
+	Short:   "Check all services 1 time and then quit",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := onceCli(); err != nil {
 			return err
@@ -101,8 +182,9 @@ var onceCmd = &cobra.Command{
 }
 
 var importCmd = &cobra.Command{
-	Use:   "import [.json file]",
-	Short: "Imports settings from a previously saved JSON file.",
+	Use:     "import [.json file]",
+	Example: "statping import backup.json",
+	Short:   "Imports settings from a previously saved JSON file.",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := importCli(args); err != nil {
 			return err
diff --git a/cmd/main.go b/cmd/main.go
index 87c2d72e..d3f7e082 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -29,16 +29,20 @@ var (
 
 func init() {
 	stopped = make(chan bool, 1)
-	core.New(VERSION)
+	core.New(VERSION, COMMIT)
 	utils.InitEnvs()
+	utils.Params.Set("VERSION", VERSION)
+	utils.Params.Set("COMMIT", COMMIT)
 
 	rootCmd.AddCommand(versionCmd)
+	rootCmd.AddCommand(updateCmd)
 	rootCmd.AddCommand(assetsCmd)
 	rootCmd.AddCommand(exportCmd)
 	rootCmd.AddCommand(importCmd)
 	rootCmd.AddCommand(sassCmd)
 	rootCmd.AddCommand(onceCmd)
 	rootCmd.AddCommand(envCmd)
+	rootCmd.AddCommand(systemctlCmd)
 	rootCmd.AddCommand(resetCmd)
 
 	parseFlags(rootCmd)
@@ -96,39 +100,8 @@ func start() {
 		exit(err)
 	}
 
-	if !confgs.Db.HasTable("core") {
-		var srvs int64
-		if confgs.Db.HasTable(&services.Service{}) {
-			confgs.Db.Model(&services.Service{}).Count(&srvs)
-			if srvs > 0 {
-				exit(errors.Wrap(err, "there are already services setup."))
-				return
-			}
-		}
-
-		if err := confgs.DropDatabase(); err != nil {
-			exit(errors.Wrap(err, "error dropping database"))
-		}
-
-		if err := confgs.CreateDatabase(); err != nil {
-			exit(errors.Wrap(err, "error creating database"))
-		}
-
-		if err := configs.CreateAdminUser(confgs); err != nil {
-			exit(errors.Wrap(err, "error creating default admin user"))
-		}
-
-		if utils.Params.GetBool("SAMPLE_DATA") {
-			log.Infoln("Adding Sample Data")
-			if err := configs.TriggerSamples(); err != nil {
-				exit(errors.Wrap(err, "error adding sample data"))
-			}
-		} else {
-			if err := core.Samples(); err != nil {
-				exit(errors.Wrap(err, "error added core details"))
-			}
-		}
-
+	if err = confgs.ResetCore(); err != nil {
+		exit(err)
 	}
 
 	if err = confgs.DatabaseChanges(); err != nil {
@@ -175,20 +148,20 @@ func InitApp() error {
 	if _, err := core.Select(); err != nil {
 		return err
 	}
+	// init Sentry error monitoring (its useful)
+	utils.SentryInit(core.App.AllowReports.Bool)
 	// init prometheus metrics
 	metrics.InitMetrics()
+	// connect each notifier, added them into database if needed
+	notifiers.InitNotifiers()
 	// select all services in database and store services in a mapping of Service pointers
 	if _, err := services.SelectAllServices(true); err != nil {
 		return err
 	}
 	// start routines for each service checking process
 	services.CheckServices()
-	// connect each notifier, added them into database if needed
-	notifiers.InitNotifiers()
 	// start routine to delete old records (failures, hits)
 	go database.Maintenance()
-	// init Sentry error monitoring (its useful)
-	utils.SentryInit(&VERSION, core.App.AllowReports.Bool)
 	core.App.Setup = true
 	core.App.Started = utils.Now()
 	return nil
diff --git a/database/database.go b/database/database.go
index c6136cfc..79b6fc2a 100644
--- a/database/database.go
+++ b/database/database.go
@@ -169,10 +169,6 @@ func Available(db Database) bool {
 	return true
 }
 
-func AmountGreaterThan1000(db *gorm.DB) *gorm.DB {
-	return db.Where("service = ?", 1000)
-}
-
 func (it *Db) MultipleSelects(args ...string) Database {
 	joined := strings.Join(args, ", ")
 	return it.Select(joined)
@@ -181,6 +177,7 @@ func (it *Db) MultipleSelects(args ...string) Database {
 type Db struct {
 	Database *gorm.DB
 	Type     string
+	ReadOnly bool
 }
 
 // Openw is a drop-in replacement for Open()
@@ -223,6 +220,9 @@ func OpenTester() (Database, error) {
 	default:
 		dbString = fmt.Sprintf("file:%s?mode=memory&cache=shared", utils.RandomString(12))
 	}
+	if utils.Params.IsSet("DB_DSN") {
+		dbString = utils.Params.GetString("DB_DSN")
+	}
 	newDb, err := Openw(testDB, dbString)
 	if err != nil {
 		return nil, err
@@ -239,6 +239,7 @@ func Wrap(db *gorm.DB) Database {
 	return &Db{
 		Database: db,
 		Type:     db.Dialect().GetName(),
+		ReadOnly: utils.Params.GetBool("READ_ONLY"),
 	}
 }
 
@@ -379,14 +380,26 @@ func (it *Db) Related(value interface{}, foreignKeys ...string) Database {
 }
 
 func (it *Db) FirstOrInit(out interface{}, where ...interface{}) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.FirstOrInit(out, where...))
 }
 
 func (it *Db) FirstOrCreate(out interface{}, where ...interface{}) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.FirstOrCreate(out, where...))
 }
 
 func (it *Db) Update(attrs ...interface{}) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.Update(attrs...))
 }
 
@@ -395,22 +408,42 @@ func (it *Db) Updates(values interface{}, ignoreProtectedAttrs ...bool) Database
 }
 
 func (it *Db) UpdateColumn(attrs ...interface{}) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.UpdateColumn(attrs...))
 }
 
 func (it *Db) UpdateColumns(values interface{}) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.UpdateColumns(values))
 }
 
 func (it *Db) Save(value interface{}) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.Save(value))
 }
 
 func (it *Db) Create(value interface{}) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.Create(value))
 }
 
 func (it *Db) Delete(value interface{}, where ...interface{}) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.Delete(value, where...))
 }
 
@@ -435,14 +468,26 @@ func (it *Db) Debug() Database {
 }
 
 func (it *Db) Begin() Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.Begin())
 }
 
 func (it *Db) Commit() Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.Commit())
 }
 
 func (it *Db) Rollback() Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.Rollback())
 }
 
@@ -455,14 +500,26 @@ func (it *Db) RecordNotFound() bool {
 }
 
 func (it *Db) CreateTable(values ...interface{}) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.CreateTable(values...))
 }
 
 func (it *Db) DropTable(values ...interface{}) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.DropTable(values...))
 }
 
 func (it *Db) DropTableIfExists(values ...interface{}) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.DropTableIfExists(values...))
 }
 
@@ -471,26 +528,50 @@ func (it *Db) HasTable(value interface{}) bool {
 }
 
 func (it *Db) AutoMigrate(values ...interface{}) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.AutoMigrate(values...))
 }
 
 func (it *Db) ModifyColumn(column string, typ string) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.ModifyColumn(column, typ))
 }
 
 func (it *Db) DropColumn(column string) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.DropColumn(column))
 }
 
 func (it *Db) AddIndex(indexName string, columns ...string) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.AddIndex(indexName, columns...))
 }
 
 func (it *Db) AddUniqueIndex(indexName string, columns ...string) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.AddUniqueIndex(indexName, columns...))
 }
 
 func (it *Db) RemoveIndex(indexName string) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.RemoveIndex(indexName))
 }
 
@@ -519,6 +600,10 @@ func (it *Db) SetJoinTableHandler(source interface{}, column string, handler gor
 }
 
 func (it *Db) AddForeignKey(field string, dest string, onDelete string, onUpdate string) Database {
+	if it.ReadOnly {
+		it.Database.Error = nil
+		return Wrap(it.Database)
+	}
 	return Wrap(it.Database.AddForeignKey(field, dest, onDelete, onUpdate))
 }
 
diff --git a/database/grouping.go b/database/grouping.go
index 54544870..28bce658 100644
--- a/database/grouping.go
+++ b/database/grouping.go
@@ -39,7 +39,7 @@ type GroupQuery struct {
 }
 
 func (b GroupQuery) Find(data interface{}) error {
-	return b.db.Find(data).Error()
+	return b.db.Order("id DESC").Find(data).Error()
 }
 
 func (b GroupQuery) Database() Database {
@@ -70,27 +70,28 @@ func (t *TimeVar) ToValues() ([]*TimeValue, error) {
 }
 
 // GraphData will return all hits or failures
-func (g *GroupQuery) GraphData(by By) ([]*TimeValue, error) {
-	dbQuery := g.db.MultipleSelects(
-		g.db.SelectByTime(g.Group),
+func (b *GroupQuery) GraphData(by By) ([]*TimeValue, error) {
+	b.db = b.db.MultipleSelects(
+		b.db.SelectByTime(b.Group),
 		by.String(),
 	).Group("timeframe").Order("timeframe", true)
 
-	g.db = dbQuery
-
-	caller, err := g.ToTimeValue()
+	caller, err := b.ToTimeValue()
 	if err != nil {
 		return nil, err
 	}
 
-	if g.FillEmpty {
-		return caller.FillMissing(g.Start, g.End)
+	if b.FillEmpty {
+		return caller.FillMissing(b.Start, b.End)
 	}
 	return caller.ToValues()
 }
 
-func (g *GroupQuery) ToTimeValue() (*TimeVar, error) {
-	rows, err := g.db.Rows()
+// ToTimeValue will format the SQL rows into a JSON format for the API.
+// [{"timestamp": "2006-01-02T15:04:05Z", "amount": 468293}]
+// TODO redo this entire function, use better SQL query to group by time
+func (b *GroupQuery) ToTimeValue() (*TimeVar, error) {
+	rows, err := b.db.Rows()
 	if err != nil {
 		return nil, err
 	}
@@ -101,8 +102,8 @@ func (g *GroupQuery) ToTimeValue() (*TimeVar, error) {
 		if err := rows.Scan(&timeframe, &amount); err != nil {
 			log.Error(err, timeframe)
 		}
-		trueTime, _ := g.db.ParseTime(timeframe)
-		newTs := types.FixedTime(trueTime, g.Group)
+		trueTime, _ := b.db.ParseTime(timeframe)
+		newTs := types.FixedTime(trueTime, b.Group)
 
 		tv := &TimeValue{
 			Timeframe: newTs,
@@ -110,33 +111,32 @@ func (g *GroupQuery) ToTimeValue() (*TimeVar, error) {
 		}
 		data = append(data, tv)
 	}
-	return &TimeVar{g, data}, nil
+	return &TimeVar{b, data}, nil
 }
 
 func (t *TimeVar) FillMissing(current, end time.Time) ([]*TimeValue, error) {
 	timeMap := make(map[string]int64)
 	var validSet []*TimeValue
-	dur := t.g.Group
 	for _, v := range t.data {
 		timeMap[v.Timeframe] = v.Amount
 	}
 
-	currentStr := types.FixedTime(current, t.g.Group)
-
 	for {
+		currentStr := types.FixedTime(current, t.g.Group)
+
 		var amount int64
 		if timeMap[currentStr] != 0 {
 			amount = timeMap[currentStr]
 		}
+
 		validSet = append(validSet, &TimeValue{
 			Timeframe: currentStr,
 			Amount:    amount,
 		})
+		current = current.Add(t.g.Group)
 		if current.After(end) {
 			break
 		}
-		current = current.Add(dur)
-		currentStr = types.FixedTime(current, t.g.Group)
 	}
 
 	return validSet, nil
@@ -233,10 +233,6 @@ func ParseQueries(r *http.Request, o isObject) (*GroupQuery, error) {
 	if endField == 0 {
 		query.End = utils.Now()
 	}
-	if query.End.After(utils.Now()) {
-		query.End = utils.Now()
-	}
-
 	if query.Limit != 0 {
 		q = q.Limit(query.Limit)
 	}
diff --git a/database/routines.go b/database/routines.go
index 92583e64..591277da 100644
--- a/database/routines.go
+++ b/database/routines.go
@@ -16,6 +16,8 @@ var (
 
 // Maintenance will automatically delete old records from 'failures' and 'hits'
 // this function is currently set to delete records 7+ days old every 60 minutes
+// env: REMOVE_AFTER - golang duration parsed time for deleting records older than REMOVE_AFTER duration from now
+// env: CLEANUP_INTERVAL - golang duration parsed time for checking old records routine
 func Maintenance() {
 	dur := utils.Params.GetDuration("REMOVE_AFTER")
 	interval := utils.Params.GetDuration("CLEANUP_INTERVAL")
diff --git a/database/time.go b/database/time.go
index ea41f77d..db690bab 100644
--- a/database/time.go
+++ b/database/time.go
@@ -19,10 +19,9 @@ func (it *Db) ParseTime(t string) (time.Time, error) {
 	}
 }
 
+// FormatTime returns the timestamp in the same format as the DATETIME column in database
 func (it *Db) FormatTime(t time.Time) string {
 	switch it.Type {
-	case "mysql":
-		return t.Format("2006-01-02 15:04:05")
 	case "postgres":
 		return t.Format("2006-01-02 15:04:05.999999999")
 	default:
@@ -30,6 +29,7 @@ func (it *Db) FormatTime(t time.Time) string {
 	}
 }
 
+// SelectByTime returns an SQL query that will group "created_at" column by x seconds and returns as "timeframe"
 func (it *Db) SelectByTime(increment time.Duration) string {
 	seconds := int64(increment.Seconds())
 	switch it.Type {
@@ -41,33 +41,3 @@ func (it *Db) SelectByTime(increment time.Duration) string {
 		return fmt.Sprintf("datetime((strftime('%%s', created_at) / %d) * %d, 'unixepoch') as timeframe", seconds, seconds)
 	}
 }
-
-func (it *Db) correctTimestamp(increment string) string {
-	var timestamper string
-	switch increment {
-	case "second":
-		timestamper = "%Y-%m-%d %H:%M:%S"
-	case "minute":
-		timestamper = "%Y-%m-%d %H:%M:00"
-	case "hour":
-		timestamper = "%Y-%m-%d %H:00:00"
-	case "day":
-		timestamper = "%Y-%m-%d 00:00:00"
-	case "month":
-		timestamper = "%Y-%m-01 00:00:00"
-	case "year":
-		timestamper = "%Y-01-01 00:00:00"
-	default:
-		timestamper = "%Y-%m-%d 00:00:00"
-	}
-
-	switch it.Type {
-	case "mysql":
-	case "second":
-		timestamper = "%Y-%m-%d %H:%i:%S"
-	case "minute":
-		timestamper = "%Y-%m-%d %H:%i:00"
-	}
-
-	return timestamper
-}
diff --git a/dev/kubernetes.yml b/dev/kubernetes.yml
new file mode 100644
index 00000000..15033baa
--- /dev/null
+++ b/dev/kubernetes.yml
@@ -0,0 +1,42 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: statping
+spec:
+  ports:
+    - port: 8080
+  selector:
+    app: statping
+  clusterIP: None
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: statping
+spec:
+  selector:
+    matchLabels:
+      app: statping
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app: statping
+    spec:
+      containers:
+        - image: statping/statping
+          name: statping
+          env:
+            - name: ALLOW_REPORTS
+              value: "true"
+          ports:
+            - containerPort: 8080
+              name: statping
+          volumeMounts:
+            - name: statping-storage
+              mountPath: /app
+      volumes:
+        - name: statping-storage
+          persistentVolumeClaim:
+            claimName: statping-claim
diff --git a/dev/portainer.json b/dev/portainer.json
new file mode 100644
index 00000000..fe93ba18
--- /dev/null
+++ b/dev/portainer.json
@@ -0,0 +1,21 @@
+[
+  {
+    "type": 1,
+    "title": "Statping",
+    "restart_policy": "unless-stopped",
+    "description": "Service monitoring with an easy to use status page and mobile app",
+    "logo": "https://assets.statping.com/icon.png",
+    "image": "statping/statping:latest",
+    "platform": "linux",
+    "categories": ["monitoring"],
+    "administrator_only": false,
+    "ports": [
+      "8080:8080/tcp"
+    ],
+    "volumes": [
+      {
+        "container": "/app"
+      }
+    ]
+  }
+]
diff --git a/dev/postman.json b/dev/postman.json
index 1f6b4ba6..f21fd2b1 100644
--- a/dev/postman.json
+++ b/dev/postman.json
@@ -2,7 +2,7 @@
 	"info": {
 		"_postman_id": "3c6a7841-0b39-4878-a3a6-1c76832b7679",
 		"name": "Statping",
-		"description": "The Statping API allows you to programmatically access data on your Statping server.\n\nThe easiest way to get started with the API is by running your own Docker or local instance of the Statping server.\n\n<img width=\"100%\" src=\"https://img.cjx.io/statuptokenbalance.gif\">\n\n# Authentication\n\nAn API Key is required to be sent as part of every request to the Statping API, by using the `Authorization` and the API Secret Key as a header.\n\n> If you do not have an API Secret Key, you can find it on the Settings page.\n\nYou can Authenticate by implementing the following...\n- Using the `Authorization` header with API Secret Key\n- Setting `GO_ENV` to `test` to bypass all authentication\n- Adding `?api=<keyhere>` URL Query along with the API Secret Key\n- Being logged into Statping as an admin (using JWT sessions/cookies)\n\n> Authentication will create a cookie named `statping_auth`.\n\n# Environment Variables\nStatping includes many environment variables that can give you more control over your instance. Please view the [Environment Variables Wiki](https://github.com/statping/statping/wiki/Environment-Variables) page to view a complete list. Below are a couple important ones...\n- `STATPING_DIR` - Statping's working directory. By default, this will be set to the current working directory. This path will contain the `config.yml` file, `logs`, and `assets` folder. \n- `SASS` - Absolute path to the `sass` executable. By default it will attempt to find `sass` in your `$PATH`. \n\n# Demo\nYou can checkout the Statping Demo instance at [https://demo.statping.com](https://demo.statping.com). All features are available for you to experiment with. The API Secret Key is `demoapisecret123`. Since this instance is public, it will be reset with sample data **every 90 minutes**.\n",
+		"description": "The Statping API allows you to programmatically access data on your Statping server.\n\nThe easiest way to get started with the API is by running your own Docker or local instance of the Statping server.\n\n<img width=\"100%\" src=\"https://img.cjx.io/statuptokenbalance.gif\">\n\n# Authentication\n\nAn API Key is required to be sent as part of every request to the Statping API, by using the `Authorization` and the API Secret Key as a header.\n\n> If you do not have an API Secret Key, you can find it on the Settings page.\n\nYou can Authenticate by implementing the following...\n- Using the `Authorization` header with API Secret Key\n- Setting `GO_ENV` to `test` to bypass all authentication\n- Adding `?api=<keyhere>` URL Query along with the API Secret Key\n- Adding `?api=<userkey>` URL Query along with the API Key for a user\n- Being logged into Statping as an admin (using JWT sessions/cookies)\n\n> Authentication will create a cookie named `statping_auth`.\n\n# Environment Variables\nStatping includes many environment variables that can give you more control over your instance. Please view the [Environment Variables Wiki](https://github.com/statping/statping/wiki/Environment-Variables) page to view a complete list. Below are a couple important ones...\n- `STATPING_DIR` - Statping's working directory. By default, this will be set to the current working directory. This path will contain the `config.yml` file, `logs`, and `assets` folder. \n- `SASS` - Absolute path to the `sass` executable. By default it will attempt to find `sass` in your `$PATH`. \n\n# Demo\nYou can checkout the Statping Demo instance at [https://demo.statping.com](https://demo.statping.com). All features are available for you to experiment with. The API Secret Key is `demoapisecret123`. Since this instance is public, it will be reset with sample data **every 90 minutes**.\n",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
 	},
 	"item": [
@@ -786,6 +786,105 @@
 						"description": "You can create custom badges with dynamic information by using [Shields.io](https://shields.io/) and parsing JSON fields with [JSONPath](http://jsonpath.com/). \n\n## Examples\n\n#### Service Uptime Percent\n<img src=\"https://img.shields.io/badge/dynamic/json?color=blue&label=%20Statping%20Uptime&query=%24.online_24_hours&url=https%3A%2F%2Fdemo.statping.com%2Fapi%2Fservices%2F2&suffix=%\">\n\n- URL: [https://demo.statping.com/api/services/2](https://demo.statping.com/api/services/2)\n- JSON Path: `$.online_24_hours`\n- Suffix: `%`\n\n```\nhttps://img.shields.io/badge/dynamic/json?color=blue&label=%20Statping%20Uptime&query=%24.online_24_hours&url=https%3A%2F%2Fdemo.statping.com%2Fapi%2Fservices%2F2&suffix=%\n```\n\n#### Count Services\n<img src=\"https://img.shields.io/badge/dynamic/json?color=purple&label=Demo%20Site&query=%24.services&url=https://demo.statping.com/health&suffix=%20services\">\n\n- URL: [https://demo.statping.com/health](https://demo.statping.com/health)\n- JSON Path: `$.services`\n- Suffix: ` services`\n\n```\nhttps://img.shields.io/badge/dynamic/json?color=purple&label=Demo%20Site&query=%24.services&url=https://demo.statping.com/health&suffix=%20services\n```"
 					},
 					"response": []
+				},
+				{
+					"name": "Send Push Notification",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"id": "11fe392f-3636-4d2d-84e9-1119b351d8ee",
+								"exec": [
+									""
+								],
+								"type": "text/javascript"
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "noauth"
+						},
+						"method": "POST",
+						"header": [],
+						"body": {
+							"mode": "raw",
+							"raw": "{\n  \"notifications\": [\n    {\n      \"tokens\": [\"dBLB1WvTJkiWl3ZPjP0-BS:APA91bGXUbKy65CaN1XqExHXZ892jik2k9XORXSiqdUyXhcQ5RDiJ6LfXrckuH3StYJFcma4UCDr_N038YUtxYsRIHYx_8vWZ6D2uq3199LegWXGl5tz-9zk3M4WZGX8WGxIRUJ31QtW\"],\n      \"platform\": 2,\n      \"message\": \"This notification will go to iOS and Android platform via Firebase!\"\n    }\n  ]\n}",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": {
+							"raw": "https://push.statping.com/api/push",
+							"protocol": "https",
+							"host": [
+								"push",
+								"statping",
+								"com"
+							],
+							"path": [
+								"api",
+								"push"
+							]
+						},
+						"description": "Send a push notification to the Statping mobile app using your Firebase device identifier."
+					},
+					"response": [
+						{
+							"name": "Send Push Notification",
+							"originalRequest": {
+								"method": "POST",
+								"header": [],
+								"body": {
+									"mode": "raw",
+									"raw": "{\n  \"notifications\": [\n    {\n      \"tokens\": [\"dBLB1WvTJkiWl3ZPjP0-BS:APA91bGXUbKy65CaN1XqExHXZ892jik2k9XORXSiqdUyXhcQ5RDiJ6LfXrckuH3StYJFcma4UCDr_N038YUtxYsRIHYx_8vWZ6D2uq3199LegWXGl5tz-9zk3M4WZGX8WGxIRUJ31QtW\"],\n      \"platform\": 2,\n      \"message\": \"This notification will go to iOS and Android Statping App\"\n    }\n  ]\n}",
+									"options": {
+										"raw": {
+											"language": "json"
+										}
+									}
+								},
+								"url": {
+									"raw": "https://push.statping.com/api/push",
+									"protocol": "https",
+									"host": [
+										"push",
+										"statping",
+										"com"
+									],
+									"path": [
+										"api",
+										"push"
+									]
+								}
+							},
+							"status": "OK",
+							"code": 200,
+							"_postman_previewlanguage": "json",
+							"header": [
+								{
+									"key": "Content-Length",
+									"value": "37"
+								},
+								{
+									"key": "Content-Type",
+									"value": "application/json; charset=utf-8"
+								},
+								{
+									"key": "Date",
+									"value": "Thu, 13 Aug 2020 02:24:17 GMT"
+								},
+								{
+									"key": "X-Gorush-Version",
+									"value": "No Version Provided"
+								}
+							],
+							"cookie": [],
+							"body": "{\n    \"counts\": 1,\n    \"logs\": [],\n    \"success\": \"ok\"\n}"
+						}
+					]
 				}
 			],
 			"description": "This is for Statping's miscellaneous API endpoints that aren't a part of another category.",
@@ -840,7 +939,7 @@
 									"",
 									"pm.test(\"View All Services\", function () {",
 									"    var jsonData = pm.response.json();",
-									"    pm.expect(jsonData.length).to.eql(5);",
+									"    pm.expect(jsonData.length).to.eql(6);",
 									"});"
 								],
 								"type": "text/javascript"
@@ -1714,7 +1813,7 @@
 								"services"
 							]
 						},
-						"description": "Create a new service and begin monitoring."
+						"description": "View a specific service, this will include the service's failures and checkins.\n\n#### Service Type Field\n- `http` - HTTP Service\n- `tcp` - TCP Service\n- `udp` - UDP Service\n- `icmp` - ICMP Service\n- `grpc` - gRPC Service\n- `static` - Static Service"
 					},
 					"response": [
 						{
@@ -1876,6 +1975,69 @@
 						}
 					]
 				},
+				{
+					"name": "Update Static Service",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"id": "18cfae1e-4025-4338-a734-a552c8ac85ca",
+								"exec": [
+									"pm.test(\"Response is ok\", function () {",
+									"    pm.response.to.have.status(200);",
+									"});",
+									"",
+									"pm.test(\"Update Service\", function () {",
+									"    var jsonData = pm.response.json();",
+									"    pm.expect(jsonData.status).to.eql(\"success\");",
+									"    pm.expect(jsonData.output.type).to.eql(\"static\");",
+									"    pm.expect(jsonData.output.online).to.eql(false);",
+									"});"
+								],
+								"type": "text/javascript"
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": [
+								{
+									"key": "token",
+									"value": "{{api_key}}",
+									"type": "string"
+								}
+							]
+						},
+						"method": "PATCH",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\n    \"online\": false,\n    \"latency\": 30500,\n    \"issue\": \"This is a failure string you can create\"\n}",
+							"options": {
+								"raw": {}
+							}
+						},
+						"url": {
+							"raw": "{{endpoint}}/api/services/7",
+							"host": [
+								"{{endpoint}}"
+							],
+							"path": [
+								"api",
+								"services",
+								"7"
+							]
+						},
+						"description": "Update a Static Service by setting it's online status to true or false. If false, you can include a issue string in the `issue` JSON field."
+					},
+					"response": []
+				},
 				{
 					"name": "Delete Service Failures",
 					"event": [
@@ -2026,7 +2188,7 @@
 					]
 				}
 			],
-			"description": "With the Statping API, you can add, remove, edit all your services fields from the API directly. This includes viewing Service chart data for latency/up-time, and even viewing a log of failures. ",
+			"description": "With the Statping API, you can add, remove, edit all your services fields from the API directly. This includes viewing Service chart data for latency/up-time, and even viewing a log of failures. \n\n### HTTP Services\nA HTTP service is a basic service that sends a HTTP request (GET, POST, PATCH, DELETE, etc) to check if that web service is online or not. You can expect a specific status code, and response body (including regex). \n\n### TCP and UDP Services\nTCP and UDP Services will send a request to the hostname and port of your choice.\n\n### ICMP Ping Services\nICMP Services will send a ICMP (ping) packet to your server to test if it's online.\n\n### gRPC Services\ngRPC Services will request your gRPC server and check the response\n\n### Static Services\nA Static Service is a \"fake\" service that is set online/offline by you.\n",
 			"auth": {
 				"type": "bearer",
 				"bearer": [
@@ -2218,14 +2380,14 @@
 							}
 						},
 						"url": {
-							"raw": "{{endpoint}}/api/services/1/incidents",
+							"raw": "{{endpoint}}/api/services/3/incidents",
 							"host": [
 								"{{endpoint}}"
 							],
 							"path": [
 								"api",
 								"services",
-								"1",
+								"3",
 								"incidents"
 							]
 						},
@@ -2292,213 +2454,6 @@
 						}
 					]
 				},
-				{
-					"name": "Update Service Incident",
-					"event": [
-						{
-							"listen": "test",
-							"script": {
-								"id": "42cd68de-5bd4-4d4e-b687-fa0bafc1d61a",
-								"exec": [
-									"pm.test(\"Response is ok\", function () {",
-									"    pm.response.to.have.status(200);",
-									"});"
-								],
-								"type": "text/javascript"
-							}
-						}
-					],
-					"request": {
-						"auth": {
-							"type": "bearer",
-							"bearer": [
-								{
-									"key": "token",
-									"value": "{{api_key}}",
-									"type": "string"
-								}
-							]
-						},
-						"method": "POST",
-						"header": [
-							{
-								"key": "Content-Type",
-								"name": "Content-Type",
-								"type": "text",
-								"value": "application/json"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": "{\n\t\"title\": \"Updated Downtime\",\n\t\"description\": \"This is an update for an incident\"\n}"
-						},
-						"url": {
-							"raw": "{{endpoint}}/api/incidents/1",
-							"host": [
-								"{{endpoint}}"
-							],
-							"path": [
-								"api",
-								"incidents",
-								"1"
-							]
-						},
-						"description": "View all incidents for a single service."
-					},
-					"response": []
-				},
-				{
-					"name": "Delete Incident",
-					"event": [
-						{
-							"listen": "test",
-							"script": {
-								"id": "c6735dbe-86e8-4b42-9b04-6fc1fea949df",
-								"exec": [
-									"pm.test(\"Response is ok\", function () {",
-									"    pm.response.to.have.status(200);",
-									"});"
-								],
-								"type": "text/javascript"
-							}
-						}
-					],
-					"request": {
-						"auth": {
-							"type": "bearer",
-							"bearer": [
-								{
-									"key": "token",
-									"value": "{{api_key}}",
-									"type": "string"
-								}
-							]
-						},
-						"method": "DELETE",
-						"header": [
-							{
-								"key": "Content-Type",
-								"name": "Content-Type",
-								"type": "text",
-								"value": "application/json"
-							}
-						],
-						"url": {
-							"raw": "{{endpoint}}/api/incidents/1",
-							"host": [
-								"{{endpoint}}"
-							],
-							"path": [
-								"api",
-								"incidents",
-								"1"
-							]
-						},
-						"description": "View all incidents for a single service."
-					},
-					"response": [
-						{
-							"name": "Delete Incident",
-							"originalRequest": {
-								"method": "DELETE",
-								"header": [
-									{
-										"key": "Content-Type",
-										"name": "Content-Type",
-										"type": "text",
-										"value": "application/json"
-									}
-								],
-								"url": {
-									"raw": "{{endpoint}}/api/incidents/2",
-									"host": [
-										"{{endpoint}}"
-									],
-									"path": [
-										"api",
-										"incidents",
-										"2"
-									]
-								}
-							},
-							"status": "OK",
-							"code": 200,
-							"_postman_previewlanguage": "json",
-							"header": [
-								{
-									"key": "Content-Type",
-									"value": "application/json"
-								},
-								{
-									"key": "Date",
-									"value": "Mon, 04 May 2020 03:31:48 GMT"
-								},
-								{
-									"key": "Content-Length",
-									"value": "207"
-								},
-								{
-									"key": "Connection",
-									"value": "close"
-								}
-							],
-							"cookie": [],
-							"body": "{\n    \"status\": \"success\",\n    \"type\": \"incident\",\n    \"method\": \"delete\",\n    \"id\": 2,\n    \"output\": {\n        \"id\": 2,\n        \"title\": \"Service Downtime\",\n        \"service\": 1,\n        \"created_at\": \"2020-05-04T03:18:24.818629Z\",\n        \"updated_at\": \"2020-05-04T03:18:24.818629Z\"\n    }\n}"
-						}
-					]
-				},
-				{
-					"name": "Incident Updates",
-					"event": [
-						{
-							"listen": "test",
-							"script": {
-								"id": "e2e7d38f-efae-44d1-9361-cd301547feb3",
-								"exec": [
-									"pm.test(\"Response is ok\", function () {",
-									"    pm.response.to.have.status(200);",
-									"});"
-								],
-								"type": "text/javascript"
-							}
-						}
-					],
-					"request": {
-						"auth": {
-							"type": "bearer",
-							"bearer": [
-								{
-									"key": "token",
-									"value": "{{api_key}}",
-									"type": "string"
-								}
-							]
-						},
-						"method": "GET",
-						"header": [
-							{
-								"key": "Content-Type",
-								"name": "Content-Type",
-								"type": "text",
-								"value": "application/json"
-							}
-						],
-						"url": {
-							"raw": "{{endpoint}}/api/incidents/2/updates",
-							"host": [
-								"{{endpoint}}"
-							],
-							"path": [
-								"api",
-								"incidents",
-								"2",
-								"updates"
-							]
-						},
-						"description": "View all incidents for a single service."
-					},
-					"response": []
-				},
 				{
 					"name": "Create Incident Update",
 					"event": [
@@ -2609,6 +2564,113 @@
 						}
 					]
 				},
+				{
+					"name": "Incident Updates",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"id": "e2e7d38f-efae-44d1-9361-cd301547feb3",
+								"exec": [
+									"pm.test(\"Response is ok\", function () {",
+									"    pm.response.to.have.status(200);",
+									"});"
+								],
+								"type": "text/javascript"
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": [
+								{
+									"key": "token",
+									"value": "{{api_key}}",
+									"type": "string"
+								}
+							]
+						},
+						"method": "GET",
+						"header": [
+							{
+								"key": "Content-Type",
+								"name": "Content-Type",
+								"type": "text",
+								"value": "application/json"
+							}
+						],
+						"url": {
+							"raw": "{{endpoint}}/api/incidents/2/updates",
+							"host": [
+								"{{endpoint}}"
+							],
+							"path": [
+								"api",
+								"incidents",
+								"2",
+								"updates"
+							]
+						},
+						"description": "View all incidents for a single service."
+					},
+					"response": []
+				},
+				{
+					"name": "Update Service Incident",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"id": "42cd68de-5bd4-4d4e-b687-fa0bafc1d61a",
+								"exec": [
+									"pm.test(\"Response is ok\", function () {",
+									"    pm.response.to.have.status(200);",
+									"});"
+								],
+								"type": "text/javascript"
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": [
+								{
+									"key": "token",
+									"value": "{{api_key}}",
+									"type": "string"
+								}
+							]
+						},
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"name": "Content-Type",
+								"type": "text",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{\n\t\"title\": \"Updated Downtime\",\n\t\"description\": \"This is an update for an incident\"\n}"
+						},
+						"url": {
+							"raw": "{{endpoint}}/api/incidents/1",
+							"host": [
+								"{{endpoint}}"
+							],
+							"path": [
+								"api",
+								"incidents",
+								"1"
+							]
+						},
+						"description": "View all incidents for a single service."
+					},
+					"response": []
+				},
 				{
 					"name": "Delete Incident Update",
 					"event": [
@@ -2712,6 +2774,106 @@
 							"body": "{\n    \"status\": \"success\",\n    \"type\": \"incident_update\",\n    \"method\": \"delete\",\n    \"id\": 1,\n    \"output\": {\n        \"id\": 1,\n        \"message\": \"Website is loading very slowly, looking into this.\",\n        \"type\": \"Investigating\",\n        \"created_at\": \"2020-05-04T03:20:05.102435Z\",\n        \"updated_at\": \"2020-05-04T03:20:05.102435Z\"\n    }\n}"
 						}
 					]
+				},
+				{
+					"name": "Delete Incident",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"id": "c6735dbe-86e8-4b42-9b04-6fc1fea949df",
+								"exec": [
+									"pm.test(\"Response is ok\", function () {",
+									"    pm.response.to.have.status(200);",
+									"});"
+								],
+								"type": "text/javascript"
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": [
+								{
+									"key": "token",
+									"value": "{{api_key}}",
+									"type": "string"
+								}
+							]
+						},
+						"method": "DELETE",
+						"header": [
+							{
+								"key": "Content-Type",
+								"name": "Content-Type",
+								"type": "text",
+								"value": "application/json"
+							}
+						],
+						"url": {
+							"raw": "{{endpoint}}/api/incidents/1",
+							"host": [
+								"{{endpoint}}"
+							],
+							"path": [
+								"api",
+								"incidents",
+								"1"
+							]
+						},
+						"description": "View all incidents for a single service."
+					},
+					"response": [
+						{
+							"name": "Delete Incident",
+							"originalRequest": {
+								"method": "DELETE",
+								"header": [
+									{
+										"key": "Content-Type",
+										"name": "Content-Type",
+										"type": "text",
+										"value": "application/json"
+									}
+								],
+								"url": {
+									"raw": "{{endpoint}}/api/incidents/2",
+									"host": [
+										"{{endpoint}}"
+									],
+									"path": [
+										"api",
+										"incidents",
+										"2"
+									]
+								}
+							},
+							"status": "OK",
+							"code": 200,
+							"_postman_previewlanguage": "json",
+							"header": [
+								{
+									"key": "Content-Type",
+									"value": "application/json"
+								},
+								{
+									"key": "Date",
+									"value": "Mon, 04 May 2020 03:31:48 GMT"
+								},
+								{
+									"key": "Content-Length",
+									"value": "207"
+								},
+								{
+									"key": "Connection",
+									"value": "close"
+								}
+							],
+							"cookie": [],
+							"body": "{\n    \"status\": \"success\",\n    \"type\": \"incident\",\n    \"method\": \"delete\",\n    \"id\": 2,\n    \"output\": {\n        \"id\": 2,\n        \"title\": \"Service Downtime\",\n        \"service\": 1,\n        \"created_at\": \"2020-05-04T03:18:24.818629Z\",\n        \"updated_at\": \"2020-05-04T03:18:24.818629Z\"\n    }\n}"
+						}
+					]
 				}
 			],
 			"protocolProfileBehavior": {}
@@ -3212,6 +3374,8 @@
 									"pm.test(\"Check Login JWT Token\", function () {",
 									"    var jsonData = pm.response.json();",
 									"    pm.expect(jsonData).to.have.property('token');",
+									"    pm.expect(jsonData).to.have.property('admin');",
+									"    pm.globals.set(\"token\", jsonData.token);",
 									"});"
 								],
 								"type": "text/javascript"
@@ -3308,24 +3472,141 @@
 							"_postman_previewlanguage": "json",
 							"header": [
 								{
-									"key": "Content-Length",
-									"value": "174"
+									"key": "Content-Type",
+									"value": "application/json"
 								},
+								{
+									"key": "Set-Cookie",
+									"value": "statping_auth=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImFkbWluIiwiYWRtaW4iOnRydWUsInNjb3BlcyI6ImFkbWluIiwiZXhwIjoxNTk2NzQzMDUzfQ.dQQGgUDhFEjCL2Gi-Seg0hBp_sqVsDn3cXB0GpSorJI; Path=/; Expires=Thu, 06 Aug 2020 19:44:13 GMT; Max-Age=259200"
+								},
+								{
+									"key": "Date",
+									"value": "Mon, 03 Aug 2020 19:44:13 GMT"
+								},
+								{
+									"key": "Content-Length",
+									"value": "197"
+								},
+								{
+									"key": "Connection",
+									"value": "close"
+								}
+							],
+							"cookie": [],
+							"body": "{\n    \"token\": \"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImFkbWluIiwiYWRtaW4iOnRydWUsInNjb3BlcyI6ImFkbWluIiwiZXhwIjoxNTk2NzQzMDUzfQ.dQQGgUDhFEjCL2Gi-Seg0hBp_sqVsDn3cXB0GpSorJI\",\n    \"admin\": true\n}"
+						}
+					]
+				},
+				{
+					"name": "Check User Token",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"id": "560e439b-d588-4a2f-a8a6-a0607531d74c",
+								"exec": [
+									"pm.test(\"Response is ok\", function () {",
+									"    pm.response.to.have.status(200);",
+									"});",
+									"",
+									"pm.test(\"View Token Response\", function () {",
+									"    var jsonData = pm.response.json();",
+									"    pm.expect(jsonData.username).to.eql(\"admin\");",
+									"    pm.expect(jsonData.admin).to.eql(true);",
+									"    pm.expect(jsonData.scopes).to.eql(\"admin\");",
+									"});"
+								],
+								"type": "text/javascript"
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": [
+								{
+									"key": "token",
+									"value": "{{api_key}}",
+									"type": "string"
+								}
+							]
+						},
+						"method": "POST",
+						"header": [],
+						"body": {
+							"mode": "urlencoded",
+							"urlencoded": [
+								{
+									"key": "token",
+									"value": "{{token}}",
+									"type": "text"
+								}
+							]
+						},
+						"url": {
+							"raw": "{{endpoint}}/api/users/token",
+							"host": [
+								"{{endpoint}}"
+							],
+							"path": [
+								"api",
+								"users",
+								"token"
+							]
+						},
+						"description": "Send your JWT token from login to this endpoint to return the JSON values."
+					},
+					"response": [
+						{
+							"name": "Check User Token",
+							"originalRequest": {
+								"method": "POST",
+								"header": [],
+								"body": {
+									"mode": "urlencoded",
+									"urlencoded": [
+										{
+											"key": "token",
+											"value": "{{token}}",
+											"type": "text"
+										}
+									]
+								},
+								"url": {
+									"raw": "{{endpoint}}/api/users/token",
+									"host": [
+										"{{endpoint}}"
+									],
+									"path": [
+										"api",
+										"users",
+										"token"
+									]
+								}
+							},
+							"status": "OK",
+							"code": 200,
+							"_postman_previewlanguage": "json",
+							"header": [
 								{
 									"key": "Content-Type",
 									"value": "application/json"
 								},
 								{
 									"key": "Date",
-									"value": "Sat, 02 May 2020 00:56:17 GMT"
+									"value": "Mon, 03 Aug 2020 19:47:23 GMT"
 								},
 								{
-									"key": "Set-Cookie",
-									"value": "statping_auth=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImFkbWluIiwiYWRtaW4iOnRydWUsImV4cCI6MTU4ODY0MDE3N30.tf399_LfAphSGlKMtgphg6qpPrn-_w92XfCrK5FwbZY; Expires=Tue, 05 May 2020 00:56:17 GMT"
+									"key": "Content-Length",
+									"value": "68"
+								},
+								{
+									"key": "Connection",
+									"value": "close"
 								}
 							],
 							"cookie": [],
-							"body": "{\n    \"token\": \"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImFkbWluIiwiYWRtaW4iOnRydWUsImV4cCI6MTU4ODY0MDE3N30.tf399_LfAphSGlKMtgphg6qpPrn-_w92XfCrK5FwbZY\",\n    \"admin\": true\n}"
+							"body": "{\n    \"username\": \"admin\",\n    \"admin\": true,\n    \"scopes\": \"admin\",\n    \"exp\": 1596743053\n}"
 						}
 					]
 				},
@@ -3917,7 +4198,7 @@
 									"",
 									"pm.test(\"View All Notifiers\", function () {",
 									"    var jsonData = pm.response.json();",
-									"    pm.expect(jsonData.length).to.eql(11);",
+									"    pm.expect(jsonData.length).to.eql(13);",
 									"});"
 								],
 								"type": "text/javascript"
@@ -4121,7 +4402,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n    \"method\": \"slack\",\n    \"host\": \"https://hooks.slack.com/services/EXAMPLEIDHERE/BV33WKP0C/MtKw3Kc8BFylTv4pohKqHtXX\",\n    \"enabled\": true,\n    \"limits\": 55\n}",
+							"raw": "{\n    \"method\": \"slack\",\n    \"host\": \"https://hooks.slack.com/services/TTJ1B90DP/RENU20O9M/9uI823SUnYBuGcxYlpSimD6H\",\n    \"enabled\": true,\n    \"limits\": 55\n}",
 							"options": {
 								"raw": {}
 							}
@@ -4233,7 +4514,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n    \"method\": \"success\",\n    \"notifier\": {\n        \"enabled\": false,\n        \"limits\": 60,\n        \"method\": \"slack\",\n        \"host\": \"https://webhooksurl.slack.com/***\",\n        \"success_data\": \"{\\n  \\\"blocks\\\": [{\\n    \\\"type\\\": \\\"section\\\",\\n    \\\"text\\\": {\\n      \\\"type\\\": \\\"mrkdwn\\\",\\n      \\\"text\\\": \\\"The service {{.Service.Name}} is back online.\\\"\\n    }\\n  }, {\\n    \\\"type\\\": \\\"actions\\\",\\n    \\\"elements\\\": [{\\n      \\\"type\\\": \\\"button\\\",\\n      \\\"text\\\": {\\n        \\\"type\\\": \\\"plain_text\\\",\\n        \\\"text\\\": \\\"View Service\\\",\\n        \\\"emoji\\\": true\\n      },\\n      \\\"style\\\": \\\"primary\\\",\\n      \\\"url\\\": \\\"{{.Core.Domain}}/service/{{.Service.Id}}\\\"\\n    }, {\\n      \\\"type\\\": \\\"button\\\",\\n      \\\"text\\\": {\\n        \\\"type\\\": \\\"plain_text\\\",\\n        \\\"text\\\": \\\"Go to Statping\\\",\\n        \\\"emoji\\\": true\\n      },\\n      \\\"url\\\": \\\"{{.Core.Domain}}\\\"\\n    }]\\n  }]\\n}\",\n        \"failure_data\": \"{\\n  \\\"blocks\\\": [{\\n    \\\"type\\\": \\\"section\\\",\\n    \\\"text\\\": {\\n      \\\"type\\\": \\\"mrkdwn\\\",\\n      \\\"text\\\": \\\":warning: The service {{.Service.Name}} is currently offline! :warning:\\\"\\n    }\\n  }, {\\n    \\\"type\\\": \\\"divider\\\"\\n  }, {\\n    \\\"type\\\": \\\"section\\\",\\n    \\\"fields\\\": [{\\n      \\\"type\\\": \\\"mrkdwn\\\",\\n      \\\"text\\\": \\\"*Service:*\\\\n{{.Service.Name}}\\\"\\n    }, {\\n      \\\"type\\\": \\\"mrkdwn\\\",\\n      \\\"text\\\": \\\"*URL:*\\\\n{{.Service.Domain}}\\\"\\n    }, {\\n      \\\"type\\\": \\\"mrkdwn\\\",\\n      \\\"text\\\": \\\"*Status Code:*\\\\n{{.Service.LastStatusCode}}\\\"\\n    }, {\\n      \\\"type\\\": \\\"mrkdwn\\\",\\n      \\\"text\\\": \\\"*When:*\\\\n{{.Failure.CreatedAt}}\\\"\\n    }, {\\n      \\\"type\\\": \\\"mrkdwn\\\",\\n      \\\"text\\\": \\\"*Downtime:*\\\\n{{.Service.DowntimeAgo}}\\\"\\n    }, {\\n      \\\"type\\\": \\\"plain_text\\\",\\n      \\\"text\\\": \\\"*Error:*\\\\n{{.Failure.Issue}}\\\"\\n    }]\\n  }, {\\n    \\\"type\\\": \\\"divider\\\"\\n  }, {\\n    \\\"type\\\": \\\"actions\\\",\\n    \\\"elements\\\": [{\\n      \\\"type\\\": \\\"button\\\",\\n      \\\"text\\\": {\\n        \\\"type\\\": \\\"plain_text\\\",\\n        \\\"text\\\": \\\"View Offline Service\\\",\\n        \\\"emoji\\\": true\\n      },\\n      \\\"style\\\": \\\"danger\\\",\\n      \\\"url\\\": \\\"{{.Core.Domain}}/service/{{.Service.Id}}\\\"\\n    }, {\\n      \\\"type\\\": \\\"button\\\",\\n      \\\"text\\\": {\\n        \\\"type\\\": \\\"plain_text\\\",\\n        \\\"text\\\": \\\"Go to Statping\\\",\\n        \\\"emoji\\\": true\\n      },\\n      \\\"url\\\": \\\"{{.Core.Domain}}\\\"\\n    }]\\n  }]\\n}\"\n    }\n}",
+							"raw": "{\n    \"method\": \"success\",\n    \"notifier\": {\n        \"enabled\": false,\n        \"limits\": 60,\n        \"method\": \"slack\",\n        \"host\": \"https://webhooksurl.slack.com/***\",\n        \"success_data\": \"{\\n  \\\"blocks\\\": [{\\n    \\\"type\\\": \\\"section\\\",\\n    \\\"text\\\": {\\n      \\\"type\\\": \\\"mrkdwn\\\",\\n      \\\"text\\\": \\\"The service {{.Service.Name}} is back online.\\\"\\n    }\\n  }, {\\n    \\\"type\\\": \\\"actions\\\",\\n    \\\"elements\\\": [{\\n      \\\"type\\\": \\\"button\\\",\\n      \\\"text\\\": {\\n        \\\"type\\\": \\\"plain_text\\\",\\n        \\\"text\\\": \\\"View Service\\\",\\n        \\\"emoji\\\": true\\n      },\\n      \\\"style\\\": \\\"primary\\\",\\n      \\\"url\\\": \\\"{{.Core.Domain}}/service/{{.Service.Id}}\\\"\\n    }, {\\n      \\\"type\\\": \\\"button\\\",\\n      \\\"text\\\": {\\n        \\\"type\\\": \\\"plain_text\\\",\\n        \\\"text\\\": \\\"Go to Statping\\\",\\n        \\\"emoji\\\": true\\n      },\\n      \\\"url\\\": \\\"{{.Core.Domain}}\\\"\\n    }]\\n  }]\\n}\",\n        \"failure_data\": \"{\\n  \\\"blocks\\\": [{\\n    \\\"type\\\": \\\"section\\\",\\n    \\\"text\\\": {\\n      \\\"type\\\": \\\"mrkdwn\\\",\\n      \\\"text\\\": \\\":warning: The service {{.Service.Name}} is currently offline! :warning:\\\"\\n    }\\n  }, {\\n    \\\"type\\\": \\\"divider\\\"\\n  }, {\\n    \\\"type\\\": \\\"section\\\",\\n    \\\"fields\\\": [{\\n      \\\"type\\\": \\\"mrkdwn\\\",\\n      \\\"text\\\": \\\"*Service:*\\\\n{{.Service.Name}}\\\"\\n    }, {\\n      \\\"type\\\": \\\"mrkdwn\\\",\\n      \\\"text\\\": \\\"*URL:*\\\\n{{.Service.Domain}}\\\"\\n    }, {\\n      \\\"type\\\": \\\"mrkdwn\\\",\\n      \\\"text\\\": \\\"*Status Code:*\\\\n{{.Service.LastStatusCode}}\\\"\\n    }, {\\n      \\\"type\\\": \\\"mrkdwn\\\",\\n      \\\"text\\\": \\\"*When:*\\\\n{{.Failure.CreatedAt}}\\\"\\n    }, {\\n      \\\"type\\\": \\\"mrkdwn\\\",\\n      \\\"text\\\": \\\"*Downtime:*\\\\n{{.Service.Downtime.Human}}\\\"\\n    }, {\\n      \\\"type\\\": \\\"plain_text\\\",\\n      \\\"text\\\": \\\"*Error:*\\\\n{{.Failure.Issue}}\\\"\\n    }]\\n  }, {\\n    \\\"type\\\": \\\"divider\\\"\\n  }, {\\n    \\\"type\\\": \\\"actions\\\",\\n    \\\"elements\\\": [{\\n      \\\"type\\\": \\\"button\\\",\\n      \\\"text\\\": {\\n        \\\"type\\\": \\\"plain_text\\\",\\n        \\\"text\\\": \\\"View Offline Service\\\",\\n        \\\"emoji\\\": true\\n      },\\n      \\\"style\\\": \\\"danger\\\",\\n      \\\"url\\\": \\\"{{.Core.Domain}}/service/{{.Service.Id}}\\\"\\n    }, {\\n      \\\"type\\\": \\\"button\\\",\\n      \\\"text\\\": {\\n        \\\"type\\\": \\\"plain_text\\\",\\n        \\\"text\\\": \\\"Go to Statping\\\",\\n        \\\"emoji\\\": true\\n      },\\n      \\\"url\\\": \\\"{{.Core.Domain}}\\\"\\n    }]\\n  }]\\n}\"\n    }\n}",
 							"options": {
 								"raw": {}
 							}
@@ -4911,8 +5192,7 @@
 									"    var first = jsonData[0];",
 									"    var id = pm.globals.get(\"checkin_id\");",
 									"    pm.expect(first.name).to.eql(\"Demo Checkin 1\");",
-									"    pm.expect(first.grace).to.eql(300);",
-									"    pm.expect(first.interval).to.eql(300);",
+									"    pm.expect(first.interval).to.eql(3);",
 									"});"
 								],
 								"type": "text/javascript"
@@ -4990,8 +5270,7 @@
 									"    pm.expect(jsonData.status).to.eql(\"success\");",
 									"    pm.expect(jsonData.type).to.eql(\"checkin\");",
 									"    pm.expect(jsonData.output.name).to.eql(\"Server Checkin\");",
-									"    pm.expect(jsonData.output.grace).to.eql(60);",
-									"    pm.expect(jsonData.output.interval).to.eql(900);",
+									"    pm.expect(jsonData.output.interval).to.eql(3);",
 									"    var id = jsonData.output.api_key;",
 									"    pm.globals.set(\"checkin_id\", id);",
 									"});"
@@ -5022,7 +5301,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n    \"service_id\": 2,\n    \"name\": \"Server Checkin\",\n    \"interval\": 900,\n    \"grace\": 60\n}",
+							"raw": "{\n    \"service_id\": 2,\n    \"name\": \"Server Checkin\",\n    \"interval\": 3\n}",
 							"options": {
 								"raw": {}
 							}
@@ -5182,8 +5461,7 @@
 									"    var id = pm.globals.get(\"checkin_id\");",
 									"    pm.expect(jsonData.name).to.eql(\"Server Checkin\");",
 									"    pm.expect(jsonData.api_key).to.eql(id);",
-									"    pm.expect(jsonData.grace).to.eql(60);",
-									"    pm.expect(jsonData.interval).to.eql(900);",
+									"    pm.expect(jsonData.interval).to.eql(3);",
 									"});"
 								],
 								"type": "text/javascript"
diff --git a/frontend/config/webpack.config.prod.js b/frontend/config/webpack.config.prod.js
index f181627b..0e10e4a4 100644
--- a/frontend/config/webpack.config.prod.js
+++ b/frontend/config/webpack.config.prod.js
@@ -60,6 +60,9 @@ const webpackConfig = merge(commonConfig, {
     plugins: [
         new webpack.EnvironmentPlugin(environment),
         new CleanWebpackPlugin(),
+        // new webpack.optimize.LimitChunkCountPlugin({
+        //   maxChunks: 1
+        // }),
         new MiniCSSExtractPlugin({
             filename: 'css/[name].css',
             chunkFilename: 'css/[name].css'
@@ -71,7 +74,7 @@ const webpackConfig = merge(commonConfig, {
             threshold: 10240,
             minRatio: 0.8
         }),
-        new webpack.HashedModuleIdsPlugin(),
+        // new webpack.HashedModuleIdsPlugin(),
         new HtmlPlugin({
             template: 'public/base.gohtml',
             filename: 'base.gohtml',
diff --git a/frontend/package.json b/frontend/package.json
index c73a280a..46b06aac 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -19,26 +19,25 @@
     "@fortawesome/free-brands-svg-icons": "^5.12.1",
     "@fortawesome/free-solid-svg-icons": "^5.12.0",
     "@fortawesome/vue-fontawesome": "^0.1.9",
-    "@sentry/browser": "^5.13.2",
-    "@sentry/integrations": "^5.13.2",
-    "apexcharts": "^3.15.0",
+    "@sentry/browser": "^5.20.1",
+    "@sentry/integrations": "^5.20.1",
+    "apexcharts": "^3.6.6",
     "axios": "^0.19.1",
-    "bootstrap": "^4.4.1",
-    "bootstrap-vue": "^2.6.1",
     "codemirror-colorpicker": "^1.9.66",
-    "core-js": "^3.4.4",
+    "core-js": "^3.6.5",
     "date-fns": "^2.9.0",
     "js-beautify": "^1.11.0",
     "querystring": "^0.2.0",
+    "sass": "^1.26.10",
+    "semver": "^7.3.2",
     "vue": "^2.6.11",
-    "vue-apexcharts": "^1.5.2",
+    "vue-apexcharts": "^1.6.0",
     "vue-clipboard2": "^0.3.1",
     "vue-codemirror": "^4.0.6",
     "vue-cookies": "^1.7.0",
     "vue-flatpickr-component": "^8.1.5",
     "vue-github-button": "^1.1.2",
     "vue-i18n": "^8.18.1",
-    "vue-moment": "^4.1.0",
     "vue-observe-visibility": "^0.4.6",
     "vue-router": "~3.0",
     "vuedraggable": "^2.23.2",
@@ -64,7 +63,6 @@
     "compression-webpack-plugin": "~2.0",
     "cross-env": "^7.0.2",
     "css-loader": "~2.1",
-    "cypress": "^4.3.0",
     "eslint": "~5.16",
     "eslint-config-standard": "~10.2",
     "eslint-friendly-formatter": "~3.0",
@@ -78,13 +76,13 @@
     "expect": "^25.1.0",
     "file-loader": "^5.0.2",
     "friendly-errors-webpack-plugin": "~1.7",
+    "github-wikito-converter": "^1.5.2",
     "html-webpack-plugin": "^4.0.0-beta.11",
     "jsdom": "^16.2.0",
     "jsdom-global": "^3.0.2",
     "mini-css-extract-plugin": "~0.5",
     "mocha": "^7.0.1",
     "mochapack": "^1.1.13",
-    "node-sass": "^4.13.1",
     "optimize-css-assets-webpack-plugin": "~5.0",
     "sass-loader": "^8.0.2",
     "start-server-and-test": "^1.10.11",
diff --git a/frontend/public/base.gohtml b/frontend/public/base.gohtml
index 07bf22ba..45ecbe3c 100644
--- a/frontend/public/base.gohtml
+++ b/frontend/public/base.gohtml
@@ -43,19 +43,11 @@
     <meta property="twitter:image" content="favicon/social.png">
 
     {{if USE_CDN}}
-    <link rel="stylesheet" href="https://assets.statping.com/vendor.css">
-    <link rel="stylesheet" href="https://assets.statping.com/style.css">
-    <link rel="stylesheet" href="https://assets.statping.com/main.css">
-    {{else}}
-    {{if USING_ASSETS}}
-    <link href="css/vendor.css" rel="stylesheet">
-    <link href="css/style.css" rel="stylesheet">
-    <link href="css/main.css" rel="stylesheet">
+    <link rel="stylesheet" href="https://assets.statping.com/css/vendor.css">
     {{else}}
     <% _.each(htmlWebpackPlugin.tags.headTags, function(headTag) { %>
     <%= headTag %> <% }) %>
     {{end}}
-    {{end}}
 </head>
 <body>
 <noscript>
@@ -65,11 +57,10 @@
 <div id="app" class="statping_container"></div>
 
 {{if USE_CDN}}
-<script src="https://assets.statping.com/bundle.js"></script>
-<script src="https://assets.statping.com/vendor.chunk.js"></script>
-<script src="https://assets.statping.com/polyfill.chunk.js"></script>
-<script src="https://assets.statping.com/style.chunk.js"></script>
-<script src="https://assets.statping.com/main.chunk.js"></script>
+<script src="https://assets.statping.com/js/bundle.js"></script>
+<script src="https://assets.statping.com/js/vendor.chunk.js"></script>
+<script src="https://assets.statping.com/js/polyfill.chunk.js"></script>
+<script src="https://assets.statping.com/js/main.chunk.js"></script>
 {{else}}
 <% _.each(htmlWebpackPlugin.tags.bodyTags, function(bodyTag) { %>
 <%= bodyTag %> <% }) %>
diff --git a/frontend/public/css/base.css b/frontend/public/css/base.css
index 1120d47f..25673621 100644
--- a/frontend/public/css/base.css
+++ b/frontend/public/css/base.css
@@ -113,10 +113,6 @@ HTML, BODY {
   color: #fff;
 }
 
-.nav-pills .nav-link {
-  border-radius: 0.2rem;
-}
-
 .form-control {
   border-radius: 0.2rem;
 }
diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico
index fda02608..470003b4 100644
Binary files a/frontend/public/favicon.ico and b/frontend/public/favicon.ico differ
diff --git a/source/tmpl/robots.txt b/frontend/public/robots.txt
similarity index 100%
rename from source/tmpl/robots.txt
rename to frontend/public/robots.txt
diff --git a/frontend/src/API.js b/frontend/src/API.js
index dbadbf04..3edd8702 100644
--- a/frontend/src/API.js
+++ b/frontend/src/API.js
@@ -1,16 +1,14 @@
-import Vue from "vue";
 import axios from 'axios'
-import * as Sentry from "@sentry/browser";
-import * as Integrations from "@sentry/integrations";
+
 const qs = require('querystring');
 axios.defaults.withCredentials = true
 
 const tokenKey = "statping_auth";
-const errorReporter = "https://bed4d75404924cb3a799e370733a1b64@sentry.statping.com/3"
 
 class Api {
   constructor() {
-
+    this.version = "0.90.67";
+    this.commit = "7e121335791d2143a2eefd404dbcce83b8f46f61";
   }
 
   async oauth() {
@@ -54,17 +52,17 @@ class Api {
     return axios.post('api/services/' + data.id, data).then(response => (response.data))
   }
 
-  async service_hits(id, start, end, group, fill=true) {
+  async service_hits(id, start, end, group, fill = true) {
     return axios.get('api/services/' + id + '/hits_data?start=' + start + '&end=' + end + '&group=' + group + '&fill=' + fill).then(response => (response.data))
   }
 
-    async service_ping(id, start, end, group, fill=true) {
-        return axios.get('api/services/' + id + '/ping_data?start=' + start + '&end=' + end + '&group=' + group + '&fill=' + fill).then(response => (response.data))
-    }
+  async service_ping(id, start, end, group, fill = true) {
+    return axios.get('api/services/' + id + '/ping_data?start=' + start + '&end=' + end + '&group=' + group + '&fill=' + fill).then(response => (response.data))
+  }
 
-    async service_failures_data(id, start, end, group, fill=true) {
-        return axios.get('api/services/' + id + '/failure_data?start=' + start + '&end=' + end + '&group=' + group + '&fill=' + fill).then(response => (response.data))
-    }
+  async service_failures_data(id, start, end, group, fill = true) {
+    return axios.get('api/services/' + id + '/failure_data?start=' + start + '&end=' + end + '&group=' + group + '&fill=' + fill).then(response => (response.data))
+  }
 
   async service_uptime(id, start, end) {
     return axios.get('api/services/' + id + '/uptime_data?start=' + start + '&end=' + end).then(response => (response.data))
@@ -75,7 +73,7 @@ class Api {
   }
 
   async service_failures(id, start, end, limit = 999, offset = 0) {
-    return axios.get('api/services/' + id + '/failures?start=' + start + '&end=' + end + '&limit=' + limit+ '&offset=' + offset).then(response => (response.data))
+    return axios.get('api/services/' + id + '/failures?start=' + start + '&end=' + end + '&limit=' + limit + '&offset=' + offset).then(response => (response.data))
   }
 
   async service_failures_delete(service) {
@@ -90,16 +88,15 @@ class Api {
     return axios.post('api/reorder/services', data).then(response => (response.data))
   }
 
-    async checkins() {
-        return axios.get('api/checkins').then(response => (response.data))
-    }
+  async checkins() {
+    return axios.get('api/checkins').then(response => (response.data))
+  }
 
   async groups() {
     return axios.get('api/groups').then(response => (response.data))
   }
 
   async groups_reorder(data) {
-      window.console.log('api/reorder/groups', data)
     return axios.post('api/reorder/groups', data).then(response => (response.data))
   }
 
@@ -132,36 +129,40 @@ class Api {
   }
 
   async incident_updates(incident) {
-    return axios.get('api/incidents/'+incident.id+'/updates').then(response => (response.data))
+    return axios.get('api/incidents/' + incident.id + '/updates').then(response => (response.data))
   }
 
   async incident_update_create(update) {
-    return axios.post('api/incidents/'+update.incident+'/updates', update).then(response => (response.data))
+    return axios.post('api/incidents/' + update.incident + '/updates', update).then(response => (response.data))
   }
 
   async incident_update_delete(update) {
-    return axios.delete('api/incidents/'+update.incident+'/updates/'+update.id).then(response => (response.data))
+    return axios.delete('api/incidents/' + update.incident + '/updates/' + update.id).then(response => (response.data))
   }
 
-    async incidents_service(id) {
-        return axios.get('api/services/'+id+'/incidents').then(response => (response.data))
-    }
+  async incidents_service(id) {
+    return axios.get('api/services/' + id + '/incidents').then(response => (response.data))
+  }
 
-    async incident_create(service_id, data) {
-        return axios.post('api/services/'+service_id+'/incidents', data).then(response => (response.data))
-    }
+  async incident_create(service_id, data) {
+    return axios.post('api/services/' + service_id + '/incidents', data).then(response => (response.data))
+  }
 
-    async incident_delete(incident) {
-        return axios.delete('api/incidents/'+incident.id).then(response => (response.data))
-    }
+  async incident_delete(incident) {
+    return axios.delete('api/incidents/' + incident.id).then(response => (response.data))
+  }
 
-    async checkin_create(data) {
-        return axios.post('api/checkins', data).then(response => (response.data))
-    }
+  async checkin(api) {
+    return axios.get('api/checkins/' + api).then(response => (response.data))
+  }
 
-    async checkin_delete(checkin) {
-        return axios.delete('api/checkins/'+checkin.api_key).then(response => (response.data))
-    }
+  async checkin_create(data) {
+    return axios.post('api/checkins', data).then(response => (response.data))
+  }
+
+  async checkin_delete(checkin) {
+    return axios.delete('api/checkins/' + checkin.api_key).then(response => (response.data))
+  }
 
   async messages() {
     return axios.get('api/messages').then(response => (response.data))
@@ -231,6 +232,15 @@ class Api {
     return axios.post('api/theme', data).then(response => (response.data))
   }
 
+  async import(data) {
+    return axios.post('api/settings/import', data).then(response => (response.data))
+  }
+
+  async check_token(token) {
+    const f = {token: token}
+    return axios.post('api/users/token', qs.stringify(f)).then(response => (response.data))
+  }
+
   async login(username, password) {
     const f = {username: username, password: password}
     return axios.post('api/login', qs.stringify(f)).then(response => (response.data))
@@ -251,6 +261,14 @@ class Api {
     })
   }
 
+  async configs() {
+    return axios.get('api/settings/configs').then(response => (response.data)) || []
+  }
+
+  async configs_save(data) {
+    return axios.post('api/settings/configs', data).then(response => (response.data)) || []
+  }
+
   token() {
     return $cookies.get(tokenKey);
   }
@@ -264,15 +282,12 @@ class Api {
     }
   }
 
-  async allActions(...all) {
-    await axios.all([all])
+  async github_release() {
+    return fetch('https://api.github.com/repos/statping/statping/releases/latest').then(response => response.json())
   }
 
-  async sentry_init() {
-    Sentry.init({
-      dsn: errorReporter,
-      integrations: [new Integrations.Vue({Vue, attachProps: true})],
-    });
+  async allActions(...all) {
+    await axios.all([all])
   }
 
 }
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 8a8d0dad..afa27a8c 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,59 +1,59 @@
 <template>
   <div id="app">
-    <router-view :loaded="loaded"/>
-      <Footer v-if="$route.path !== '/setup'"/>
+    <router-view/>
+    <Footer v-if="$route.path !== '/setup'"/>
   </div>
 </template>
 
 <script>
-  import Footer from "./components/Index/Footer";
+  const Footer = () => import(/* webpackChunkName: "index" */ "./components/Index/Footer");
 
   export default {
-  name: 'app',
-  components: {
-    Footer
-  },
-  data () {
-    return {
-      loaded: false,
+    name: 'app',
+    components: {
+      Footer
+    },
+    data() {
+      return {
+        loaded: false,
         version: "",
-    }
-  },
-      computed: {
-          core() {
-            return this.$store.getters.core
-          }
-      },
-  async beforeMount() {
-    await this.$store.dispatch('loadCore')
+      }
+    },
+    computed: {
+      core() {
+        return this.$store.getters.core
+      }
+    },
+    async beforeMount() {
+      await this.$store.dispatch('loadCore')
 
-    this.$i18n.locale = this.core.language || "en";
-    // this.$i18n.locale = "ru";
+      this.$i18n.locale = this.core.language || "en";
+      // this.$i18n.locale = "ru";
 
       if (!this.core.setup) {
         this.$router.push('/setup')
       }
-    if (this.$route.path !== '/setup') {
-      if (this.$store.state.admin) {
-        await this.$store.dispatch('loadAdmin')
-      } else {
-        await this.$store.dispatch('loadRequired')
+      if (this.$route.path !== '/setup') {
+        if (this.$store.state.admin) {
+          await this.$store.dispatch('loadAdmin')
+        } else {
+          await this.$store.dispatch('loadRequired')
+        }
+        this.loaded = true
       }
-      this.loaded = true
-    }
-  },
+    },
     async mounted() {
-          if (this.$route.path !== '/setup') {
-            if (this.$store.state.admin) {
-                this.logged_in = true
-                  // await this.$store.dispatch('loadAdmin')
-              }
-          }
+      if (this.$route.path !== '/setup') {
+        if (this.$store.state.admin) {
+          this.logged_in = true
+          // await this.$store.dispatch('loadAdmin')
+        }
+      }
     }
-}
+  }
 </script>
 
 <style lang="scss">
     @import "./assets/css/bootstrap.min.css";
-    @import "./assets/scss/main";
+    @import "./assets/scss/index";
 </style>
diff --git a/frontend/src/assets/scss/base.scss b/frontend/src/assets/scss/base.scss
index 9b09b68d..8143cde0 100644
--- a/frontend/src/assets/scss/base.scss
+++ b/frontend/src/assets/scss/base.scss
@@ -1,8 +1,5 @@
 @import 'variables';
-
-HTML,BODY {
-    background-color: $background-color;
-}
+@import 'mixin';
 
 .index-chart {
   height: $service-card-height;
@@ -26,26 +23,11 @@ HTML,BODY {
   box-shadow: 0px 3px 6px 1px rgba(0,0,0,0.08);
 }
 
-.copy-btn {
-  position: absolute;
-  right: 0;
-}
-
 .btn-xs {
   font-size: 8pt;
   padding: 2px 6px;
 }
 
-.copy-btn BUTTON {
-  background-color: white;
-  margin: 6px;
-  height: 26px;
-  font-size: 8pt;
-  padding: 5px 7px;
-  border: 1px solid #a7a7a7;
-  border-radius: 4px !important;
-}
-
 .dim {
   background-color: #f3f3f3;
 }
@@ -55,41 +37,6 @@ HTML,BODY {
   font-weight: bold;
 }
 
-/* The slider itself */
-.slider {
-  -webkit-appearance: none;  /* Override default CSS styles */
-  appearance: none;
-  width: 100%; /* Full-width */
-  height: 5px; /* Specified height */
-  background: #d3d3d3; /* Grey background */
-  outline: none; /* Remove outline */
-  -webkit-transition: .2s; /* 0.2 seconds transition on hover */
-  transition: opacity .2s;
-}
-
-/* Mouse-over effects */
-.slider:hover {
-  opacity: 1; /* Fully shown on mouse-over */
-}
-
-/* The slider handle (use -webkit- (Chrome, Opera, Safari, Edge) and -moz- (Firefox) to override default look) */
-.slider::-webkit-slider-thumb {
-  -webkit-appearance: none; /* Override default look */
-  appearance: none;
-  border-radius: 50%;
-  width: 20px; /* Set a specific slider handle width */
-  height: 20px; /* Slider handle height */
-  background: #4CAF50; /* Green background */
-  cursor: pointer; /* Cursor on hover */
-}
-
-.slider::-moz-range-thumb {
-  width: 15px; /* Set a specific slider handle width */
-  height: 15px; /* Slider handle height */
-  background: #4CAF50; /* Green background */
-  cursor: pointer; /* Cursor on hover */
-}
-
 @-o-keyframes fadeIt {
   0%   { background-color: #f5f5f5; }
   50%  { background-color: #f2f2f2; }
@@ -136,43 +83,53 @@ HTML,BODY {
 }
 
 .chartmarker {
-  padding: 5px;
-  width: 240px;
-  text-align: right;
+  padding: 0px;
+  width: 200px;
+  text-align: left;
 }
 
 .chartmarker SPAN {
-  font-size: 9pt;
+  font-size: 4pt;
   display: block;
-  color: #8b8b8b;
+  color: #b1b1b1;
 }
 
 .apexcharts-tooltip {
   box-shadow: none;
 }
 
-.contain-card {
-
-  .card-header {
-    font-size: 1.15rem;
-  }
-
-  .dropdown-menu {
-    background-color: rgba(239, 239, 239, 0.65);
-  }
-
-}
-
 .dropup .dropdown-menu {
     border-radius: 8px 8px 8px 0;
     background-color: #efefef;
 }
 
+.divided {
+  display: flex;
+  align-items: center;
+  margin-bottom: 0;
+}
+
+.divider {
+  flex-grow: 1;
+  border-bottom: 1px solid rgba(0,0,0,0.1);
+  margin: 0 20px 0 20px;
+}
+
+.daily-failures {
+  position: absolute;
+  padding-top: 3px;
+  top: 10px;
+  right: 100px;
+  width: 300px;
+  height: 25px;
+}
+
 .service_day {
   height: 20px;
   margin-right: 2px;
-  border-radius: 4px;
-  max-width: 25px;
+  border-radius: 2px;
+  max-width: 30px;
+  cursor: pointer;
 }
 
 .service_day SPAN {
@@ -202,13 +159,6 @@ HTML,BODY {
     opacity: 0;
   }
 
-  .container {
-    padding-top: 20px;
-    padding-bottom: 25px;
-    max-width: $max-width;
-    box-shadow: 0 .5rem 1rem rgba(0,0,0,.15)!important;
-  }
-
   .header-title {
     color: $title-color;
   }
@@ -226,10 +176,6 @@ HTML,BODY {
     padding: 5px 7px;
   }
 
-  .navbar {
-    margin-bottom: 30px;
-  }
-
   .btn-sm {
     line-height: 1.3;
     font-size: 0.75rem;
@@ -274,20 +220,6 @@ HTML,BODY {
     color: $service-description-color
   }
 
-  .footer {
-    text-decoration: none;
-    margin-top: 20px;
-  }
-
-  .footer A {
-    color: $footer-text-color;
-    text-decoration: none;
-  }
-
-  .footer A:HOVER {
-    color: #6d6d6d;
-  }
-
   .font-0 {
     font-size: 0.35rem;
   }
@@ -342,22 +274,6 @@ HTML,BODY {
     }
   }
 
-  .card-body .badge {
-    color: #fff;
-  }
-
-  .nav-pills .nav-link {
-    border-radius: $global-border-radius;
-  }
-
-  .form-control {
-    border-radius: $global-border-radius;
-  }
-
-  .mini_success {
-    background-color: #f3f3f3;
-  }
-
   .no-decoration {
     color: black;
     text-decoration: none;
@@ -368,10 +284,6 @@ HTML,BODY {
     text-decoration: none;
   }
 
-  .mini_error {
-    background-color: #ffbbbb;
-  }
-
   .btn-white {
     background-color: white;
     border: 1px solid #d8d8d8;
@@ -395,10 +307,6 @@ HTML,BODY {
     color: #a0a0a0;
   }
 
-  .service_block {
-    min-height: 340px;
-  }
-
   .json-field {
     font-size: 10pt;
   }
@@ -418,27 +326,6 @@ HTML,BODY {
   font-weight: bold;
 }
 
-
-  .card {
-    background-color: $service-background;
-    border: $service-border;
-    box-shadow: 0px 3px 6px 1px rgba(0, 0, 0, 0.08);
-  }
-
-  .card-body {
-    overflow: hidden;
-  }
-
-  .card-body H4 A {
-    color: $service-title;
-    text-decoration: none;
-  }
-
-  .card-title A {
-    color: $service-title;
-    text-decoration: none;
-  }
-
   .chart-container {
     position: relative;
     height: 240px;
@@ -458,79 +345,6 @@ HTML,BODY {
     width: 100%;
   }
 
-  .inputTags-field {
-    border: 0;
-    background-color: transparent;
-    padding-top: .13rem;
-  }
-
-  input.inputTags-field:focus {
-    outline-width: 0;
-  }
-
-  .inputTags-list {
-    display: block;
-    width: 100%;
-    min-height: calc(2.25rem + 2px);
-    padding: .2rem .35rem;
-    font-size: 1rem;
-    font-weight: 400;
-    line-height: 1.5;
-    color: #495057;
-    background-color: #fff;
-    background-clip: padding-box;
-    border: 1px solid #ced4da;
-    border-radius: .25rem;
-    transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
-  }
-
-  .inputTags-item {
-    background-color: #3aba39;
-    margin-right: 5px;
-    padding: 5px 8px;
-    font-size: 10pt;
-    color: white;
-    border-radius: 4px;
-  }
-
-  .inputTags-item .close-item {
-    margin-left: 6px;
-    font-size: 13pt;
-    font-weight: bold;
-    cursor: pointer;
-  }
-
-  @mixin dynamic-color-hov($color) {
-    &.dyn-dark {
-      background-color: darken($color, 12%) !important;
-      border-color: darken($color, 17%) !important;
-    }
-    &.dyn-dark:HOVER {
-      background-color: darken($color, 17%) !important;
-      border-color: darken($color, 20%) !important;
-    }
-    &.dyn-light {
-      background-color: lighten($color, 12%) !important;
-      border-color: lighten($color, 17%) !important;
-    }
-    &.dyn-light:HOVER {
-      background-color: lighten($color, 17%) !important;
-      border-color: lighten($color, 20%) !important;
-    }
-  }
-
-  @mixin dynamic-color($color) {
-    &.dyn-dark {
-      background-color: darken($color, 12%) !important;
-      border-color: darken($color, 17%) !important;
-    }
-    &.dyn-light {
-      background-color: lighten($color, 12%) !important;
-      border-color: lighten($color, 17%) !important;
-    }
-  }
-
-
   .btn-primary {
     background-color: $primary-color;
     border-color: darken($primary-color, 17%);
@@ -564,18 +378,6 @@ HTML,BODY {
     background-color: darken($danger-color, 10%) !important;
   }
 
-  .nav-pills .nav-link.active, .nav-pills .show>.nav-link {
-    background-color: $nav-tab-color;
-  }
-
-  .nav-pills A {
-    color: #424242;
-  }
-
-  .nav-pills I {
-    margin-right: 10px;
-  }
-
   @keyframes fadeInOut {
     0%   { opacity:1; }
     50%  { opacity:0.3; }
@@ -600,181 +402,13 @@ HTML,BODY {
     -webkit-animation: fadeInOut 1s infinite;
     -moz-animation: fadeInOut 1s infinite;
     -o-animation: fadeInOut 1s infinite;
-    animation: fadeInOut 21 infinite;
-  }
-
-  .CodeMirror {
-    /* Bootstrap Settings */
-    box-sizing: border-box;
-    margin: 0;
-    font: inherit;
-    overflow: auto;
-    display: block;
-    width: 100%;
-    padding: 0px;
-    font-size: 14px;
-    line-height: 1.5;
-    color: #555;
-    background-color: #fff;
-    background-image: none;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-    /* Code Mirror Settings */
-    font-family: monospace;
-    position: relative;
-    height:80vh;
-  }
-
-  .CodeMirror-focused {
-    /* Bootstrap Settings */
-    border-color: #66afe9;
-    outline: 0;
-    box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
-    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-  }
-
-  .switch {
-    font-size: 1rem;
-    position: relative;
-  }
-  .switch input {
-    position: absolute;
-    height: 1px;
-    width: 1px;
-    background: none;
-    border: 0;
-    clip: rect(0 0 0 0);
-    clip-path: inset(50%);
-    overflow: hidden;
-    padding: 0;
-  }
-  .switch input + label {
-    position: relative;
-    min-width: calc(calc(2.375rem * .8) * 2);
-    border-radius: calc(2.375rem * .8);
-    height: calc(2.375rem * .8);
-    line-height: calc(2.375rem * .8);
-    display: inline-block;
-    cursor: pointer;
-    outline: none;
-    user-select: none;
-    vertical-align: middle;
-    text-indent: calc(calc(calc(2.375rem * .8) * 2) + .5rem);
-  }
-  .switch input + label::before,
-  .switch input + label::after {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: calc(calc(2.375rem * .8) * 2);
-    bottom: 0;
-    display: block;
-  }
-  .switch input + label::before {
-    right: 0;
-    background-color: #dee2e6;
-    border-radius: calc(2.375rem * .8);
-    transition: 0.2s all;
-  }
-  .switch input + label::after {
-    top: 2px;
-    left: 2px;
-    width: calc(calc(2.375rem * .8) - calc(2px * 2));
-    height: calc(calc(2.375rem * .8) - calc(2px * 2));
-    border-radius: 50%;
-    background-color: white;
-    transition: 0.2s all;
-  }
-  .switch-rd-gr input:checked + label::before {
-    background-color: #29b10c !important;
-  }
-  .switch input:checked + label::before {
-    background-color: #08d;
-  }
-  .switch input:checked + label::after {
-    margin-left: calc(2.375rem * .8);
-  }
-  .switch input:focus + label::before {
-    outline: none;
-    box-shadow: 0 0 0 0.2rem rgba(0, 136, 221, 0.25);
-  }
-  .switch input:disabled + label {
-    color: #868e96;
-    cursor: not-allowed;
-  }
-  .switch input:disabled + label::before {
-    background-color: #e9ecef;
-  }
-  .switch.switch-sm {
-    font-size: 0.875rem;
-  }
-  .switch.switch-sm input + label {
-    min-width: calc(calc(1.9375rem * .8) * 2);
-    height: calc(1.9375rem * .8);
-    line-height: calc(1.9375rem * .8);
-    text-indent: calc(calc(calc(1.9375rem * .8) * 2) + .5rem);
-  }
-  .switch.switch-sm input + label::before {
-    width: calc(calc(1.9375rem * .8) * 2);
-  }
-  .switch.switch-sm input + label::after {
-    width: calc(calc(1.9375rem * .8) - calc(2px * 2));
-    height: calc(calc(1.9375rem * .8) - calc(2px * 2));
-  }
-  .switch.switch-sm input:checked + label::after {
-    margin-left: calc(1.9375rem * .8);
-  }
-  .switch.switch-lg {
-    font-size: 1.25rem;
-  }
-  .switch.switch-lg input + label {
-    min-width: calc(calc(3rem * .8) * 2);
-    height: calc(3rem * .8);
-    line-height: calc(3rem * .8);
-    text-indent: calc(calc(calc(3rem * .8) * 2) + .5rem);
-  }
-  .switch.switch-lg input + label::before {
-    width: calc(calc(3rem * .8) * 2);
-  }
-  .switch.switch-lg input + label::after {
-    width: calc(calc(3rem * .8) - calc(2px * 2));
-    height: calc(calc(3rem * .8) - calc(2px * 2));
-  }
-  .switch.switch-lg input:checked + label::after {
-    margin-left: calc(3rem * .8);
-  }
-  .switch + .switch {
-    margin-left: 1rem;
+    animation: fadeInOut 1s infinite;
   }
 
   .sortable_drag {
     background-color: #0000000f;
   }
 
-  .drag_icon {
-    cursor: move; /* fallback if grab cursor is unsupported */
-    cursor: grab;
-    cursor: -moz-grab;
-    cursor: -webkit-grab;
-    width: 25px;
-    height: 25px;
-    display: inline-block;
-    margin-right: 5px;
-    margin-left: -10px;
-    text-align: center;
-    color: #b1b1b1;
-  }
-
-  /* (Optional) Apply a "closed-hand" cursor during drag operation. */
-  .drag_icon:active {
-    cursor: grabbing;
-    cursor: -moz-grabbing;
-    cursor: -webkit-grabbing;
-  }
-
   .switch_btn {
     float: right;
     margin: -1px 0px 0px 0px;
@@ -799,7 +433,7 @@ HTML,BODY {
   }
 
   .jumbotron {
-    background-color: white;
+    background-color: rgba(0,0,0,0);
   }
 
   .toggle-service {
@@ -809,19 +443,6 @@ HTML,BODY {
     cursor: pointer;
   }
 
-  .list-group-item {
-    min-height: 85pt;
-  }
-
-  .list-group-item:HOVER {
-    background-color: #fff;
-  }
-
-  .index_container {
-    min-height: 980pt;
-    background-color: $container-color;
-  }
-
   /* Enter and leave animations can use different */
   /* durations and timing functions.              */
   .slide-fade-enter-active {
diff --git a/frontend/src/assets/scss/forms.scss b/frontend/src/assets/scss/forms.scss
new file mode 100644
index 00000000..e88580a4
--- /dev/null
+++ b/frontend/src/assets/scss/forms.scss
@@ -0,0 +1,299 @@
+@import 'variables';
+@import 'mixin';
+
+.copy-btn {
+  position: absolute;
+  right: 0;
+  z-index: 995;
+}
+
+.copy-btn BUTTON {
+  background-color: white;
+  margin: 6px;
+  height: 26px;
+  font-size: 8pt;
+  padding: 5px 7px;
+  border: 1px solid #a7a7a7;
+  border-radius: 4px !important;
+}
+
+.form-control {
+  background-color: $input-background;
+  border: $input-border;
+  color: $input-color;
+}
+
+.form-control:FOCUS {
+  background-color: lighten($input-background, 4%) !important;
+  border: $input-border;
+  color: $input-color;
+}
+
+.form-control[readonly] {
+  background-color: lighten($background-color, 12%) !important;
+  color: lighten($input-color, 30%) !important;
+}
+
+/* The slider itself */
+.slider {
+  -webkit-appearance: none;  /* Override default CSS styles */
+  appearance: none;
+  width: 100%; /* Full-width */
+  height: 5px; /* Specified height */
+  background: #d3d3d3; /* Grey background */
+  outline: none; /* Remove outline */
+  -webkit-transition: .2s; /* 0.2 seconds transition on hover */
+  transition: opacity .2s;
+}
+
+/* Mouse-over effects */
+.slider:hover {
+  opacity: 1; /* Fully shown on mouse-over */
+}
+
+/* The slider handle (use -webkit- (Chrome, Opera, Safari, Edge) and -moz- (Firefox) to override default look) */
+.slider::-webkit-slider-thumb {
+  -webkit-appearance: none; /* Override default look */
+  appearance: none;
+  border-radius: 50%;
+  width: 20px; /* Set a specific slider handle width */
+  height: 20px; /* Slider handle height */
+  background: #4CAF50; /* Green background */
+  cursor: pointer; /* Cursor on hover */
+}
+
+.slider::-moz-range-thumb {
+  width: 15px; /* Set a specific slider handle width */
+  height: 15px; /* Slider handle height */
+  background: #4CAF50; /* Green background */
+  cursor: pointer; /* Cursor on hover */
+}
+
+
+.inputTags-field {
+  border: 0;
+  background-color: transparent;
+  padding-top: .13rem;
+}
+
+input.inputTags-field:focus {
+  outline-width: 0;
+}
+
+.inputTags-list {
+  display: block;
+  width: 100%;
+  min-height: calc(2.25rem + 2px);
+  padding: .2rem .35rem;
+  font-size: 1rem;
+  font-weight: 400;
+  line-height: 1.5;
+  color: #495057;
+  background-color: #fff;
+  background-clip: padding-box;
+  border: 1px solid #ced4da;
+  border-radius: .25rem;
+  transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
+}
+
+.inputTags-item {
+  background-color: #3aba39;
+  margin-right: 5px;
+  padding: 5px 8px;
+  font-size: 10pt;
+  color: white;
+  border-radius: 4px;
+}
+
+.inputTags-item .close-item {
+  margin-left: 6px;
+  font-size: 13pt;
+  font-weight: bold;
+  cursor: pointer;
+}
+
+.switch {
+  font-size: 1rem;
+  position: relative;
+}
+.switch input {
+  position: absolute;
+  height: 1px;
+  width: 1px;
+  background: none;
+  border: 0;
+  clip: rect(0 0 0 0);
+  clip-path: inset(50%);
+  overflow: hidden;
+  padding: 0;
+}
+.switch input + label {
+  position: relative;
+  min-width: calc(calc(2.375rem * .8) * 2);
+  border-radius: calc(2.375rem * .8);
+  height: calc(2.375rem * .8);
+  line-height: calc(2.375rem * .8);
+  display: inline-block;
+  cursor: pointer;
+  outline: none;
+  user-select: none;
+  vertical-align: middle;
+  text-indent: calc(calc(calc(2.375rem * .8) * 2) + .5rem);
+}
+.switch input + label::before,
+.switch input + label::after {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: calc(calc(2.375rem * .8) * 2);
+  bottom: 0;
+  display: block;
+}
+.switch input + label::before {
+  right: 0;
+  background-color: #dee2e6;
+  border-radius: calc(2.375rem * .8);
+  transition: 0.2s all;
+}
+.switch input + label::after {
+  top: 2px;
+  left: 2px;
+  width: calc(calc(2.375rem * .8) - calc(2px * 2));
+  height: calc(calc(2.375rem * .8) - calc(2px * 2));
+  border-radius: 50%;
+  background-color: white;
+  transition: 0.2s all;
+}
+.switch-rd-gr input:checked + label::before {
+  background-color: #29b10c !important;
+}
+.switch input:checked + label::before {
+  background-color: #08d;
+}
+.switch input:checked + label::after {
+  margin-left: calc(2.375rem * .8);
+}
+.switch input:focus + label::before {
+  outline: none;
+  box-shadow: 0 0 0 0.2rem rgba(0, 136, 221, 0.25);
+}
+.switch input:disabled + label {
+  color: #868e96;
+  cursor: not-allowed;
+}
+.switch input:disabled + label::before {
+  background-color: #e9ecef;
+}
+.switch.switch-sm {
+  font-size: 0.875rem;
+}
+.switch.switch-sm input + label {
+  min-width: calc(calc(1.9375rem * .8) * 2);
+  height: calc(1.9375rem * .8);
+  line-height: calc(1.9375rem * .8);
+  text-indent: calc(calc(calc(1.9375rem * .8) * 2) + .5rem);
+}
+.switch.switch-sm input + label::before {
+  width: calc(calc(1.9375rem * .8) * 2);
+}
+.switch.switch-sm input + label::after {
+  width: calc(calc(1.9375rem * .8) - calc(2px * 2));
+  height: calc(calc(1.9375rem * .8) - calc(2px * 2));
+}
+.switch.switch-sm input:checked + label::after {
+  margin-left: calc(1.9375rem * .8);
+}
+.switch.switch-lg {
+  font-size: 1.25rem;
+}
+.switch.switch-lg input + label {
+  min-width: calc(calc(3rem * .8) * 2);
+  height: calc(3rem * .8);
+  line-height: calc(3rem * .8);
+  text-indent: calc(calc(calc(3rem * .8) * 2) + .5rem);
+}
+.switch.switch-lg input + label::before {
+  width: calc(calc(3rem * .8) * 2);
+}
+.switch.switch-lg input + label::after {
+  width: calc(calc(3rem * .8) - calc(2px * 2));
+  height: calc(calc(3rem * .8) - calc(2px * 2));
+}
+.switch.switch-lg input:checked + label::after {
+  margin-left: calc(3rem * .8);
+}
+.switch + .switch {
+  margin-left: 1rem;
+}
+
+
+.CodeMirror {
+  /* Bootstrap Settings */
+  box-sizing: border-box;
+  margin: 0;
+  font: inherit;
+  overflow: auto;
+  display: block;
+  width: 100%;
+  padding: 0px;
+  font-size: 14px;
+  line-height: 1.5;
+  color: #555;
+  background-color: #fff;
+  background-image: none;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  /* Code Mirror Settings */
+  font-family: monospace;
+  position: relative;
+  height:80vh;
+}
+
+.CodeMirror-focused {
+  /* Bootstrap Settings */
+  border-color: #66afe9;
+  outline: 0;
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+}
+
+.nav-pills .nav-link.active, .nav-pills .show>.nav-link {
+  background-color: $nav-tab-color;
+}
+
+.nav-pills A {
+  color: $text-color;
+}
+
+.nav-link.active A:HOVER {
+  color: white !important;
+}
+
+.nav-pills I {
+  margin-right: 10px;
+}
+
+
+.drag_icon {
+  cursor: move; /* fallback if grab cursor is unsupported */
+  cursor: grab;
+  cursor: -moz-grab;
+  cursor: -webkit-grab;
+  width: 25px;
+  height: 25px;
+  display: inline-block;
+  margin-right: 5px;
+  margin-left: -10px;
+  text-align: center;
+  color: #b1b1b1;
+}
+
+/* (Optional) Apply a "closed-hand" cursor during drag operation. */
+.drag_icon:active {
+  cursor: grabbing;
+  cursor: -moz-grabbing;
+  cursor: -webkit-grabbing;
+}
diff --git a/frontend/src/assets/scss/index.scss b/frontend/src/assets/scss/index.scss
new file mode 100644
index 00000000..fbb1a62e
--- /dev/null
+++ b/frontend/src/assets/scss/index.scss
@@ -0,0 +1,6 @@
+@import 'variables';
+@import 'mixin';
+@import 'layout';
+@import 'base';
+@import 'forms';
+@import 'mobile';
diff --git a/frontend/src/assets/scss/layout.scss b/frontend/src/assets/scss/layout.scss
new file mode 100644
index 00000000..59b82352
--- /dev/null
+++ b/frontend/src/assets/scss/layout.scss
@@ -0,0 +1,230 @@
+@import 'variables';
+@import 'mixin';
+
+HTML,BODY {
+  background-color: $background-color;
+  color: $text-color;
+}
+
+A {
+  color: $text-color;
+}
+
+.modal-backdrop {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1040;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+.modal {
+  z-index: 999999 !important;
+  display: block;
+}
+
+.modal-dialog {
+  top: 20%;
+}
+
+.modal-header {
+  padding: 0.5rem 1rem;
+}
+
+.modal-footer {
+  padding: 0.5rem 1rem;
+}
+
+.text-muted {
+  color: lighten($text-color, 30%) !important;
+}
+
+.day-success {
+  background-color: $day-success-background;
+}
+
+.day-success:HOVER {
+  background-color: lighten($day-success-background, 2%) !important;
+}
+
+.day-error {
+  background-color: $day-error-background;
+}
+
+.day-error:HOVER {
+  background-color: lighten($day-error-background, 2%) !important;
+}
+
+.contain-card {
+
+  .card-header {
+    font-size: 1.15rem;
+  }
+
+  .dropdown-menu {
+    background-color: rgba(239, 239, 239, 0.65);
+  }
+
+}
+
+.navbar {
+  margin-bottom: 30px;
+  color: $navbar-color;
+  background-color: $navbar-background;
+}
+
+.table {
+  color: $text-color;
+}
+
+.nav-pills {
+  border-radius: $global-border-radius;
+}
+
+.nav-link {
+  color: $navbar-color;
+}
+
+.form-control {
+  border-radius: $global-border-radius;
+}
+
+.card {
+  background-color: $card-background;
+  border: $card-border;
+  box-shadow: $card-shadow;
+}
+
+.card-body {
+  overflow: hidden;
+}
+
+.card-body H4 A {
+  color: $service-title;
+  text-decoration: none;
+}
+
+.card-title A {
+  color: $service-title;
+  text-decoration: none;
+}
+
+.card-body .badge {
+  color: #fff;
+}
+
+.dashboard_card {
+  background-color: $group-list-background;
+  box-shadow: rgba(0,0,0,.05) 0px 2px 3px 1px;
+}
+
+.dashboard_card:HOVER {
+  background-color: lighten($group-list-background, 2%) !important;
+  box-shadow: rgba(0,0,0,.05) 0px 1px 5px 3px;
+  -webkit-transition-duration: 300ms;
+  -moz-transition-duration: 300ms;
+  -o-transition-duration: 300ms;
+  transition-duration: 300ms;
+}
+
+.list-group-item {
+  min-height: 85pt;
+  background-color: $group-list-background;
+}
+
+.list-group-item:HOVER {
+  background-color: lighten($group-list-background, 5%) !important;
+  box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 6px 1px;
+  -webkit-transition-duration: 300ms;
+  -moz-transition-duration: 300ms;
+  -o-transition-duration: 300ms;
+  transition-duration: 300ms;
+  margin-top: -1px;
+  margin-bottom: 1px;
+}
+
+.list-group-item A {
+  color: $group-list-title;
+}
+
+.chart_list_tooltip {
+  height: 30px;
+  font-size: 6pt;
+}
+
+.container {
+  padding-top: 20px;
+  padding-bottom: 25px;
+  max-width: $max-width;
+  box-shadow: 0 .5rem 1rem rgba(0, 0, 0, 0.15) !important;
+  background-color: $container-color;
+}
+
+.login_container {
+  border-radius: 5px;
+  box-shadow: 0 .5rem 1rem rgba(0, 0, 0, 0.15) !important;
+  background-color: $container-color;
+}
+
+.footer {
+  text-decoration: none;
+  margin-top: 20px;
+}
+
+.footer .links {
+  color: $footer-text-color;
+  text-decoration: none;
+}
+
+.footer .links:HOVER {
+  color: #8c8c8c;
+}
+
+.footer .statping {
+  color: lighten($footer-text-color, 10%);
+  text-decoration: none;
+}
+.footer .statping:HOVER {
+  color: lighten($footer-text-color, 0%);
+  text-decoration: none;
+}
+
+.no-select {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.dates{
+  padding:10px 0px;
+  margin:10px 20px;
+  font-weight:600;
+  overflow:auto;
+  color: darken($card-background, 45%);
+  font-size: 22px;
+}
+.dates div{
+  float:left;
+  width:50%;
+  text-align:center;
+  position:relative;
+}
+.dates strong {
+  display:block;
+  color: darken($card-background, 20%);
+  font-size:20px;
+  font-weight:700;
+}
+.dates span{
+  width:1px;
+  height:60px;
+  position:absolute;
+  right:0;
+  top:0;
+  background: darken($card-background, 10%);
+}
diff --git a/frontend/src/assets/scss/main.scss b/frontend/src/assets/scss/main.scss
deleted file mode 100644
index 3e942341..00000000
--- a/frontend/src/assets/scss/main.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import 'base';
-@import 'mobile';
diff --git a/frontend/src/assets/scss/mixin.scss b/frontend/src/assets/scss/mixin.scss
new file mode 100644
index 00000000..98e8dc47
--- /dev/null
+++ b/frontend/src/assets/scss/mixin.scss
@@ -0,0 +1,29 @@
+@mixin dynamic-color-hov($color) {
+  &.dyn-dark {
+    background-color: darken($color, 12%) !important;
+    border-color: darken($color, 17%) !important;
+  }
+  &.dyn-dark:HOVER {
+    background-color: darken($color, 17%) !important;
+    border-color: darken($color, 20%) !important;
+  }
+  &.dyn-light {
+    background-color: lighten($color, 12%) !important;
+    border-color: lighten($color, 17%) !important;
+  }
+  &.dyn-light:HOVER {
+    background-color: lighten($color, 17%) !important;
+    border-color: lighten($color, 20%) !important;
+  }
+}
+
+@mixin dynamic-color($color) {
+  &.dyn-dark {
+    background-color: darken($color, 12%) !important;
+    border-color: darken($color, 17%) !important;
+  }
+  &.dyn-light {
+    background-color: lighten($color, 12%) !important;
+    border-color: lighten($color, 17%) !important;
+  }
+}
diff --git a/frontend/src/assets/scss/mobile.scss b/frontend/src/assets/scss/mobile.scss
index 8ad729d0..c0fb79df 100644
--- a/frontend/src/assets/scss/mobile.scss
+++ b/frontend/src/assets/scss/mobile.scss
@@ -40,10 +40,6 @@
         font-size: 0.9rem;
     }
 
-  .service_li {
-    border: 1px solid #f3f3f3 !important;
-  }
-
     .container {
         padding: 0px !important;
         padding-top: 0vh !important;
@@ -74,10 +70,19 @@
     position: absolute;
   }
 
-    .btn-sm {
-        line-height: 1.4rem;
-        font-size: 0.83rem;
-    }
+  .btn-sm {
+    line-height: 1.3;
+    font-size: 0.75rem;
+  }
+
+  .badge {
+    padding-top: 2px;
+    padding-bottom: 3px;
+  }
+
+  .switch LABEL {
+    font-size: 10pt;
+  }
 
     .full-col-12 {
         padding-left: 0px;
diff --git a/frontend/src/assets/scss/variables.scss b/frontend/src/assets/scss/variables.scss
index 6951a1bd..959218cd 100644
--- a/frontend/src/assets/scss/variables.scss
+++ b/frontend/src/assets/scss/variables.scss
@@ -1,16 +1,28 @@
 /*    Index Page      */
-$background-color: #fcfcfc;
-$container-color: #fcfcfc;
-$max-width: 860px;
-$title-color: #464646;
-$description-color: #939393;
+$background-color: #EAEAEA;
+$container-color: #ffffff;
+$text-color: #2a2a2a;
+$max-width: 1012px;
+$title-color: #4e4e4e;
+$description-color: #828282;
 $subtitle-color: #747474;
 $mobile-card-shadow: 2px 3px 10px #b7b7b7;
 
+$group-list-background: #fcfcfc;
+$group-list-title: #474747;
+$navbar-color: #1c1c1c;
+$navbar-background: #ffffff;
+$input-background: #fdfdfd;
+$input-color: #4e4e4e;
+$input-border: 1px solid #c9c9c9;
+$day-success-background: #e9e9e9;
+$day-error-background: #d50a0a;
+
 /*    Status Container   */
-$service-background: #ffffff;
-$service-border: 1px solid rgba(0,0,0,.125);
-$service-title: #444444;
+$card-background: #fcfcfc;
+$card-border: 1px solid rgba(76, 76, 76, 0.12);
+$card-shadow: 0px 3px 6px 1px rgba(0, 0, 0, 0.08);
+$service-title: #3e3e3e;
 $service-title-size: 1.8rem;
 $service-stats-color: #4f4f4f;
 $service-description-color: #fff;
@@ -23,7 +35,7 @@ $danger-color: #dd3545;
 $primary-color: #3e9bff;
 
 /*   Footer Settings   */
-$footer-text-color: #8d8d8d;
+$footer-text-color: #b0b0b0;
 $nav-tab-color: #13a00d;
 $footer-display: block;
 
diff --git a/frontend/src/codemirror_json.js b/frontend/src/codemirror_json.js
index 65cf09de..70b27fc6 100644
--- a/frontend/src/codemirror_json.js
+++ b/frontend/src/codemirror_json.js
@@ -6,7 +6,7 @@ CodeMirror.defineMode('mymode', () => {
       if (stream.match(".Service") || (stream.match(".Core")) || (stream.match(".Failure"))) {
         return "var-highlight"
       } else if (stream.match(".Id") || stream.match(".Domain") || stream.match(".CreatedAt") ||
-        stream.match(".Name") || stream.match(".DowntimeAgo") || stream.match(".Issue") || stream.match(".LastStatusCode") ||
+        stream.match(".Name") || stream.match(".Downtime.Human") || stream.match(".Issue") || stream.match(".LastStatusCode") ||
         stream.match(".Port") || stream.match(".FailuresLast24Hours") || stream.match(".PingTime")) {
         return "var-sub-highlight"
       } else if (stream.match("{{") || stream.match("}}")) {
diff --git a/frontend/src/components/Dashboard/Cache.vue b/frontend/src/components/Dashboard/Cache.vue
index 1577c90b..5a0e3f38 100644
--- a/frontend/src/components/Dashboard/Cache.vue
+++ b/frontend/src/components/Dashboard/Cache.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="card text-black-50 bg-white mb-5">
+    <div class="card mb-5">
         <div class="card-header">Cache</div>
         <div class="card-body">
         <span v-if="!cache" class="text-muted">There are no cached pages yet!</span>
diff --git a/frontend/src/components/Dashboard/Checkins.vue b/frontend/src/components/Dashboard/Checkins.vue
index 310b322d..0e4592e2 100644
--- a/frontend/src/components/Dashboard/Checkins.vue
+++ b/frontend/src/components/Dashboard/Checkins.vue
@@ -2,40 +2,80 @@
     <div class="col-12">
         <h2>{{service.name}} Checkins</h2>
         <p class="mb-3">Tell your service to send a routine HTTP request to a Statping Checkin.</p>
-        <div v-for="(checkin, i) in checkins" class="col-12 alert alert-light" role="alert">
-            <span class="badge badge-pill badge-info text-uppercase">{{checkin.name}}</span>
-            <span class="float-right font-2">Last checkin {{ago(checkin.last_hit)}}</span>
-            <span class="float-right font-2 mr-3">Check Every {{checkin.interval}} seconds</span>
-            <span class="float-right font-2 mr-3">Grace Period {{checkin.grace}} seconds</span>
-            <span class="d-block mt-2">
-                <input type="text" class="form-control" :value="`${core.domain}/checkin/${checkin.api_key}`" readonly>
-                <span class="small">Send a GET request to this URL every {{checkin.interval}} seconds
-                    <button @click="deleteCheckin(checkin)" type="button" class="btn btn-danger btn-xs float-right mt-1">Delete</button>
+
+        <div v-for="(checkin, i) in checkins" class="card text-black-50 bg-white mt-3">
+            <div class="card-header text-capitalize">
+                {{checkin.name}}
+                <button @click="deleteCheckin(checkin)" class="btn btn-sm small btn-danger float-right text-uppercase">Delete</button>
+            </div>
+            <div class="card-body">
+                <div class="input-group">
+                    <input type="text" class="form-control" :value="`${core.domain}/checkin/${checkin.api_key}`" readonly>
+                    <div class="input-group-append copy-btn">
+                        <button @click.prevent="copy(`${core.domain}/checkin/${checkin.api_key}`)" class="btn btn-outline-secondary" type="button">Copy</button>
+                    </div>
+                </div>
+
+                <span class="small">Send a GET request to this URL every {{checkin.interval}} minutes</span>
+                <span class="small float-right mt-1 mr-3 d-none d-md-block">Requested {{ago(checkin.last_hit)}} ago</span>
+                <span class="small float-right mt-1 mr-3 d-none d-md-block">Request expected every {{checkin.interval}} minutes</span>
+
+                <div class="card text-black-50 bg-white mt-3">
+                    <div class="card-header text-capitalize">
+                        <font-awesome-icon @click="expanded = !expanded" :icon="expanded ? 'minus' : 'plus'" class="mr-2 pointer"/>
+                        {{checkin.name}} Records
+                    </div>
+                    <div class="card-body" :class="{'d-none': !expanded}">
+                        <div class="alert alert-primary small" :class="{'alert-success': hit.success, 'alert-danger': !hit.success}" v-for="(hit, i) in records(checkin)">
+                            Checkin {{hit.success ? "Request" : "Failure"}} at {{hit.created_at}}
+                        </div>
+                    </div>
+                </div>
+
+                <div class="card text-black-50 bg-white mt-3">
+                    <div class="card-header text-capitalize">
+                        <font-awesome-icon @click="curl_expanded = !curl_expanded" :icon="curl_expanded ? 'minus' : 'plus'" class="mr-2 pointer"/>
+                        Cronjob Task
+                    </div>
+                    <div class="card-body" :class="{'d-none': !curl_expanded}">
+                        This cronjob script will request the checkin endpoint every {{checkin.interval}} minutes. Add this cronjob task to the machine running this service.
+                        <div class="input-group mt-2">
+                            <input type="text" class="form-control" :value="`${checkin.interval} * * * * /usr/bin/curl ${core.domain}/checkin/${checkin.api_key} >/dev/null 2>&1`" readonly>
+                            <div class="input-group-append copy-btn">
+                                <button @click.prevent="copy(`${checkin.interval} * * * * /usr/bin/curl ${core.domain}/checkin/${checkin.api_key} >/dev/null 2>&1`)" class="btn btn-outline-secondary" type="button">Copy</button>
+                            </div>
+                        </div>
+                        <span class="small d-block">Using CURL</span>
+                    </div>
+                </div>
+            </div>
+            <div class="card-footer">
+                <span :class="{'text-success': last_record(checkin).success, 'text-danger': !last_record(checkin).success}">
+                    {{last_record(checkin).success ? "Checkin is currently working correctly" : "Checkin is currently failing"}}
                 </span>
-            </span>
+            </div>
         </div>
 
-        <div class="col-12 alert alert-light">
+        <div class="card text-black-50 bg-white mt-4">
+            <div class="card-header text-capitalize">Create Checkin</div>
+            <div class="card-body">
             <form @submit.prevent="saveCheckin">
                 <div class="form-group row">
-                    <div class="col-5">
+                    <div class="col-7 col-md-5">
                         <label for="checkin_interval" class="col-form-label">Checkin Name</label>
                         <input v-model="checkin.name" type="text" name="name" class="form-control" id="checkin_name" placeholder="New Checkin">
                     </div>
-                    <div class="col-2">
-                        <label for="checkin_interval" class="col-form-label">Interval</label>
-                        <input v-model="checkin.interval" type="number" name="interval" class="form-control" id="checkin_interval" placeholder="60">
+                    <div class="col-5 col-md-3">
+                        <label for="checkin_interval" class="col-form-label">Interval (minutes)</label>
+                        <input v-model="checkin.interval" type="number" name="interval" class="form-control" id="checkin_interval" placeholder="1" min="1">
                     </div>
-                    <div class="col-2">
-                        <label for="grace_period" class="col-form-label">Grace Period</label>
-                        <input v-model="checkin.grace" type="number" name="grace" class="form-control" id="grace_period" placeholder="10">
-                    </div>
-                    <div class="col-3">
+                    <div class="col-12 col-md-4">
                         <label class="col-form-label"></label>
-                        <button @click.prevent="saveCheckin" type="submit" id="submit" class="btn btn-primary d-block mt-2">Save Checkin</button>
+                        <button :disabled="btn_disabled" @click.prevent="saveCheckin" type="submit" id="submit" class="btn btn-primary d-block mt-2">Save Checkin</button>
                     </div>
                 </div>
             </form>
+            </div>
         </div>
     </div>
 </template>
@@ -49,11 +89,14 @@ export default {
         return {
             service: {},
           ready: false,
+          expanded: false,
+          curl_expanded: false,
           checkin: {
             name: "",
-            interval: 60,
-            grace: 60,
-            service_id: 0
+            interval: 1,
+            service_id: 0,
+            hits: [],
+            failures: []
           }
         }
     },
@@ -64,6 +107,12 @@ export default {
         core() {
           return this.$store.getters.core
         },
+        btn_disabled() {
+          if (this.checkin.name === "" || this.checkin.interval <= 0) {
+            return true
+          }
+          return false
+        },
       },
       async created() {
           if (this.$route.params) {
@@ -74,32 +123,43 @@ export default {
           }
       },
     methods: {
+      records(checkin) {
+        let hits = []
+        let failures = []
+        checkin.hits.forEach((hit) => {
+          hits.push({success: true, created_at: this.parseISO(hit.created_at), id: hit.id})
+        })
+        checkin.failures.forEach((failure) => {
+          failures.push({success: false, created_at: this.parseISO(failure.created_at), id: failure.id})
+        })
+        return hits.concat(failures).sort((a, b) => {return a.created_at-b.created_at}).reverse().slice(0,32)
+      },
+      last_record(checkin) {
+        const r = this.records(checkin)
+        if (r.length === 0) {
+          return {success: false}
+        }
+        return r[0]
+      },
       fixInts() {
         const c = this.checkin
         this.checkin.interval = parseInt(c.interval)
-        this.checkin.grace = parseInt(c.grace)
         return this.checkin
       },
       async saveCheckin() {
         const c = this.fixInts()
         await Api.checkin_create(c)
-        await this.updateCheckins()
+        this.checkin.name = ""
+        await this.load()
       },
       async deleteCheckin(checkin) {
         await Api.checkin_delete(checkin)
-        await this.updateCheckins()
+        await this.load()
       },
-      async updateCheckins() {
+      async load() {
         const checkins = await Api.checkins()
         this.$store.commit('setCheckins', checkins)
       }
     }
 }
 </script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-    .sm {
-        font-size: 8pt;
-    }
-</style>
diff --git a/frontend/src/components/Dashboard/Configs.vue b/frontend/src/components/Dashboard/Configs.vue
new file mode 100644
index 00000000..0d2977b6
--- /dev/null
+++ b/frontend/src/components/Dashboard/Configs.vue
@@ -0,0 +1,67 @@
+<template>
+<div>
+  <h3>Configuration</h3>
+  For security reasons, all database credentials cannot be editted from this page.
+
+  <codemirror v-show="loaded" v-model="configs" ref="configs" :options="cmOptions" class="mt-4 codemirrorInput"/>
+
+  <button @click.prevent="save" class="btn col-12 btn-primary mt-3">Save</button>
+</div>
+</template>
+
+<script>
+import Api from "../../API";
+
+import {codemirror} from 'vue-codemirror'
+import('codemirror/lib/codemirror.css')
+import('codemirror/mode/yaml/yaml.js')
+
+export default {
+name: "Configs",
+  components: {
+    codemirror
+  },
+  data() {
+    return {
+      loaded: false,
+      configs: null,
+      cmOptions: {
+        height: 700,
+        tabSize: 4,
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/x-yaml",
+        line: true
+      }
+    }
+  },
+  mounted() {
+    this.loaded = false
+    this.update()
+    this.loaded = true
+  },
+  watch: {
+    "configs" () {
+      this.$refs.configs.codemirror.refresh()
+    }
+  },
+  methods: {
+    async update() {
+      this.configs = await Api.configs()
+      this.$refs.configs.codemirror.value = this.configs
+      this.$refs.configs.codemirror.refresh()
+    },
+    async save() {
+      try {
+        await Api.configs_save(this.configs)
+      } catch(e) {
+        window.console.error(e)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/components/Dashboard/DashboardIndex.vue b/frontend/src/components/Dashboard/DashboardIndex.vue
index 8049883e..49c1b255 100644
--- a/frontend/src/components/Dashboard/DashboardIndex.vue
+++ b/frontend/src/components/Dashboard/DashboardIndex.vue
@@ -1,33 +1,58 @@
 <template>
     <div class="col-12 mt-4 mt-md-3">
-
         <div class="row stats_area mb-5">
             <div class="col-4">
                 <span class="font-6 font-weight-bold d-block">{{$store.getters.services.length}}</span>
-                <span class="font-2">{{ $t('dashboard.total_services') }}</span>
+                <span class="font-2">{{ $t('total_services') }}</span>
             </div>
             <div class="col-4">
                 <span class="font-6 font-weight-bold d-block">{{failuresLast24Hours()}}</span>
-                <span class="font-2">{{ $t('dashboard.failures_24_hours') }}</span>
+                <span class="font-2">{{ $t('failures_24_hours') }}</span>
             </div>
             <div class="col-4">
                 <span class="font-6 font-weight-bold d-block">{{$store.getters.onlineServices(true).length}}</span>
-                <span class="font-2">{{ $t('dashboard.online_services') }}</span>
+                <span class="font-2">{{ $t('online_services') }}</span>
             </div>
         </div>
 
-        <div v-for="(service, index) in services" class="service_block" v-bind:key="index">
-            <ServiceInfo :service=service />
+        <div class="col-12" v-if="services.length === 0">
+            <div class="alert alert-dark d-block">
+                {{$t('no_services')}}
+                <router-link v-if="$store.state.admin" to="/dashboard/create_service" class="btn btn-sm btn-success float-right">
+                    <font-awesome-icon icon="plus"/>  {{ $t('create') }}
+                </router-link>
+            </div>
         </div>
+
+      <div v-for="message in messagesInRange" class="bg-light shadow-sm p-3 pr-4 pl-4 col-12 mb-4">
+        <font-awesome-icon icon="calendar" class="mr-3" size="1x"/> {{message.description}}
+        <span class="d-block small text-muted mt-3">
+        Starts at <strong>{{niceDate(message.start_on)}}</strong> till <strong>{{niceDate(message.end_on)}}</strong>
+        ({{dur(parseISO(message.start_on), parseISO(message.end_on))}})
+        </span>
+      </div>
+
+      <div class="row">
+        <div v-for="(service, index) in services_no_group" class="col-12 col-md-4">
+          <ServiceInfo :service="service" />
+        </div>
+      </div>
+
+      <div v-for="group in groups">
+        <GroupedServices :group="group"/>
+      </div>
+
     </div>
 </template>
 
 <script>
-  const ServiceInfo = () => import('@/components/Service/ServiceInfo')
+  import GroupedServices from "@/components/Dashboard/GroupedServices";
+  const ServiceInfo = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/ServiceInfo')
 
   export default {
       name: 'DashboardIndex',
       components: {
+        GroupedServices,
           ServiceInfo
       },
     data() {
@@ -36,12 +61,20 @@
         }
     },
       computed: {
+        messagesInRange() {
+          return this.$store.getters.globalMessages.filter(m => this.isAfter(this.now(), m.start_on) && this.isBefore(this.now(), m.end_on))
+        },
           services() {
               return this.$store.getters.services
-          }
+          },
+        services_no_group() {
+          return this.$store.getters.servicesNoGroup
+        },
+        groups() {
+          return this.$store.getters.groupsInOrder
+        },
       },
       methods: {
-
           failuresLast24Hours() {
               let total = 0;
               this.services.map((s) => {
diff --git a/frontend/src/components/Dashboard/DashboardMessages.vue b/frontend/src/components/Dashboard/DashboardMessages.vue
index 38c5b5c8..99f339ea 100644
--- a/frontend/src/components/Dashboard/DashboardMessages.vue
+++ b/frontend/src/components/Dashboard/DashboardMessages.vue
@@ -1,19 +1,26 @@
 <template>
   <div class="col-12">
-    <div class="card contain-card text-black-50 bg-white mb-4">
-      <div class="card-header">{{ $t('top_nav.announcements') }}</div>
+    <div class="card contain-card mb-4">
+      <div class="card-header">{{ $t('announcements') }}</div>
       <div class="card-body pt-0">
-        <table class="table table-striped">
+
+          <div v-if="messages.length === 0">
+              <div class="alert alert-dark d-block mt-3 mb-0">
+                  You currently don't have any Announcements! Create one using the form below.
+              </div>
+          </div>
+
+        <table v-else class="table table-striped">
           <thead>
             <tr>
-                <th scope="col">{{ $t('dashboard.title') }}</th>
-                <th scope="col" class="d-none d-md-table-cell">{{ $tc('dashboard.service', 1) }}</th>
-                <th scope="col" class="d-none d-md-table-cell">{{ $t('dashboard.begins') }}</th>
+                <th scope="col">{{ $t('title') }}</th>
+                <th scope="col" class="d-none d-md-table-cell">{{ $tc('service', 1) }}</th>
+                <th scope="col" class="d-none d-md-table-cell">{{ $t('begins') }}</th>
                 <th scope="col"></th>
             </tr>
           </thead>
           <tbody>
-            <tr v-for="message in $store.getters.messages" v-bind:key="message.id">
+            <tr v-for="message in messages" v-bind:key="message.id">
               <td>{{message.title}}</td>
               <td class="d-none d-md-table-cell">
                 <router-link :to="serviceLink(service(message.service))">{{serviceName(service(message.service))}}</router-link>
@@ -40,7 +47,7 @@
 
 <script>
   import Api from "../../API"
-  import FormMessage from "../../forms/Message";
+  const FormMessage = () => import(/* webpackChunkName: "dashboard" */ "../../forms/Message");
 
   export default {
   name: 'DashboardMessages',
@@ -51,6 +58,11 @@
       message: {}
     }
   },
+    computed: {
+        messages() {
+          return this.$store.getters.messages
+        }
+    },
   methods: {
     goto(to) {
       this.$router.push(to)
@@ -69,13 +81,21 @@
     serviceName (service) {
       return service.name || "Global Message"
     },
+    async delete(m) {
+      await Api.message_delete(m.id)
+      const messages = await Api.messages()
+      this.$store.commit('setMessages', messages)
+    },
     async deleteMessage(m) {
-      let c = confirm(`Are you sure you want to delete message '${m.title}'?`)
-      if (c) {
-        await Api.message_delete(m.id)
-        const messages = await Api.messages()
-        this.$store.commit('setMessages', messages)
+      const modal = {
+        visible: true,
+        title: "Delete Announcement",
+        body: `Are you sure you want to delete Announcement ${m.title}?`,
+        btnColor: "btn-danger",
+        btnText: "Delete Announcement",
+        func: () => this.delete(m),
       }
+      this.$store.commit("setModal", modal)
     }
   }
 }
diff --git a/frontend/src/components/Dashboard/DashboardServices.vue b/frontend/src/components/Dashboard/DashboardServices.vue
index ce5cdc51..a029e46b 100644
--- a/frontend/src/components/Dashboard/DashboardServices.vue
+++ b/frontend/src/components/Dashboard/DashboardServices.vue
@@ -1,9 +1,10 @@
 <template>
     <div class="col-12">
-        <div class="card contain-card text-black-50 bg-white mb-4">
-            <div class="card-header">{{ $t('top_nav.services') }}
-                <router-link v-if="$store.state.admin" to="/dashboard/create_service" class="btn btn-sm btn-outline-success float-right">
-                    <font-awesome-icon icon="plus"/>  Create
+
+        <div class="card contain-card mb-4">
+            <div class="card-header">{{ $t('services') }}
+                <router-link v-if="$store.state.admin" to="/dashboard/create_service" class="btn btn-sm btn-success float-right">
+                    <font-awesome-icon icon="plus"/>  {{$t('create')}}
                 </router-link>
             </div>
             <div class="card-body pt-0">
@@ -11,15 +12,22 @@
             </div>
         </div>
 
-        <div class="card contain-card text-black-50 bg-white mb-4">
-            <div class="card-header">{{ $t('top_nav.groups') }}</div>
+        <div class="card contain-card mb-4">
+            <div class="card-header">{{ $t('groups') }}</div>
             <div class="card-body pt-0">
-        <table class="table">
+
+                <div v-if="groupsList.length === 0">
+                    <div class="alert alert-dark d-block mt-3 mb-0">
+                        You currently don't have any groups! Create one using the form below.
+                    </div>
+                </div>
+
+        <table v-else class="table">
             <thead>
             <tr>
-                <th scope="col">{{ $t('dashboard.name') }}</th>
-                <th scope="col">{{ $tc('dashboard.service', 2) }}</th>
-                <th scope="col">{{ $t('dashboard.visibility') }}</th>
+                <th scope="col">{{ $t('name') }}</th>
+                <th scope="col" class="d-none d-md-table-cell">{{ $tc('service', 2) }}</th>
+                <th scope="col">{{ $t('visibility') }}</th>
                 <th scope="col"></th>
             </tr>
             </thead>
@@ -29,7 +37,7 @@
                 <td><span class="drag_icon d-none d-md-inline">
                     <font-awesome-icon icon="bars" class="mr-3" /></span> {{group.name}}
                 </td>
-                <td>{{$store.getters.servicesInGroup(group.id).length}}</td>
+                <td class="d-none d-md-table-cell">{{$store.getters.servicesInGroup(group.id).length}}</td>
                 <td>
                     <span class="badge text-uppercase" :class="{'badge-primary': group.public, 'badge-secondary': !group.public}">
                         {{group.public ? $t('public') : $t('private')}}
@@ -60,15 +68,17 @@
 </template>
 
 <script>
-  const FormGroup = () => import('@/forms/Group')
-  const ToggleSwitch = () => import('@/forms/ToggleSwitch')
-  const ServicesList = () => import('@/components/Dashboard/ServicesList')
+  const Modal = () => import(/* webpackChunkName: "dashboard" */ "@/components/Elements/Modal")
+  const FormGroup = () => import(/* webpackChunkName: "dashboard" */ '@/forms/Group')
+  const ToggleSwitch = () => import(/* webpackChunkName: "dashboard" */ '@/forms/ToggleSwitch')
+  const ServicesList = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/ServicesList')
   import Api from "../../API";
-  import draggable from 'vuedraggable'
+  const draggable = () => import(/* webpackChunkName: "dashboard" */ 'vuedraggable')
 
   export default {
       name: 'DashboardServices',
       components: {
+        Modal,
           ServicesList,
           ToggleSwitch,
           FormGroup,
@@ -105,13 +115,24 @@
               this.group = g
               this.edit = !mode
           },
+        confirm_delete(service) {
+
+        },
+        async delete(g) {
+          await Api.group_delete(g.id)
+          const groups = await Api.groups()
+          this.$store.commit('setGroups', groups)
+        },
           async deleteGroup(g) {
-              let c = confirm(`Are you sure you want to delete '${g.name}'?`)
-              if (c) {
-                  await Api.group_delete(g.id)
-                  const groups = await Api.groups()
-                  this.$store.commit('setGroups', groups)
-              }
+            const modal = {
+              visible: true,
+              title: "Delete Group",
+              body: `Are you sure you want to delete group ${g.name}? All services attached will be removed from this group.`,
+              btnColor: "btn-danger",
+              btnText: "Delete Group",
+              func: () => this.delete(g),
+            }
+            this.$store.commit("setModal", modal)
           }
       }
   }
diff --git a/frontend/src/components/Dashboard/DashboardUsers.vue b/frontend/src/components/Dashboard/DashboardUsers.vue
index 05a5e94c..6fce2e7c 100644
--- a/frontend/src/components/Dashboard/DashboardUsers.vue
+++ b/frontend/src/components/Dashboard/DashboardUsers.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="col-12">
-        <div class="card contain-card text-black-50 bg-white mb-4">
-            <div class="card-header">{{ $t('top_nav.users') }}</div>
+        <div class="card contain-card mb-4">
+            <div class="card-header">{{ $t('users') }}</div>
             <div class="card-body pt-0">
         <table class="table table-striped">
             <thead>
@@ -9,6 +9,7 @@
                     <th scope="col">{{$t('username')}}</th>
                     <th scope="col">{{$t('type')}}</th>
                     <th scope="col" class="d-none d-md-table-cell">{{ $t('last_login') }}</th>
+                    <th scope="col" class="d-none d-md-table-cell">Scopes</th>
                     <th scope="col"></th>
                 </tr>
             </thead>
@@ -21,7 +22,8 @@
                         {{user.admin ? $t('admin') : $t('user')}}
                     </span>
                 </td>
-                <td class="d-none d-md-table-cell">{{niceDate(user.updated_at)}}</td>
+              <td class="d-none d-md-table-cell">{{niceDate(user.updated_at)}}</td>
+              <td class="d-none d-md-table-cell">{{user.scopes}}</td>
                 <td class="text-right">
                     <div class="btn-group">
                         <a @click.prevent="editUser(user, edit)" href="#" class="btn btn-outline-secondary edit-user">
@@ -45,7 +47,7 @@
 
 <script>
   import Api from "../../API"
-  const FormUser = () => import('@/forms/User')
+  const FormUser = () => import(/* webpackChunkName: "dashboard" */ '@/forms/User')
 
   export default {
   name: 'DashboardUsers',
@@ -72,13 +74,21 @@
       this.user = u
       this.edit = !mode
     },
+    async delete(u) {
+      await Api.user_delete(u.id)
+      const users = await Api.users()
+      this.$store.commit('setUsers', users)
+    },
     async deleteUser(u) {
-      let c = confirm(`Are you sure you want to delete user '${u.username}'?`)
-      if (c) {
-        await Api.user_delete(u.id)
-        const users = await Api.users()
-        this.$store.commit('setUsers', users)
+      const modal = {
+        visible: true,
+        title: "Delete User",
+        body: `Are you sure you want to delete user ${u.username}?`,
+        btnColor: "btn-danger",
+        btnText: "Delete User",
+        func: () => this.delete(u),
       }
+      this.$store.commit("setModal", modal)
     }
   }
 }
diff --git a/frontend/src/components/Dashboard/EditService.vue b/frontend/src/components/Dashboard/EditService.vue
index 3b44e23b..003f0134 100644
--- a/frontend/src/components/Dashboard/EditService.vue
+++ b/frontend/src/components/Dashboard/EditService.vue
@@ -13,11 +13,11 @@
 </template>
 
 <script>
-  import FormGroup from "../../forms/Group";
+  const FormGroup = () => import(/* webpackChunkName: "dashboard" */ "../../forms/Group");
   import Api from "../../API";
-  import ToggleSwitch from "../../forms/ToggleSwitch";
-  import draggable from 'vuedraggable'
-  import FormService from "../../forms/Service";
+  const ToggleSwitch = () => import(/* webpackChunkName: "dashboard" */ "../../forms/ToggleSwitch");
+  const draggable = () => import(/* webpackChunkName: "dashboard" */ 'vuedraggable')
+  const FormService = () => import(/* webpackChunkName: "dashboard" */ "../../forms/Service");
 
   export default {
     name: 'EditService',
diff --git a/frontend/src/components/Dashboard/Failures.vue b/frontend/src/components/Dashboard/Failures.vue
index 95fa915c..c289ee9d 100644
--- a/frontend/src/components/Dashboard/Failures.vue
+++ b/frontend/src/components/Dashboard/Failures.vue
@@ -1,22 +1,77 @@
 <template>
-    <div class="col-12">
-        <h2>{{service.name}} Failures
-        <button v-if="failures.length>0" @click="deleteFailures" class="btn btn-outline-danger float-right">Delete All</button></h2>
-    <div class="list-group mt-3 mb-4">
+    <div v-if="service" class="col-12">
+        <h3>{{service.name}} Failures
+            <button v-if="failures.length>0" @click="deleteFailures" class="btn btn-danger float-right">Delete All</button>
+        </h3>
 
-        <div class="alert alert-info" v-if="failures.length===0">
-            You don't have any failures for {{service.name}}. Way to go!
-        </div>
-
-        <div v-for="(failure, index) in failures" :key="index" class="mb-2 list-group-item list-group-item-action flex-column align-items-start">
-            <div class="d-flex w-100 justify-content-between">
-                <h5 class="mb-1">{{failure.issue}}</h5>
-                <small>{{niceDate(failure.created_at)}}</small>
+        <div class="card mt-4 mb-4">
+            <div class="card-header">
+                Search and Filter
+                <span class="float-right">
+                    <font-awesome-icon v-if="loading" icon="circle-notch" spin/>
+                </span>
+            </div>
+            <div class="card-body">
+                <form>
+                    <div class="form-row">
+                        <div class="col">
+                            <label for="fromdate">From Date</label>
+                            <flatPickr id="fromdate" :disabled="loading" @on-change="load" v-model="start_time" :config="{ wrap: true, allowInput: true, enableTime: true, dateFormat: 'Z', altInput: true, altFormat: 'Y-m-d h:i K', maxDate: new Date() }" type="text" class="form-control text-left d-block" required />
+                        </div>
+                        <div class="col">
+                            <label for="todate">To Date</label>
+                            <flatPickr id="todate" :disabled="loading" @on-change="load" v-model="end_time" :config="{ wrap: true, allowInput: true, enableTime: true, dateFormat: 'Z', altInput: true, altFormat: 'Y-m-d h:i K', maxDate: new Date() }" type="text" class="form-control text-left d-block" required />
+                        </div>
+                        <div class="col">
+                            <label for="search">Search Terms</label>
+                            <input id="search" type="text" v-model="search" class="form-control">
+                        </div>
+                    </div>
+                    <div class="form-row mt-3">
+                        <div class="col">
+                            <span @click="show_checkins = !!show_checkins" class="switch float-left">
+                                <input v-model="show_checkins" type="checkbox" class="switch" id="showcheckins" v-bind:checked="show_checkins">
+                                 <label v-if="show_checkins" for="showcheckins">Showing Checkin Failures</label>
+                                 <label v-else for="showcheckins">View Checkin Failures</label>
+                            </span>
+                        </div>
+                    </div>
+                </form>
             </div>
-            <p class="mb-1">{{failure.issue}}</p>
         </div>
 
-        <nav v-if="total > 4" class="mt-3">
+        <div v-if="failures.length === 0" class="alert alert-info">
+            <span v-if="search">
+                Could not find any failures with issue: "{{search}}"
+            </span>
+            <span v-else>
+                You don't have any failures for {{service.name}}. Way to go!
+            </span>
+        </div>
+
+        <table v-else class="table">
+            <thead>
+            <tr>
+                <th scope="col">#</th>
+                <th scope="col">Issue</th>
+                <th scope="col">Status Code</th>
+                <th scope="col">Ping</th>
+                <th scope="col">Created</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr v-for="(failure, index) in failures" :key="index">
+                <th class="font-1" scope="row">{{failure.id}}</th>
+                <td class="font-1">{{failure.issue}}</td>
+                <td class="font-1">{{failure.error_code}}</td>
+                <td class="font-1">{{humanTime(failure.ping)}}</td>
+                <td class="font-1">{{ago(failure.created_at)}}</td>
+            </tr>
+
+            </tbody>
+        </table>
+
+        <nav v-if="total > 4 && failures.length !== 0" class="mt-3">
             <ul class="pagination justify-content-center">
                 <li class="page-item" :class="{'disabled': page===1}">
                     <a @click.prevent="gotoPage(page-1)" :disabled="page===1" class="page-link" href="#" aria-label="Previous">
@@ -35,39 +90,59 @@
                 </li>
             </ul>
             <div class="text-center">
-             <span class="text-black-50">{{total}} Total</span>
+                <span>{{total}} Failures</span>
             </div>
         </nav>
-    </div>
+
     </div>
 </template>
 
 <script>
 import Api from "../../API";
+import flatPickr from 'vue-flatpickr-component';
+import 'flatpickr/dist/flatpickr.css';
 
 export default {
     name: 'Failures',
+      components: {
+        flatPickr
+      },
     data() {
         return {
-            service: {},
-          failures: [],
-          limit: 10,
+          loading: true,
+          search: "",
+          show_checkins: false,
+          service: null,
+          fails: [],
+          limit: 64,
           offset: 0,
           total: 0,
-          page: 1
+          page: 1,
+          start_time: this.nowSubtract(216000).toISOString(),
+          end_time: this.nowSubtract(0).toISOString(),
         }
     },
+      watch: {
+        '$route': 'reloadTimes',
+      },
       computed: {
+        failures() {
+          let sorted = this.fails
+          if (this.show_checkins) {
+            sorted = sorted.filter(f => f.method === "checkin");
+          } else {
+            sorted = sorted.filter(f => f.method !== "checkin");
+          }
+          if (this.search !== "") {
+            sorted = sorted.filter(f => f.issue.toLowerCase().includes(this.search));
+          }
+          return sorted
+        },
         pages() {
           return Math.floor(this.total / this.limit)
         },
         maxPages() {
-          const p = Math.floor(this.total / this.limit)
-          if (p > 16) {
-            return 16
-          } else {
-            return p
-          }
+          return Math.floor(this.total / this.limit)
         }
       },
       async created() {
@@ -76,14 +151,22 @@ export default {
         await this.gotoPage(1)
       },
     methods: {
+      async delete() {
+        await Api.service_failures_delete(this.service)
+        this.service = await Api.service(this.service.id)
+        this.total = 0
+        await this.load()
+      },
       async deleteFailures() {
-        const c = confirm('Are you sure you want to delete all failures?')
-        if (c) {
-          await Api.service_failures_delete(this.service)
-          this.service = await Api.service(this.service.id)
-          this.total = 0
-          await this.load()
+        const modal = {
+          visible: true,
+          title: "Delete All Failures",
+          body: `Are you sure you want to delete all Failures for service ${this.service.title}?`,
+          btnColor: "btn-danger",
+          btnText: "Delete Failures",
+          func: () => this.delete(),
         }
+        this.$store.commit("setModal", modal)
       },
       async gotoPage(page) {
         this.page = page;
@@ -91,15 +174,10 @@ export default {
         await this.load()
       },
       async load() {
-        this.failures = await Api.service_failures(this.service.id, 0, 9999999999, this.limit, this.offset)
+        this.loading = true
+        this.fails = await Api.service_failures(this.service.id, this.toUnix(this.parseISO(this.start_time)), this.toUnix(this.parseISO(this.end_time)), this.limit, this.offset)
+        this.loading = false
       }
     }
 }
 </script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-    .sm {
-        font-size: 8pt;
-    }
-</style>
diff --git a/frontend/src/components/Dashboard/GroupedServices.vue b/frontend/src/components/Dashboard/GroupedServices.vue
new file mode 100644
index 00000000..29ff2b46
--- /dev/null
+++ b/frontend/src/components/Dashboard/GroupedServices.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="row">
+    <h5 v-if="group.name && group_services" class="h5 col-12 mb-3 mt-2 text-dim">
+      <font-awesome-icon @click="toggle" :icon="expanded ? 'minus' : 'plus'" class="pointer mr-3"/> {{group.name}}
+      <span class="badge badge-success text-uppercase float-right ml-2">{{services_online.length}} {{$t('online')}}</span>
+      <span v-if="services_online.services_offline > 0" class="badge badge-danger text-uppercase float-right">
+        {{services_offline.length}} {{$t('offline')}}
+      </span>
+    </h5>
+    <div class="col-12 col-md-4" v-if="expanded" v-for="service in group_services">
+      <ServiceInfo :service="service" />
+    </div>
+  </div>
+</template>
+
+<script>
+const ServiceInfo = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/ServiceInfo')
+
+
+export default {
+name: "GroupedServices",
+  components: {
+    ServiceInfo
+  },
+  data() {
+    return {
+      expanded: true
+    }
+  },
+  props: {
+    group: {
+      required: true,
+      type: Object,
+    }
+  },
+  computed: {
+    services_online() {
+      return this.$store.getters.servicesInGroup(this.group.id).filter((s) => s.online)
+    },
+    services_offline() {
+      return this.$store.getters.servicesInGroup(this.group.id).filter((s) => !s.online)
+    },
+    group_services() {
+      return this.$store.getters.servicesInGroup(this.group.id)
+    },
+  },
+  methods: {
+    toggle() {
+      this.expanded = !this.expanded
+    },
+    dashboard_cookies() {
+      const data = [{group: 5, show: false}]
+      if (!this.$cookies.isKey("statping_layout")) {
+        this.$cookies.set("statping_layout", JSON.stringify(data))
+      }
+    }
+  }
+}
+</script>
diff --git a/frontend/src/components/Dashboard/Importer.vue b/frontend/src/components/Dashboard/Importer.vue
new file mode 100644
index 00000000..c131806b
--- /dev/null
+++ b/frontend/src/components/Dashboard/Importer.vue
@@ -0,0 +1,250 @@
+<template>
+<div class="mb-5">
+  <h3 v-if="!loaded" >Import and Export</h3>
+  <p v-if="!loaded">
+    You can export your current Statping services, groups, notifiers, and other settings to a JSON file.
+  </p>
+
+  <div v-if="!loaded" class="mt-4 row">
+    <div class="col-8 custom-file">
+      <input @change="onFileChange" type="file" class="custom-file-input pointer" id="customFile" accept=".json,application/json">
+      <label class="custom-file-label" for="customFile">Choose exported Statping JSON file</label>
+    </div>
+    <div class="col-4">
+      <a class="btn btn-block btn-light btn-outline-secondary" href="/api/settings/export">Export</a>
+    </div>
+  </div>
+
+  <div v-if="loaded" class="col-12 mb-4">
+    <h3>Core Settings
+      <span @click="file.core.enabled = !!file.core.enabled" class="switch switch-sm float-right">
+            <input @change="update" v-model="file.core.enabled" type="checkbox" class="switch" :id="`switch-core`">
+            <label :for="`switch-core`"></label>
+          </span>
+    </h3>
+
+    <div class="row mb-2"><span class="col-4">Name</span><span class="col-8 text-right font-weight-bold">{{file.core.name}}</span></div>
+    <div class="row mb-2"><span class="col-4">Description</span><span class="col-8 text-right font-weight-bold">{{file.core.description}}</span></div>
+    <div class="row mb-2"><span class="col-4">Domain</span><span class="col-8 text-right font-weight-bold">{{file.core.domain}}</span></div>
+
+  </div>
+
+  <div v-if="loaded" class="col-12 mb-4">
+    <h3>Users
+      <button @click.prevent="toggle_all(file.users)" class="btn btn-sm btn-outline-dark float-right mt-1">Select All</button>
+    </h3>
+    <div v-if="!file.users" class="alert alert-link">
+      No Users in file
+    </div>
+    <div v-for="user in file.users" v-bind:key="user.id" class="row">
+      <div class="col-4 font-weight-bold">
+        {{user.username}}
+      </div>
+      <div class="col-6">
+        {{user.email}}
+      </div>
+      <div class="col-2 text-right">
+          <span @click="user.enabled = !!user.enabled" class="switch switch-sm">
+            <input @change="update" v-model="user.enabled" type="checkbox" class="switch" :id="`switch-user-${user.id}`">
+            <label :for="`switch-user-${user.id}`"></label>
+          </span>
+      </div>
+    </div>
+  </div>
+
+
+  <div v-if="loaded" class="col-12 mb-4">
+    <h3>Checkins
+      <button @click.prevent="toggle_all(file.checkins)" class="btn btn-sm btn-outline-dark float-right mt-1">Select All</button>
+    </h3>
+    <div v-if="!file.checkins" class="alert alert-link">
+      No Checkins in file
+    </div>
+    <div v-for="checkin in file.checkins" v-bind:key="checkin.id" class="row">
+      <div class="col-4 font-weight-bold">
+        {{checkin.name}}
+      </div>
+      <div class="col-6">
+        Service #{{checkin.service_id}}
+      </div>
+      <div class="col-2 text-right">
+          <span @click="checkin.enabled = !!checkin.enabled" class="switch switch-sm">
+            <input @change="update" v-model="checkin.enabled" type="checkbox" class="switch" :id="`switch-checkin-${checkin.id}`">
+            <label :for="`switch-checkin-${checkin.id}`"></label>
+          </span>
+      </div>
+    </div>
+  </div>
+
+  <div v-if="loaded" class="col-12 mb-4">
+    <h3>Services
+      <button @click.prevent="toggle_all(file.services)" class="btn btn-sm btn-outline-dark float-right mt-1">Select All</button>
+    </h3>
+    <div v-if="!file.services" class="alert alert-link">
+      No Services in file
+    </div>
+    <div v-for="service in file.services" v-bind:key="service.id" class="row">
+        <div class="col-4 font-weight-bold">
+          {{service.name}}
+        </div>
+      <div class="col-6">
+        {{service.domain}}
+      </div>
+        <div class="col-2 text-right">
+          <span @click="service.enabled = !!service.enabled" class="switch switch-sm">
+            <input @change="update" v-model="service.enabled" type="checkbox" class="switch" :id="`switch-service-${service.id}`">
+            <label :for="`switch-service-${service.id}`"></label>
+          </span>
+        </div>
+    </div>
+  </div>
+
+  <div v-if="loaded" class="col-12 mb-4">
+    <h3>Groups
+      <button @click.prevent="toggle_all(file.groups)" class="btn btn-sm btn-outline-dark float-right mt-1">Select All</button>
+    </h3>
+    <div v-if="!file.groups" class="alert alert-link">
+      No Groups in file
+    </div>
+    <div v-for="group in file.groups" v-bind:key="group.id" class="row">
+      <div class="col-4 font-weight-bold">
+        {{group.name}}
+      </div>
+      <div class="col-8 text-right">
+          <span @click="group.enabled = !!group.enabled" class="switch switch-sm">
+            <input @change="update" v-model="group.enabled" type="checkbox" class="switch" :id="`switch-group-${group.id}`">
+            <label :for="`switch-group-${group.id}`"></label>
+          </span>
+      </div>
+    </div>
+  </div>
+
+  <div v-if="loaded" class="col-12 mb-4">
+    <h3>Incidents
+      <button @click.prevent="toggle_all(file.incidents)" class="btn btn-sm btn-outline-dark float-right mt-1">Select All</button>
+    </h3>
+    <div v-if="!file.incidents" class="alert alert-link">
+      No Incidents in file
+    </div>
+    <div v-for="incident in file.incidents" v-bind:key="incident.id" class="row">
+      <div class="col-4 font-weight-bold">
+        {{incident.name}}
+      </div>
+      <div class="col-8 text-right">
+          <span @click="incident.enabled = !!incident.enabled" class="switch switch-sm">
+            <input @change="update" v-model="incident.enabled" type="checkbox" class="switch" :id="`switch-incident-${incident.id}`">
+            <label :for="`switch-incident-${incident.id}`"></label>
+          </span>
+      </div>
+    </div>
+  </div>
+
+  <div v-if="loaded" class="col-12 mb-3">
+    <h3>Notifiers
+      <button @click.prevent="toggle_all(file.notifiers)" class="btn btn-sm btn-outline-dark float-right mt-1">Select All</button>
+    </h3>
+    <div v-if="!file.notifiers" class="alert alert-link">
+      No Notifiers in file
+    </div>
+    <div v-for="notifier in file.notifiers" v-bind:key="notifier.id" class="row">
+      <div class="col-4">
+        {{notifier.title}}
+      </div>
+      <div class="col-8 text-right">
+          <span @click="notifier.enabled = !!notifier.enabled" class="switch">
+            <input @change="update" v-model="notifier.enabled" type="checkbox" class="switch" :id="`switch-notifier-${notifier.id}`">
+            <label :for="`switch-notifier-${notifier.id}`"></label>
+          </span>
+      </div>
+    </div>
+  </div>
+
+  <div v-if="error" class="alert alert-danger">
+    {{error}}
+  </div>
+
+  <div class="col-12">
+    <button v-if="loaded" @click.prevent="import_all" class="btn btn-block btn-success">Import</button>
+  </div>
+
+</div>
+</template>
+
+<script>
+import Api from '../../API';
+
+export default {
+name: "Importer",
+  data () {
+    return {
+      error: null,
+      file: null,
+      loaded: false,
+      output: null,
+      all: {
+        notifiers: false,
+        services: false,
+        groups: false,
+      }
+    }
+  },
+  methods: {
+  clean_elem(elem) {
+    if (!elem) {
+      return null
+    }
+    elem.map(e => delete(e.enabled) && delete(e.id))
+    return elem
+  },
+  async import_all() {
+    this.error = null
+    const outgoing = {
+      core: this.output.core,
+      users: this.clean_elem(this.output.users),
+      services: this.clean_elem(this.output.services),
+      groups: this.clean_elem(this.output.groups),
+      notifiers: this.clean_elem(this.output.notifiers),
+      checkins: this.clean_elem(this.output.checkins),
+    }
+    try {
+      await Api.import(outgoing)
+    } catch(e) {
+      this.error = e
+    }
+  },
+  toggle_all(elem) {
+    elem.map(s => s.enabled = true)
+    this.update()
+  },
+    update() {
+      this.output = {
+        core: this.file.core.enabled ? this.file.core : null,
+        users: this.file.users.filter(s => s.enabled),
+        services: this.file.services.filter(s => s.enabled),
+        groups: this.file.groups.filter(s => s.enabled),
+        notifiers: this.file.notifiers.filter(s => s.enabled),
+        checkins: this.file.checkins.filter(s => s.enabled),
+      }
+    },
+    onFileChange(e) {
+      let files = e.target.files || e.dataTransfer.files;
+      if (!files.length)
+        return;
+      this.processJSON(files[0]);
+    },
+    processJSON(file) {
+      let reader = new FileReader();
+      reader.onload = (e) => {
+        this.file = JSON.parse(e.target.result);
+        this.file.core.enabled = false
+      };
+      reader.readAsText(file);
+      this.loaded = true
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/components/Dashboard/Incidents.vue b/frontend/src/components/Dashboard/Incidents.vue
index a3ec53e1..2a3457aa 100644
--- a/frontend/src/components/Dashboard/Incidents.vue
+++ b/frontend/src/components/Dashboard/Incidents.vue
@@ -1,10 +1,10 @@
 <template>
     <div class="col-12">
 
-        <div v-for="incident in incidents" :key="incident.id" class="card contain-card text-black-50 bg-white mb-4">
+        <div v-for="incident in incidents" :key="incident.id" class="card contain-card mb-4">
             <div class="card-header">Incident: {{incident.title}}
                 <button @click="deleteIncident(incident)" class="btn btn-sm btn-danger float-right">
-                    <font-awesome-icon icon="times" />  Delete
+                    <font-awesome-icon icon="times" />
                 </button>
             </div>
 
@@ -14,7 +14,7 @@
         </div>
 
 
-        <div class="card contain-card text-black-50 bg-white">
+        <div class="card contain-card">
             <div class="card-header">Create Incident</div>
             <div class="card-body">
                 <form @submit.prevent="createIncident">
@@ -50,8 +50,9 @@
 </template>
 
 <script>
-    import Api from "../../API";
-    const FormIncidentUpdates = () => import('@/forms/IncidentUpdates')
+import Api from "../../API";
+
+const FormIncidentUpdates = () => import(/* webpackChunkName: "dashboard" */ '@/forms/IncidentUpdates')
 
     export default {
         name: 'Incidents',
@@ -79,15 +80,23 @@
 
     methods: {
 
+      async delete(i) {
+        this.res = await Api.incident_delete(i)
+        if (this.res.status === "success") {
+          this.incidents = this.incidents.filter(obj => obj.id !== i.id);
+          //await this.loadIncidents()
+        }
+      },
         async deleteIncident(incident) {
-            let c = confirm(`Are you sure you want to delete '${incident.title}'?`)
-            if (c) {
-                this.res = await Api.incident_delete(incident)
-                if (this.res.status === "success") {
-                    this.incidents = this.incidents.filter(obj => obj.id !== incident.id); // this is better in terms of not having to querry the db to get a fresh copy of all updates
-                    //await this.loadIncidents()
-                } // TODO: further error checking here... maybe alert user it failed with modal or so
-            }
+          const modal = {
+            visible: true,
+            title: "Delete Incident",
+            body: `Are you sure you want to delete Incident ${incident.title}?`,
+            btnColor: "btn-danger",
+            btnText: "Delete Incident",
+            func: () => this.delete(incident),
+          }
+          this.$store.commit("setModal", modal)
         },
 
         async createIncident() {
@@ -112,10 +121,3 @@
     }
 }
 </script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-    .sm {
-        font-size: 8pt;
-    }
-</style>
diff --git a/frontend/src/components/Dashboard/ServiceEvents.vue b/frontend/src/components/Dashboard/ServiceEvents.vue
new file mode 100644
index 00000000..f325c4b9
--- /dev/null
+++ b/frontend/src/components/Dashboard/ServiceEvents.vue
@@ -0,0 +1,93 @@
+<template>
+  <div class="row p-2">
+
+    <div v-if="loaded && last_failure && failureBefore" class="col-12 text-danger font-2 m-0 mb-2">
+      <font-awesome-icon icon="exclamation" class="mr-1 text-danger font-weight-bold" size="1x"/> Recent Failure<br>
+      <span class="font-italic font-weight-light text-dim mt-1" style="max-width: 270px">
+      Last failure was {{ago(last_failure.created_at)}} ago. {{last_failure.issue}}
+      </span>
+    </div>
+
+    <div v-if="loaded" v-for="message in messages" class="col-12 font-2 m-0 mb-2">
+      <font-awesome-icon icon="calendar" class="mr-1" size="1x"/> Upcoming Announcement<br>
+      <span class="font-italic font-weight-light text-dim mt-1">{{message.description}}</span>
+      <span class="font-0 text-dim float-right font-weight-light mt-1">@ <strong>{{niceDate(message.start_on)}}</strong>
+      </span>
+    </div>
+
+    <div v-if="loaded" v-for="incident in incidents" class="col-12 font-2 m-0 mb-2">
+      <font-awesome-icon icon="bullhorn" class="mr-1" size="1x"/>Recent Incident<br>
+      <span class="font-italic font-weight-light text-dim mt-1" style="max-width: 270px">{{incident.title}} - {{incident.description}}</span>
+      <span class="font-0 text-dim float-right font-weight-light mt-1">@ <strong>{{niceDate(incident.created_at)}}</strong></span>
+    </div>
+
+    <div v-if="success_event && !failureBefore" class="col-12 font-2 m-0 mb-2">
+      <span class="text-success"><font-awesome-icon icon="check" class="mr-1" size="1x"/>No New Events</span>
+      <span class="font-italic d-inline-block text-truncate text-dim mt-1" style="max-width: 270px">
+        Last failure was {{ago(service.last_error)}} ago.
+      </span>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import Api from "../../API";
+const Loading = () => import(/* webpackChunkName: "index" */ "@/components/Elements/Loading");
+
+export default {
+name: "ServiceEvents",
+  components: {
+    Loading
+  },
+  props: {
+    service: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      incidents: null,
+      loaded: false,
+    }
+  },
+  mounted() {
+   this.load()
+  },
+  computed: {
+  last_failure() {
+    if (!this.service.failures) {
+      return null
+    }
+    return this.service.failures[0]
+  },
+  failureBefore() {
+    return this.isAfter(this.parseISO(this.service.last_error), this.nowSubtract(43200).toISOString())
+  },
+    messages() {
+      return this.$store.getters.serviceMessages(this.service.id)
+    },
+    success_event() {
+      if (this.service.online && this.service.messages.length === 0 && this.service.incidents.length === 0) {
+        return true
+      }
+      return false
+    }
+  },
+  methods: {
+    async load() {
+      this.loaded = false
+      await this.getMessages()
+      await this.getIncidents()
+      this.loaded = true
+    },
+    async getMessages() {
+      // this.messages = this.$store.getters.serviceMessages(this.service.id)
+    },
+    async getIncidents() {
+      this.incidents = await Api.incidents_service(this.service.id)
+    },
+  }
+}
+</script>
diff --git a/frontend/src/components/Dashboard/ServiceInfo.vue b/frontend/src/components/Dashboard/ServiceInfo.vue
new file mode 100644
index 00000000..79d9e3a4
--- /dev/null
+++ b/frontend/src/components/Dashboard/ServiceInfo.vue
@@ -0,0 +1,173 @@
+<template>
+    <div class="dashboard_card card mb-4" :class="{'offline-card': !service.online}">
+        <div class="card-header pb-1">
+            <h6 v-observe-visibility="setVisible">
+                <router-link :to="serviceLink(service)" class="no-decoration">{{service.name}}</router-link>
+                <span class="badge float-right text-uppercase" :class="{'badge-success': service.online, 'badge-danger': !service.online}">
+                    {{service.online ? $t('online') : $t('offline')}}
+                </span>
+            </h6>
+        </div>
+
+        <div class="card-body">
+            <div v-if="loaded" class="row pl-2">
+              <div class="col-md-6 col-sm-12 pl-2 mt-2 mt-md-0 mb-3">
+                  <ServiceSparkLine :title="set2_name" subtitle="Latency Last 24 Hours" :series="set2"/>
+              </div>
+              <div class="col-md-6 col-sm-12 pl-0 mt-4 mt-md-0 mb-3">
+                  <ServiceSparkLine :title="set1_name" subtitle="Latency Last 7 Days" :series="set1"/>
+              </div>
+              <ServiceEvents :service="service"/>
+            </div>
+              <div v-else class="row mb-5">
+                <div class="col-12 col-md-6 text-center">
+                  <font-awesome-icon icon="circle-notch" class="text-dim" size="2x" spin/>
+                </div>
+                <div class="col-12 col-md-6 text-center text-dim">
+                  <font-awesome-icon icon="circle-notch" class="text-dim" size="2x" spin/>
+                </div>
+              </div>
+        </div>
+        <div class="card-footer">
+
+          <div class="row">
+          <div class="col-5 pr-0">
+              <span class="small text-dim">{{ hoverbtn }}</span>
+          </div>
+
+            <div class="col-7 pr-2 pl-0">
+              <div class="btn-group float-right">
+                  <button @click="$router.push({path: `/dashboard/service/${service.id}/incidents`, params: {id: service.id}})" @mouseleave="unsetHover" @mouseover="setHover($t('incidents'))" class="btn btn-sm btn-white incident">
+                    <font-awesome-icon icon="bullhorn"/>
+                  </button>
+                  <button @click="$router.push({path: `/dashboard/service/${service.id}/checkins`, params: {id: service.id}})" @mouseleave="unsetHover" @mouseover="setHover($t('checkins'))" class="btn btn-sm btn-white checkins">
+                    <font-awesome-icon icon="calendar-check"/>
+                  </button>
+                  <button @click="$router.push({path: `/dashboard/service/${service.id}/failures`, params: {id: service.id}})" @mouseleave="unsetHover" @mouseover="setHover($t('failures'))" class="btn btn-sm btn-white failures">
+                    <font-awesome-icon icon="exclamation-triangle"/> <span v-if="service.stats.failures !== 0" class="badge badge-danger ml-1">{{service.stats.failures}}</span>
+                  </button>
+              </div>
+            </div>
+
+          </div>
+
+        </div>
+
+        <span v-for="(failure, index) in failures" v-bind:key="index" class="alert alert-light">
+            {{ $t('failed') }} {{failure.created_at}}<br>
+            {{failure.issue}}
+        </span>
+
+    </div>
+</template>
+
+<script>
+  const Checkin = () => import(/* webpackChunkName: "dashboard" */ '../../forms/Checkin');
+  const FormMessage = () => import(/* webpackChunkName: "dashboard" */ '../../forms/Message');
+  const ServiceFailures = () => import(/* webpackChunkName: "dashboard" */ '../Service/ServiceFailures');
+  const ServiceSparkLine = () => import(/* webpackChunkName: "dashboard" */ "./ServiceSparkLine");
+  import Api from "../../API";
+
+  const ServiceEvents = () => import(/* webpackChunkName: "dashboard" */ "@/components/Dashboard/ServiceEvents");
+
+  export default {
+      name: 'ServiceInfo',
+      components: {
+        ServiceEvents,
+          Checkin,
+          ServiceFailures,
+          FormMessage,
+          ServiceSparkLine
+      },
+      props: {
+          service: {
+              type: Object,
+              required: true
+          }
+      },
+      data() {
+          return {
+              uptime: null,
+              hovered: false,
+              hoverbtn: "",
+              openTab: "",
+              set1: [],
+              set2: [],
+              loaded: false,
+              set1_name: "",
+              set2_name: "",
+              failures: null,
+            visible: false
+          }
+      },
+    watch: {
+
+    },
+    mounted() {
+      this.unsetHover()
+    },
+    methods: {
+      setHover(name) {
+        this.hoverbtn = name
+      },
+        unsetHover() {
+          this.hoverbtn = this.$t('uptime', [this.service.online_7_days])
+        },
+        async setVisible(isVisible, entry) {
+          if (isVisible && !this.visible) {
+            await this.loadInfo()
+            await this.getUptime()
+            this.visible = true
+          }
+        },
+        async getUptime() {
+          const end = this.endOf("day", this.now())
+          const start = this.beginningOf("day", this.nowSubtract(3 * 86400))
+          this.uptime = await Api.service_uptime(this.service.id, this.toUnix(start), this.toUnix(end))
+        },
+        async loadInfo() {
+          this.set1 = await this.getHits(86400 * 7, "12h")
+          this.set1_name = this.calc(this.set1)
+          this.set2 = await this.getHits(86400, "60m")
+          this.set2_name = this.calc(this.set2)
+          this.loaded = true
+        },
+          Tab(name) {
+              if (this.openTab === name) {
+                  this.openTab = ''
+                  return
+              }
+              this.openTab=name;
+          },
+        sinceYesterday(data) {
+          let total = 0
+          data.forEach((f) => {
+            total += parseInt(f.y)
+          });
+          total = total / data.length
+        },
+          async getHits(seconds, group) {
+              let start = this.nowSubtract(seconds)
+              let end = this.endOf("today")
+              const startEnd = this.startEndParams(start, end, group)
+              const fetched = await Api.service_hits(this.service.id, startEnd.start, startEnd.end, group, true)
+              const data = this.convertToChartData(fetched, 0.001, true)
+              return [{name: "Latency", ...data}]
+          },
+          calc(s) {
+              let data = s[0].data
+
+              if (data) {
+                  let total = 0
+                  data.forEach((f) => {
+                      total += parseInt(f.y)
+                  });
+                  total = total / data.length
+                  return Math.round(total) + " ms"
+              } else {
+                  return "Offline"
+              }
+          }
+      }
+  }
+</script>
diff --git a/frontend/src/components/Service/ServiceSparkLine.vue b/frontend/src/components/Dashboard/ServiceSparkLine.vue
similarity index 75%
rename from frontend/src/components/Service/ServiceSparkLine.vue
rename to frontend/src/components/Dashboard/ServiceSparkLine.vue
index 296cf4c8..08991ff1 100644
--- a/frontend/src/components/Service/ServiceSparkLine.vue
+++ b/frontend/src/components/Dashboard/ServiceSparkLine.vue
@@ -1,11 +1,10 @@
 <template v-if="series.length">
-    <apexchart width="100%" height="180" type="bar" :options="chartOpts" :series="series"></apexchart>
+    <apexchart width="100%" height="100" type="bar" :options="chartOpts" :series="series"></apexchart>
 </template>
 
 <script>
   const timeoptions = { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' };
 
-
   export default {
   name: 'ServiceSparkLine',
   props: {
@@ -38,6 +37,9 @@
             enabled: true
           },
         },
+        showPoint: false,
+        fullWidth:true,
+        chartPadding: {top: 0,right: 0,bottom: 0,left: 0},
         stroke: {
           curve: 'straight'
         },
@@ -51,21 +53,20 @@
         tooltip: {
           theme: false,
           enabled: true,
-          custom: function({series, seriesIndex, dataPointIndex, w}) {
+          custom: ({series, seriesIndex, dataPointIndex, w}) => {
             let ts = w.globals.seriesX[seriesIndex][dataPointIndex];
             const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
             let val = series[seriesIndex][dataPointIndex];
-            val = val + " ms"
-            return `<div class="chartmarker"><span>Average Response Time: </span><span class="font-3">${val}</span><span>${dt}</span></div>`
+            return `<div class="chartmarker"><span class="font-3">Average Response Time:  ${this.humanTime(val)}</span><span>${dt}</span></div>`
           },
           fixed: {
             enabled: true,
-            position: 'topRight',
+            position: 'bottomLeft',
             offsetX: 0,
-            offsetY: 0,
+            offsetY: -30,
           },
           x: {
-            show: false,
+            show: true,
           },
           y: {
             formatter: (value) => { return value + " %" },
@@ -75,15 +76,16 @@
           text: this.title,
           offsetX: 0,
           style: {
-            fontSize: '28px',
+            fontSize: '18px',
             cssClass: 'apexcharts-yaxis-title'
           }
         },
         subtitle: {
           text: this.subtitle,
           offsetX: 0,
+          offsetY: 20,
           style: {
-            fontSize: '14px',
+            fontSize: '9px',
             cssClass: 'apexcharts-yaxis-title'
           }
         }
@@ -92,7 +94,3 @@
   }
 }
 </script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-</style>
diff --git a/frontend/src/components/Dashboard/ServicesList.vue b/frontend/src/components/Dashboard/ServicesList.vue
index 78cc0635..68dd99ba 100644
--- a/frontend/src/components/Dashboard/ServicesList.vue
+++ b/frontend/src/components/Dashboard/ServicesList.vue
@@ -1,10 +1,26 @@
 <template>
-    <table class="table">
+    <div>
+        <div v-if="servicesList.length === 0">
+            <div class="alert alert-dark d-block mt-3 mb-0">
+                You currently don't have any services!
+            </div>
+        </div>
+    <table v-else class="table">
         <thead>
         <tr>
-            <th scope="col">Name</th>
-            <th scope="col" class="d-none d-md-table-cell">Visibility</th>
+            <th scope="col">{{$t('name')}}</th>
+            <th scope="col" class="d-none d-md-table-cell">{{$t('status')}}</th>
+            <th scope="col" class="d-none d-md-table-cell">{{$t('visibility')}}</th>
             <th scope="col" class="d-none d-md-table-cell">{{ $t('group') }}</th>
+            <th scope="col" class="d-none d-md-table-cell" style="width: 130px">
+              {{$t('failures')}}
+              <div class="btn-group float-right" role="group">
+                <a @click="list_timeframe='3h'" type="button" class="small" :class="{'text-success': list_timeframe==='3h', 'text-muted': list_timeframe!=='3h'}">3h</a>
+                <a @click="list_timeframe='12h'" type="button" class="small" :class="{'text-success': list_timeframe==='12h', 'text-muted': list_timeframe!=='12h'}">12h</a>
+                <a @click="list_timeframe='24h'" type="button" class="small" :class="{'text-success': list_timeframe==='24h', 'text-muted': list_timeframe!=='24h'}">24h</a>
+                <a @click="list_timeframe='7d'" type="button" class="small" :class="{'text-success': list_timeframe==='7d', 'text-muted': list_timeframe!=='7d'}">7d</a>
+              </div>
+            </th>
             <th scope="col"></th>
         </tr>
         </thead>
@@ -15,6 +31,11 @@
                         <font-awesome-icon icon="bars" class="mr-3"/>
                     </span> {{service.name}}
                 </td>
+              <td class="d-none d-md-table-cell">
+                    <span class="badge text-uppercase" :class="{'badge-success': service.online, 'badge-danger': !service.online}">
+                        {{service.online ? $t('online') : $t('offline')}}
+                    </span>
+              </td>
                 <td class="d-none d-md-table-cell">
                     <span class="badge text-uppercase" :class="{'badge-primary': service.public, 'badge-secondary': !service.public}">
                         {{service.public ? $t('public') : $t('private')}}
@@ -25,15 +46,18 @@
                         <span class="badge badge-secondary">{{serviceGroup(service)}}</span>
                     </div>
                 </td>
+              <td class="d-none d-md-table-cell">
+                <ServiceSparkList :service="service" :timeframe="list_timeframe"/>
+              </td>
                 <td class="text-right">
                     <div class="btn-group">
-                        <button v-if="$store.state.admin" @click.prevent="goto({path: `/dashboard/edit_service/${service.id}`, params: {service: service} })" class="btn btn-sm btn-outline-secondary">
+                        <button :disabled="loading" v-if="$store.state.admin" @click.prevent="goto({path: `/dashboard/edit_service/${service.id}`, params: {service: service} })" class="btn btn-sm btn-outline-secondary">
                             <font-awesome-icon icon="edit" />
                         </button>
-                        <button @click.prevent="goto({path: serviceLink(service), params: {service: service} })" class="btn btn-sm btn-outline-secondary">
+                        <button :disabled="loading" @click.prevent="goto({path: serviceLink(service), params: {service: service} })" class="btn btn-sm btn-outline-secondary">
                             <font-awesome-icon icon="chart-area" />
                         </button>
-                        <button v-if="$store.state.admin" @click.prevent="deleteService(service)" href="#" class="btn btn-sm btn-danger">
+                        <button :disabled="loading" v-if="$store.state.admin" @click.prevent="deleteService(service)" class="btn btn-sm btn-danger">
                             <font-awesome-icon v-if="!loading" icon="times" />
                             <font-awesome-icon v-if="loading" icon="circle-notch" spin/>
                         </button>
@@ -42,22 +66,77 @@
             </tr>
         </draggable>
     </table>
+    </div>
 </template>
 
 <script>
 import Api from "../../API";
-import draggable from 'vuedraggable'
-import ToggleSwitch from '../../forms/ToggleSwitch';
+import ServiceSparkList from "@/components/Service/ServiceSparkList";
+import Modal from "@/components/Elements/Modal";
+const draggable = () => import(/* webpackChunkName: "dashboard" */ 'vuedraggable')
+const ToggleSwitch = () => import(/* webpackChunkName: "dashboard" */ '../../forms/ToggleSwitch');
 
 export default {
       name: 'ServicesList',
     components: {
+      Modal,
+      ServiceSparkList,
         ToggleSwitch,
           draggable
     },
       data() {
         return {
           loading: false,
+          list_timeframe: "12h",
+          chartOpts: {
+            chart: {
+              type: 'bar',
+              height: 50,
+              sparkline: {
+                enabled: true
+              },
+            },
+            xaxis: {
+              type: 'numeric',
+            },
+            showPoint: false,
+            fullWidth:true,
+            chartPadding: {top: 0,right: 0,bottom: 0,left: 0},
+            stroke: {
+              curve: 'straight'
+            },
+            fill: {
+              opacity: 0.8,
+            },
+            yaxis: {
+              min: 0
+            },
+            plotOptions: {
+              bar: {
+                colors: {
+                  ranges: [{
+                    from: 0,
+                    to: 1,
+                    color: '#39c10a'
+                  }, {
+                    from: 2,
+                    to: 90,
+                    color: '#e01a1a'
+                  }]
+                },
+              },
+            },
+            tooltip: {
+              theme: false,
+              enabled: false,
+            },
+            title: {
+              enabled: false,
+            },
+            subtitle: {
+              enabled: false,
+            }
+          }
         }
       },
     computed: {
@@ -82,14 +161,25 @@ export default {
               await Api.services_reorder(data)
               await this.update()
           },
+        tester(s) {
+          console.log(s)
+        },
+        async delete(s) {
+          this.loading = true
+          await Api.service_delete(s.id)
+          await this.update()
+          this.loading = false
+        },
           async deleteService(s) {
-              let c = confirm(`Are you sure you want to delete '${s.name}'?`)
-              if (c) {
-                this.loading = true
-                  await Api.service_delete(s.id)
-                  await this.update()
-                this.loading = false
-              }
+            const modal = {
+              visible: true,
+              title: "Delete Service",
+              body: `Are you sure you want to delete service ${s.name}? This will also delete all failures, checkins, and incidents for this service.`,
+              btnColor: "btn-danger",
+              btnText: "Delete Service",
+              func: () => this.delete(s),
+            }
+            this.$store.commit("setModal", modal)
           },
           serviceGroup(s) {
               let group = this.$store.getters.groupById(s.group_id)
diff --git a/frontend/src/components/Dashboard/ThemeEditor.vue b/frontend/src/components/Dashboard/ThemeEditor.vue
index bf0f6d1a..d9644a8d 100644
--- a/frontend/src/components/Dashboard/ThemeEditor.vue
+++ b/frontend/src/components/Dashboard/ThemeEditor.vue
@@ -1,17 +1,21 @@
 <template>
-    <div class="card text-black-50 bg-white mb-5">
-        <div class="card-header">Theme Editor</div>
+    <div class="card mb-5">
+        <div class="card-header">{{$t('theme_editor')}}</div>
         <div class="card-body">
         <div v-if="error" class="alert alert-danger mt-3" style="white-space: pre-line;">
             {{error}}
         </div>
 
+            <h6 v-if="directory" id="assets_dir" class="text-muted text-monospace text-sm-center font-1 mb-4">
+                {{$t('assets_dir')}}: {{directory}}
+            </h6>
+
             <div v-if="loaded && !directory" class="jumbotron jumbotron-fluid">
                 <div class="text-center col-12">
-                    <h1 class="display-5">Enable Local Assets</h1>
-                    <span class="lead">Customize your status page design by enabling local assets. This will create a 'assets' directory containing all CSS.<p>
+                    <h1 class="display-5">{{$t('enable_assets')}}</h1>
+                    <span class="lead">{{$t('assets_desc')}}<p>
                         <button id="enable_assets" @click.prevent="createAssets" :disabled="pending" href="#" class="btn btn-primary mt-3">
-                            <font-awesome-icon v-if="pending" icon="circle-notch" class="mr-2" spin/>{{pending ? "Creating Assets" : "Enable Local Assets"}}
+                            <font-awesome-icon v-if="pending" icon="circle-notch" class="mr-2" spin/>{{pending ? $t('assets_loading') : $t('assets_btn')}}
                         </button>
                     </p></span>
                 </div>
@@ -21,33 +25,48 @@
         <h3>Variables</h3>
         <codemirror v-show="loaded" v-model="vars" ref="vars" :options="cmOptions" class="codemirrorInput"/>
 
-        <h3 class="mt-3">Base Theme</h3>
+        <h3 class="mt-3">Base {{$t('theme')}}</h3>
         <codemirror v-show="loaded" v-model="base" ref="base" :options="cmOptions" class="codemirrorInput"/>
 
+        <h3 class="mt-3">Layout {{$t('theme')}}</h3>
+        <codemirror v-show="loaded" v-model="layout" ref="layout" :options="cmOptions" class="codemirrorInput"/>
+
+        <h3 class="mt-3">Forms {{$t('theme')}}</h3>
+        <codemirror v-show="loaded" v-model="forms" ref="forms" :options="cmOptions" class="codemirrorInput"/>
+
+        <h3 class="mt-3">Mixins</h3>
+        <codemirror v-show="loaded" v-model="mixins" ref="mixins" :options="cmOptions" class="codemirrorInput"/>
+
         <h3 class="mt-3">Mobile Overwrites</h3>
         <codemirror v-show="loaded" v-model="mobile" ref="mobile" :options="cmOptions" class="codemirrorInput"/>
 
-        <button id="save_assets" @submit.prevent="saveAssets" type="submit" class="btn btn-primary btn-block mt-2" :disabled="pending">{{pending ? "Saving..." : "Save Style"}}</button>
-        <button id="delete_assets" v-if="directory" @click.prevent="deleteAssets" href="#" class="btn btn-danger btn-block confirm-btn" :disabled="pending">Delete Local Assets</button>
-
-        <h6 id="assets_dir" class="text-muted text-monospace text-sm-center font-1 mt-3">
-            Asset Directory: {{directory}}
-        </h6>
     </form>
     </div>
+
+        <div v-if="directory" class="card-footer">
+            <div class="row">
+                <div class="col-6">
+                    <button id="save_assets" @click.prevent="saveAssets" type="submit" class="btn btn-primary btn-block" :disabled="pending">{{pending ? "Saving..." : "Save Styles"}}</button>
+                </div>
+                <div class="col-6">
+                    <button id="delete_assets" @click.prevent="deleteAssets" class="btn btn-danger btn-block confirm-btn" :disabled="pending">Delete Local Assets</button>
+                </div>
+            </div>
+        </div>
     </div>
 </template>
 
 <script>
-  import Api from "../../API";
+import Api from "../../API";
 
-  // require component
-  import { codemirror } from 'vue-codemirror'
-  import 'codemirror/mode/css/css.js'
+// require component
+import {codemirror} from 'vue-codemirror'
 
-  import 'codemirror/lib/codemirror.css'
-  import 'codemirror-colorpicker/dist/codemirror-colorpicker.css'
-  import 'codemirror-colorpicker'
+import('codemirror/mode/css/css.js')
+
+  import('codemirror/lib/codemirror.css')
+  import('codemirror-colorpicker/dist/codemirror-colorpicker.css')
+  import('codemirror-colorpicker')
 
   export default {
       name: 'ThemeEditor',
@@ -62,6 +81,9 @@
       data () {
           return {
               base: null,
+              layout: null,
+              forms: null,
+              mixins: null,
               vars: null,
               mobile: null,
               error: null,
@@ -90,6 +112,9 @@
             this.$refs.vars.codemirror.refresh()
             this.$refs.base.codemirror.refresh()
             this.$refs.mobile.codemirror.refresh()
+            this.$refs.layout.codemirror.refresh()
+            this.$refs.forms.codemirror.refresh()
+            this.$refs.mixins.codemirror.refresh()
           }
         },
           async fetchTheme() {
@@ -101,6 +126,9 @@
                   this.base = theme.base
                   this.vars = theme.variables
                   this.mobile = theme.mobile
+                  this.layout = theme.layout
+                  this.forms = theme.forms
+                  this.mixins = theme.mixins
               }
               this.pending = false
               this.loaded = true
@@ -116,18 +144,33 @@
               this.pending = false
             await this.fetchTheme()
           },
+        async delete() {
+          this.pending = true
+          const resp = await Api.theme_generate(false)
+          await this.fetchTheme()
+          this.pending = false
+        },
           async deleteAssets() {
-              this.pending = true
-              let c = confirm('Are you sure you want to delete all local assets?')
-              if (c) {
-                  const resp = await Api.theme_generate(false)
-                  await this.fetchTheme()
-              }
-              this.pending = false
+            const modal = {
+              visible: true,
+              title: "Delete Local Assets",
+              body: `Are you sure you want to delete all local assets?`,
+              btnColor: "btn-danger",
+              btnText: "Delete",
+              func: () => this.delete(),
+            }
+            this.$store.commit("setModal", modal)
           },
           async saveAssets() {
               this.pending = true
-              const data = {base: this.base, variables: this.vars, mobile: this.mobile}
+              const data = {
+                base: this.base,
+                layout: this.layout,
+                forms: this.forms,
+                mixins: this.mixins,
+                variables: this.vars,
+                mobile: this.mobile
+              }
             let resp
             try {
               resp = await Api.theme_save(data)
@@ -157,9 +200,3 @@
       }
   }
 </script>
-<style scoped>
-    .CodeMirror {
-        border: 1px solid #eee;
-        height: 550px;
-    }
-</style>
diff --git a/frontend/src/components/Dashboard/TopNav.vue b/frontend/src/components/Dashboard/TopNav.vue
index 3129592a..8136fff8 100644
--- a/frontend/src/components/Dashboard/TopNav.vue
+++ b/frontend/src/components/Dashboard/TopNav.vue
@@ -1,5 +1,5 @@
 <template>
-    <nav class="navbar navbar-expand-lg navbar-light bg-light">
+    <nav class="navbar navbar-expand-lg">
         <router-link to="/" class="navbar-brand">Statping</router-link>
         <button @click="navopen = !navopen" class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
             <font-awesome-icon v-if="!navopen" icon="bars"/>
@@ -9,26 +9,29 @@
         <div class="navbar-collapse" :class="{collapse: !navopen}" id="navbarText">
             <ul class="navbar-nav mr-auto">
                 <li @click="navopen = !navopen" class="nav-item navbar-item">
-                    <router-link to="/dashboard" class="nav-link">{{ $t('top_nav.dashboard') }}</router-link>
+                    <router-link to="/dashboard" class="nav-link">{{ $t('dashboard') }}</router-link>
                 </li>
                 <li @click="navopen = !navopen" class="nav-item navbar-item">
-                    <router-link to="/dashboard/services" class="nav-link">{{ $t('top_nav.services') }}</router-link>
+                    <router-link to="/dashboard/services" class="nav-link">{{ $t('services') }}</router-link>
                 </li>
-                <li v-if="$store.state.admin" @click="navopen = !navopen" class="nav-item navbar-item">
-                    <router-link to="/dashboard/users" class="nav-link">{{ $t('top_nav.users') }}</router-link>
+                <li v-if="admin" @click="navopen = !navopen" class="nav-item navbar-item">
+                    <router-link to="/dashboard/users" class="nav-link">{{ $t('users') }}</router-link>
                 </li>
                 <li @click="navopen = !navopen" class="nav-item navbar-item">
-                    <router-link to="/dashboard/messages" class="nav-link">{{ $t('top_nav.announcements') }}</router-link>
+                    <router-link to="/dashboard/messages" class="nav-link">{{ $t('announcements') }}</router-link>
                 </li>
-                <li v-if="$store.state.admin" @click="navopen = !navopen" class="nav-item navbar-item">
-                    <router-link to="/dashboard/settings" class="nav-link">{{ $t('top_nav.settings') }}</router-link>
-                </li>
-                <li v-if="$store.state.admin" @click="navopen = !navopen" class="nav-item navbar-item">
-                    <router-link to="/dashboard/logs" class="nav-link">{{ $t('top_nav.logs') }}</router-link>
+                <li v-if="admin" @click="navopen = !navopen" class="nav-item navbar-item">
+                    <router-link to="/dashboard/settings" class="nav-link">{{ $t('settings') }}</router-link>
                 </li>
+              <li v-if="admin" @click="navopen = !navopen" class="nav-item navbar-item">
+                <router-link to="/dashboard/logs" class="nav-link">{{ $t('logs') }}</router-link>
+              </li>
+              <li v-if="admin" @click="navopen = !navopen" class="nav-item navbar-item">
+                <router-link to="/dashboard/help" class="nav-link">{{ $t('help') }}</router-link>
+              </li>
             </ul>
             <span class="navbar-text">
-      <a href="#" class="nav-link" @click.prevent="logout">{{ $t('top_nav.logout') }}</a>
+      <a href="#" class="nav-link" @click.prevent="logout">{{ $t('logout') }}</a>
     </span>
         </div>
     </nav>
@@ -37,7 +40,6 @@
 
 <script>
   import Api from "../../API"
-  import Vue from "vue";
 
   export default {
   name: 'TopNav',
@@ -46,6 +48,11 @@
               navopen: false
           }
       },
+    computed: {
+      admin() {
+        return this.$store.state.admin
+      }
+    },
       methods: {
         async logout () {
           await Api.logout()
@@ -58,7 +65,3 @@
     }
 }
 </script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-</style>
diff --git a/frontend/src/components/Elements/IncidentUpdate.vue b/frontend/src/components/Elements/IncidentUpdate.vue
new file mode 100644
index 00000000..675e9fa7
--- /dev/null
+++ b/frontend/src/components/Elements/IncidentUpdate.vue
@@ -0,0 +1,42 @@
+<template>
+    <div class="col-12 mb-3 pb-2 border-bottom" role="alert">
+        <span class="font-weight-bold text-capitalize" :class="{'text-success': update.type.toLowerCase()==='resolved', 'text-danger': update.type.toLowerCase()==='investigating', 'text-warning': update.type.toLowerCase()==='update'}">{{update.type}}</span>
+        <span class="text-muted">- {{update.message}}
+            <button v-if="admin" @click="delete_update(update)" type="button" class="close">
+                <span aria-hidden="true">&times;</span>
+            </button>
+        </span>
+        <span class="d-block small">{{ago(update.created_at)}} ago</span>
+    </div>
+</template>
+
+<script>
+  import Api from "@/API";
+
+  export default {
+    name: "IncidentUpdate",
+    props: {
+      update: {
+        required: true
+      },
+      admin: {
+        required: true
+      },
+      onUpdate: {
+        required: false
+      }
+    },
+    methods: {
+      async delete_update(update) {
+        this.res = await Api.incident_update_delete(update)
+        if (this.res.status === "success") {
+         this.onUpdate()
+        }
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/components/Elements/Loading.vue b/frontend/src/components/Elements/Loading.vue
new file mode 100644
index 00000000..0d1404db
--- /dev/null
+++ b/frontend/src/components/Elements/Loading.vue
@@ -0,0 +1,23 @@
+<template>
+  <div v-if="loading" class="row mt-3 mb-3">
+    <div class="col-12 text-center text-muted">
+      <font-awesome-icon icon="circle-notch" size="3x" spin/>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+name: "Loading",
+  props: {
+    loading: {
+      type: Boolean,
+      required: true,
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/components/Elements/Modal.vue b/frontend/src/components/Elements/Modal.vue
new file mode 100644
index 00000000..44c32c18
--- /dev/null
+++ b/frontend/src/components/Elements/Modal.vue
@@ -0,0 +1,50 @@
+<template>
+ <div v-if="modal.visible" class="modal d-block mt-5 pt-5" tabindex="-1">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title">{{modal.title}}</h5>
+          </div>
+          <div class="modal-body">
+            <p>{{modal.body}}</p>
+          </div>
+          <div class="modal-footer">
+            <button @click.prevent="close" type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+            <button @click.prevent="runFunc" type="button" :class="`btn ${modal.btnColor}`">{{modal.btnText}}</button>
+          </div>
+        </div>
+      </div>
+    </div>
+</template>
+
+<script>
+export default {
+name: "Modal",
+  data () {
+    return {
+
+    }
+  },
+  computed: {
+    modal() {
+     return this.$store.getters.modal
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    runFunc() {
+      this.$store.getters.modal.func()
+      this.close()
+    },
+    close() {
+      this.$store.commit("setModal", {visible: false})
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/components/Elements/chart_options.js b/frontend/src/components/Elements/chart_options.js
new file mode 100644
index 00000000..33103f81
--- /dev/null
+++ b/frontend/src/components/Elements/chart_options.js
@@ -0,0 +1,46 @@
+
+
+const serviceSparkLine = {
+    chart: {
+      type: 'bar',
+      height: 50,
+      sparkline: {
+        enabled: true
+      },
+    },
+    stroke: {
+      curve: 'straight'
+    },
+    fill: {
+      opacity: 0.3,
+    },
+    yaxis: {
+      min: 0
+    },
+    colors: ['#b3bdc3'],
+    tooltip: {
+      theme: false,
+      enabled: false,
+    },
+    title: {
+      text: this.title,
+      offsetX: 0,
+      style: {
+        fontSize: '28px',
+        cssClass: 'apexcharts-yaxis-title'
+      }
+    },
+    subtitle: {
+      text: this.subtitle,
+      offsetX: 0,
+      style: {
+        fontSize: '14px',
+        cssClass: 'apexcharts-yaxis-title'
+      }
+    }
+}
+
+
+export default {
+  ServiceList: serviceSparkLine
+}
diff --git a/frontend/src/components/Index/Footer.vue b/frontend/src/components/Index/Footer.vue
index 31ab4b15..f4bf4f31 100644
--- a/frontend/src/components/Index/Footer.vue
+++ b/frontend/src/components/Index/Footer.vue
@@ -1,10 +1,15 @@
 <template>
     <footer>
         <div v-if="!core.footer" class="footer text-center mb-4 p-2">
-            <a href="https://github.com/statping/statping" target="_blank">
-                Statping {{core.version}} made with <font-awesome-icon icon="heart" class="text-danger"/>
-            </a> |
-            <router-link :to="$store.state.admin ? '/dashboard' : '/login'">{{$t('top_nav.dashboard')}}</router-link>
+          <div class="d-block text-dim">
+          <div class="mb-3">
+            <router-link class="links" :to="admin ? '/dashboard' : '/login'">{{$t('dashboard')}}</router-link>
+          </div>
+            <span class="font-1 mt-3">
+            <a href="https://github.com/statping/statping" class="statping" target="_blank">
+              Statping v{{core.version}} made with <font-awesome-icon icon="heart" class="hlight font-1"/></a>
+            </span>
+          </div>
         </div>
         <div v-else class="footer text-center mb-4 p-2" v-html="core.footer"></div>
     </footer>
@@ -21,11 +26,19 @@
   computed: {
       core() {
         return this.$store.getters.core
-      }
+      },
+    commit() {
+      return this.$store.getters.core.commit.slice(0,8)
+    },
+    admin() {
+      return this.$store.getters.admin
+    },
   }
 }
 </script>
 
-<!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
+.hlight {
+  color: #f6cbcb;
+}
 </style>
diff --git a/frontend/src/components/Index/Group.vue b/frontend/src/components/Index/Group.vue
index 63042fa4..c5be25c2 100644
--- a/frontend/src/components/Index/Group.vue
+++ b/frontend/src/components/Index/Group.vue
@@ -1,9 +1,9 @@
 <template>
-    <div class="col-12 full-col-12">
+    <div v-if="services.length > 0" class="col-12 full-col-12">
         <h4 v-if="group.name !== 'Empty Group'" class="group_header mb-3 mt-4">{{group.name}}</h4>
         <div class="list-group online_list mb-4">
 
-            <a v-for="(service, index) in $store.getters.servicesInGroup(group.id)" v-bind:key="index" class="service_li list-group-item list-group-item-action">
+            <div v-for="(service, index) in services" v-bind:key="index" class="list-group-item list-group-item-action">
                 <router-link class="no-decoration font-3" :to="serviceLink(service)">{{service.name}}</router-link>
                 <span class="badge text-uppercase float-right" :class="{'bg-success': service.online, 'bg-danger': !service.online }">
                     {{service.online ? $t('online') : $t('offline')}}
@@ -12,16 +12,16 @@
                 <GroupServiceFailures :service="service"/>
 
                 <IncidentsBlock :service="service"/>
-            </a>
+
+            </div>
 
         </div>
     </div>
 </template>
 
 <script>
-    import Api from '../../API';
-    import GroupServiceFailures from './GroupServiceFailures';
-    import IncidentsBlock from './IncidentsBlock';
+    const GroupServiceFailures = () => import(/* webpackChunkName: "index" */ './GroupServiceFailures');
+    const IncidentsBlock = () => import(/* webpackChunkName: "index" */ './IncidentsBlock');
 
 export default {
   name: 'Group',
@@ -30,11 +30,15 @@ export default {
       GroupServiceFailures
   },
   props: {
-    group: Object
+    group: {
+      type: Object,
+      required: true,
+    }
   },
+  computed: {
+    services() {
+      return this.$store.getters.servicesInGroup(this.group.id)
+    }
+  }
 }
 </script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-</style>
diff --git a/frontend/src/components/Index/GroupServiceFailures.vue b/frontend/src/components/Index/GroupServiceFailures.vue
index 72ad7bda..f6927dbd 100644
--- a/frontend/src/components/Index/GroupServiceFailures.vue
+++ b/frontend/src/components/Index/GroupServiceFailures.vue
@@ -1,17 +1,31 @@
 <template>
     <div>
-        <div class="d-flex mt-3 mb-2">
-            <div class="flex-fill service_day" v-for="(d, index) in failureData" :class="{'mini_error': d.amount > 0, 'mini_success': d.amount === 0}">
-                <span v-if="d.amount != 0" class="small">{{d.amount}}</span>
+      <div v-observe-visibility="{callback: visibleChart, once: true}" v-if="!loaded" class="row">
+        <div class="col-12 text-center mt-3">
+          <font-awesome-icon icon="circle-notch" class="text-dim" size="2x" spin/>
+        </div>
+      </div>
+      <transition name="fade">
+        <div v-if="loaded">
+        <div class="d-flex mt-3">
+            <div class="flex-fill service_day" v-for="(d, index) in failureData" @mouseover="mouseover(d)" @mouseout="mouseout" :class="{'day-error': d.amount > 0, 'day-success': d.amount === 0}">
+                <span v-if="d.amount !== 0" class="d-none d-md-block text-center small"></span>
             </div>
         </div>
         <div class="row mt-2">
-            <div class="col-3 text-left font-2 text-muted">30 Days Ago</div>
-            <div class="col-6 text-center font-2" :class="{'text-muted': service.online, 'text-danger': !service.online}">
-               {{service_txt}}
-            </div>
-            <div class="col-3 text-right font-2 text-muted">Today</div>
+          <div class="col-12 no-select">
+            <p class="divided">
+              <span class="font-2 text-muted">90 {{$t('days_ago')}}</span>
+              <span class="divider"></span>
+              <span class="text-center font-2" :class="{'text-muted': service.online, 'text-danger': !service.online}">{{service_txt}}</span>
+              <span class="divider"></span>
+              <span class="font-2 text-muted">{{$t('today')}}</span>
+            </p>
+          </div>
         </div>
+      <div class="daily-failures small text-right text-dim">{{hover_text}}</div>
+      </div>
+  </transition>
     </div>
 </template>
 
@@ -26,6 +40,9 @@ export default {
     data() {
         return {
             failureData: [],
+          hover_text: "",
+          loaded: false,
+          visible: false,
         }
     },
   props: {
@@ -39,22 +56,35 @@ export default {
       return this.smallText(this.service)
     }
   },
-    mounted () {
-      this.lastDaysFailures()
+  mounted () {
+
     },
     methods: {
+      visibleChart(isVisible, entry) {
+        if (isVisible && !this.visible) {
+          this.visible = true
+          this.lastDaysFailures().then(() =>  this.loaded = true)
+        }
+      },
+      mouseout() {
+        this.hover_text = ""
+      },
+    mouseover(e) {
+      let txt = `${e.amount} Failures`
+      if (e.amount === 0) {
+        txt = `No Issues`
+      }
+      this.hover_text = `${e.date.toLocaleDateString()} - ${txt}`
+    },
       async lastDaysFailures() {
-        const start = this.nowSubtract(86400 * 30)
-        const data = await Api.service_failures_data(this.service.id, this.toUnix(start), this.toUnix(this.startToday()), "24h")
+        const start = this.beginningOf('day', this.nowSubtract(86400 * 90))
+        const end = this.endOf('tomorrow')
+        const data = await Api.service_failures_data(this.service.id, this.toUnix(start), this.toUnix(end), "24h", true)
         data.forEach((d) => {
           let date = this.parseISO(d.timeframe)
-          this.failureData.push({month: 1, day: date.getDate(), amount: d.amount})
+          this.failureData.push({month: date.getMonth(), day: date.getDate(), date: date, amount: d.amount})
         })
       }
     }
 }
 </script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-</style>
diff --git a/frontend/src/components/Index/Header.vue b/frontend/src/components/Index/Header.vue
index 0718d141..3d534889 100644
--- a/frontend/src/components/Index/Header.vue
+++ b/frontend/src/components/Index/Header.vue
@@ -15,7 +15,3 @@ export default {
     }
 }
 </script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-</style>
diff --git a/frontend/src/components/Index/IncidentsBlock.vue b/frontend/src/components/Index/IncidentsBlock.vue
index 7ca7a54e..44c5ea45 100644
--- a/frontend/src/components/Index/IncidentsBlock.vue
+++ b/frontend/src/components/Index/IncidentsBlock.vue
@@ -1,25 +1,25 @@
 <template>
     <div class="row">
-        <div v-for="(incident, i) in incidents" class="col-12 mt-4 mb-3">
+        <div v-for="(incident, i) in incidents" class="col-12 mt-2">
             <span class="braker mt-1 mb-3"></span>
-            <h6>Incident: {{incident.title}}
+            <h6>{{incident.title}}
                 <span class="font-2 float-right">{{niceDate(incident.created_at)}}</span>
             </h6>
-            <span class="font-2" v-html="incident.description"></span>
-
-            <UpdatesBlock :incident="incident"/>
-
+            <div class="font-2 mb-3" v-html="incident.description"></div>
+                <IncidentUpdate v-for="(update, i) in incident.updates" v-bind:key="i" :update="update" :admin="false"/>
         </div>
     </div>
 </template>
 
 <script>
 import Api from '../../API';
-import UpdatesBlock from "@/components/Index/UpdatesBlock";
+import IncidentUpdate from "@/components/Elements/IncidentUpdate";
 
 export default {
   name: 'IncidentsBlock',
-  components: {UpdatesBlock},
+  components: {
+    IncidentUpdate
+  },
   props: {
         service: {
             type: Object,
@@ -49,8 +49,7 @@ export default {
         this.incidents = await Api.incidents_service(this.service.id)
       },
       async incident_updates(incident) {
-        await Api.incident_updates(incident).then((d) => {return d})
-        return o
+        return await Api.incident_updates(incident)
       }
     }
 }
diff --git a/frontend/src/components/Index/MessageBlock.vue b/frontend/src/components/Index/MessageBlock.vue
index 96c98225..4967b2bd 100644
--- a/frontend/src/components/Index/MessageBlock.vue
+++ b/frontend/src/components/Index/MessageBlock.vue
@@ -1,13 +1,20 @@
 <template>
-    <div class="alert alert-warning pb-4 pt-3 mt-5 mb-5" role="alert">
-        <h3 class="mb-3">{{message.title}}</h3>
-        <span class="mb-3">{{message.description}}</span>
-        <div class="row d-block mt-3">
-            <span class="col-12 col-md-6 text-left small">
-                Started {{niceDate(message.start_on)}} ({{ago(message.start_on)}} ago)
-            </span>
-            <span class="col-12 col-md-6 text-right float-right small">
-                Ends on {{niceDate(message.end_on)}} (in {{ago(message.end_on)}})</span>
+    <div class="card shadow mb-4" role="alert">
+      <div class="card-body pb-2">
+        <h3 class="mb-3 font-weight-bold">{{message.title}}</h3>
+        <span class="mb-2">{{message.description}}</span>
+        <div class="col-12 mb-0">
+          <div class="dates">
+            <div class="start">
+              <strong>STARTS</strong> {{niceDate(message.start_on)}}
+              <span></span>
+            </div>
+            <div class="ends">
+              <strong>ENDS</strong> {{niceDate(message.end_on)}}
+            </div>
+          </div>
+        </div>
+
         </div>
     </div>
 </template>
@@ -17,7 +24,8 @@ export default {
   name: 'MessageBlock',
     props: {
         message: {
-            type: Object
+            type: Object,
+            required: true,
         }
     }
 }
@@ -25,4 +33,5 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
+
 </style>
diff --git a/frontend/src/components/Index/UpdatesBlock.vue b/frontend/src/components/Index/UpdatesBlock.vue
deleted file mode 100644
index e4c3f7d6..00000000
--- a/frontend/src/components/Index/UpdatesBlock.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<template>
-    <div class="row">
-        <div v-for="(update, i) in updates" v-bind:key="i" class="col-12 mt-3">
-            <div class="col-md-2 col-12">
-                <span class="badge text-uppercase" :class="badgeClass(update.type)">{{update.type}}</span>
-            </div>
-            <div class="col-md-12 col-12 mt-2 font-3">{{update.message}}</div>
-            <div class="col-12 font-1 float-right text-black-50 mt-2">{{ago(update.created_at)}} ago</div>
-        </div>
-    </div>
-</template>
-
-<script>
-import Api from '../../API';
-
-export default {
-  name: 'UpdatesBlock',
-    props: {
-        incident: {
-            type: Object,
-            required: true
-        }
-    },
-    data() {
-        return {
-            updates: null,
-        }
-    },
-    mounted () {
-        this.getIncidentUpdates()
-    },
-    methods: {
-        badgeClass(val) {
-          switch (val.toLowerCase()) {
-            case "resolved":
-              return "badge-success"
-            case "update":
-              return "badge-info"
-            case "investigating":
-              return "badge-danger"
-          }
-        },
-      async getIncidentUpdates() {
-        this.updates = await Api.incident_updates(this.incident)
-      }
-    }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-</style>
diff --git a/frontend/src/components/Service/AdvancedChart.vue b/frontend/src/components/Service/AdvancedChart.vue
index 650ef519..677432e7 100644
--- a/frontend/src/components/Service/AdvancedChart.vue
+++ b/frontend/src/components/Service/AdvancedChart.vue
@@ -1,8 +1,6 @@
 <template>
-    <div>
-        <div class="service-chart-container">
-            <apexchart width="100%" height="420" type="area" :options="main_chart_options" :series="main_chart"></apexchart>
-        </div>
+    <div class="service-chart-container">
+        <apexchart width="100%" height="350" type="area" :options="main_chart_options" :series="main_chart"></apexchart>
     </div>
 </template>
 
@@ -38,6 +36,7 @@
         return {
           loading: true,
           main_data: null,
+          ping_data: null,
           expanded_data: null,
           main_chart_options: {
             noData: {
@@ -53,6 +52,7 @@
             },
             chart: {
               id: 'mainchart',
+              stacked: true,
               events: {
                 dataPointSelection: (event, chartContext, config) => {
                   window.console.log('slect')
@@ -112,7 +112,9 @@
             },
             yaxis: {
               labels: {
-                show: true
+                formatter: (value) => {
+                  return this.humanTime(value)
+                }
               },
             },
             markers: {
@@ -167,15 +169,15 @@
               show: false
             },
             fill: {
-              colors: ["#48d338"],
+              colors: ["#f1771f", "#48d338"],
               opacity: 1,
               type: 'solid'
             },
             stroke: {
               show: true,
-              curve: 'smooth',
+              curve: 'stepline',
               lineCap: 'butt',
-              colors: ["#3aa82d"],
+              colors: ["#f1771f", "#48d338"],
               width: 2,
             }
           },
@@ -229,8 +231,11 @@
       computed: {
         main_chart () {
           return [{
-            name: this.service.name,
+            name: "latency",
             ...this.convertToChartData(this.main_data)
+          },{
+            name: "ping",
+            ...this.convertToChartData(this.ping_data)
           }]
         },
         expanded_chart () {
@@ -263,9 +268,13 @@
         },
         async chartHits() {
           this.main_data = await this.load_hits()
+          this.ping_data = await this.load_ping()
         },
         async load_hits(start=this.params.start, end=this.params.end, group=this.group) {
           return await Api.service_hits(this.service.id, start, end, group, false)
+        },
+        async load_ping(start=this.params.start, end=this.params.end, group=this.group) {
+          return await Api.service_ping(this.service.id, start, end, group, false)
         }
       }
     }
diff --git a/frontend/src/components/Service/Analytics.vue b/frontend/src/components/Service/Analytics.vue
index 7172a7fe..3bad5a21 100644
--- a/frontend/src/components/Service/Analytics.vue
+++ b/frontend/src/components/Service/Analytics.vue
@@ -14,7 +14,7 @@
 
 <script>
     import MiniSparkLine from './MiniSparkLine';
-    import ServiceSparkLine from './ServiceSparkLine';
+    import ServiceSparkLine from '../Dashboard/ServiceSparkLine';
 
     export default {
         name: 'Analytics',
diff --git a/frontend/src/components/Service/FailuresBarChart.vue b/frontend/src/components/Service/FailuresBarChart.vue
new file mode 100644
index 00000000..5720e60a
--- /dev/null
+++ b/frontend/src/components/Service/FailuresBarChart.vue
@@ -0,0 +1,167 @@
+<template>
+  <div class="col-12">
+  <div class="text-center" style="width:210px" v-if="!loaded">
+    <font-awesome-icon icon="circle-notch" class="h-25 text-dim" spin/>
+  </div>
+  <apexchart v-else width="100%" height="50" type="bar" :options="chartOpts" :series="data"></apexchart>
+  </div>
+</template>
+
+<script>
+import Api from "@/API";
+const timeoptions = { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' };
+
+
+export default {
+  name: "FailuresBarChart",
+  props: {
+    service: {
+      required: true,
+      type: Object,
+    },
+    group: {
+      required: true,
+      type: String,
+    },
+    start: {
+      required: true,
+      type: String,
+    },
+    end: {
+      required: true,
+      type: String,
+    },
+  },
+  data() {
+    return {
+      data: null,
+      loaded: false,
+      chartOpts: {
+        chart: {
+          type: 'bar',
+          height: 150,
+          sparkline: {
+            enabled: true
+          },
+          animations: {
+            enabled: false,
+          },
+        },
+        xaxis: {
+          type: 'datetime',
+        },
+        showPoint: false,
+        fullWidth:true,
+        chartPadding: {top: 0,right: 0,bottom: 0,left: 80},
+        stroke: {
+          curve: 'straight'
+        },
+        fill: {
+          opacity: 0.4,
+        },
+        yaxis: {
+          min: 0,
+          max: 1,
+        },
+        plotOptions: {
+          bar: {
+            colors: {
+              ranges: [{
+                from: 0,
+                to: 1,
+                color: '#cfcfcf'
+              }, {
+                from: 2,
+                to: 3,
+                color: '#f58e49'
+              }, {
+                from: 3,
+                to: 20,
+                color: '#e01a1a'
+              }, {
+                from: 21,
+                to: Infinity,
+                color: '#9b0909'
+              }]
+            },
+          },
+        },
+        tooltip: {
+          theme: false,
+          enabled: true,
+          custom: ({series, seriesIndex, dataPointIndex, w}) => {
+            let val = series[seriesIndex][dataPointIndex];
+            let ts = w.globals.seriesX[seriesIndex][dataPointIndex];
+            const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
+            let ago = `${(dataPointIndex-12) * -1} hours ago`
+            if ((dataPointIndex-12) * -1 === 0) {
+              ago = `Current hour`
+            }
+            return `<div class="chart_list_tooltip font-2 mb-4">${val-1} Failures<br>${dt}</div>`
+          },
+          fixed: {
+            enabled: true,
+            position: 'topLeft',
+            offsetX: 0,
+            offsetY: 0,
+          },
+          x: {
+            formatter: (value) => { return value },
+          },
+          y: {
+            show: false
+          },
+        },
+        title: {
+          enabled: false,
+        },
+        subtitle: {
+          enabled: false,
+        }
+      }
+    }
+  },
+  async mounted() {
+    await this.loadFailures()
+  },
+  watch: {
+    group(o, n) {
+      this.loaded = false
+      this.loadFailures()
+      this.loaded = true
+    },
+    start(o, n) {
+      this.loaded = false
+      this.loadFailures()
+      this.loaded = true
+    },
+    end(o, n) {
+      this.loaded = false
+      this.loadFailures()
+      this.loaded = true
+    },
+  },
+  methods: {
+    convertChartData(data) {
+      if (!data) {
+        return []
+      }
+      let arr = []
+      data.forEach((d, k) => {
+        arr.push({
+          x: d.timeframe,
+          y: d.amount+1,
+        })
+      })
+      return arr
+    },
+    async loadFailures() {
+      this.loaded = false
+      const startEnd = this.startEndParams(this.parseISO(this.start), this.parseISO(this.end), this.group)
+      const data = await Api.service_failures_data(this.service.id, startEnd.start, startEnd.end, this.group, true)
+      this.loaded = true
+      this.data = [{data: this.convertChartData(data)}]
+    }
+  },
+}
+</script>
diff --git a/frontend/src/components/Service/Incidents.vue b/frontend/src/components/Service/Incidents.vue
deleted file mode 100644
index 8b72066a..00000000
--- a/frontend/src/components/Service/Incidents.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-    <div class="row stats_area mt-5 mb-4">
-        okok
-    </div>
-</template>
-
-<script>
-    export default {
-        name: 'Incidents',
-        props: {
-            service: {
-                type: Object,
-                required: true
-            },
-        }
-    }
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-</style>
diff --git a/frontend/src/components/Service/ServiceBlock.vue b/frontend/src/components/Service/ServiceBlock.vue
index bfd15daf..a2872446 100644
--- a/frontend/src/components/Service/ServiceBlock.vue
+++ b/frontend/src/components/Service/ServiceBlock.vue
@@ -10,24 +10,10 @@
 
                     <ServiceTopStats :service="service"/>
 
-                        <div v-if="expanded" class="row">
-                            <Analytics title="Last Failure" :func="stats.total_failures"/>
-                            <Analytics title="Total Failures" :func="stats.total_failures"/>
-                            <Analytics title="Highest Latency" :func="stats.high_latency"/>
-                            <Analytics title="Lowest Latency" :func="stats.lowest_latency"/>
-                            <Analytics title="Total Uptime" :func="stats.high_ping"/>
-                            <Analytics title="Total Downtime" :func="stats.low_ping"/>
-
-                            <div class="col-12">
-                                <router-link :to="serviceLink(service)" class="btn btn-block btn-outline-success mt-4" :class="{'btn-outline-success': service.online, 'btn-outline-danger': !service.online}">
-                                    View More Details
-                                </router-link>
-                            </div>
-                         </div>
                 </div>
             </div>
 
-            <div v-show="!expanded" v-observe-visibility="visibleChart" class="chart-container">
+            <div v-show="!expanded" v-observe-visibility="{callback: visibleChart, throttle: 200}" class="chart-container">
                 <ServiceChart :service="service" :visible="visible" :chart_timeframe="chartTimeframe"/>
             </div>
 
@@ -62,7 +48,7 @@
 
                 <div class="col-md-2 col-6 float-right">
                     <button v-if="!expanded" @click="setService" class="btn btn-sm float-right dyn-dark text-white" :class="{'bg-success': service.online, 'bg-danger': !service.online}">
-                        {{$t('service.view')}}
+                        {{$t('view')}}
                     </button>
                 </div>
             </div>
@@ -72,28 +58,20 @@
 </template>
 
 <script>
-import Api from '../../API';
-import Analytics from './Analytics';
-import ServiceChart from "./ServiceChart";
-import ServiceTopStats from "@/components/Service/ServiceTopStats";
-import Graphing from '../../graphing'
+const Analytics = () => import(/* webpackChunkName: "service" */ './Analytics');
+const ServiceChart  = () => import(/* webpackChunkName: "service" */ "./ServiceChart");
+const ServiceTopStats = () => import(/* webpackChunkName: "service" */ "@/components/Service/ServiceTopStats");
 
 export default {
     name: 'ServiceBlock',
     components: { Analytics, ServiceTopStats, ServiceChart},
     props: {
-        in_service: {
+        service: {
             type: Object,
             required: true
         },
     },
-  watch: {
-
-  },
   computed: {
-    service() {
-      return this.track_service
-    },
     timeframepick() {
       return this.timeframes.find(s => s.value === this.timeframe_val)
     },
@@ -139,7 +117,7 @@ export default {
             {value: "4320m", text: "3/day", set: 10 },
             {value: "10080m", text: "7/day", set: 11 },
           ],
-            stats: {
+          stats: {
                 total_failures: {
                     title: "Total Failures",
                     subtitle: "Last 7 Days",
@@ -166,14 +144,13 @@ export default {
                     value: 0,
                 }
             },
-            track_service: null,
         }
     },
   beforeDestroy() {
     // clearInterval(this.timer_func)
   },
-  async created() {
-      this.track_service = this.in_service
+  created() {
+
   },
     methods: {
       disabled_interval(interval) {
@@ -204,30 +181,8 @@ export default {
       },
       async setService() {
         await this.$store.commit('setService', this.service)
-        this.$router.push('/service/'+this.service.id, {props: {in_service: this.service}})
+        this.$router.push('/service/'+this.service.id, {props: {service: this.service}})
       },
-        async showMoreStats() {
-            this.expanded = !this.expanded;
-
-            const failData = await Graphing.failures(this.service, 7)
-            this.stats.total_failures.chart = failData.data;
-            this.stats.total_failures.value = failData.total;
-
-            const hitsData = await Graphing.hits(this.service, 7)
-
-            this.stats.high_latency.chart = hitsData.chart;
-            this.stats.high_latency.value = this.humanTime(hitsData.high);
-
-            this.stats.lowest_latency.chart = hitsData.chart;
-            this.stats.lowest_latency.value = this.humanTime(hitsData.low);
-
-            const pingData = await Graphing.pings(this.service, 7)
-            this.stats.high_ping.chart = pingData.chart;
-            this.stats.high_ping.value = this.humanTime(pingData.high);
-
-            this.stats.low_ping.chart = pingData.chart;
-            this.stats.low_ping.value = this.humanTime(pingData.low);
-        },
         visibleChart(isVisible, entry) {
                 if (isVisible && !this.visible) {
                     this.visible = true
@@ -242,7 +197,3 @@ export default {
     }
 }
 </script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-</style>
diff --git a/frontend/src/components/Service/ServiceChart.vue b/frontend/src/components/Service/ServiceChart.vue
index 14283cee..482ff7cf 100644
--- a/frontend/src/components/Service/ServiceChart.vue
+++ b/frontend/src/components/Service/ServiceChart.vue
@@ -47,122 +47,138 @@
           return {
               ready: false,
               showing: false,
-              data: [],
-              chartOptions: {
-                  noData: {
-                      text: 'Loading...'
-                  },
-                  chart: {
-                      height: "100%",
-                      width: "100%",
-                      type: "area",
-                      animations: {
-                          enabled: true,
-                          initialAnimation: {
-                              enabled: true
-                          }
-                      },
-                      selection: {
-                          enabled: false
-                      },
-                      zoom: {
-                          enabled: false
-                      },
-                      toolbar: {
-                          show: false
-                      },
-                  },
-                  grid: {
-                      show: false,
-                      padding: {
-                          top: 0,
-                          right: 0,
-                          bottom: 0,
-                          left: -10,
-                      }
-                  },
-                  dropShadow: {
-                      enabled: false,
-                  },
-                  xaxis: {
-                      type: "datetime",
-                      labels: {
-                          show: false
-                      },
-                    tooltip: {
-                      enabled: false
-                    }
-                  },
-                  yaxis: {
-                      labels: {
-                          show: false
-                      },
-                  },
-                markers: {
-                  size: 0,
-                  strokeWidth: 0,
-                  hover: {
-                    size: undefined,
-                    sizeOffset: 0
-                  }
-                },
-                  tooltip: {
-                      theme: false,
-                      enabled: true,
-                      custom: ({series, seriesIndex, dataPointIndex, w}) => {
-                          let ts = w.globals.seriesX[seriesIndex][dataPointIndex];
-                          const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
-                          let val = series[seriesIndex][dataPointIndex];
-                          if (val >= 10000) {
-                            val = Math.round(val / 1000) + " ms"
-                          } else {
-                            val = val + " μs"
-                          }
-                          return `<div class="chartmarker"><span>Average Response Time: </span><span class="font-3">${val}</span><span>${dt}</span></div>`
-                      },
-                      fixed: {
-                          enabled: true,
-                          position: 'topRight',
-                          offsetX: -30,
-                          offsetY: 0,
-                      },
-                      x: {
-                          show: false,
-                      },
-                    y: {
-                      formatter: (value) => { return value + " %" },
-                    },
-                  },
-                  legend: {
-                      show: false,
-                  },
-                  dataLabels: {
-                      enabled: false
-                  },
-                  floating: true,
-                  axisTicks: {
-                      show: false
-                  },
-                  axisBorder: {
-                      show: false
-                  },
-                  fill: {
-                      colors: [this.service.online ? "#48d338" : "#dd3545"],
-                      opacity: 1,
-                      type: 'solid'
-                  },
-                  stroke: {
-                      show: false,
-                      curve: 'smooth',
-                      lineCap: 'butt',
-                      colors: [this.service.online ? "#3aa82d" : "#dd3545"],
-                  }
-              },
-              series: [{
-                  data: []
-              }]
+              data: null,
+              ping_data: null,
+              series: null,
           }
       },
+    computed: {
+      chartOptions() {
+        return {
+          noData: {
+            text: 'Loading...'
+          },
+          chart: {
+            height: "100%",
+            width: "100%",
+            type: "area",
+            animations: {
+              enabled: true,
+              easing: 'easeinout',
+              speed: 800,
+              animateGradually: {
+                enabled: false,
+                delay: 400,
+              },
+              dynamicAnimation: {
+                enabled: true,
+                speed: 500
+              },
+              hover: {
+                animationDuration: 0, // duration of animations when hovering an item
+              },
+              responsiveAnimationDuration: 0,
+            },
+            selection: {
+              enabled: false
+            },
+            zoom: {
+              enabled: false
+            },
+            toolbar: {
+              show: false
+            },
+          },
+          grid: {
+            show: false,
+            padding: {
+              top: 0,
+              right: 0,
+              bottom: 0,
+              left: -10,
+            }
+          },
+          dropShadow: {
+            enabled: false,
+          },
+          xaxis: {
+            type: "datetime",
+            labels: {
+              show: false
+            },
+            tooltip: {
+              enabled: false
+            }
+          },
+          yaxis: {
+            labels: {
+              show: false
+            },
+          },
+          markers: {
+            size: 0,
+            strokeWidth: 0,
+            hover: {
+              size: undefined,
+              sizeOffset: 0
+            }
+          },
+          tooltip: {
+            theme: false,
+            enabled: true,
+            custom: ({series, seriesIndex, dataPointIndex, w}) => {
+              let ts = w.globals.seriesX[seriesIndex][dataPointIndex];
+              const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
+              let val = series[0][dataPointIndex];
+              let pingVal = series[1][dataPointIndex];
+              return `<div class="chartmarker">
+<span>Average Response Time: ${this.humanTime(val)}/${this.chart_timeframe.interval}</span>
+<span>Average Ping: ${this.humanTime(pingVal)}/${this.chart_timeframe.interval}</span>
+<span>${dt}</span>
+</div>`
+            },
+            fixed: {
+              enabled: true,
+              position: 'topRight',
+              offsetX: -30,
+              offsetY: 0,
+            },
+            x: {
+              show: false,
+            },
+            y: {
+              formatter: (value) => {
+                return value + " %"
+              },
+            },
+          },
+          legend: {
+            show: false,
+          },
+          dataLabels: {
+            enabled: false
+          },
+          floating: true,
+          axisTicks: {
+            show: false
+          },
+          axisBorder: {
+            show: false
+          },
+          fill: {
+            colors: this.service.online ? ["#3dc82f", "#48d338"] : ["#c60f20", "#dd3545"],
+            opacity: 1,
+            type: 'solid',
+          },
+          stroke: {
+            show: false,
+            curve: 'smooth',
+            lineCap: 'butt',
+            colors: this.service.online ? ["#38bc2a", "#48d338"] : ["#c60f20", "#dd3545"],
+          }
+        }
+      }
+    },
       watch: {
         visible: function(newVal, oldVal) {
           if (newVal && !this.showing) {
@@ -178,17 +194,17 @@
       },
       methods: {
           async chartHits(val) {
-              const start = val.start_time
-              const end = this.toUnix(new Date())
-              this.data = await Api.service_hits(this.service.id, start, end, val.interval, false)
-              if (this.data === null && val.interval !== "5m") {
-                  await this.chartHits({start_time: val.start_time, interval: "5m"})
-              }
-              this.series = [{
-                  name: this.service.name,
-                  ...this.convertToChartData(this.data)
-              }]
-              this.ready = true
+              this.ready = false
+            const end = this.endOf("hour", this.now())
+            const start = this.beginningOf("hour", this.fromUnix(val.start_time))
+              this.data = await Api.service_hits(this.service.id, this.toUnix(start), this.toUnix(end), val.interval, false)
+              this.ping_data = await Api.service_ping(this.service.id, this.toUnix(start), this.toUnix(end), val.interval, false)
+
+            this.series = [
+                {name: "Latency", ...this.convertToChartData(this.data)},
+                {name: "Ping", ...this.convertToChartData(this.ping_data)},
+                ]
+            this.ready = true
           }
       }
   }
diff --git a/frontend/src/components/Service/ServiceFailures.vue b/frontend/src/components/Service/ServiceFailures.vue
index d9c5d54e..220f762e 100644
--- a/frontend/src/components/Service/ServiceFailures.vue
+++ b/frontend/src/components/Service/ServiceFailures.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import ServiceChart from "./ServiceChart";
+const ServiceChart = () => import(/* webpackChunkName: "service" */ "./ServiceChart");
 import Api from "../../API";
 
 export default {
diff --git a/frontend/src/components/Service/ServiceInfo.vue b/frontend/src/components/Service/ServiceInfo.vue
deleted file mode 100644
index 93a4a480..00000000
--- a/frontend/src/components/Service/ServiceInfo.vue
+++ /dev/null
@@ -1,211 +0,0 @@
-<template>
-    <div class="card mb-4" :class="{'offline-card': !service.online}">
-        <div class="card-title px-4 pt-3">
-            <h4 v-observe-visibility="setVisible">
-                <router-link :to="serviceLink(service)">{{service.name}}</router-link>
-                <span class="badge float-right text-uppercase" :class="{'badge-success': service.online, 'badge-danger': !service.online}">
-                    {{service.online ? $t('online') : $t('offline')}}
-                </span>
-            </h4>
-        </div>
-
-        <div class="card-body p-3 p-md-1 pt-md-1 pb-md-1">
-
-            <transition name="fade">
-            <div v-if="loaded" class="col-12 pb-2">
-
-                <div v-if="false" class="row mb-4 align-content-center">
-
-                    <div v-if="!service.online" class="col-3 text-left">
-                        <span class="text-danger font-5 font-weight-bold"></span>
-                        <span class="font-2 d-block">Current Downtime</span>
-                    </div>
-
-                    <div v-if="service.online" class="col-3 text-left">
-                        <span class="text-success font-5 font-weight-bold">
-                            {{service.online_24_hours.toString()}} %
-                        </span>
-                        <span class="font-2 d-block">Total Uptime</span>
-                    </div>
-
-                    <div v-if="service.online" class="col-3 text-left">
-                        <span class="text-success font-5 font-weight-bold">
-                            0
-                        </span>
-                        <span class="font-2 d-block">Downtime Today</span>
-                    </div>
-
-                    <div v-if="service.online" class="col-3 text-left">
-                        <span class="text-success font-5 font-weight-bold">
-                            {{(uptime.uptime / 10000).toFixed(0).toString()}}
-                        </span>
-                        <span class="font-2 d-block">Uptime Duration</span>
-                    </div>
-
-                    <div class="col-3 text-left">
-                        <span class="text-danger font-5 font-weight-bold">
-                            {{service.failures_24_hours}}
-                        </span>
-                        <span class="font-2 d-block">Failures last 24 hours</span>
-                    </div>
-
-                </div>
-
-                <div class="row">
-                    <div class="col-md-6 col-sm-12 mt-2 mt-md-0 mb-3">
-                        <ServiceSparkLine :title="set2_name" subtitle="Latency Last 24 Hours" :series="set2"/>
-                    </div>
-                    <div class="col-md-6 col-sm-12 mt-4 mt-md-0 mb-3">
-                        <ServiceSparkLine :title="set1_name" subtitle="Latency Last 7 Days" :series="set1"/>
-                    </div>
-                </div>
-
-            </div>
-            </transition>
-        </div>
-
-        <div class="card-footer">
-            <div class="row">
-
-                <div class="col-12 col-md-3 mb-2 mb-md-0">
-                    <router-link :to="{path: `/dashboard/service/${service.id}/incidents`, params: {id: service.id} }" class="btn btn-block btn-white text-capitalize incident">
-                        {{$tc('incident', 2)}}
-                    </router-link>
-                </div>
-                <div class="col-12 col-md-3 mb-2 mb-md-0">
-                    <router-link :to="{path: `/dashboard/service/${service.id}/checkins`, params: {id: service.id} }" class="btn btn-block btn-white text-capitalize checkins">
-                        {{$tc('checkin', 2)}}
-                    </router-link>
-                </div>
-                <div class="col-12 col-md-3 mb-2 mb-md-0">
-                    <router-link :to="{path: `/dashboard/service/${service.id}/failures`, params: {id: service.id} }" class="btn btn-block btn-white text-capitalize failures">
-                        {{$tc('failure', 2)}} <span class="badge badge-danger float-right mt-1">{{service.stats.failures}}</span>
-                    </router-link>
-                </div>
-                <div class="col-12 col-md-3 mb-2 mb-md-0 mt-0 mt-md-1">
-                    <span class="text-black-50 float-md-right">
-                        {{$t('uptime', [service.online_7_days])}}
-                    </span>
-                </div>
-
-            </div>
-        </div>
-
-        <span v-for="(failure, index) in failures" v-bind:key="index" class="alert alert-light">
-            Failed {{failure.created_at}}<br>
-            {{failure.issue}}
-        </span>
-
-    </div>
-</template>
-
-<script>
-  import Checkin from '../../forms/Checkin';
-  import FormIncident from '../../forms/Incident';
-  import FormMessage from '../../forms/Message';
-  import ServiceFailures from './ServiceFailures';
-  import ServiceSparkLine from "./ServiceSparkLine";
-  import Api from "../../API";
-
-  export default {
-      name: 'ServiceInfo',
-      components: {
-          Checkin,
-          ServiceFailures,
-          FormIncident,
-          FormMessage,
-          ServiceSparkLine
-      },
-      props: {
-          service: {
-              type: Object,
-              required: true
-          }
-      },
-      data() {
-          return {
-              uptime: null,
-              openTab: "",
-              set1: [],
-              set2: [],
-              loaded: false,
-              set1_name: "",
-              set2_name: "",
-              failures: null,
-            visible: false
-          }
-      },
-    watch: {
-
-    },
-      methods: {
-        async setVisible(isVisible, entry) {
-          if (isVisible && !this.visible) {
-            await this.loadInfo()
-            await this.getUptime()
-            this.visible = true
-          }
-        },
-        async getUptime() {
-          this.uptime = await Api.service_uptime(this.service.id)
-        },
-        async loadInfo() {
-          this.set1 = await this.getHits(24 * 7, "6h")
-          this.set1_name = this.calc(this.set1)
-          this.set2 = await this.getHits(24, "1h")
-          this.set2_name = this.calc(this.set2)
-          this.loaded = true
-        },
-          Tab(name) {
-              if (this.openTab === name) {
-                  this.openTab = ''
-                  return
-              }
-              this.openTab=name;
-          },
-        sinceYesterday(data) {
-          let total = 0
-          data.forEach((f) => {
-            total += parseInt(f.y)
-          });
-          total = total / data.length
-        },
-          async getHits(hours, group) {
-              const start = this.nowSubtract(3600 * hours)
-              const fetched = await Api.service_hits(this.service.id, this.toUnix(start), this.toUnix(this.now()), group, false)
-
-              const data = this.convertToChartData(fetched, 0.001, true)
-
-              return [{name: "Latency", ...data}]
-
-          },
-          calc(s) {
-              let data = s[0].data
-
-              if (data) {
-                  let total = 0
-                  data.forEach((f) => {
-                      total += parseInt(f.y)
-                  });
-                  total = total / data.length
-                  return Math.round(total) + " ms"
-              } else {
-                  return "Offline"
-              }
-          }
-      }
-  }
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-    .offline-card {
-        background-color: #fff5f5;
-    }
-    .fade-enter-active, .fade-leave-active {
-        transition: opacity .75s;
-    }
-    .fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
-        opacity: 0;
-    }
-</style>
diff --git a/frontend/src/components/Service/ServiceSparkList.vue b/frontend/src/components/Service/ServiceSparkList.vue
new file mode 100644
index 00000000..5d5f2561
--- /dev/null
+++ b/frontend/src/components/Service/ServiceSparkList.vue
@@ -0,0 +1,165 @@
+<template>
+  <div class="text-center" style="width:210px" v-if="!loaded">
+    <font-awesome-icon icon="circle-notch" class="h-25 text-dim" spin/>
+  </div>
+  <apexchart v-else width="240" height="30" type="bar" :options="chartOpts" :series="data"></apexchart>
+</template>
+
+<script>
+import Api from "@/API";
+const timeoptions = { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' };
+
+
+export default {
+  name: "ServiceSparkList",
+  props: {
+    service: {
+      required: true,
+      type: Object,
+    },
+    timeframe: {
+      required: true,
+      type: String,
+    }
+  },
+  data() {
+    return {
+      data: null,
+      loaded: false,
+      chartOpts: {
+        chart: {
+          type: 'bar',
+          height: 50,
+          sparkline: {
+            enabled: true
+          },
+          animations: {
+            enabled: false,
+          },
+        },
+        xaxis: {
+          type: 'datetime',
+        },
+        showPoint: false,
+        fullWidth:true,
+        chartPadding: {top: 0,right: 0,bottom: 0,left: 0},
+        stroke: {
+          curve: 'straight'
+        },
+        fill: {
+          opacity: 0.4,
+        },
+        yaxis: {
+          min: 0,
+          max: 5,
+        },
+        plotOptions: {
+          bar: {
+            colors: {
+              ranges: [{
+                from: 0,
+                to: 1,
+                color: '#cfcfcf'
+              }, {
+                from: 2,
+                to: 3,
+                color: '#f58e49'
+              }, {
+                from: 3,
+                to: 20,
+                color: '#e01a1a'
+              }, {
+                from: 21,
+                to: Infinity,
+                color: '#9b0909'
+              }]
+            },
+          },
+        },
+        tooltip: {
+          theme: false,
+          enabled: true,
+          custom: ({series, seriesIndex, dataPointIndex, w}) => {
+            let val = series[seriesIndex][dataPointIndex];
+            let ts = w.globals.seriesX[seriesIndex][dataPointIndex];
+            const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
+            let ago = `${(dataPointIndex-12) * -1} hours ago`
+            if ((dataPointIndex-12) * -1 === 0) {
+              ago = `Current hour`
+            }
+            return `<div class="chart_list_tooltip">${val-1} Failures<br>${dt}</div>`
+          },
+          fixed: {
+            enabled: true,
+            position: 'topLeft',
+            offsetX: 0,
+            offsetY: 0,
+          },
+          x: {
+            formatter: (value) => { return value },
+          },
+          y: {
+           show: false
+          },
+        },
+        title: {
+          enabled: false,
+        },
+        subtitle: {
+          enabled: false,
+        }
+      }
+    }
+  },
+  mounted() {
+    this.loadFailures()
+  },
+  watch: {
+    timeframe(o, n) {
+      this.loaded = false
+      this.loadFailures()
+      this.loaded = true
+    }
+  },
+  methods: {
+    convertChartData(data) {
+      if (!data) {
+        return []
+      }
+      let arr = []
+      data.forEach((d, k) => {
+        arr.push({
+          x: d.timeframe,
+          y: d.amount+1,
+        })
+      })
+      return arr
+    },
+    async loadFailures() {
+      this.loaded = false
+      let start = 43200
+      let group = "12h"
+      if (this.timeframe === "3h") {
+        start = 10800
+        group = "5m"
+      } else if (this.timeframe === "12h") {
+        start = 43200
+        group = "1h"
+      } else if (this.timeframe === "24h") {
+        start = 86400
+        group = "2h"
+      } else if (this.timeframe === "7d") {
+        start = 86400 * 7
+        group = "24h"
+      }
+
+      const startTime = this.beginningOf("day", this.nowSubtract(start))
+      const endTime = this.endOf("day", this.now())
+
+      const data = await Api.service_failures_data(this.service.id, this.toUnix(startTime), this.toUnix(endTime), group, true)
+      this.loaded = true
+      this.data = [{data: this.convertChartData(data)}]
+    }
+  },
+}
+</script>
diff --git a/frontend/src/components/Service/ServiceTopStats.vue b/frontend/src/components/Service/ServiceTopStats.vue
index f35ac058..9104b549 100644
--- a/frontend/src/components/Service/ServiceTopStats.vue
+++ b/frontend/src/components/Service/ServiceTopStats.vue
@@ -2,15 +2,15 @@
     <div class="row stats_area mt-5 mb-4">
         <div class="col-4">
             <span class="font-5 d-block font-weight-bold">{{humanTime(service.avg_response)}}</span>
-            <span class="font-1 subtitle">{{$t('service.average')}}</span>
+            <span class="font-1 subtitle">{{$t('average_response')}}</span>
         </div>
         <div class="col-4">
             <span class="font-5 d-block font-weight-bold">{{service.online_24_hours}} %</span>
-            <span class="font-1 subtitle">{{$t('service.last_uptime', [24, $tc('hour', 24)])}}</span>
+            <span class="font-1 subtitle">{{$t('last_uptime', [24, $tc('hour', 24)])}}</span>
         </div>
         <div class="col-4">
             <span class="font-5 d-block font-weight-bold">{{service.online_7_days}} %</span>
-            <span class="font-1 subtitle">{{$t('service.last_uptime', [7, $tc('day', 7)])}}</span>
+            <span class="font-1 subtitle">{{$t('last_uptime', [7, $tc('day', 7)])}}</span>
         </div>
     </div>
 </template>
diff --git a/frontend/src/forms/Checkin.vue b/frontend/src/forms/Checkin.vue
index 906a3722..52271995 100644
--- a/frontend/src/forms/Checkin.vue
+++ b/frontend/src/forms/Checkin.vue
@@ -16,19 +16,15 @@
         <div class="col-12 alert alert-light">
             <form @submit.prevent="saveCheckin">
                 <div class="form-group row">
-                    <div class="col-5">
+                    <div class="col-12 col-md-5">
                         <label for="checkin_interval" class="col-form-label">Checkin Name</label>
                         <input v-model="checkin.name" type="text" name="name" class="form-control" id="checkin_name" placeholder="New Checkin">
                     </div>
-                    <div class="col-2">
-                        <label for="checkin_interval" class="col-form-label">Interval</label>
-                        <input v-model="checkin.interval" type="number" name="interval" class="form-control" id="checkin_interval" placeholder="60">
+                    <div class="col-12 col-md-5">
+                        <label for="checkin_interval" class="col-form-label">Interval (minutes)</label>
+                        <input v-model="checkin.interval" type="number" name="interval" class="form-control" id="checkin_interval" placeholder="1" min="1">
                     </div>
-                    <div class="col-2">
-                        <label for="grace_period" class="col-form-label">Grace Period</label>
-                        <input v-model="checkin.grace" type="number" name="grace" class="form-control" id="grace_period" placeholder="10">
-                    </div>
-                    <div class="col-3">
+                    <div class="col-12 col-md-5">
                         <label class="col-form-label"></label>
                         <button @click.prevent="saveCheckin" type="submit" id="submit" class="btn btn-success d-block mt-2">Save Checkin</button>
                     </div>
@@ -54,7 +50,6 @@
               checkin: {
                   name: "",
                   interval: 60,
-                  grace: 60,
                   service_id: this.service.id
               }
           }
diff --git a/frontend/src/forms/CoreSettings.vue b/frontend/src/forms/CoreSettings.vue
index d8b95dda..0f394af9 100644
--- a/frontend/src/forms/CoreSettings.vue
+++ b/frontend/src/forms/CoreSettings.vue
@@ -1,64 +1,74 @@
 <template>
     <form @submit.prevent="saveSettings">
-        <div class="form-group">
-            <label>{{ $t('settings.name') }}</label>
-            <input v-model="core.name" type="text" class="form-control" placeholder="Great Uptime" id="project">
+    <div class="card">
+        <div class="card-header">Statping Settings</div>
+        <div class="card-body">
+                <div class="form-group">
+                    <label>{{ $t('project_name') }}</label>
+                    <input v-model="core.name" type="text" class="form-control" placeholder="Great Uptime" id="project">
+                </div>
+
+                <div class="form-group">
+                    <label>{{ $t('description') }}</label>
+                    <input v-model="core.description" type="text" class="form-control" placeholder="Great Uptime" id="description">
+                </div>
+
+                <div class="form-group row">
+                    <div class="col-8 col-sm-9">
+                        <label>{{ $t('domain') }}</label>
+                        <input v-model="core.domain" type="url" class="form-control" id="domain">
+                    </div>
+                    <div class="col-4 col-sm-3 mt-sm-1 mt-0">
+                        <label class="d-inline d-sm-none">{{$t('enable_cdn')}}</label>
+                        <label class="d-none d-sm-block">{{$t('enable_cdn')}}</label>
+                        <span @click="core.using_cdn = !!core.using_cdn" class="switch" id="using_cdn">
+                            <input v-model="core.using_cdn" type="checkbox" name="using_cdn" class="switch" id="switch-normal" :checked="core.using_cdn">
+                            <label for="switch-normal"></label>
+                          </span>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>{{ $t('footer') }}</label>
+                    <textarea v-model="core.footer" rows="4" class="form-control" id="footer">{{core.footer}}</textarea>
+                    <small class="form-text text-muted">{{ $t('footer_notes') }}</small>
+                </div>
+
+                <div class="form-group">
+                    <label>{{ $t('language') }}</label>
+                    <select v-model="core.language" class="form-control">
+                        <option value="en">English</option>
+                        <option value="es">Spanish</option>
+                        <option value="fr">French</option>
+                        <option value="ru">Russian</option>
+                        <option value="de">German</option>
+                        <option value="ja">Japanese</option>
+                        <option value="it">Italian</option>
+                        <option value="ko">Korean</option>
+                        <option value="zh">Chinese</option>
+                    </select>
+                </div>
+
+                <div class="form-group row mt-3">
+                    <label class="col-sm-10 col-form-label">{{ $t('send_reports') }}</label>
+                    <div class="col-sm-2 float-right">
+                        <span @click="core.allow_reports = !!core.allow_reports" class="switch" id="allow_report">
+                        <input v-model="core.allow_reports" type="checkbox" name="allow_report" class="switch" id="switch_allow_report" :checked="core.allow_reports">
+                        <label for="switch_allow_report"></label>
+                      </span>
+                    </div>
+                    <div class="col-12">
+                        <small>{{ $t('send_reports_desc') }}</small>
+                    </div>
+                </div>
+
         </div>
-
-        <div class="form-group">
-            <label>{{ $t('settings.description') }}</label>
-            <input v-model="core.description" type="text" class="form-control" placeholder="Great Uptime" id="description">
+        <div class="card-footer">
+            <button @click.prevent="saveSettings" id="save_core" type="submit" class="btn btn-primary btn-block" v-bind:disabled="loading">
+                <font-awesome-icon v-if="loading" icon="circle-notch" class="mr-2" spin/>{{ $t('save_settings') }}
+            </button>
         </div>
-
-        <div class="form-group row">
-            <div class="col-8 col-sm-9">
-                <label>{{ $t('domain') }}</label>
-                <input v-model="core.domain" type="url" class="form-control" id="domain">
-            </div>
-            <div class="col-4 col-sm-3 mt-sm-1 mt-0">
-                <label class="d-inline d-sm-none">Enable CDN</label>
-                <label class="d-none d-sm-block">Enable CDN</label>
-                <span @click="core.using_cdn = !!core.using_cdn" class="switch" id="using_cdn">
-                    <input v-model="core.using_cdn" type="checkbox" name="using_cdn" class="switch" id="switch-normal" :checked="core.using_cdn">
-                    <label for="switch-normal"></label>
-                  </span>
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label>{{ $t('settings.footer') }}</label>
-            <textarea v-model="core.footer" rows="4" class="form-control" id="footer">{{core.footer}}</textarea>
-            <small class="form-text text-muted">{{ $t('settings.footer_notes') }}</small>
-        </div>
-
-        <div class="form-group">
-            <label>{{ $t('setup.language') }}</label>
-            <select v-model="core.language" class="form-control">
-                <option value="en">English</option>
-                <option value="es">Spanish</option>
-                <option value="fr">French</option>
-                <option value="ru">Russian</option>
-                <option value="de">German</option>
-            </select>
-        </div>
-
-        <div class="form-group row mt-3">
-            <label class="col-sm-10 col-form-label">{{ $t('settings.error_reporting') }}</label>
-            <div class="col-sm-2 float-right">
-                <span @click="core.allow_reports = !!core.allow_reports" class="switch" id="allow_report">
-                <input v-model="core.allow_reports" type="checkbox" name="allow_report" class="switch" id="switch_allow_report" :checked="core.allow_reports">
-                <label for="switch_allow_report"></label>
-              </span>
-            </div>
-            <div class="col-12">
-                <small>{{ $t('settings.error_reporting_notes') }}</small>
-            </div>
-        </div>
-
-        <button @click.prevent="saveSettings" id="save_core" type="submit" class="btn btn-primary btn-block mt-3" v-bind:disabled="loading">
-            <font-awesome-icon v-if="loading" icon="circle-notch" class="mr-2" spin/>{{ $t('settings.save') }}
-        </button>
-
+    </div>
     </form>
 </template>
 
@@ -82,8 +92,8 @@
             this.loading = true
               const c = this.core
               await Api.core_save(c)
-              const core = await Api.core()
-              this.$store.commit('setCore', core)
+              this.$store.commit('setCore', c)
+            this.$i18n.locale = c.language || "en";
             this.loading = false
           },
           selectAll() {
diff --git a/frontend/src/forms/Group.vue b/frontend/src/forms/Group.vue
index 249fe150..5d366069 100644
--- a/frontend/src/forms/Group.vue
+++ b/frontend/src/forms/Group.vue
@@ -1,6 +1,6 @@
 <template>
-    <div class="card contain-card text-black-50 bg-white mb-3">
-        <div class="card-header">{{group.id ? `Update ${group.name}` : "Create Group"}}
+    <div class="card contain-card mb-3">
+        <div class="card-header">{{group.id ? `${$t('update')} ${group.name}` : $t('group_create')}}
             <transition name="slide-fade">
                 <button @click="removeEdit" v-if="group.id" class="btn float-right btn-danger btn-sm">
                     {{ $t('close') }}
@@ -10,24 +10,24 @@
 
     <form @submit.prevent="saveGroup">
         <div class="form-group row">
-            <label for="title" class="col-sm-4 col-form-label">{{ $t('dashboard.group') }} {{ $t('dashboard.name') }}</label>
+            <label for="title" class="col-sm-4 col-form-label">{{ $t('group') }} {{ $t('name') }}</label>
             <div class="col-sm-8">
                 <input v-model="group.name" type="text" class="form-control" id="title" placeholder="Group Name" required>
             </div>
         </div>
         <div class="form-group row">
-            <label for="switch-group-public" class="col-sm-4 col-form-label text-capitalize">{{ $t('public') }} {{ $t('dashboard.group') }}</label>
+            <label for="switch-group-public" class="col-sm-4 col-form-label text-capitalize">{{ $t('public') }} {{ $t('group') }}</label>
             <div class="col-md-8 col-xs-12 mt-1">
             <span @click="group.public = !!group.public" class="switch float-left">
                 <input v-model="group.public" type="checkbox" class="switch" id="switch-group-public" :checked="group.public">
-                <label for="switch-group-public">Show group services to the public</label>
+                <label for="switch-group-public">{{$t('group_public_desc')}}</label>
             </span>
             </div>
         </div>
         <div class="form-group row">
             <div class="col-sm-12">
                 <button @click.prevent="saveGroup" type="submit" :disabled="loading || group.name === ''" class="btn btn-block" :class="{'btn-primary': !group.id, 'btn-secondary': group.id}">
-                    {{loading ? "Loading..." : group.id ? "Update Group" : "Create Group"}}
+                    {{loading ? "Loading..." : group.id ? $t('group_update') : $t('group_create')}}
                 </button>
             </div>
         </div>
diff --git a/frontend/src/forms/Incident.vue b/frontend/src/forms/Incident.vue
deleted file mode 100644
index b6f2b174..00000000
--- a/frontend/src/forms/Incident.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-<div>
-
-</div>
-</template>
-
-<script>
-  import Api from "../API";
-  import flatPickr from 'vue-flatpickr-component';
-  import 'flatpickr/dist/flatpickr.css';
-  import FormIncidentUpdates from './IncidentUpdates';
-
-  export default {
-  name: 'FormIncident',
-  components: {
-      FormIncidentUpdates
-  },
-  props: {
-    service: {
-      type: Object
-    }
-  },
-  data () {
-    return {
-      incident: {
-        title: "",
-        description: "",
-        service: this.service.id,
-      },
-        incidents: [],
-    }
-  },
-      async mounted () {
-          await this.loadIncidents()
-      },
-      methods: {
-
-  }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-</style>
diff --git a/frontend/src/forms/IncidentUpdates.vue b/frontend/src/forms/IncidentUpdates.vue
index 37095af7..4fa6f637 100644
--- a/frontend/src/forms/IncidentUpdates.vue
+++ b/frontend/src/forms/IncidentUpdates.vue
@@ -1,24 +1,16 @@
 <template>
-    <div class="card-body bg-light pt-3">
+    <div class="card-body pt-3">
 
         <div v-if="updates.length===0" class="alert alert-link text-danger">
             No updates found, create a new Incident Update below.
         </div>
 
-        <div v-for="update in updates" :key="update.id">
-            <div class="alert alert-light" role="alert">
-                <span class="badge badge-pill badge-info text-uppercase">{{update.type}}</span>
-                <span class="float-right font-2">{{ago(update.created_at)}} ago</span>
-                <span class="d-block mt-2">{{update.message}}
-                    <button @click="delete_update(update)" type="button" class="close">
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                </span>
-            </div>
+        <div v-for="update in updates.reverse()" :key="update.id">
+            <IncidentUpdate :update="update" :onUpdate="loadUpdates" :admin="true"/>
         </div>
 
         <form class="row" @submit.prevent="createIncidentUpdate">
-            <div class="col-3">
+            <div class="col-12 col-md-3 mb-3 mb-md-0">
                 <select v-model="incident_update.type" class="form-control">
                     <option value="Investigating">Investigating</option>
                     <option value="Update">Update</option>
@@ -26,11 +18,11 @@
                     <option value="Resolved">Resolved</option>
                 </select>
             </div>
-            <div class="col-7">
-                <input v-model="incident_update.message" rows="5" name="description" class="form-control" id="message" required>
+            <div class="col-12 col-md-7 mb-3 mb-md-0">
+                <input v-model="incident_update.message" name="description" class="form-control" id="message" required>
             </div>
 
-            <div class="col-2">
+            <div class="col-12 col-md-2">
                 <button @click.prevent="createIncidentUpdate"
                         :disabled="!incident_update.message"
                         type="submit" class="btn btn-block btn-primary">
@@ -44,12 +36,11 @@
 
 <script>
     import Api from "../API";
-    import flatPickr from 'vue-flatpickr-component';
-    import 'flatpickr/dist/flatpickr.css';
+    const IncidentUpdate = () => import(/* webpackChunkName: "index" */ "@/components/Elements/IncidentUpdate");
 
     export default {
         name: 'FormIncidentUpdates',
-        components: {},
+        components: {IncidentUpdate},
         props: {
             incident: {
                 type: Object,
@@ -58,7 +49,7 @@
         },
         data () {
             return {
-                updates: [],
+                updates: null,
                 incident_update: {
                     incident: this.incident.id,
                     message: "",
@@ -72,15 +63,6 @@
         },
 
         methods: {
-
-            async delete_update(update) {
-                this.res = await Api.incident_update_delete(update)
-                if (this.res.status === "success") {
-                    this.updates = this.updates.filter(obj => obj.id !== update.id); // this is better in terms of not having to querry the db to get a fresh copy of all updates
-                    //await this.loadUpdates()
-                }
-            },
-
             async createIncidentUpdate() {
                 this.res = await Api.incident_update_create(this.incident_update)
                 if (this.res.status === "success") {
diff --git a/frontend/src/forms/Login.vue b/frontend/src/forms/Login.vue
index cea8eee3..b84c2d68 100644
--- a/frontend/src/forms/Login.vue
+++ b/frontend/src/forms/Login.vue
@@ -2,30 +2,30 @@
     <div>
     <form @submit.prevent="login" autocomplete="on">
         <div class="form-group row">
-            <label for="username" class="col-sm-2 col-form-label">{{$t('username')}}</label>
-            <div class="col-sm-10">
-                <input @keyup="checkForm" type="text" v-model="username" name="username" class="form-control" id="username" placeholder="Username" autocorrect="off" autocapitalize="none">
+            <label for="username" class="col-4 col-form-label">{{$t('username')}}</label>
+            <div class="col-8">
+                <input @keyup="checkForm" type="text" v-model="username" autocomplete="username" name="username" class="form-control" id="username" placeholder="admin" autocorrect="off" autocapitalize="none">
             </div>
         </div>
         <div class="form-group row">
-            <label for="password" class="col-sm-2 col-form-label">{{$t('password')}}</label>
-            <div class="col-sm-10">
-                <input @keyup="checkForm" type="password" v-model="password" name="password" class="form-control" id="password" placeholder="Password">
+            <label for="password" class="col-4 col-form-label">{{$t('password')}}</label>
+            <div class="col-8">
+                <input @keyup="checkForm" type="password" v-model="password" autocomplete="current-password" name="password" class="form-control" id="password" placeholder="************">
             </div>
         </div>
         <div class="form-group row">
             <div class="col-sm-12">
                 <div v-if="error" class="alert alert-danger" role="alert">
-                    {{$t('dashboard.wrong_login')}}
+                    {{$t('wrong_login')}}
                 </div>
-                <button @click.prevent="login" type="submit" class="btn btn-block mb-3 btn-primary" :disabled="disabled || loading">
-                    <font-awesome-icon v-if="loading" icon="circle-notch" class="mr-2" spin/>{{loading ? $t('dashboard.loading') : $t('dashboard.sign_in')}}
+                <button @click.prevent="login" type="submit" class="btn btn-block btn-primary" :disabled="disabled || loading">
+                    <font-awesome-icon v-if="loading" icon="circle-notch" class="mr-2" spin/>{{loading ? $t('loading') : $t('sign_in')}}
                 </button>
             </div>
         </div>
     </form>
 
-        <a v-if="oauth && oauth.gh_client_id" @click.prevent="GHlogin" href="#" class="btn btn-block btn-outline-dark">
+        <a v-if="oauth && oauth.gh_client_id" @click.prevent="GHlogin" href="#" class="mt-4 btn btn-block btn-outline-dark">
             <font-awesome-icon :icon="['fab', 'github']" /> Login with Github
         </a>
 
@@ -59,17 +59,20 @@
       },
       data() {
           return {
-              username: "",
-              password: "",
-              auth: {},
-              loading: false,
-              error: false,
-              disabled: true,
+            username: "",
+            password: "",
+            auth: {},
+            loading: false,
+            error: false,
+            disabled: true,
             google_scope: "https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email",
             slack_scope: "identity.email,identity.basic"
           }
       },
-      methods: {
+    mounted() {
+      this.$cookies.remove("statping_auth")
+    },
+    methods: {
           checkForm() {
               if (!this.username || !this.password) {
                   this.disabled = true
@@ -84,24 +87,39 @@
               if (auth.error) {
                   this.error = true
               } else if (auth.token) {
-                // this.$cookies.set("statping_auth", auth.token)
+                  this.$cookies.set("statping_auth", auth.token)
                   await this.$store.dispatch('loadAdmin')
                   this.$store.commit('setAdmin', auth.admin)
+                  this.$store.commit('setLoggedIn', true)
                   this.$router.push('/dashboard')
               }
               this.loading = false
           },
+      encode(val) {
+            return encodeURI(val)
+      },
+      custom_scopes() {
+        let scopes = []
+        if (this.oauth.custom_open_id) {
+          scopes.push("openid")
+        }
+        scopes.push(this.oauth.custom_scopes.split(","))
+        if (scopes.length !== 0) {
+          return "&scopes="+scopes.join(",")
+        }
+        return ""
+      },
         GHlogin() {
-            window.location = `https://github.com/login/oauth/authorize?client_id=${this.oauth.gh_client_id}&redirect_uri=${this.core.domain}/oauth/github&scope=user,repo`
+            window.location = `https://github.com/login/oauth/authorize?client_id=${this.oauth.gh_client_id}&redirect_uri=${this.encode(this.core.domain+"/oauth/github")}&scope=user,repo`
         },
         Slacklogin() {
-          window.location = `https://slack.com/oauth/authorize?client_id=${this.oauth.slack_client_id}&redirect_uri=${this.core.domain}/oauth/slack&scope=identity.basic`
+          window.location = `https://slack.com/oauth/authorize?client_id=${this.oauth.slack_client_id}&redirect_uri=${this.encode(this.core.domain+"/oauth/slack")}&scope=identity.basic`
         },
         Googlelogin() {
-          window.location = `https://accounts.google.com/signin/oauth?client_id=${this.oauth.google_client_id}&redirect_uri=${this.core.domain}/oauth/google&response_type=code&scope=https://www.googleapis.com/auth/userinfo.profile+https://www.googleapis.com/auth/userinfo.email`
+          window.location = `https://accounts.google.com/signin/oauth?client_id=${this.oauth.google_client_id}&redirect_uri=${this.encode(this.core.domain+"/oauth/google")}&response_type=code&scope=https://www.googleapis.com/auth/userinfo.profile+https://www.googleapis.com/auth/userinfo.email`
         },
         Customlogin() {
-          window.location = `${this.oauth.custom_endpoint_auth}?client_id=${this.oauth.custom_client_id}&redirect_uri=${this.core.domain}/oauth/custom${this.oauth.custom_scopes !== "" ? "&scope="+this.oauth.custom_scopes : "" }`
+          window.location = `${this.oauth.custom_endpoint_auth}?client_id=${this.oauth.custom_client_id}&redirect_uri=${this.encode(this.core.domain+"/oauth/custom")}&response_type=code${this.custom_scopes()}`
         }
       }
   }
diff --git a/frontend/src/forms/Message.vue b/frontend/src/forms/Message.vue
index 32f794cd..c56df1b8 100644
--- a/frontend/src/forms/Message.vue
+++ b/frontend/src/forms/Message.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div class="card contain-card text-black-50 bg-white mb-5">
-      <div class="card-header">{{message.id ? `Update ${message.title}` : "Create Announcement"}}
+    <div class="card contain-card mb-5">
+      <div class="card-header">{{message.id ? `${$t('update')} ${message.title}` : $t('message_create')}}
         <transition name="slide-fade">
           <button @click="removeEdit" v-if="message.id" class="btn btn-sm float-right btn-danger btn-sm">
               {{ $t('close') }}
@@ -11,75 +11,75 @@
       <div class="card-body">
         <form @submit="saveMessage">
           <div class="form-group row">
-            <label class="col-sm-4 col-form-label">{{ $t('dashboard.title') }}</label>
+            <label class="col-sm-4 col-form-label">{{ $t('title') }}</label>
             <div class="col-sm-8">
               <input v-model="message.title" type="text" name="title" class="form-control" id="title" placeholder="Announcement Title" required>
             </div>
           </div>
 
           <div class="form-group row">
-            <label class="col-sm-4 col-form-label">Description</label>
+            <label class="col-sm-4 col-form-label">{{ $t('description') }}</label>
             <div class="col-sm-8">
               <textarea v-model="message.description" rows="5" name="description" class="form-control" id="description" required></textarea>
             </div>
           </div>
 
           <div class="form-group row">
-            <label class="col-sm-4 col-form-label">Service</label>
+            <label class="col-sm-4 col-form-label">{{ $t('service') }}</label>
             <div class="col-sm-8">
               <select v-model="message.service" name="service_id" class="form-control">
-                <option :value="0">Global Announcement</option>
+                <option v-bind:value="0">{{ $t('global_announcement') }}</option>
                 <option v-for="service in $store.getters.services" :value="service.id" v-bind:key="service.id" >{{service.name}}</option>
               </select>
             </div>
           </div>
 
           <div class="form-group row">
-            <label class="col-sm-4 col-form-label">Announcement Date Range</label>
+            <label class="col-sm-4 col-form-label">{{ $t('announcement_date') }}</label>
             <div class="col-sm-4">
               <flatPickr v-model="message.start_on" @on-change="startChange" :config="config" type="text" name="start_on" class="form-control form-control-plaintext" id="start_on" value="0001-01-01T00:00:00Z" required />
             </div>
-            <div class="col-sm-4">
+            <div class="col-sm-4 mt-3 mt-md-0">
               <flatPickr v-model="message.end_on" @on-change="endChange" :config="config" type="text" name="end_on" class="form-control form-control-plaintext" id="end_on" value="0001-01-01T00:00:00Z" required />
             </div>
           </div>
 
           <div v-show="this.service === null" class="form-group row">
-            <label for="service_id" class="col-sm-4 col-form-label">Service</label>
+            <label for="service_id" class="col-sm-4 col-form-label">{{ $t('service') }}</label>
             <div class="col-sm-8">
               <select v-model="message.service" class="form-control" name="service" id="service_id">
-                <option :value="0">Global Message</option>
+                <option v-bind:value="0">{{ $t('global_announcement') }}</option>
                 <option v-for="service in $store.getters.services" :value="service.id" v-bind:key="service.id">{{service.name}}</option>
               </select>
             </div>
           </div>
 
           <div class="form-group row">
-            <label for="notify_method" class="col-sm-4 col-form-label">Notify Users</label>
+            <label for="notify_method" class="col-sm-4 col-form-label">{{ $t('notify_users') }}</label>
             <div class="col-sm-8">
               <span @click="message.notify = !!message.notify" class="switch">
                 <input v-model="message.notify" type="checkbox" class="switch" id="switch-normal">
-                <label for="switch-normal">Notify Users Before Scheduled Time</label>
+                <label for="switch-normal">{{ $t('notify_desc') }}</label>
               </span>
             </div>
           </div>
 
           <div v-if="message.notify" class="form-group row">
-            <label for="notify_method" class="col-sm-4 col-form-label">Notification Method</label>
+            <label for="notify_method" class="col-sm-4 col-form-label">{{ $t('notify_method') }}</label>
             <div class="col-sm-8">
               <input v-model="message.notify_method" type="text" name="notify_method" class="form-control" id="notify_method" value="" placeholder="email">
             </div>
           </div>
 
           <div v-if="message.notify" class="form-group row">
-            <label for="notify_before" class="col-sm-4 col-form-label">Notify Before</label>
+            <label for="notify_before" class="col-sm-4 col-form-label">{{ $t('notify_before') }}</label>
             <div class="col-sm-8">
               <div class="form-inline">
-                <input v-model="message.notify_before" type="number" name="notify_before" class="col-4 form-control" id="notify_before">
+                <input v-model.number="message.notify_before" type="number" name="notify_before" class="col-4 form-control" id="notify_before">
                 <select v-model="message.notify_before_scale" class="ml-2 col-7 form-control" name="notify_before_scale" id="notify_before_scale">
-                  <option value="minute">Minutes</option>
-                  <option value="hour">Hours</option>
-                  <option value="day">Days</option>
+                  <option value="minute">{{ $t('minutes') }}</option>
+                  <option value="hour">{{ $t('hours') }}</option>
+                  <option value="day">{{ $t('days') }}</option>
                 </select>
               </div>
             </div>
@@ -90,7 +90,7 @@
               <button @click="saveMessage"
                       :disabled="!message.title || !message.description"
                       type="submit" class="btn btn-block" :class="{'btn-primary': !message.id, 'btn-secondary': message.id}">
-                  {{message.id ? "Edit Message" : "Create Message"}}
+                  {{message.id ? $t('message_edit') : $t('message_create')}}
               </button>
             </div>
           </div>
@@ -130,6 +130,7 @@
         start_on: new Date(),
         end_on: new Date(),
         service_id: 0,
+        service: 0,
         notify_method: "",
         notify: false,
         notify_before: 0,
diff --git a/frontend/src/forms/Notifier.vue b/frontend/src/forms/Notifier.vue
index 2702132e..73866ac3 100644
--- a/frontend/src/forms/Notifier.vue
+++ b/frontend/src/forms/Notifier.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <form @submit.prevent="saveNotifier">
-    <div class="card contain-card text-black-50 bg-white mb-3">
+    <div class="card contain-card mb-3">
         <div class="card-header text-capitalize">
             {{notifier.title}}
             <span @click="enableToggle" class="switch switch-sm switch-rd-gr float-right">
@@ -14,10 +14,10 @@
 
             <div v-if="notifier.method==='mobile'">
                 <div class="form-group row mt-3">
-                    <label for="domain" class="col-sm-4 col-form-label">Statping Domain</label>
+                    <label for="statping_domain" class="col-sm-4 col-form-label">Statping Domain</label>
                     <div class="col-sm-8">
                         <div class="input-group">
-                            <input v-bind:value="$store.getters.core.domain" type="text" class="form-control" id="domain" readonly>
+                            <input v-bind:value="$store.getters.core.domain" type="text" class="form-control" id="statping_domain" readonly>
                             <div class="input-group-append copy-btn">
                                 <button @click.prevent="copy($store.getters.core.domain)" class="btn btn-outline-secondary" type="button">Copy</button>
                             </div>
@@ -69,7 +69,7 @@
         </div>
     </div>
 
-        <div v-if="notifier.data_type" class="card text-black-50 bg-white mb-3">
+                    <div v-if="notifier.data_type" class="card mb-3">
             <div class="card-header text-capitalize">
                 <font-awesome-icon @click="expanded = !expanded" :icon="expanded ? 'minus' : 'plus'" class="mr-2 pointer"/>
                 {{notifier.title}} Outgoing Request
@@ -103,7 +103,7 @@
 
     </form>
 
-        <div v-if="error || success" class="card text-black-50 bg-white mb-3">
+        <div v-if="error || success" class="card mb-3">
             <div class="card-body">
 
             <div v-if="error && !success" class="alert alert-danger col-12" role="alert">
@@ -119,7 +119,7 @@
             </div>
         </div>
 
-        <div class="card text-black-50 bg-white mb-3">
+        <div class="card mb-3">
             <div class="card-body">
                 <div class="row">
                     <div class="col-12 col-sm-4 mb-2 mb-sm-0 mt-2 mt-sm-0">
@@ -128,14 +128,39 @@
                         </button>
                     </div>
                     <div class="col-12 col-md-4 mb-2 mb-sm-0 mt-2 mt-sm-0">
-                        <button @click.prevent="testNotifier('success')" :disabled="loadingTest" class="btn btn-outline-dark btn-block text-capitalize test-notifier">
+                        <button @click.prevent="testNotifier('success')" :disabled="loadingTest" class="btn btn-secondary btn-block text-capitalize test-notifier">
                             <font-awesome-icon v-if="loadingTest" icon="circle-notch" class="mr-2" spin/>{{loadingTest ? "Loading..." : "Test Success"}}</button>
                     </div>
                     <div class="col-12 col-md-4 mb-2 mb-sm-0 mt-2 mt-sm-0">
-                        <button @click.prevent="testNotifier('failure')" :disabled="loadingTest" class="btn btn-outline-dark btn-block text-capitalize test-notifier">
+                        <button @click.prevent="testNotifier('failure')" :disabled="loadingTest" class="btn btn-secondary btn-block text-capitalize test-notifier">
                             <font-awesome-icon v-if="loadingTest" icon="circle-notch" class="mr-2" spin/>{{loadingTest ? "Loading..." : "Test Failure"}}</button>
                     </div>
                 </div>
+            </div>
+        </div>
+
+        <div v-if="notifier.logs" class="card mb-3">
+            <div class="card-header text-capitalize">
+                <font-awesome-icon @click="expanded_logs = !expanded_logs" :icon="expanded_logs ? 'minus' : 'plus'" class="mr-2 pointer"/>
+                {{notifier.title}} Logs
+                <span class="badge badge-info float-right text-uppercase mt-1">{{notifier.logs.length}}</span>
+            </div>
+            <div class="card-body" :class="{'d-none': !expanded_logs}">
+
+                <div v-for="(log, i) in notifier.logs.reverse()" class="alert" :class="{'alert-danger': log.error, 'alert-dark': !log.success && !log.error, 'alert-success': log.success && !log.error}">
+                        <span class="d-block">
+                            Service {{log.service}}
+                            {{log.success ? "Success Triggered" : "Failure Triggered"}}
+                        </span>
+
+                    <div v-if="log.message !== ''" class="bg-white p-3 small mt-2">
+                        <code>{{log.message}}</code>
+                    </div>
+
+                    <div class="row mt-2">
+                        <span class="col-6 small">{{niceDate(log.created_at)}}</span>
+                    </div>
+                </div>
 
             </div>
         </div>
@@ -148,16 +173,19 @@
 </template>
 
 <script>
-  import Api from "../API";
+import Api from "../API";
+/* webpackChunkName: "codemirror" */
+import {codemirror} from 'vue-codemirror'
+/* webpackChunkName: "codemirror" */
+import 'codemirror/mode/javascript/javascript.js'
+/* webpackChunkName: "codemirror" */
+import 'codemirror/lib/codemirror.css'
+/* webpackChunkName: "codemirror" */
+import 'codemirror/theme/neat.css'
+/* webpackChunkName: "codemirror" */
+import '../codemirror_json'
 
-  const beautify = require('js-beautify').js
-
-  // require component
-  import { codemirror } from 'vue-codemirror'
-  import 'codemirror/mode/javascript/javascript.js'
-  import 'codemirror/lib/codemirror.css'
-  import 'codemirror/theme/neat.css'
-  import '../codemirror_json'
+const beautify = require('js-beautify').js
 
 export default {
     name: 'Notifier',
@@ -183,6 +211,7 @@ export default {
             success: false,
             saved: false,
           expanded: false,
+          expanded_logs: false,
           success_data: null,
           failure_data: null,
             form: {},
@@ -300,10 +329,3 @@ export default {
     }
 }
 </script>
-<style scoped>
-    .CodeMirror {
-        border: 1px solid #eee;
-        height: 550px;
-        font-size: 9pt;
-    }
-</style>
diff --git a/frontend/src/forms/OAuth.vue b/frontend/src/forms/OAuth.vue
index 1b99eec4..646429a8 100644
--- a/frontend/src/forms/OAuth.vue
+++ b/frontend/src/forms/OAuth.vue
@@ -1,6 +1,6 @@
 <template>
     <form @submit.prevent="saveOAuth">
-        <div class="card text-black-50 bg-white mb-3">
+        <div class="card mb-3">
             <div class="card-header">
                 Internal Login
                 <span @click="local_enabled = !!local_enabled" class="switch switch-sm switch-rd-gr float-right">
@@ -12,7 +12,7 @@
                 Use Statping's default authentication to allow users you've created to login.
             </div>
         </div>
-        <div class="card text-black-50 bg-white mb-3">
+        <div class="card mb-3">
             <div class="card-header text-capitalize">
                 <font-awesome-icon @click="expanded.github = !expanded.github" :icon="expanded.github ? 'minus' : 'plus'" class="mr-2 pointer"/>
                 Github Settings
@@ -50,12 +50,6 @@
                         <small>Optional comma delimited list of Github Organizations</small>
                     </div>
                 </div>
-                <div class="form-group row">
-                    <label class="col-sm-4 col-form-label">Enable Github Login</label>
-                    <div class="col-md-8 col-xs-12 mt-1">
-
-                    </div>
-                </div>
                 <div class="form-group row">
                     <label for="gh_callback" class="col-sm-4 col-form-label">Callback URL</label>
                     <div class="col-sm-8">
@@ -69,7 +63,7 @@
                 </div>
             </div>
         </div>
-        <div class="card text-black-50 bg-white mb-3">
+        <div class="card mb-3">
             <div class="card-header">
                 <font-awesome-icon @click="expanded.google = !expanded.google" :icon="expanded.google ? 'minus' : 'plus'" class="mr-2 pointer"/>
                 Google Settings
@@ -113,7 +107,7 @@
                 </div>
             </div>
         </div>
-        <div class="card text-black-50 bg-white mb-3">
+        <div class="card mb-3">
             <div class="card-header">
                 <font-awesome-icon @click="expanded.slack = !expanded.slack" :icon="expanded.slack ? 'minus' : 'plus'" class="mr-2 pointer"/>
                 Slack Settings
@@ -165,7 +159,7 @@
             </div>
         </div>
 
-        <div class="card text-black-50 bg-white mb-3">
+        <div class="card mb-3">
             <div class="card-header">
                 <font-awesome-icon @click="expanded.custom = !expanded.custom" :icon="expanded.custom ? 'minus' : 'plus'" class="mr-2 pointer"/>
                 Custom oAuth Settings
@@ -174,8 +168,8 @@
                     <label for="switch-custom-oauth" class="mb-0"> </label>
                 </span>
             </div>
-            <div class="card-body" :class="{'d-none': !expanded.custom}">
-                <div class="form-group row mt-3">
+            <div class="card-body" :class="{'d-none': !expanded.custom || !custom_enabled}">
+                <div class="form-group row">
                     <label for="custom_name" class="col-sm-4 col-form-label">Custom Name</label>
                     <div class="col-sm-8">
                         <input v-model="oauth.custom_name" type="text" class="form-control" id="custom_name" required>
@@ -205,13 +199,24 @@
                         <input v-model="oauth.custom_endpoint_token" type="text" class="form-control" id="custom_endpoint_token" required>
                     </div>
                 </div>
-                <div class="form-group row">
-                    <label for="custom_scopes" class="col-sm-4 col-form-label">Scopes</label>
-                    <div class="col-sm-8">
-                        <input v-model="oauth.custom_scopes" type="text" class="form-control" id="custom_scopes">
-                        <small>Optional comma delimited list of oauth scopes</small>
-                    </div>
+              <div class="form-group row">
+                <label for="custom_scopes" class="col-sm-4 col-form-label">Scopes</label>
+                <div class="col-sm-8">
+                  <input v-model="oauth.custom_scopes" type="text" class="form-control" id="custom_scopes">
+                  <small>Optional comma delimited list of oauth scopes</small>
                 </div>
+              </div>
+              <div class="form-group row">
+                <label for="custom_scopes" class="col-sm-4 col-form-label">Open ID</label>
+                <div class="col-sm-8">
+                  <span @click="oauth.custom_open_id = !!oauth.custom_open_id" class="switch switch-rd-gr float-right">
+                    <input v-model="oauth.custom_open_id" type="checkbox" id="switch-custom-openid" :checked="oauth.custom_open_id">
+                    <label for="switch-custom-openid" class="mb-0"> </label>
+                </span>
+                  <small>Enable if provider is OpenID</small>
+                </div>
+              </div>
+
                 <div class="form-group row">
                     <label for="slack_callback" class="col-sm-4 col-form-label">Callback URL</label>
                     <div class="col-sm-8">
@@ -277,6 +282,7 @@
               custom_endpoint_auth: "",
               custom_endpoint_token: "",
               custom_scopes: "",
+              custom_open_id: false,
             }
           }
       },
diff --git a/frontend/src/forms/Service.vue b/frontend/src/forms/Service.vue
index 40d990a4..a7e5cd1f 100644
--- a/frontend/src/forms/Service.vue
+++ b/frontend/src/forms/Service.vue
@@ -1,24 +1,25 @@
 <template>
     <form v-if="service.type" @submit.prevent="saveService">
-        <div class="card contain-card text-black-50 bg-white mb-4">
-            <div class="card-header">{{ $t('service.info') }}</div>
+        <div class="card contain-card mb-4">
+            <div class="card-header">{{ $t('service_info') }}</div>
             <div class="card-body">
-        <div class="form-group row">
-            <label class="col-sm-4 col-form-label">{{ $t('service.name') }}</label>
-            <div class="col-sm-8">
-                <input v-model="service.name" @input="updatePermalink" id="name" type="text" name="name" class="form-control" placeholder="Server Name" required spellcheck="false" autocorrect="off">
-                <small class="form-text text-muted">Give your service a name you can recognize</small>
+            <div class="form-group row">
+                <label class="col-sm-4 col-form-label">{{ $t('service_name') }}</label>
+                <div class="col-sm-8">
+                    <input v-model="service.name" @input="updatePermalink" id="name" type="text" name="name" class="form-control" placeholder="Server Name" required spellcheck="false" autocorrect="off">
+                    <small class="form-text text-muted">Give your service a name you can recognize</small>
+                </div>
             </div>
-        </div>
         <div class="form-group row">
-            <label for="service_type" class="col-sm-4 col-form-label">{{ $t('service.type') }}</label>
+            <label for="service_type" class="col-sm-4 col-form-label">{{ $t('service_type') }}</label>
             <div class="col-sm-8">
                 <select v-model="service.type" class="form-control" id="service_type">
-                    <option value="http">HTTP Service</option>
-                    <option value="tcp">TCP Service</option>
-                    <option value="udp">UDP Service</option>
+                    <option value="http">HTTP {{ $t('service') }}</option>
+                    <option value="tcp">TCP {{ $t('service') }}</option>
+                    <option value="udp">UDP {{ $t('service') }}</option>
                     <option value="icmp">ICMP Ping</option>
-                    <option value="grpc">gRPC Service</option>
+                    <option value="grpc">gRPC {{ $t('service') }}</option>
+                    <option value="static">Static {{ $t('service') }}</option>
                 </select>
                 <small class="form-text text-muted">Use HTTP if you are checking a website or use TCP if you are checking a server</small>
             </div>
@@ -34,7 +35,7 @@
             </div>
         </div>
             <div class="form-group row">
-                <label class="col-sm-4 col-form-label">Permalink URL</label>
+                <label class="col-sm-4 col-form-label">{{ $t('permalink') }}</label>
                 <div class="col-sm-8">
                     <input v-model="service.permalink" type="text" name="permalink" class="form-control" id="permalink" autocapitalize="none" spellcheck="true" placeholder='awesome_service'>
                     <small class="form-text text-muted">Use text for the service URL rather than the service number.</small>
@@ -42,8 +43,8 @@
             </div>
 
             <div class="form-group row">
-                <label class="col-sm-4 col-form-label">Public Service</label>
-                <div class="col-8 mt-1">
+                <label class="col-sm-4 col-form-label">{{ $t('service_public') }}</label>
+                <div class="col-12 col-md-8 mt-1 mb-2">
                     <span @click="service.public = !!service.public" class="switch float-left">
                         <input v-model="service.public" type="checkbox" name="public-option" class="switch" id="switch-public" v-bind:checked="service.public">
                         <label v-if="service.public" for="switch-public">This service will be visible for everyone</label>
@@ -52,29 +53,31 @@
                 </div>
             </div>
 
-            <div class="form-group row">
-                <label for="service_interval" class="col-sm-4 col-form-label">Check Interval</label>
+            <div v-if="service.type !== 'static'" class="form-group row">
+                <label for="service_interval" class="col-sm-4 col-form-label">{{ $t('check_interval') }}</label>
                 <div class="col-sm-6">
                     <span class="slider-info">{{secondsHumanize(service.check_interval)}}</span>
                     <input v-model="service.check_interval" type="range" class="slider" id="service_interval" min="1" max="1800" :step="1">
                     <small id="interval" class="form-text text-muted">Interval to check your service state</small>
                 </div>
                 <div class="col-sm-2">
-                    <input v-model="service.check_interval" type="text" name="check_interval" class="form-control">
+                    <input v-model="service.check_interval" type="number" name="check_interval" class="form-control">
                 </div>
             </div>
 
             </div>
         </div>
 
-        <div class="card contain-card text-black-50 bg-white mb-4">
+        <div v-if="service.type !== 'static'" class="card contain-card mb-4">
             <div class="card-header">Request Details</div>
             <div class="card-body">
 
             <div class="form-group row">
-                <label for="service_url" class="col-sm-4 col-form-label">Service Endpoint {{service.type === 'http' ? "(URL)" : "(Domain)"}}</label>
+                <label for="service_url" class="col-sm-4 col-form-label">
+                  {{ $t('service_endpoint') }} {{service.type === 'http' ? "(URL)" : "(Domain)"}}
+                </label>
                 <div class="col-sm-8">
-                    <input v-model="service.domain" type="text" class="form-control" id="service_url" :placeholder="service.type === 'http' ? 'https://google.com' : '192.168.1.1'" required autocapitalize="none" spellcheck="false">
+                    <input v-model="service.domain" type="url" class="form-control" id="service_url" :placeholder="service.type === 'http' ? 'https://google.com' : '192.168.1.1'" required autocapitalize="none" spellcheck="false">
                     <small class="form-text text-muted">Statping will attempt to connect to this address</small>
                 </div>
             </div>
@@ -87,7 +90,7 @@
             </div>
 
             <div v-if="service.type.match(/^(http)$/)" class="form-group row">
-                <label class="col-sm-4 col-form-label">Service Check Type</label>
+                <label class="col-sm-4 col-form-label">{{ $t('service_check') }}</label>
                 <div class="col-sm-8">
                     <select v-model="service.method" name="method" class="form-control">
                         <option value="GET" >GET</option>
@@ -101,7 +104,7 @@
             </div>
 
         <div class="form-group row">
-            <label class="col-sm-4 col-form-label">Request Timeout</label>
+            <label class="col-sm-4 col-form-label">{{ $t('service_timeout') }}</label>
             <div class="col-sm-6">
                 <span v-if="service.timeout >= 0" class="slider-info">{{secondsHumanize(service.timeout)}}</span>
                 <input v-model="service.timeout" type="range" id="timeout" name="timeout" class="slider" min="1" max="180">
@@ -109,7 +112,7 @@
             </div>
 
             <div class="col-sm-2">
-                <input v-model="service.timeout" type="text" name="service_timeout" class="form-control">
+                <input v-model="service.timeout" type="number" name="service_timeout" class="form-control">
             </div>
 
         </div>
@@ -129,14 +132,14 @@
             </div>
         </div>
         <div v-if="service.type.match(/^(http)$/)" class="form-group row">
-            <label class="col-sm-4 col-form-label">Expected Response (Regex)</label>
+            <label class="col-sm-4 col-form-label">{{ $t('expected_resp') }} (Regex)</label>
             <div class="col-sm-8">
                 <textarea v-model="service.expected" class="form-control" rows="3" autocapitalize="none" spellcheck="false" placeholder='(method)": "((\\"|[success])*)"'></textarea>
                 <small class="form-text text-muted">You can use plain text or insert <a target="_blank" href="https://regex101.com/r/I5bbj9/1">Regex</a> to validate the response</small>
             </div>
         </div>
         <div v-if="service.type.match(/^(http)$/)" class="form-group row">
-            <label for="service_response_code" class="col-sm-4 col-form-label">Expected Status Code</label>
+            <label for="service_response_code" class="col-sm-4 col-form-label">{{ $t('expected_code') }}</label>
             <div class="col-sm-8">
                 <input v-model="service.expected_status" type="number" name="expected_status" class="form-control" placeholder="200" id="service_response_code">
                 <small class="form-text text-muted">A status code of 200 is success, or view all the <a target="_blank" href="https://www.restapitutorial.com/httpstatuscodes.html">HTTP Status Codes</a></small>
@@ -144,8 +147,8 @@
         </div>
 
         <div v-if="service.type.match(/^(http)$/)" class="form-group row">
-            <label class="col-sm-4 col-form-label">Follow HTTP Redirects</label>
-            <div class="col-8 mt-1">
+            <label class="col-12 col-md-4 col-form-label">{{ $t('follow_redir') }}</label>
+            <div class="col-12 col-md-8 mt-1 mb-2 mb-md-0">
                 <span @click="service.redirect = !!service.redirect" class="switch float-left">
                     <input v-model="service.redirect" type="checkbox" name="redirect-option" class="switch" id="switch-redirect" v-bind:checked="service.redirect">
                     <label for="switch-redirect">Follow HTTP Redirects if server attempts</label>
@@ -154,8 +157,8 @@
         </div>
 
         <div v-if="service.type.match(/^(http)$/)" class="form-group row">
-            <label class="col-sm-4 col-form-label">Verify SSL</label>
-            <div class="col-8 mt-1">
+            <label class="col-12 col-md-4 col-form-label">{{ $t('verify_ssl') }}</label>
+            <div class="col-12 col-md-8 mt-1 mb-2 mb-md-0">
                 <span @click="service.verify_ssl = !!service.verify_ssl" class="switch float-left">
                     <input v-model="service.verify_ssl" type="checkbox" name="verify_ssl-option" class="switch" id="switch-verify-ssl" v-bind:checked="service.verify_ssl">
                     <label for="switch-verify-ssl" v-if="service.verify_ssl">Verify SSL Certificate for this service</label>
@@ -165,8 +168,8 @@
         </div>
 
         <div v-if="service.type.match(/^(tcp|http)$/)" class="form-group row">
-            <label class="col-sm-4 col-form-label">Use TLS Certificate</label>
-            <div class="col-8 mt-1">
+            <label class="col-12 col-md-4 col-form-label">{{ $t('tls_cert') }}</label>
+            <div class="col-12 col-md-8 mt-1 mb-2 mb-md-0">
                 <span @click="use_tls = !!use_tls" class="switch float-left">
                     <input v-model="use_tls" type="checkbox" name="verify_ssl-option" class="switch" id="switch-use-tls" v-bind:checked="use_tls">
                     <label for="switch-use-tls" v-if="use_tls">Custom TLS Certificates for mTLS services</label>
@@ -202,13 +205,13 @@
             </div>
         </div>
 
-        <div class="card contain-card text-black-50 bg-white mb-4">
-            <div class="card-header">Notification Options</div>
+        <div class="card contain-card mb-4">
+            <div class="card-header">{{ $t('notification_opts') }}</div>
             <div class="card-body">
 
                 <div class="form-group row">
-                    <label class="col-sm-4 col-form-label">Enable Notifications</label>
-                    <div class="col-8 mt-1">
+                    <label class="col-sm-4 col-form-label">{{ $t('notifications_enable') }}</label>
+                    <div class="col-12 col-md-8 mt-1 mb-2 mb-md-0">
                         <span @click="service.allow_notifications = !!service.allow_notifications" class="switch float-left">
                             <input v-model="service.allow_notifications" type="checkbox" name="allow_notifications-option" class="switch" id="switch-notifications" v-bind:checked="service.allow_notifications">
                             <label for="switch-notifications">Allow notifications to be sent for this service</label>
@@ -216,7 +219,7 @@
                     </div>
                 </div>
                 <div v-if="service.allow_notifications"  class="form-group row">
-                    <label class="col-sm-4 col-form-label">Notify After Failures</label>
+                    <label class="col-sm-4 col-form-label">{{ $t('notify_after') }}</label>
                     <div class="col-sm-8">
                         <span class="slider-info">{{service.notify_after === 0 ? "First Failure" : service.notify_after+' Failures'}}</span>
                         <input v-model="service.notify_after" type="range" name="notify_after" class="slider" id="notify_after" min="0" max="20">
@@ -224,8 +227,8 @@
                     </div>
                 </div>
                 <div v-if="service.allow_notifications" class="form-group row">
-                    <label class="col-sm-4 col-form-label">Notify All Changes</label>
-                    <div class="col-8 mt-1">
+                    <label class="col-sm-4 col-form-label">{{ $t('notify_all') }}</label>
+                    <div class="col-12 col-md-8 mt-1">
                         <span @click="service.notify_all_changes = !!service.notify_all_changes" class="switch float-left">
                             <input v-model="service.notify_all_changes" type="checkbox" name="notify_all-option" class="switch" id="notify_all" v-bind:checked="service.notify_all_changes">
                             <label v-if="service.notify_all_changes" for="notify_all">Continuously send notifications when service is failing.</label>
@@ -240,7 +243,7 @@
         <div class="form-group row">
             <div class="col-12">
                 <button :disabled="loading" @click.prevent="saveService" type="submit" class="btn btn-success btn-block">
-                    {{service.id ? "Update Service" : "Create Service"}}
+                    {{service.id ? $t('service_update') : $t('service_create')}}
                 </button>
             </div>
         </div>
diff --git a/frontend/src/forms/Setup.vue b/frontend/src/forms/Setup.vue
index 5232b4e0..d97720a3 100644
--- a/frontend/src/forms/Setup.vue
+++ b/frontend/src/forms/Setup.vue
@@ -1,25 +1,29 @@
 <template>
     <div class="container col-md-7 col-sm-12 mt-2 sm-container">
-        <div class="col-12 col-md-8 offset-md-2 mb-4">
-            <img alt="Statping Setup" class="col-12 mt-5 mt-md-0" style="max-width:680px" src="banner.png">
+        <div class="col-12 col-md-6 offset-md-3 mb-4">
+            <img alt="Statping Setup" class="img-fluid mt-5 mt-md-0" src="banner.png">
         </div>
 
         <div class="col-12">
             <form @submit.prevent="saveSetup">
                 <div class="row">
-                    <div class="col-6">
+                    <div class="col-12 col-md-6">
                         <div class="form-group">
-                            <label class="text-capitalize">{{ $t('setup.language') }}</label>
+                            <label class="text-capitalize">{{ $t('language') }}</label>
                             <select @change="changeLanguages" v-model="setup.language" id="language" class="form-control">
                                 <option value="en">English</option>
                                 <option value="es">Spanish</option>
                                 <option value="fr">French</option>
                                 <option value="ru">Russian</option>
                                 <option value="de">German</option>
+                                <option value="ja">Japanese</option>
+                                <option value="ko">Korean</option>
+                                <option value="it">Italian</option>
+                                <option value="zh">Chinese</option>
                             </select>
                         </div>
                         <div class="form-group">
-                            <label class="text-capitalize">{{ $t('setup.connection') }}</label>
+                            <label class="text-capitalize">{{ $t('db_connection') }}</label>
                             <select @change="canSubmit" v-model="setup.db_connection" id="db_connection" class="form-control">
                                 <option value="sqlite">SQLite</option>
                                 <option value="postgres">Postgres</option>
@@ -27,36 +31,36 @@
                             </select>
                         </div>
                         <div class="row">
-                            <div class="col-6">
+                            <div class="col-7 col-md-6">
                                 <div v-if="setup.db_connection !== 'sqlite'" class="form-group">
-                                    <label class="text-capitalize">{{ $t('setup.host') }}</label>
+                                    <label class="text-capitalize">{{ $t('db_host') }}</label>
                                     <input @keyup="canSubmit" v-model="setup.db_host" id="db_host" type="text" class="form-control" placeholder="localhost">
                                 </div>
                             </div>
-                            <div class="col-6">
+                            <div class="col-5 col-md-6">
                                 <div v-if="setup.db_connection !== 'sqlite'" class="form-group">
-                                    <label class="text-capitalize">{{ $t('port') }}</label>
+                                    <label class="text-capitalize">{{ $t('db_port') }}</label>
                                     <input @keyup="canSubmit" v-model="setup.db_port" id="db_port" type="number" class="form-control" placeholder="5432">
                                 </div>
                             </div>
                         </div>
                         <div v-if="setup.db_connection !== 'sqlite'" class="form-group">
-                            <label class="text-capitalize">{{ $t('username') }}</label>
+                            <label class="text-capitalize">{{ $t('db_username') }}</label>
                             <input @keyup="canSubmit" v-model="setup.db_user" id="db_user" type="text" class="form-control" placeholder="root">
                         </div>
                         <div v-if="setup.db_connection !== 'sqlite'" class="form-group">
-                            <label for="db_password" class="text-capitalize">{{ $t('password') }}</label>
+                            <label for="db_password" class="text-capitalize">{{ $t('db_password') }}</label>
                             <input @keyup="canSubmit" v-model="setup.db_password" id="db_password" type="password" class="form-control" placeholder="password123">
                         </div>
                         <div v-if="setup.db_connection !== 'sqlite'" class="form-group">
-                            <label for="db_database" class="text-capitalize">{{ $t('setup.database') }}</label>
+                            <label for="db_database" class="text-capitalize">{{ $t('db_database') }}</label>
                             <input @keyup="canSubmit" v-model="setup.db_database" id="db_database" type="text" class="form-control" placeholder="Database name">
                         </div>
 
                         <div class="form-group mt-3">
                             <div class="row">
                                 <div class="col-9">
-                                    <span class="text-left text-capitalize">{{ $t('setup.send_reports') }}</span>
+                                    <span class="text-left text-capitalize">{{ $t('send_reports') }}</span>
                                 </div>
                                 <div class="col-3 text-right">
                                     <span @click="setup.send_reports = !!setup.send_reports" class="switch">
@@ -65,40 +69,39 @@
                                     </span>
                                 </div>
                             </div>
-
                         </div>
 
                     </div>
 
-                    <div class="col-6">
+                    <div class="col-12 col-md-6">
 
                         <div class="form-group">
-                            <label class="text-capitalize">{{ $t('setup.project_name') }}</label>
+                            <label class="text-capitalize">{{ $t('project_name') }}</label>
                             <input @keyup="canSubmit" v-model="setup.project" id="project" type="text" class="form-control" placeholder="Work Servers" required>
                         </div>
 
                         <div class="form-group">
-                            <label class="text-capitalize">{{ $t('setup.project_description') }}</label>
+                            <label class="text-capitalize">{{ $t('description') }}</label>
                             <input @keyup="canSubmit" v-model="setup.description" id="description" type="text" class="form-control" placeholder="Monitors all of my work services">
                         </div>
 
                         <div class="form-group">
-                            <label class="text-capitalize" for="domain">{{ $t('setup.domain') }}</label>
+                            <label class="text-capitalize" for="domain">{{ $t('domain') }}</label>
                             <input @keyup="canSubmit" v-model="setup.domain" type="text" class="form-control" id="domain" required>
                         </div>
 
                         <div class="form-group">
-                            <label class="text-capitalize">{{ $t('setup.username') }}</label>
+                            <label class="text-capitalize">{{ $t('username') }}</label>
                             <input @keyup="canSubmit" v-model="setup.username" id="username" type="text" class="form-control" placeholder="admin" required>
                         </div>
 
                         <div class="form-group">
-                            <label class="text-capitalize">{{ $t('setup.password') }}</label>
+                            <label class="text-capitalize">{{ $t('password') }}</label>
                             <input @keyup="canSubmit" v-model="setup.password" id="password" type="password" class="form-control" placeholder="password" required>
                         </div>
 
                         <div class="form-group">
-                            <label class="text-capitalize">{{ $t('setup.password_confirm') }}</label>
+                            <label class="text-capitalize">{{ $t('confirm_password') }}</label>
                             <input @keyup="canSubmit" v-model="setup.confirm_password" id="password_confirm" type="password" class="form-control" placeholder="password" required>
                             <span v-if="passnomatch" class="small text-danger">Both passwords should match</span>
                         </div>
@@ -110,14 +113,14 @@
                                     <input @keyup="canSubmit" v-model="setup.email" id="email" type="text" class="form-control" placeholder="myemail@domain.com">
                                 </div>
                                 <div class="col-4 text-right">
-                                    <label class="d-none d-sm-block text-capitalize text-capitalize">{{ $t('setup.newsletter') }}</label>
+                                    <label class="d-none d-sm-block text-capitalize text-capitalize">{{ $t('newsletter') }}</label>
                                     <span @click="setup.newsletter = !!setup.newsletter" class="switch">
                                       <input v-model="setup.newsletter" type="checkbox" name="send_newsletter" class="switch" id="send_newsletter" :checked="setup.newsletter">
                                       <label for="send_newsletter"></label>
                                     </span>
                                 </div>
                             </div>
-                            <small>{{ $t('setup.newsletter_note') }}</small>
+                            <small>{{ $t('newsletter_note') }}</small>
                         </div>
                     </div>
 
@@ -125,9 +128,11 @@
                         {{error}}
                     </div>
 
-                    <button @click.prevent="saveSetup" v-bind:disabled="disabled || loading" type="submit" class="btn btn-primary btn-block" :class="{'btn-primary': !loading, 'btn-default': loading}">
-                        <font-awesome-icon v-if="loading" icon="circle-notch" class="mr-2" spin/>{{loading ? "Loading..." : "Save Settings"}}
-                    </button>
+                    <div class="col-12">
+                        <button @click.prevent="saveSetup" v-bind:disabled="disabled || loading" type="submit" class="btn btn-primary btn-block" :class="{'btn-primary': !loading, 'btn-default': loading}">
+                            <font-awesome-icon v-if="loading" icon="circle-notch" class="mr-2" spin/>{{loading ? $t('loading') : $t('save_settings')}}
+                        </button>
+                    </div>
                 </div>
             </form>
 
@@ -137,7 +142,6 @@
 
 <script>
   import Api from "../API";
-  import Index from "../pages/Index";
 
   export default {
   name: 'Setup',
diff --git a/frontend/src/forms/User.vue b/frontend/src/forms/User.vue
index d3251bfe..8380969f 100644
--- a/frontend/src/forms/User.vue
+++ b/frontend/src/forms/User.vue
@@ -1,6 +1,6 @@
 <template>
-    <div class="card contain-card text-black-50 bg-white mb-3">
-        <div class="card-header"> {{user.id ? `Update ${user.username}` : "Create User"}}
+    <div class="card contain-card mb-3">
+        <div class="card-header"> {{user.id ? `${$t('update')} ${user.username}` : $t('user_create')}}
             <transition name="slide-fade">
                 <button @click.prevent="removeEdit" v-if="user.id" class="btn btn-sm float-right btn-danger btn-sm">Close</button>
             </transition>
@@ -8,31 +8,31 @@
         <div class="card-body">
     <form @submit="saveUser">
         <div class="form-group row">
-            <label class="col-sm-4 col-form-label">Username</label>
+            <label class="col-sm-4 col-form-label">{{$t('username')}}</label>
             <div class="col-6 col-md-4">
                 <input v-model="user.username" type="text" class="form-control" id="username" placeholder="Username" required autocorrect="off" autocapitalize="none" v-bind:readonly="user.id">
             </div>
             <div class="col-6 col-md-4">
                   <span id="admin_switch" @click="user.admin = !!user.admin" class="switch">
                     <input v-model="user.admin" type="checkbox" class="switch" id="user_admin_switch" v-bind:checked="user.admin">
-                    <label for="user_admin_switch">Administrator</label>
+                    <label for="user_admin_switch">{{$t('administrator')}}</label>
                   </span>
             </div>
         </div>
         <div class="form-group row">
-            <label for="email" class="col-sm-4 col-form-label">Email Address</label>
+            <label for="email" class="col-sm-4 col-form-label">{{$t('email')}}</label>
             <div class="col-sm-8">
                 <input v-model="user.email" type="email" class="form-control" id="email" placeholder="user@domain.com" required autocapitalize="none" spellcheck="false">
             </div>
         </div>
         <div class="form-group row">
-            <label class="col-sm-4 col-form-label">Password</label>
+            <label class="col-sm-4 col-form-label">{{$t('password')}}</label>
             <div class="col-sm-8">
                 <input v-model="user.password" type="password" id="password" class="form-control" placeholder="Password" required>
             </div>
         </div>
         <div class="form-group row">
-            <label class="col-sm-4 col-form-label">Confirm Password</label>
+            <label class="col-sm-4 col-form-label">{{$t('confirm_password')}}</label>
             <div class="col-sm-8">
                 <input v-model="user.confirm_password" type="password" id="password_confirm" class="form-control" placeholder="Confirm Password" required>
             </div>
@@ -54,7 +54,7 @@
                         class="btn-primary"
                         :disabled="loading || !user.username || !user.email || !user.password || !user.confirm_password || (user.password !== user.confirm_password)"
                         :action="saveUser"
-                        :label="user.id ? 'Update User' : 'Create User'"
+                        :label="user.id ? $t('user_update'): $t('user_create')"
                 />
             </div>
         </div>
@@ -66,7 +66,7 @@
 
 <script>
   import Api from "../API";
-  import LoadButton from "@/components/Elements/LoadButton";
+  const LoadButton = () => import(/* webpackChunkName: "index" */ "@/components/Elements/LoadButton");
 
   export default {
   name: 'FormUser',
diff --git a/frontend/src/icons.js b/frontend/src/icons.js
index b61a4260..91e7c3bc 100644
--- a/frontend/src/icons.js
+++ b/frontend/src/icons.js
@@ -1,7 +1,6 @@
 import {library} from '@fortawesome/fontawesome-svg-core'
 import {fas} from '@fortawesome/fontawesome-free-solid';
 import {fab} from '@fortawesome/free-brands-svg-icons';
-import {far} from '@fortawesome/fontawesome-svg-core';
 import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome'
 import Vue from "vue";
 
diff --git a/frontend/src/languages/chinese.js b/frontend/src/languages/chinese.js
new file mode 100755
index 00000000..e594cf48
--- /dev/null
+++ b/frontend/src/languages/chinese.js
@@ -0,0 +1,142 @@
+const chinese = {
+    settings: "设置",
+    dashboard: "仪表板",
+    services: "服务",
+    service: "服务",
+    failures: "失败",
+    users: "用户",
+    login: "登录",
+    logout: "注销",
+    online: "在线",
+    offline: "离线",
+    configs: "配置",
+    username: "用户名",
+    password: "密码",
+    email: "电子邮件",
+    confirm_password: "确认密码",
+    uptime: "正常运行时间",
+    name: "名称",
+    copy: "复制",
+    close: "关",
+    secret: "秘密",
+    regen_api: "重新生成 API 密钥",
+    regen_desc: "API 密码用于读取创建更新和删除路由。如果需要，您可以重新生成 API 密钥。",
+    visibility: "可见性",
+    group: "小组",
+    group_create: "创建组",
+    group_update: "更新组",
+    group_public_desc: "向公众显示群组服务",
+    groups: "组",
+    no_group: "无组",
+    public: "公共",
+    private: "私人",
+    announcements: "公告",
+    notifiers: "通告程序",
+    logs: "日志",
+    help: "帮助",
+    type: "类型",
+    edit: "编辑",
+    update: "更新",
+    create: "创建",
+    view: "查看",
+    save: "保存",
+    title: "标题",
+    status: "状态",
+    begins: "开始",
+    total_services: "服务总数",
+    online_services: "在线服务",
+    request_timeout: "请求超时",
+    service_never_online: "服务从未在线",
+    service_online_check: "在线检查",
+    service_offline_time: "服务已脱机",
+    days_ago: "天前",
+    today: "今天",
+    week: "周",
+    month: "月份",
+    day: "日",
+    hour: "小时",
+    minute: "分钟",
+    failures_24_hours: "过去 24 小时失败",
+    no_services: "您目前没有任何服务！",
+    theme: "主题",
+    cache: "高速缓存",
+    authentication: "身份验证",
+    import: "导入",
+    main_settings: "主要设置",
+    variables: "变量",
+    docs: "文档",
+    links: "链接",
+    changelog: "更改日志",
+    repo: "存储库",
+    language: "语言",
+    db_connection: "数据库连接",
+    db_host: "数据库主机",
+    db_port: "数据库端口",
+    db_username: "数据库用户名",
+    db_password: "数据库口令",
+    db_database: "数据库名称",
+    send_reports: "发送错误报告",
+    send_reports_desc: "将错误发送到 “状态” 以进行调试",
+    project_name: "状态页面名称",
+    description: "说明",
+    domain: "域",
+    enable_cdn: "启用 CDN",
+    newsletter: "新闻通讯",
+    newsletter_note: "我们只会向您发送重大变更的电子邮件",
+    loading: "正在加载",
+    save_settings: "保存设置",
+    average_response: "平均响应",
+    last_uptime: "上次正常运行时间",
+    sign_in: "登录",
+    last_login: "上次登录",
+    admin: "管理员",
+    user: "用户",
+    failed: "失败",
+    wrong_login: "用户名或密码不正确",
+    theme_editor: "主题编辑器",
+    enable_assets: "启用本地资产",
+    assets_desc: "通过启用本地资产自定义状态页面设计。这将创建一个包含所有 CSS 的 “资产” 目录。",
+    assets_btn: "启用本地资产",
+    assets_loading: "创建资产",
+    assets_dir: "资产目录",
+    footer: "页脚",
+    footer_notes: "您可以在页脚中使用 HTML 标签",
+    global_announcement: "全球公告",
+    announcement_date: "公告日期范围",
+    notify_users: "通知用户",
+    notify_desc: "在计划时间之前通知用户",
+    notify_method: "通知方法",
+    notify_before: "之前通知",
+    message_create: "创建公告",
+    message_edit: "编辑公告",
+    minutes: "分钟",
+    hours: "小时数",
+    days: "天数",
+    user_create: "创建用户",
+    user_update: "更新用户",
+    administrator: "管理员",
+    checkins: "车臣金斯",
+    incidents: "事件",
+    service_info: "服务信息",
+    service_name: "服务名称",
+    service_type: "服务类型",
+    permalink: "永久链接 URL",
+    service_public: "公共服务",
+    check_interval: "检查间隔",
+    service_endpoint: "服务终端节点",
+    service_check: "服务检查类型",
+    service_timeout: "请求超时",
+    expected_resp: "预期响应",
+    expected_code: "预期状态代码",
+    follow_redir: "跟随重定向",
+    verify_ssl: "验证 SSL",
+    tls_cert: "使用 TLS 证书",
+    notification_opts: "通知选项",
+    notifications_enable: "启用通知",
+    notify_after: "故障后通知",
+    notify_all: "通知所有更改",
+    service_update: "更新服务",
+    service_create: "创建服务"
+}
+
+export default chinese
\ No newline at end of file
diff --git a/frontend/src/languages/data.csv b/frontend/src/languages/data.csv
new file mode 100644
index 00000000..cc8aa51b
--- /dev/null
+++ b/frontend/src/languages/data.csv
@@ -0,0 +1,139 @@
+key,en
+settings,Settings
+dashboard,Dashboard
+services,Services
+service,Service
+failures,Failures
+users,Users
+login,Login
+logout,Logout
+online,Online
+offline,Offline
+configs,Configuration
+username,Username
+password,Password
+email,Email
+confirm_password,Confirm Password
+uptime,Uptime
+name,Name
+copy,Copy
+close,Close
+secret,Secret
+regen_api,Regenerate API Keys
+regen_desc,API Secret is used for read create update and delete routes. You can Regenerate API Keys if you need to.
+visibility,Visibility
+group,Group
+group_create,Create Group
+group_update,Update Group
+group_public_desc,Show group services to the public
+groups,Groups
+no_group,No Group
+public,Public
+private,Private
+announcements,Announcements
+notifiers,Notifiers
+logs,Logs
+help,Help
+type,Type
+edit,Edit
+update,Update
+create,Create
+view,View
+save,Save
+title,Title
+status,Status
+begins,Begins
+total_services,Total Services
+online_services,Online Services
+request_timeout,Request Timeout
+service_never_online,Service has never been online
+service_online_check,Online checked
+service_offline_time,Service has been offline for
+days_ago,Days Ago
+today,Today
+week,Week
+month,Month
+day,Day
+hour,Hour
+minute,Minute
+failures_24_hours,Failures last 24 hours
+no_services,You currently don't have any services!
+theme,Theme
+cache,Cache
+authentication,Authentication
+import,Import
+main_settings,Main Settings
+variables,Variables
+docs,Documentation
+links,Links
+changelog,Change Log
+repo,Repository
+language,Language
+db_connection,Database Connection
+db_host,Database Host
+db_port,Database Port
+db_username,Database Username
+db_password,Database Password
+db_database,Database Name
+send_reports,Send Error Reports
+send_reports_desc,Send errors to Statping for debugging
+project_name,Status Page Name
+description,Description
+domain,Domain
+enable_cdn,Enable CDN
+newsletter,Newsletter
+newsletter_note,We will only send you an email for major changes
+loading,Loading
+save_settings,Save Settings
+average_response,Average Response
+last_uptime,Uptime last
+sign_in,Sign In
+last_login,Last Login
+admin,Admin
+user,User
+failed,Failed
+wrong_login,Incorrect username or password
+theme_editor,Theme Editor
+enable_assets,Enable Local Assets
+assets_desc,Customize your status page design by enabling local assets. This will create a 'assets' directory containing all CSS.
+assets_btn,Enable Local Assets
+assets_loading,Creating Assets
+assets_dir,Assets Directory
+footer,Footer
+footer_notes,You can use HTML tags in footer
+global_announcement,Global Announcement
+announcement_date,Announcement Date Range
+notify_users,Notify Users
+notify_desc,Notify Users Before Scheduled Time
+notify_method,Notification Method
+notify_before,Notify Before
+message_create,Create Announcement
+message_edit,Edit Announcement
+minutes,Minutes
+hours,Hours
+days,Days
+user_create,Create User
+user_update,Update User
+administrator,Administrator
+checkins,Checkins
+incidents,Incidents
+service_info,Service Info
+service_name,Service Name
+service_type,Service Type
+permalink,Permalink URL
+service_public,Public Service
+check_interval,Check Interval
+service_endpoint,Service Endpoint
+service_check,Service Check Type
+service_timeout,Request Timeout
+expected_resp,Expected Response
+expected_code,Expected Status Code
+follow_redir,Follow Redirects
+verify_ssl,Verify SSL
+tls_cert,Use TLS Cert
+notification_opts,Notification Options
+notifications_enable,Enable Notifications
+notify_after,Notify After Failures
+notify_all,Notify All Changes
+service_update,Update Service
+service_create,Create Service
diff --git a/frontend/src/languages/english.js b/frontend/src/languages/english.js
index 45b06a61..cd34b643 100644
--- a/frontend/src/languages/english.js
+++ b/frontend/src/languages/english.js
@@ -1,100 +1,142 @@
 const english = {
-  top_nav: {
+    settings: "Settings",
     dashboard: "Dashboard",
     services: "Services",
+    service: "Service",
+    failures: "Failures",
     users: "Users",
+    login: "Login",
+    logout: "Logout",
+    online: "Online",
+    offline: "Offline",
+    configs: "Configuration",
+    username: "Username",
+    password: "Password",
+    email: "Email",
+    confirm_password: "Confirm Password",
+    uptime: "Uptime",
+    name: "Name",
+    copy: "Copy",
+    close: "Close",
+    secret: "Secret",
+    regen_api: "Regenerate API Keys",
+    regen_desc: "API Secret is used for read create update and delete routes. You can Regenerate API Keys if you need to.",
+    visibility: "Visibility",
+    group: "Group",
+    group_create: "Create Group",
+    group_update: "Update Group",
+    group_public_desc: "Show group services to the public",
     groups: "Groups",
+    no_group: "No Group",
+    public: "Public",
+    private: "Private",
     announcements: "Announcements",
-    settings: "Settings",
+    notifiers: "Notifiers",
     logs: "Logs",
-    logout: 'Logout',
-  },
-  setup: {
-    language: "Language",
-    connection: "Database Connection",
-    host: "Host",
-    database: "Database",
-    project_name: "Project Name",
-    project_description: "Project Description",
-    domain: "Domain URL",
-    username: "Admin Username",
-    password: "Admin Password",
-    password_confirm: "Confirm Admin Password",
-    newsletter: "Newsletter",
-    newsletter_note: "We will not share your email, emails are only for major updates.",
-    send_reports: "Send Error Reports to Statping"
-  },
-  dashboard: {
+    help: "Help",
+    type: "Type",
+    edit: "Edit",
+    update: "Update",
+    create: "Create",
+    view: "View",
+    save: "Save",
+    title: "Title",
+    status: "Status",
+    begins: "Begins",
     total_services: "Total Services",
-    failures_24_hours: "Failures last 24 Hours",
     online_services: "Online Services",
-    service: 'Service | Services',
-    group: 'Group',
-    title: 'Title',
-    begins: 'Begins',
-    name: 'Name',
-    loading: 'Loading',
-    login: 'Login',
-    sign_in: "Sign In",
-    visibility: 'Visibility',
-    wrong_login: 'Incorrect username or password'
-  },
-  settings: {
-    name: "Project Name",
-    description: "Project Name",
-    footer: "Custom Footer",
-    footer_notes: "HTML is allowed inside the footer",
-    error_reporting: "Enable Error Reporting",
-    error_reporting_notes: "Help the Statping project out by sending anonymous error logs back to our server.",
-    save: "Save Settings",
-    main: "Main Settings",
-    theme: "Theme Editor",
+    request_timeout: "Request Timeout",
+    service_never_online: "Service has never been online",
+    service_online_check: "Online checked",
+    service_offline_time: "Service has been offline for",
+    days_ago: "Days Ago",
+    today: "Today",
+    week: "Week",
+    month: "Month",
+    day: "Day",
+    hour: "Hour",
+    minute: "Minute",
+    failures_24_hours: "Failures last 24 hours",
+    no_services: "You currently don't have any services!",
+    theme: "Theme",
     cache: "Cache",
-    oauth: "OAuth",
-    beta: "BETA",
-    changelog: "Changelog",
-    repo: "Statping Github Repo",
+    authentication: "Authentication",
+    import: "Import",
+    main_settings: "Main Settings",
+    variables: "Variables",
     docs: "Documentation",
-  },
-  service: {
-    name: "Service Name",
-    type: "Service Type",
-    info: "Service Information",
-    view: "View Service",
-    average: "Average Response",
-    last_uptime: "Uptime last {0} {1}",
-  },
-  email: "Email Address",
-  port: "Database Port",
-  setting: "Settings",
-  username: "Username",
-  password: 'Password',
-  services: 'Services',
-  domain: 'Domain',
-  online: 'online',
-  public: 'Public',
-  private: 'Private',
-  admin: 'Admin',
-  offline: 'offline',
-  failure: 'failure | failures',
-  incident: 'incident | incidents',
-  checkin: 'checkin | checkins',
-  user: 'User | Users',
-  group: 'Group',
-  message: 'message',
-  edit: 'Edit',
-  type: 'Type',
-  sample_data: 'Sample Data',
-  today: 'Today',
-  last_login: 'Last Login',
-  uptime: '{0}% Uptime',
-  close: 'Close',
-  second: 'second | seconds',
-  minute: 'minute | minutes',
-  hour: 'hour | hours',
-  day: 'day | days',
-  week: 'week | weeks',
-  month: 'month | months',
+    links: "Links",
+    changelog: "Change Log",
+    repo: "Repository",
+    language: "Language",
+    db_connection: "Database Connection",
+    db_host: "Database Host",
+    db_port: "Database Port",
+    db_username: "Database Username",
+    db_password: "Database Password",
+    db_database: "Database Name",
+    send_reports: "Send Error Reports",
+    send_reports_desc: "Send errors to Statping for debugging",
+    project_name: "Status Page Name",
+    description: "Description",
+    domain: "Domain",
+    enable_cdn: "Enable CDN",
+    newsletter: "Newsletter",
+    newsletter_note: "We will only send you an email for major changes",
+    loading: "Loading",
+    save_settings: "Save Settings",
+    average_response: "Average Response",
+    last_uptime: "Uptime last",
+    sign_in: "Sign In",
+    last_login: "Last Login",
+    admin: "Admin",
+    user: "User",
+    failed: "Failed",
+    wrong_login: "Incorrect username or password",
+    theme_editor: "Theme Editor",
+    enable_assets: "Enable Local Assets",
+    assets_desc: "Customize your status page design by enabling local assets. This will create a 'assets' directory containing all CSS.",
+    assets_btn: "Enable Local Assets",
+    assets_loading: "Creating Assets",
+    assets_dir: "Assets Directory",
+    footer: "Footer",
+    footer_notes: "You can use HTML tags in footer",
+    global_announcement: "Global Announcement",
+    announcement_date: "Announcement Date Range",
+    notify_users: "Notify Users",
+    notify_desc: "Notify Users Before Scheduled Time",
+    notify_method: "Notification Method",
+    notify_before: "Notify Before",
+    message_create: "Create Announcement",
+    message_edit: "Edit Announcement",
+    minutes: "Minutes",
+    hours: "Hours",
+    days: "Days",
+    user_create: "Create User",
+    user_update: "Update User",
+    administrator: "Administrator",
+    checkins: "Checkins",
+    incidents: "Incidents",
+    service_info: "Service Info",
+    service_name: "Service Name",
+    service_type: "Service Type",
+    permalink: "Permalink URL",
+    service_public: "Public Service",
+    check_interval: "Check Interval",
+    service_endpoint: "Service Endpoint",
+    service_check: "Service Check Type",
+    service_timeout: "Request Timeout",
+    expected_resp: "Expected Response",
+    expected_code: "Expected Status Code",
+    follow_redir: "Follow Redirects",
+    verify_ssl: "Verify SSL",
+    tls_cert: "Use TLS Cert",
+    notification_opts: "Notification Options",
+    notifications_enable: "Enable Notifications",
+    notify_after: "Notify After Failures",
+    notify_all: "Notify All Changes",
+    service_update: "Update Service",
+    service_create: "Create Service"
 }
 
-export default english
+export default english
\ No newline at end of file
diff --git a/frontend/src/languages/french.js b/frontend/src/languages/french.js
index 5ce86045..4115f01c 100644
--- a/frontend/src/languages/french.js
+++ b/frontend/src/languages/french.js
@@ -1,100 +1,142 @@
 const french = {
-  top_nav: {
-    dashboard: "Dashboard",
+    settings: "Paramètres",
+    dashboard: "Tableau de bord",
     services: "Services",
-    users: "Users",
-    groups: "Groups",
-    announcements: "Announcements",
-    settings: "Settings",
-    logs: "Logs",
-    logout: 'Logout',
-  },
-  setup: {
-    language: "Language",
-    connection: "Database Connection",
-    host: "Host",
-    database: "Database",
-    project_name: "Project Name",
-    project_description: "Project Description",
-    domain: "Domain URL",
-    username: "Admin Username",
-    password: "Admin Password",
-    password_confirm: "Confirm Admin Password",
-    newsletter: "Newsletter",
-    newsletter_note: "We will not share your email, emails are only for major updates.",
-    send_reports: "Send Error Reports to Statping"
-  },
-  dashboard: {
-    total_services: "Total Services",
-    failures_24_hours: "Failures last 24 Hours",
-    online_services: "Online Services",
-    service: 'Service | Services',
-    group: 'Group',
-    title: 'Title',
-    begins: 'Begins',
-    name: 'Name',
-    loading: 'Loading',
-    login: 'Login',
-    sign_in: "Sign In",
-    visibility: 'Visibility',
-    wrong_login: 'Incorrect username or password'
-  },
-  settings: {
-    name: "Project Name",
-    description: "Project Name",
-    footer: "Custom Footer",
-    footer_notes: "HTML is allowed inside the footer",
-    error_reporting: "Enable Error Reporting",
-    error_reporting_notes: "Help the Statping project out by sending anonymous error logs back to our server.",
-    save: "Save Settings",
-    main: "Main Settings",
-    theme: "Theme Editor",
+    service: "Service",
+    failures: "Échecs",
+    users: "Utilisateurs",
+    login: "Identifiant",
+    logout: "Déconnexion",
+    online: "En ligne",
+    offline: "Offline",
+    configs: "Configuration",
+    username: "Nom d'utilisateur",
+    password: "mot de passe",
+    email: "Email",
+    confirm_password: "Confirmer le",
+    uptime: "Temps de disponibilité",
+    name: "Nom",
+    copy: "Copie",
+    close: "Fermer",
+    secret: "Secret",
+    regen_api: "Régénérer les clés d'API",
+    regen_desc: "API Secret est utilisé pour lire créer des routes de mise à jour et de suppression. Vous pouvez Régénérer les clés d'API si vous en avez besoin.",
+    visibility: "Visibilité",
+    group: "Groupe",
+    group_create: "Créer un groupe",
+    group_update: "Groupe Mettre à jour",
+    group_public_desc: "Afficher les services de groupe au public",
+    groups: "Groupes",
+    no_group: "Pas de groupe",
+    public: "Publique",
+    private: "Privé",
+    announcements: "Annonces",
+    notifiers: "Notifiants",
+    logs: "Journaux",
+    help: "Aider",
+    type: "Type",
+    edit: "Éditer",
+    update: "Mise à jour",
+    create: "Créer",
+    view: "Voir",
+    save: "Sauvegarder",
+    title: "Titre",
+    status: "Statut",
+    begins: "Commence",
+    total_services: "Total des services",
+    online_services: "Services en ligne",
+    request_timeout: "Délai d'attente de",
+    service_never_online: "Le service n'a jamais été en ligne",
+    service_online_check: "Vérifié en ligne",
+    service_offline_time: "Le service a été hors ligne pour",
+    days_ago: "Il y a jours",
+    today: "Aujourd'hui",
+    week: "Semaine",
+    month: "Mois",
+    day: "Jour",
+    hour: "Heure",
+    minute: "Minute",
+    failures_24_hours: "Les échecs durent 24 heures",
+    no_services: "Vous n'avez actuellement aucun service !",
+    theme: "Thème",
     cache: "Cache",
-    oauth: "OAuth",
-    beta: "BETA",
-    changelog: "Changelog",
-    repo: "Statping Github Repo",
+    authentication: "Authentification",
+    import: "Importer",
+    main_settings: "Paramètres principaux",
+    variables: "Variables",
     docs: "Documentation",
-  },
-  service: {
-    name: "Service Name",
-    type: "Service Type",
-    info: "Service Information",
-    view: "View Service",
-    average: "Average Response",
-    last_uptime: "Uptime last {0} {1}",
-  },
-  email: "Email Address",
-  port: "Database Port",
-  setting: "Settings",
-  username: "Username",
-  password: 'Password',
-  services: 'Services',
-  domain: 'Domain',
-  online: 'online',
-  public: 'Public',
-  private: 'Private',
-  admin: 'Admin',
-  offline: 'offline',
-  failure: 'failure | failures',
-  incident: 'incident | incidents',
-  checkin: 'checkin | checkins',
-  user: 'User | Users',
-  group: 'Group',
-  message: 'message',
-  edit: 'Edit',
-  type: 'Type',
-  sample_data: 'Sample Data',
-  today: 'Today',
-  last_login: 'Last Login',
-  uptime: '{0}% Uptime',
-  close: 'Close',
-  second: 'second | seconds',
-  minute: 'minute | minutes',
-  hour: 'hour | hours',
-  day: 'day | days',
-  week: 'week | weeks',
-  month: 'month | months',
+    links: "Links",
+    changelog: "Journal des modifications",
+    repo: "Référentiel",
+    language: "Langue",
+    db_connection: "Connexion à la base",
+    db_host: "Hôte de base",
+    db_port: "Port base de données",
+    db_username: "Nom utilisateur de base",
+    db_password: "Mot de passe",
+    db_database: "Nom de la base",
+    send_reports: "Envoyer des rapports d'erreurs",
+    send_reports_desc: "Envoyer des erreurs à Statping pour le débogage",
+    project_name: "Nom de la page d'état",
+    description: "Description",
+    domain: "Domaine",
+    enable_cdn: "Activer le CDN",
+    newsletter: "Bulletin",
+    newsletter_note: "Nous ne vous enverrons qu'un e-mail pour les modifications majeures",
+    loading: "Chargement",
+    save_settings: "Enregistrer les paramètres",
+    average_response: "Réponse moyenne",
+    last_uptime: "Temps de disponibilité dernier",
+    sign_in: "Se connecter",
+    last_login: "Dernière connexion",
+    admin: "Admin",
+    user: "Utilisateur",
+    failed: "Échec",
+    wrong_login: "Nom d'utilisateur ou mot de passe",
+    theme_editor: "Editeur de thème",
+    enable_assets: "Activer les actifs locaux",
+    assets_desc: "Personnalisez la conception de votre page d'état en activant les ressources locales. Cela va créer un répertoire 'assets' contenant tous les CSS.",
+    assets_btn: "Activer les actifs locaux",
+    assets_loading: "Création d'actifs",
+    assets_dir: "Répertoire des actifs",
+    footer: "Pied de page",
+    footer_notes: "Vous pouvez utiliser des balises HTML dans le pied de page",
+    global_announcement: "Annonce mondiale",
+    announcement_date: "Fourchette de dates d'annonce",
+    notify_users: "Aviser les utilisateurs",
+    notify_desc: "Avertir les utilisateurs avant l'heure prévue",
+    notify_method: "Méthode de notification",
+    notify_before: "Avertir avant",
+    message_create: "Créer une annonce",
+    message_edit: "Modifier l'annonce",
+    minutes: "Procès-Verbal",
+    hours: "Heures",
+    days: "Jours",
+    user_create: "Créer un utilisateur",
+    user_update: "Mise à jour utilisateur",
+    administrator: "Administrateur",
+    checkins: "Checkins",
+    incidents: "Incidents",
+    service_info: "Informations sur le service",
+    service_name: "Nom du service",
+    service_type: "Type de service",
+    permalink: "URL Permalien",
+    service_public: "Fonction publique",
+    check_interval: "Période de vérification",
+    service_endpoint: "Point de terminaison de service",
+    service_check: "Type de vérification de service",
+    service_timeout: "Délai d'attente de",
+    expected_resp: "Réponse attendue",
+    expected_code: "Code d'état attendu",
+    follow_redir: "Suivre les redirections",
+    verify_ssl: "Vérifier SSL",
+    tls_cert: "Utiliser le certificat TLS",
+    notification_opts: "Options de notification",
+    notifications_enable: "Activer les notifications",
+    notify_after: "Notification après les échecs",
+    notify_all: "Notifier toutes les modifications",
+    service_update: "Mise à jour Service",
+    service_create: "Créer un service"
 }
 
-export default french
+export default french
\ No newline at end of file
diff --git a/frontend/src/languages/german.js b/frontend/src/languages/german.js
index a828e7cf..e9f80593 100644
--- a/frontend/src/languages/german.js
+++ b/frontend/src/languages/german.js
@@ -1,100 +1,142 @@
 const german = {
-  top_nav: {
-    dashboard: "Dashboard",
-    services: "Services",
-    users: "Users",
-    groups: "Groups",
-    announcements: "Announcements",
-    settings: "Settings",
-    logs: "Logs",
-    logout: 'Logout',
-  },
-  setup: {
-    language: "Language",
-    connection: "Database Connection",
-    host: "Host",
-    database: "Database",
-    project_name: "Project Name",
-    project_description: "Project Description",
-    domain: "Domain URL",
-    username: "Admin Username",
-    password: "Admin Password",
-    password_confirm: "Confirm Admin Password",
-    newsletter: "Newsletter",
-    newsletter_note: "We will not share your email, emails are only for major updates.",
-    send_reports: "Send Error Reports to Statping"
-  },
-  dashboard: {
-    total_services: "Total Services",
-    failures_24_hours: "Failures last 24 Hours",
-    online_services: "Online Services",
-    service: 'Service | Services',
-    group: 'Group',
-    title: 'Title',
-    begins: 'Begins',
-    name: 'Name',
-    loading: 'Loading',
-    login: 'Login',
-    sign_in: "Sign In",
-    visibility: 'Visibility',
-    wrong_login: 'Incorrect username or password'
-  },
-  settings: {
-    name: "Project Name",
-    description: "Project Name",
-    footer: "Custom Footer",
-    footer_notes: "HTML is allowed inside the footer",
-    error_reporting: "Enable Error Reporting",
-    error_reporting_notes: "Help the Statping project out by sending anonymous error logs back to our server.",
-    save: "Save Settings",
-    main: "Main Settings",
-    theme: "Theme Editor",
+    settings: "Einstellungen",
+    dashboard: "Armaturenbrett",
+    services: "Dienstleistungen",
+    service: "Service",
+    failures: "Ausfälle",
+    users: "Benutzer",
+    login: "Login",
+    logout: "Abmelden",
+    online: "Online",
+    offline: "Offline",
+    configs: "Konfiguration",
+    username: "Benutzername",
+    password: "Kennwort",
+    email: "Mail",
+    confirm_password: "Passwort bestätigen",
+    uptime: "Betriebszeit",
+    name: "Name",
+    copy: "Kopie",
+    close: "Schließen",
+    secret: "Geheimnis",
+    regen_api: "API-Schlüssel neu generieren",
+    regen_desc: "API Secret wird für Lesen erstellen Update und Löschen Routen verwendet. Sie können API-Schlüssel bei Bedarf neu generieren.",
+    visibility: "Sichtbarkeit",
+    group: "Gruppe",
+    group_create: "Gruppe erstellen",
+    group_update: "Gruppe aktualisieren",
+    group_public_desc: "Gruppendienste für die Öffentlichkeit anzeigen",
+    groups: "Gruppen",
+    no_group: "Keine Gruppe",
+    public: "Öffentlichkeit",
+    private: "Privat",
+    announcements: "Ankündigungen",
+    notifiers: "Notifizierer",
+    logs: "Protokolle",
+    help: "Helfen",
+    type: "Typ",
+    edit: "Bearbeiten",
+    update: "Update",
+    create: "Schaffen",
+    view: "Ansicht",
+    save: "sparen",
+    title: "Titel",
+    status: "Status",
+    begins: "Beginnt",
+    total_services: "Dienstleistungen insgesamt",
+    online_services: "Online-Dienste",
+    request_timeout: "Zeitüberschreitung anfordern",
+    service_never_online: "Service war noch nie online",
+    service_online_check: "Online geprüft",
+    service_offline_time: "Dienst war offline für",
+    days_ago: "Vor Tagen",
+    today: "Heute",
+    week: "Woche",
+    month: "Monat",
+    day: "Tag",
+    hour: "Stunde",
+    minute: "Minute",
+    failures_24_hours: "Ausfälle dauern 24 Stunden",
+    no_services: "Sie haben derzeit keine Dienste!",
+    theme: "Thema",
     cache: "Cache",
-    oauth: "OAuth",
-    beta: "BETA",
-    changelog: "Changelog",
-    repo: "Statping Github Repo",
-    docs: "Documentation",
-  },
-  service: {
-    name: "Service Name",
-    type: "Service Type",
-    info: "Service Information",
-    view: "View Service",
-    average: "Average Response",
-    last_uptime: "Uptime last {0} {1}",
-  },
-  email: "Email Address",
-  port: "Database Port",
-  setting: "Settings",
-  username: "Username",
-  password: 'Password',
-  services: 'Services',
-  domain: 'Domain',
-  online: 'online',
-  public: 'Public',
-  private: 'Private',
-  admin: 'Admin',
-  offline: 'offline',
-  failure: 'failure | failures',
-  incident: 'incident | incidents',
-  checkin: 'checkin | checkins',
-  user: 'User | Users',
-  group: 'Group',
-  message: 'message',
-  edit: 'Edit',
-  type: 'Type',
-  sample_data: 'Sample Data',
-  today: 'Today',
-  last_login: 'Last Login',
-  uptime: '{0}% Uptime',
-  close: 'Close',
-  second: 'second | seconds',
-  minute: 'minute | minutes',
-  hour: 'hour | hours',
-  day: 'day | days',
-  week: 'week | weeks',
-  month: 'month | months',
+    authentication: "Authentifikation",
+    import: "Importieren",
+    main_settings: "Haupteinstellungen",
+    variables: "Variablen",
+    docs: "Dokumentation",
+    links: "Links",
+    changelog: "Protokoll ändern",
+    repo: "Depot",
+    language: "Sprache",
+    db_connection: "Datenbankverbindung",
+    db_host: "Datenbank-Host",
+    db_port: "Datenbank-Port",
+    db_username: "Datenbank-Benutzername",
+    db_password: "Datenbank-Kennwort",
+    db_database: "Name der Datenbank",
+    send_reports: "Fehlerberichte senden",
+    send_reports_desc: "Fehler zum Debuggen an Statping senden",
+    project_name: "Name der Seite „Status“",
+    description: "Beschreibung",
+    domain: "Domäne",
+    enable_cdn: "CDN aktivieren",
+    newsletter: "Newsletter",
+    newsletter_note: "Wir senden Ihnen nur eine E-Mail für größere Änderungen",
+    loading: "Laden",
+    save_settings: "Einstellungen speichern",
+    average_response: "Durchschnittliche Antwort",
+    last_uptime: "Betriebszeit zuletzt",
+    sign_in: "Anmelden",
+    last_login: "Letzte Anmeldung",
+    admin: "Admin",
+    user: "Benutzer",
+    failed: "Fehlgeschlagen",
+    wrong_login: "Falscher Benutzername oder Passwort",
+    theme_editor: "Theme-Editor",
+    enable_assets: "Lokale Assets aktivieren",
+    assets_desc: "Passen Sie das Design Ihrer Statusseite an, indem Sie lokale Elemente aktivieren. Dadurch wird ein Verzeichnis „Assets“ erstellt, das alle CSS enthält.",
+    assets_btn: "Lokale Assets aktivieren",
+    assets_loading: "Erstellen von Assets",
+    assets_dir: "Assets Verzeichnis",
+    footer: "Fußzeile",
+    footer_notes: "Sie können HTML-Tags in der Fußzeile verwenden",
+    global_announcement: "Globale Ankündigung",
+    announcement_date: "Datumsbereich für Ankündigung",
+    notify_users: "Benutzer benachrichtigen",
+    notify_desc: "Benutzer vor geplanter Zeit benachrichtigen",
+    notify_method: "Benachrichtigungsmethode",
+    notify_before: "Vor benachrichtigen",
+    message_create: "Ankündigung erstellen",
+    message_edit: "Ankündigung bearbeiten",
+    minutes: "Protokoll",
+    hours: "Stunden",
+    days: "Tage",
+    user_create: "Benutzer erstellen",
+    user_update: "Benutzer aktualisieren",
+    administrator: "Administrator",
+    checkins: "Checkins",
+    incidents: "Vorfälle",
+    service_info: "Service-Info",
+    service_name: "Dienstname",
+    service_type: "Service-Art",
+    permalink: "Permalink-URL",
+    service_public: "Öffentlicher Dienst",
+    check_interval: "Intervall prüfen",
+    service_endpoint: "Service-Endpunkt",
+    service_check: "Service-Prüfungstyp",
+    service_timeout: "Zeitüberschreitung anfordern",
+    expected_resp: "Erwartete Antwort",
+    expected_code: "Erwarteter Statuscode",
+    follow_redir: "Weiterleitungen folgen",
+    verify_ssl: "SSL verifizieren",
+    tls_cert: "TLS-Zertifikat verwenden",
+    notification_opts: "Benachrichtigungsoptionen",
+    notifications_enable: "Benachrichtigungen aktivieren",
+    notify_after: "Benachrichtigung nach Fehlern",
+    notify_all: "Alle Änderungen benachrichtigen",
+    service_update: "Dienst aktualisieren",
+    service_create: "Dienst erstellen"
 }
 
-export default german
+export default german
\ No newline at end of file
diff --git a/frontend/src/languages/index.js b/frontend/src/languages/index.js
index 905a0919..1c13728a 100644
--- a/frontend/src/languages/index.js
+++ b/frontend/src/languages/index.js
@@ -3,6 +3,10 @@ import spanish from "./spanish"
 import german from "./german"
 import russian from "./russian";
 import french from "./french";
+import japanese from "./japanese";
+import chinese from "./chinese";
+import korean from "./korean";
+import italian from "./italian";
 
 const language = {
   en: english,
@@ -10,6 +14,10 @@ const language = {
   de: german,
   ru: russian,
   fr: french,
+  ja: japanese,
+  zh: chinese,
+  ko: korean,
+  it: italian,
 }
 
 export default language
diff --git a/frontend/src/languages/italian.js b/frontend/src/languages/italian.js
new file mode 100755
index 00000000..ccf9a417
--- /dev/null
+++ b/frontend/src/languages/italian.js
@@ -0,0 +1,142 @@
+const italian = {
+    settings: "Impostazioni",
+    dashboard: "cruscotto",
+    services: "Servizi",
+    service: "Servizio",
+    failures: "Fallimenti",
+    users: "Utenti",
+    login: "Login",
+    logout: "Disconnetti",
+    online: "Online",
+    offline: "Offline",
+    configs: "Configurazione",
+    username: "Nome utente",
+    password: "Password",
+    email: "E-mail",
+    confirm_password: "Conferma password",
+    uptime: "Tempi di attività",
+    name: "Nome",
+    copy: "Copia",
+    close: "Vicino",
+    secret: "Segreto",
+    regen_api: "Rigenera chiavi API",
+    regen_desc: "API Secret viene utilizzato per leggere creare aggiornamento ed eliminare route. Se necessario, è possibile rigenerare le chiavi API.",
+    visibility: "Visibilità",
+    group: "Gruppo",
+    group_create: "Crea gruppo",
+    group_update: "Aggiorna gruppo",
+    group_public_desc: "Mostra i servizi di gruppo al pubblico",
+    groups: "Gruppi",
+    no_group: "Nessun gruppo",
+    public: "Pubblico",
+    private: "Privato",
+    announcements: "Comunicazioni",
+    notifiers: "Notificatori",
+    logs: "Log",
+    help: "Guida",
+    type: "Tipo",
+    edit: "Modifica",
+    update: "Aggiorna",
+    create: "Crea",
+    view: "Visualizza",
+    save: "Salvare",
+    title: "Titolo",
+    status: "Stato",
+    begins: "Inizia",
+    total_services: "Totale servizi",
+    online_services: "Servizi online",
+    request_timeout: "Timeout richiesta",
+    service_never_online: "Il servizio non è mai stato online",
+    service_online_check: "Controllato online",
+    service_offline_time: "Il servizio è stato offline per",
+    days_ago: "Giorni fa",
+    today: "Oggi",
+    week: "Settimana",
+    month: "Mese",
+    day: "Giorno",
+    hour: "Ora",
+    minute: "Minuti",
+    failures_24_hours: "Errori nelle ultime 24 ore",
+    no_services: "Al momento non hai alcun servizio!",
+    theme: "Tema",
+    cache: "Cache",
+    authentication: "autenticazione",
+    import: "Importa",
+    main_settings: "Impostazioni principali",
+    variables: "Variabili",
+    docs: "Documentazione",
+    links: "Collegamenti",
+    changelog: "Registro delle modifiche",
+    repo: "repository",
+    language: "Lingua",
+    db_connection: "Connessione al database",
+    db_host: "Host del database",
+    db_port: "Porta del database",
+    db_username: "Nome utente del database",
+    db_password: "Password del database",
+    db_database: "Nome database",
+    send_reports: "Invia segnalazioni errori",
+    send_reports_desc: "Invia errori a Statping per il debug",
+    project_name: "Nome pagina di stato",
+    description: "Descrizione",
+    domain: "Dominio",
+    enable_cdn: "Abilita CDN",
+    newsletter: "Bollettino",
+    newsletter_note: "Ti invieremo solo una e-mail per le modifiche più importanti",
+    loading: "Caricamento",
+    save_settings: "Salva impostazioni",
+    average_response: "Risposta media",
+    last_uptime: "Ultimo tempo di attività",
+    sign_in: "Accedi",
+    last_login: "Ultimo Login",
+    admin: "Amministratore",
+    user: "Utente",
+    failed: "Non riuscito",
+    wrong_login: "Nome utente o password non corretti",
+    theme_editor: "Editor tema",
+    enable_assets: "Abilita risorse locali",
+    assets_desc: "Personalizza la progettazione della pagina di stato abilitando le risorse locali. Questo creerà una directory 'asset' contenente tutti i CSS.",
+    assets_btn: "Abilita risorse locali",
+    assets_loading: "Creazione di risorse",
+    assets_dir: "Directory delle risorse",
+    footer: "Piè di pagina",
+    footer_notes: "È possibile utilizzare i tag HTML nel piè di pagina",
+    global_announcement: "Annuncio globale",
+    announcement_date: "Intervallo di date di annuncio",
+    notify_users: "Notify agli utenti",
+    notify_desc: "Notifichi agli utenti prima dell'ora pianific",
+    notify_method: "Metodo di notifica",
+    notify_before: "Notifichi prima",
+    message_create: "Crea annuncio",
+    message_edit: "Modifica annuncio",
+    minutes: "Minuti",
+    hours: "Ore",
+    days: "Giorni",
+    user_create: "Crea utente",
+    user_update: "Aggiorna utente",
+    administrator: "Amministratore",
+    checkins: "Check-ins",
+    incidents: "Incidenti",
+    service_info: "Info servizio",
+    service_name: "Nome servizio",
+    service_type: "Tipo di servizio",
+    permalink: "URL Permalink",
+    service_public: "Servizio pubblico",
+    check_interval: "Intervallo controllo",
+    service_endpoint: "Endpoint servizio",
+    service_check: "Tipo di controllo del servizio",
+    service_timeout: "Timeout richiesta",
+    expected_resp: "Risposta prevista",
+    expected_code: "Codice di stato previsto",
+    follow_redir: "Segui i reindirizzamenti",
+    verify_ssl: "Verifica SSL",
+    tls_cert: "Usa certificato TLS",
+    notification_opts: "Opzioni di notifica",
+    notifications_enable: "Abilita notifiche",
+    notify_after: "Notify dopo gli errori",
+    notify_all: "Notifichi tutte le modifiche",
+    service_update: "Servizio di aggiornamento",
+    service_create: "Crea servizio"
+}
+
+export default italian
\ No newline at end of file
diff --git a/frontend/src/languages/japanese.js b/frontend/src/languages/japanese.js
new file mode 100755
index 00000000..eed5a90c
--- /dev/null
+++ b/frontend/src/languages/japanese.js
@@ -0,0 +1,142 @@
+const japanese = {
+    settings: "設定",
+    dashboard: "ダッシュボード",
+    services: "サービス",
+    service: "サービス",
+    failures: "障害",
+    users: "ユーザー",
+    login: "ログイン",
+    logout: "ログアウト",
+    online: "オンライン",
+    offline: "オフライン",
+    configs: "構成",
+    username: "ユーザ名",
+    password: "パスワード",
+    email: "Eメール",
+    confirm_password: "パスワードの確認",
+    uptime: "稼働時間",
+    name: "氏名",
+    copy: "コピー",
+    close: "閉じる",
+    secret: "秘密",
+    regen_api: "API キーの再生成",
+    regen_desc: "APIシークレットは、ルート作成の更新と削除の読み込みに使用されます。必要に応じて、API キーを再生成できます。",
+    visibility: "可視性",
+    group: "グループ",
+    group_create: "[グループを作成]",
+    group_update: "[グループを更新]",
+    group_public_desc: "グループサービスを一般公開する",
+    groups: "グループ",
+    no_group: "グループなし",
+    public: "パブリック",
+    private: "私立",
+    announcements: "アナウンス",
+    notifiers: "通知者",
+    logs: "ログ",
+    help: "ヘルプ",
+    type: "タイプ",
+    edit: "編集",
+    update: "更新",
+    create: "作成",
+    view: "ビュー",
+    save: "保存する",
+    title: "タイトル",
+    status: "ステータス",
+    begins: "開始する",
+    total_services: "トータルサービス",
+    online_services: "オンラインサービス",
+    request_timeout: "リクエストのタイムアウト",
+    service_never_online: "サービスがオンラインになったことがない",
+    service_online_check: "オンラインチェック済み",
+    service_offline_time: "のサービスがオフラインになりました",
+    days_ago: "日前",
+    today: "今日",
+    week: "週数",
+    month: "月",
+    day: "日",
+    hour: "アワー",
+    minute: "分",
+    failures_24_hours: "過去 24 時間の障害",
+    no_services: "現在、サービスをお持ちになりません。",
+    theme: "テーマ",
+    cache: "キャッシュ",
+    authentication: "認証",
+    import: "インポート",
+    main_settings: "メイン設定",
+    variables: "変数",
+    docs: "ドキュメント",
+    links: "リンク",
+    changelog: "変更ログ",
+    repo: "リポジトリ",
+    language: "言語",
+    db_connection: "データベース接続",
+    db_host: "データベース・ホスト",
+    db_port: "データベースポート",
+    db_username: "データベースのユーザー名",
+    db_password: "データベースパスワード",
+    db_database: "データベース名",
+    send_reports: "エラーレポートを送信",
+    send_reports_desc: "デバッグのためにエラーを Statping に送信する",
+    project_name: "ステータスページ名",
+    description: "説明",
+    domain: "ドメイン",
+    enable_cdn: "CDN を有効にする",
+    newsletter: "ニュースレター",
+    newsletter_note: "大きな変更についてのみメールをお送りします",
+    loading: "ロード中",
+    save_settings: "設定を保存",
+    average_response: "平均応答",
+    last_uptime: "稼働時間最後",
+    sign_in: "サインイン",
+    last_login: "最終ログイン",
+    admin: "管理者",
+    user: "ユーザー",
+    failed: "失敗しました",
+    wrong_login: "ユーザー名またはパスワードが正しくありません",
+    theme_editor: "テーマ・エディター",
+    enable_assets: "ローカルアセットを有効にする",
+    assets_desc: "ローカルアセットを有効にして、ステータスページのデザインをカスタマイズします。これにより、すべてのCSSを含む「assets」ディレクトリが作成されます。",
+    assets_btn: "ローカルアセットを有効にする",
+    assets_loading: "アセットの作成",
+    assets_dir: "アセットディレクトリ",
+    footer: "フッター",
+    footer_notes: "あなたはフッターにHTMLタグを使用することができます",
+    global_announcement: "グローバル発表",
+    announcement_date: "発表日の範囲",
+    notify_users: "ユーザーに通知",
+    notify_desc: "スケジュールされた時間前にユーザーに通知する",
+    notify_method: "通知方法",
+    notify_before: "前に通知する",
+    message_create: "アナウンスの作成",
+    message_edit: "アナウンスの編集",
+    minutes: "分単位",
+    hours: "時間",
+    days: "日数",
+    user_create: "ユーザーの作成",
+    user_update: "ユーザーの更新",
+    administrator: "管理者",
+    checkins: "チェックイン",
+    incidents: "事変",
+    service_info: "サービス情報",
+    service_name: "サービス名",
+    service_type: "サービスタイプ",
+    permalink: "パーマリンクURL",
+    service_public: "公共サービス",
+    check_interval: "チェック間隔",
+    service_endpoint: "サービスエンドポイント",
+    service_check: "サービス・チェック・タイプ",
+    service_timeout: "リクエストのタイムアウト",
+    expected_resp: "期待される応答",
+    expected_code: "予想されるステータスコード",
+    follow_redir: "リダイレクトに従う",
+    verify_ssl: "SSL の確認",
+    tls_cert: "TLS 証明書を使用",
+    notification_opts: "通知オプション",
+    notifications_enable: "通知を有効にする",
+    notify_after: "障害発生後に通知する",
+    notify_all: "すべての変更を通知",
+    service_update: "サービスの更新",
+    service_create: "サービスの作成"
+}
+
+export default japanese
\ No newline at end of file
diff --git a/frontend/src/languages/korean.js b/frontend/src/languages/korean.js
new file mode 100755
index 00000000..2cba872f
--- /dev/null
+++ b/frontend/src/languages/korean.js
@@ -0,0 +1,142 @@
+const korean = {
+    settings: "설정",
+    dashboard: "대시보드",
+    services: "서비스",
+    service: "서비스",
+    failures: "장애",
+    users: "사용자",
+    login: "로그인",
+    logout: "로그아웃",
+    online: "온라인",
+    offline: "오프라인",
+    configs: "구성",
+    username: "사용자 이름",
+    password: "비밀번호",
+    email: "이메일",
+    confirm_password: "비밀번호 확인",
+    uptime: "가동 시간",
+    name: "이름",
+    copy: "복사",
+    close: "닫기",
+    secret: "비밀",
+    regen_api: "API 키 재생성",
+    regen_desc: "API 비밀은 읽기 생성 업데이트 및 삭제 경로를 위해 사용됩니다.필요한 경우 API 키를 재생성할 수 있습니다.",
+    visibility: "가시성",
+    group: "그룹",
+    group_create: "그룹 만들기",
+    group_update: "그룹 업데이트",
+    group_public_desc: "일반인에게 그룹 서비스 표시",
+    groups: "그룹",
+    no_group: "그룹 없음",
+    public: "공공",
+    private: "비공개",
+    announcements: "공지사항",
+    notifiers: "통지자",
+    logs: "로그",
+    help: "도움말",
+    type: "유형",
+    edit: "편집",
+    update: "업데이트",
+    create: "만들기",
+    view: "보기",
+    save: "저장",
+    title: "제목",
+    status: "상태",
+    begins: "시작",
+    total_services: "총 서비스",
+    online_services: "온라인 서비스",
+    request_timeout: "요청 시간 초과",
+    service_never_online: "서비스는 온라인 적이 없습니다",
+    service_online_check: "온라인 확인",
+    service_offline_time: "서비스가 에 대해 오프라인되었습니다.",
+    days_ago: "일 전",
+    today: "오늘",
+    week: "주",
+    month: "월",
+    day: "일",
+    hour: "시간",
+    minute: "분",
+    failures_24_hours: "지난 24시간 동안 장애 발생",
+    no_services: "현재 서비스가 없습니다!",
+    theme: "테마",
+    cache: "캐시",
+    authentication: "인증",
+    import: "가져오기",
+    main_settings: "주 설정",
+    variables: "변수",
+    docs: "설명서",
+    links: "링크",
+    changelog: "변경 로그",
+    repo: "저장소",
+    language: "언어",
+    db_connection: "데이터베이스 연결",
+    db_host: "데이터베이스 호스트",
+    db_port: "데이터베이스 포트",
+    db_username: "데이터베이스 사용자 이름",
+    db_password: "데이터베이스 암호",
+    db_database: "데이터베이스 이름",
+    send_reports: "오류 보고서 보내기",
+    send_reports_desc: "디버깅을 위해 스태핑에 오류 보내기",
+    project_name: "상태 페이지 이름",
+    description: "설명",
+    domain: "도메인",
+    enable_cdn: "CDN 사용",
+    newsletter: "신제품",
+    newsletter_note: "주요 변경 사항에 대한 이메일만 보내드립니다.",
+    loading: "로드 중",
+    save_settings: "설정 저장",
+    average_response: "평균 응답",
+    last_uptime: "마지막 가동 시간",
+    sign_in: "로그인",
+    last_login: "마지막 로그인",
+    admin: "관리자",
+    user: "사용자",
+    failed: "실패",
+    wrong_login: "잘못된 사용자 이름 또는 암호",
+    theme_editor: "테마 편집기",
+    enable_assets: "로컬 자산 활성화",
+    assets_desc: "로컬 자산을 활성화하여 상태 페이지 디자인을 사용자 지정할 수 있습니다.이렇게하면 모든 CSS를 포함하는 '자산'디렉토리가 만들어집니다.",
+    assets_btn: "로컬 자산 활성화",
+    assets_loading: "자산 생성",
+    assets_dir: "자산 디렉토리",
+    footer: "바닥글",
+    footer_notes: "당신은 바닥 글에 HTML 태그를 사용할 수 있습니다",
+    global_announcement: "글로벌 발표",
+    announcement_date: "발표 날짜 범위",
+    notify_users: "사용자에게 알림",
+    notify_desc: "예약된 시간 전에 사용자에게 알림",
+    notify_method: "통지 방법",
+    notify_before: "다음 전에 알림",
+    message_create: "공지사항 만들기",
+    message_edit: "공지사항 편집",
+    minutes: "몇 분",
+    hours: "영업 시간",
+    days: "일 수",
+    user_create: "사용자 생성",
+    user_update: "사용자 업데이트",
+    administrator: "관리자",
+    checkins: "체크인",
+    incidents: "인시던트",
+    service_info: "서비스 정보",
+    service_name: "서비스 이름",
+    service_type: "서비스 유형",
+    permalink: "영구 링크 URL",
+    service_public: "공공 서비스",
+    check_interval: "확인 간격",
+    service_endpoint: "서비스 엔드포인트",
+    service_check: "서비스 검사 유형",
+    service_timeout: "요청 시간 초과",
+    expected_resp: "예상 응답",
+    expected_code: "예상 상태 코드",
+    follow_redir: "리다이렉트 따르기",
+    verify_ssl: "SSL 확인",
+    tls_cert: "TLS 인증서 사용",
+    notification_opts: "알림 옵션",
+    notifications_enable: "알림 활성화",
+    notify_after: "실패 후 알림",
+    notify_all: "모든 변경 사항 알림",
+    service_update: "서비스 업데이트",
+    service_create: "서비스 만들기"
+}
+
+export default korean
\ No newline at end of file
diff --git a/frontend/src/languages/russian.js b/frontend/src/languages/russian.js
index 9eccf7d7..4a578938 100644
--- a/frontend/src/languages/russian.js
+++ b/frontend/src/languages/russian.js
@@ -1,100 +1,142 @@
 const russian = {
-  top_nav: {
-    dashboard: "Dashboard",
-    services: "Services",
-    users: "Users",
-    groups: "Groups",
-    announcements: "Announcements",
-    settings: "Settings",
-    logs: "Logs",
-    logout: 'Logout',
-  },
-  setup: {
-    language: "Language",
-    connection: "Database Connection",
-    host: "Host",
-    database: "Database",
-    project_name: "Project Name",
-    project_description: "Project Description",
-    domain: "Domain URL",
-    username: "Admin Username",
-    password: "Admin Password",
-    password_confirm: "Confirm Admin Password",
-    newsletter: "Newsletter",
-    newsletter_note: "We will not share your email, emails are only for major updates.",
-    send_reports: "Send Error Reports to Statping"
-  },
-  dashboard: {
-    total_services: "Total Services",
-    failures_24_hours: "Failures last 24 Hours",
-    online_services: "Online Services",
-    service: 'Service | Services',
-    group: 'Group',
-    title: 'Title',
-    begins: 'Begins',
-    name: 'Name',
-    loading: 'Loading',
-    login: 'Login',
-    sign_in: "Sign In",
-    visibility: 'Visibility',
-    wrong_login: 'Incorrect username or password'
-  },
-  settings: {
-    name: "Project Name",
-    description: "Project Name",
-    footer: "Custom Footer",
-    footer_notes: "HTML is allowed inside the footer",
-    error_reporting: "Enable Error Reporting",
-    error_reporting_notes: "Help the Statping project out by sending anonymous error logs back to our server.",
-    save: "Save Settings",
-    main: "Main Settings",
-    theme: "Theme Editor",
-    cache: "Cache",
-    oauth: "OAuth",
-    beta: "BETA",
-    changelog: "Changelog",
-    repo: "Statping Github Repo",
-    docs: "Documentation",
-  },
-  service: {
-    name: "Service Name",
-    type: "Service Type",
-    info: "Service Information",
-    view: "View Service",
-    average: "Average Response",
-    last_uptime: "Uptime last {0} {1}",
-  },
-  email: "Email Address",
-  port: "Database Port",
-  setting: "Settings",
-  username: "Username",
-  password: 'Password',
-  services: 'Services',
-  domain: 'Domain',
-  online: 'онлайн',
-  public: 'Public',
-  private: 'Private',
-  admin: 'Admin',
-  offline: 'не в сети',
-  failure: 'failure | failures',
-  incident: 'incident | incidents',
-  checkin: 'checkin | checkins',
-  user: 'User | Users',
-  group: 'Group',
-  message: 'message',
-  edit: 'Edit',
-  type: 'Type',
-  sample_data: 'Sample Data',
-  today: 'Today',
-  last_login: 'Last Login',
-  uptime: '{0}% Uptime',
-  close: 'близко',
-  second: 'второй | секунд',
-  minute: 'минут | минут',
-  hour: 'час | часов',
-  day: 'день | дней',
-  week: 'неделя | недель',
-  month: 'месяц | месяцы',
+    settings: "Настройки",
+    dashboard: "Панель управления",
+    services: "служб",
+    service: "обслуживания",
+    failures: "Сбои",
+    users: "Пользователи",
+    login: "Войти",
+    logout: "Выход из системы",
+    online: "Онлайн",
+    offline: "Оффлайн",
+    configs: "Конфигурация",
+    username: "Имя пользователя",
+    password: "Пароль",
+    email: "Электронная почта",
+    confirm_password: "Подтвердить пароль",
+    uptime: "Время бесперебойной работы",
+    name: "Имя",
+    copy: "Копия",
+    close: "Закрыть",
+    secret: "Секрет",
+    regen_api: "Регенерация ключей API",
+    regen_desc: "API Secret используется для чтения создания обновлений и удаления маршрутов. Вы можете регенерировать ключи API, если вам нужно.",
+    visibility: "Видимость",
+    group: "Группы",
+    group_create: "Создать группу",
+    group_update: "Обновить группу",
+    group_public_desc: "Показать групповые услуги публике",
+    groups: "Группы",
+    no_group: "Нет группы",
+    public: "Общественный",
+    private: "Частные",
+    announcements: "Объявления",
+    notifiers: "Уведомлятели",
+    logs: "Журналы",
+    help: "Помогите",
+    type: "Тип",
+    edit: "Редактировать",
+    update: "Обновить",
+    create: "Создайте",
+    view: "Посмотреть",
+    save: "Сохранить",
+    title: "Название",
+    status: "положению",
+    begins: "Начинается",
+    total_services: "Всего услуг",
+    online_services: "Онлайн-сервисы",
+    request_timeout: "Тайм-аут запроса",
+    service_never_online: "Сервис никогда не был в сети",
+    service_online_check: "Проверено онлайн",
+    service_offline_time: "Служба была отключена для",
+    days_ago: "Дней назад",
+    today: "Сегодня",
+    week: "Недели",
+    month: "Месяц",
+    day: "День",
+    hour: "Час",
+    minute: "Минута",
+    failures_24_hours: "Сбои за 24 часа",
+    no_services: "В настоящее время у вас нет услуг!",
+    theme: "Тема",
+    cache: "Кэш",
+    authentication: "Проверка подлинности",
+    import: "Импорт",
+    main_settings: "Основные настройки",
+    variables: "Переменные",
+    docs: "Документация",
+    links: "Ссылки",
+    changelog: "Журнал изменений",
+    repo: "Репозиторий",
+    language: "Язык",
+    db_connection: "Подключение к базе данных",
+    db_host: "Узел базы данных",
+    db_port: "Порт базы данных",
+    db_username: "Имя пользователя базы данных",
+    db_password: "Пароль базы данных",
+    db_database: "Имя базы данных",
+    send_reports: "Отправка отчетов об ошибках",
+    send_reports_desc: "Отправить ошибки в Statping для отладки",
+    project_name: "Имя страницы состояния",
+    description: "Описание",
+    domain: "Домен",
+    enable_cdn: "Включить CDN",
+    newsletter: "Информационный бюллетень",
+    newsletter_note: "Мы отправим вам только сообщение по электронной почте для серьезных изменений",
+    loading: "Загрузка",
+    save_settings: "Сохранить настройки",
+    average_response: "Средний ответ",
+    last_uptime: "Время безотказной работы",
+    sign_in: "Войти",
+    last_login: "Последний вход",
+    admin: "Администратор",
+    user: "Пользователя",
+    failed: "Не удалось",
+    wrong_login: "Неверное имя пользователя или пароль",
+    theme_editor: "Редактор тем",
+    enable_assets: "Включить локальные ресурсы",
+    assets_desc: "Настройте дизайн страницы состояния, включив локальные ресурсы. Это создаст каталог 'assets', содержащий все CSS.",
+    assets_btn: "Включить локальные ресурсы",
+    assets_loading: "Создание компонентов",
+    assets_dir: "Каталог активов",
+    footer: "Подколонтитул",
+    footer_notes: "Вы можете использовать HTML-теги в нижнем колонтитуле",
+    global_announcement: "Глобальное объявление",
+    announcement_date: "Диапазон дат объявления",
+    notify_users: "Уведомлять пользователей",
+    notify_desc: "Уведомлять пользователей до запланированного времени",
+    notify_method: "Способ уведомления",
+    notify_before: "Уведомить до",
+    message_create: "Создать объявление",
+    message_edit: "Редактировать объявление",
+    minutes: "Минуты",
+    hours: "Часы",
+    days: "Дни",
+    user_create: "Создать пользователя",
+    user_update: "Обновить пользователя",
+    administrator: "Администратора",
+    checkins: "Чеккинс",
+    incidents: "Инциденты",
+    service_info: "Информация о сервисе",
+    service_name: "Имя службы",
+    service_type: "Тип услуги",
+    permalink: "URL-адрес Постоянной ссылки",
+    service_public: "Государственная служба",
+    check_interval: "Интервал проверки",
+    service_endpoint: "Конечная точка службы",
+    service_check: "Тип проверки службы",
+    service_timeout: "Тайм-аут запроса",
+    expected_resp: "Ожидаемый ответ",
+    expected_code: "Код ожидаемого состояния",
+    follow_redir: "Следуйте за перенаправленными",
+    verify_ssl: "Проверить SSL",
+    tls_cert: "Использовать сертификат TLS",
+    notification_opts: "Параметры уведомления",
+    notifications_enable: "Включить уведомления",
+    notify_after: "Уведомлять после сбоев",
+    notify_all: "Уведомлять обо всех изменениях",
+    service_update: "Обновить службу",
+    service_create: "Создать службу"
 }
 
-export default russian
+export default russian
\ No newline at end of file
diff --git a/frontend/src/languages/spanish.js b/frontend/src/languages/spanish.js
index 3e6a8cb0..ea6e4293 100644
--- a/frontend/src/languages/spanish.js
+++ b/frontend/src/languages/spanish.js
@@ -1,100 +1,142 @@
 const spanish = {
-  top_nav: {
-    dashboard: "Dashboard",
-    services: "Services",
-    users: "Users",
-    groups: "Groups",
-    announcements: "Announcements",
-    settings: "Settings",
-    logs: "Logs",
-    logout: 'Logout',
-  },
-  setup: {
-    language: "Language",
-    connection: "Database Connection",
-    host: "Host",
-    database: "Database",
-    project_name: "Project Name",
-    project_description: "Project Description",
-    domain: "Domain URL",
-    username: "Admin Username",
-    password: "Admin Password",
-    password_confirm: "Confirm Admin Password",
+    settings: "Configuración",
+    dashboard: "Salpicadero",
+    services: "Servicios",
+    service: "Servicio",
+    failures: "Fallos",
+    users: "Usuarios",
+    login: "Iniciar sesión",
+    logout: "Cerrar sesión",
+    online: "En línea",
+    offline: "Offline",
+    configs: "Configuración",
+    username: "Nombre de usuario",
+    password: "Contraseña",
+    email: "Correo",
+    confirm_password: "Confirmar contraseña",
+    uptime: "Tiempo de actividad",
+    name: "Nombre",
+    copy: "Copia",
+    close: "Cerrar",
+    secret: "Secreto",
+    regen_api: "Regenerar claves de API",
+    regen_desc: "API Secret se utiliza para leer crear actualizaciones y eliminar rutas. Puede regenerar claves de API si lo necesita.",
+    visibility: "Visibilidad",
+    group: "Grupo",
+    group_create: "Crear grupo",
+    group_update: "Actualizar grupo",
+    group_public_desc: "Mostrar servicios de grupo al público",
+    groups: "Grupos",
+    no_group: "Ningún grupo",
+    public: "Público",
+    private: "Privado",
+    announcements: "Anuncios",
+    notifiers: "Notificadores",
+    logs: "Registros",
+    help: "Ayudar",
+    type: "Tipo",
+    edit: "Editar",
+    update: "Actualizar",
+    create: "Crear",
+    view: "Ver",
+    save: "Guardar",
+    title: "Título",
+    status: "Estado",
+    begins: "Comienza",
+    total_services: "Total de servicios",
+    online_services: "Servicios en línea",
+    request_timeout: "Tiempo de espera de solicitud",
+    service_never_online: "El servicio nunca ha estado en línea",
+    service_online_check: "Verificado en línea",
+    service_offline_time: "El servicio ha estado desconectado para",
+    days_ago: "Hace días",
+    today: "Hoy",
+    week: "Semana",
+    month: "Mes",
+    day: "Día",
+    hour: "Hora",
+    minute: "Minuto",
+    failures_24_hours: "Fallos de las últimas 24 horas",
+    no_services: "¡Actualmente no tienes ningún servicio!",
+    theme: "Tema",
+    cache: "Caché",
+    authentication: "Autentificación",
+    import: "Importación",
+    main_settings: "Configuración principal",
+    variables: "Variables",
+    docs: "Documentación",
+    links: "Enlaces",
+    changelog: "Registro de cambios",
+    repo: "Repositorio",
+    language: "Idioma",
+    db_connection: "Conexión a la base",
+    db_host: "Host de base",
+    db_port: "Puerto base de datos",
+    db_username: "Nombre de usuario de",
+    db_password: "Contraseña",
+    db_database: "Nombre de la base",
+    send_reports: "Enviar informes de errores",
+    send_reports_desc: "Enviar errores a Statping para la depuración",
+    project_name: "Nombre de página de estado",
+    description: "Descripción",
+    domain: "Dominio",
+    enable_cdn: "Habilitar CDN",
     newsletter: "Newsletter",
-    newsletter_note: "We will not share your email, emails are only for major updates.",
-    send_reports: "Send Error Reports to Statping"
-  },
-  dashboard: {
-    total_services: "Total Services",
-    failures_24_hours: "Failures last 24 Hours",
-    online_services: "Online Services",
-    service: 'Service | Services',
-    group: 'Group',
-    title: 'Title',
-    begins: 'Begins',
-    name: 'Name',
-    loading: 'Loading',
-    login: 'Login',
-    sign_in: "Sign In",
-    visibility: 'Visibility',
-    wrong_login: 'Incorrect username or password'
-  },
-  settings: {
-    name: "Project Name",
-    description: "Project Name",
-    footer: "Custom Footer",
-    footer_notes: "HTML is allowed inside the footer",
-    error_reporting: "Enable Error Reporting",
-    error_reporting_notes: "Help the Statping project out by sending anonymous error logs back to our server.",
-    save: "Save Settings",
-    main: "Main Settings",
-    theme: "Theme Editor",
-    cache: "Cache",
-    oauth: "OAuth",
-    beta: "BETA",
-    changelog: "Changelog",
-    repo: "Statping Github Repo",
-    docs: "Documentation",
-  },
-  service: {
-    name: "Service Name",
-    type: "Service Type",
-    info: "Service Information",
-    view: "View Service",
-    average: "Average Response",
-    last_uptime: "Uptime last {0} {1}",
-  },
-  email: "Email Address",
-  port: "Database Port",
-  setting: "Settings",
-  username: "Username",
-  password: 'Password',
-  services: 'Services',
-  domain: 'Domain',
-  online: 'online',
-  public: 'Public',
-  private: 'Private',
-  admin: 'Admin',
-  offline: 'offline',
-  failure: 'failure | failures',
-  incident: 'incident | incidents',
-  checkin: 'checkin | checkins',
-  user: 'User | Users',
-  group: 'Group',
-  message: 'message',
-  edit: 'Edit',
-  type: 'Type',
-  sample_data: 'Sample Data',
-  today: 'Today',
-  last_login: 'Last Login',
-  uptime: '{0}% Uptime',
-  close: 'Close',
-  second: 'second | seconds',
-  minute: 'minute | minutes',
-  hour: 'hour | hours',
-  day: 'day | days',
-  week: 'week | weeks',
-  month: 'month | months',
+    newsletter_note: "Sólo le enviaremos un correo electrónico para cambios importantes",
+    loading: "Cargando",
+    save_settings: "Guardar configuración",
+    average_response: "Respuesta media",
+    last_uptime: "Tiempo de actividad último",
+    sign_in: "Iniciar sesión",
+    last_login: "Último Login",
+    admin: "Admin",
+    user: "Usuario",
+    failed: "Falló",
+    wrong_login: "Nombre de usuario o contraseña incorrectos",
+    theme_editor: "Editor de temas",
+    enable_assets: "Habilitar activos locales",
+    assets_desc: "Personalice el diseño de la página de estado habilitando los activos locales. Esto creará un directorio de 'activos' que contiene todos los CSS.",
+    assets_btn: "Habilitar activos locales",
+    assets_loading: "Creación de Activos",
+    assets_dir: "Directorio de activos",
+    footer: "Pie de página",
+    footer_notes: "Puede usar etiquetas HTML en pie de página",
+    global_announcement: "Anuncio global",
+    announcement_date: "Rango de fechas del anuncio",
+    notify_users: "Notificar a usuarios",
+    notify_desc: "Notificar a los usuarios antes del horario programado",
+    notify_method: "Método de notificación",
+    notify_before: "Notificar antes",
+    message_create: "Crear anuncio",
+    message_edit: "Editar anuncio",
+    minutes: "Acta",
+    hours: "Horas",
+    days: "Días",
+    user_create: "Crear usuario",
+    user_update: "Actualizar usuario",
+    administrator: "Administrador",
+    checkins: "Checkins",
+    incidents: "Incidentes",
+    service_info: "Información de servicio",
+    service_name: "Nombre del servicio",
+    service_type: "Tipo de servicio",
+    permalink: "URL de enlace permanente",
+    service_public: "Servicio Público",
+    check_interval: "Intervalo Comprobar",
+    service_endpoint: "Punto final de servicio",
+    service_check: "Tipo de comprobación de servicio",
+    service_timeout: "Tiempo de espera de solicitud",
+    expected_resp: "Respuesta esperada",
+    expected_code: "Código de estado esperado",
+    follow_redir: "Seguir redirecciones",
+    verify_ssl: "Verificar SSL",
+    tls_cert: "Usar Cert TLS",
+    notification_opts: "Opciones de notificación",
+    notifications_enable: "Habilitar notificaciones",
+    notify_after: "Notificar después de errores",
+    notify_all: "Notificar todos los cambios",
+    service_update: "Servicio de actualización",
+    service_create: "Crear servicio"
 }
 
-export default spanish
+export default spanish
\ No newline at end of file
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 20e4e100..ee918dcd 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -5,13 +5,18 @@ import VueObserveVisibility from 'vue-observe-visibility'
 import VueClipboard from 'vue-clipboard2'
 import VueCookies from 'vue-cookies'
 import VueI18n from 'vue-i18n'
+import * as Sentry from "@sentry/browser";
+import * as Integrations from "@sentry/integrations";
 import router from './routes'
 import "./mixin"
 import "./icons"
-const App = () => import('@/App.vue')
 import store from './store'
 import language from './languages'
 
+const errorReporter = "https://bed4d75404924cb3a799e370733a1b64@sentry.statping.com/3"
+
+const App = () => import(/* webpackChunkName: "index" */ '@/App.vue')
+
 Vue.component('apexchart', VueApexCharts)
 
 Vue.use(VueClipboard);
@@ -27,7 +32,15 @@ const i18n = new VueI18n({
 
 Vue.$cookies.config('3d')
 
-Vue.config.productionTip = false
+Sentry.init({
+  dsn: errorReporter,
+  integrations: [new Integrations.Vue({Vue, attachProps: true, logErrors: true})],
+});
+
+Vue.config.productionTip = process.env.NODE_ENV !== 'production'
+Vue.config.devtools = process.env.NODE_ENV !== 'production'
+Vue.config.performance = process.env.NODE_ENV !== 'production'
+
 new Vue({
   router,
   store,
diff --git a/frontend/src/mixin.js b/frontend/src/mixin.js
index 55e0cfc8..373239e6 100644
--- a/frontend/src/mixin.js
+++ b/frontend/src/mixin.js
@@ -1,9 +1,11 @@
 import Vue from "vue";
-const { startOfToday, startOfMonth, lastDayOfMonth, subSeconds, getUnixTime, fromUnixTime, differenceInSeconds, formatDistance, addMonths, isWithinInterval } = require('date-fns')
+const { startOfDay, startOfHour, startOfWeek, endOfMonth, endOfHour, startOfToday, startOfTomorrow, startOfYesterday, endOfYesterday, endOfTomorrow, endOfToday, endOfDay, startOfMonth, lastDayOfMonth, subSeconds, getUnixTime, fromUnixTime, differenceInSeconds, formatDistance, addMonths, addSeconds, isWithinInterval } = require('date-fns')
 import formatDistanceToNow from 'date-fns/formatDistanceToNow'
 import format from 'date-fns/format'
 import parseISO from 'date-fns/parseISO'
-import addSeconds from 'date-fns/addSeconds'
+import isBefore from 'date-fns/isBefore'
+import isAfter from 'date-fns/isAfter'
+import { roundToNearestMinutes } from 'date-fns'
 
 export default Vue.mixin({
   methods: {
@@ -19,9 +21,9 @@ export default Vue.mixin({
     startToday() {
       return startOfToday()
     },
-      secondsHumanize (val) {
-        return `${val} ${this.$t('second', val)}`
-      },
+    secondsHumanize(val) {
+      return `${val} ${this.$t('second', val)}`
+    },
     utc(val) {
       return new Date.UTC(val)
     },
@@ -29,39 +31,106 @@ export default Vue.mixin({
       return formatDistanceToNow(parseISO(t1))
     },
     daysInMonth(t1) {
-        return lastDayOfMonth(t1)
+      return lastDayOfMonth(t1)
     },
     nowSubtract(seconds) {
-      return subSeconds(new Date(), seconds)
+      return subSeconds(this.now(), seconds)
+    },
+    isAfter(date, compare) {
+      return isAfter(date, parseISO(compare))
+    },
+    isBefore(date, compare) {
+      return isBefore(date, parseISO(compare))
     },
     dur(t1, t2) {
       return formatDistance(t1, t2)
     },
-    format(val, type="EEEE, MMM do h:mma") {
+    format(val, type = "EEEE, MMM do h:mma") {
       return format(val, type)
     },
     niceDate(val) {
       return format(parseISO(val), "EEEE, MMM do h:mma")
     },
-      parseISO(v) {
-        return parseISO(v)
-      },
+    parseISO(v) {
+      return parseISO(v)
+    },
+    round(minutes) {
+      return roundToNearestMinutes(minutes)
+    },
+    endOf(method, val) {
+      switch (method) {
+        case "hour":
+          return endOfHour(val)
+        case "day":
+          return endOfDay(val)
+        case "today":
+          return endOfToday()
+        case "tomorrow":
+          return endOfTomorrow()
+        case "yesterday":
+          return endOfYesterday()
+        case "month":
+          return endOfMonth(val)
+      }
+      return val
+    },
+    startEndParams(start, end, group) {
+      start = this.beginningOf("hour", start)
+      end = this.endOf("hour", end)
+      return {start: this.toUnix(start), end: this.toUnix(end), group: group}
+    },
+    beginningOf(method, val) {
+      switch (method) {
+        case "hour":
+          return startOfHour(val)
+        case "day":
+          return startOfDay(val)
+        case "today":
+          return startOfToday()
+        case "tomorrow":
+          return startOfTomorrow()
+        case "yesterday":
+          return startOfYesterday()
+        case "week":
+          return startOfWeek(val)
+        case "month":
+          return startOfMonth(val)
+      }
+      return val
+    },
     isZero(val) {
       return getUnixTime(parseISO(val)) <= 0
     },
     smallText(s) {
-      const incidents = s.incidents
       if (s.online) {
-        return `Online, checked ${this.ago(s.last_success)} ago`
+        return `${this.$t('service_online_check')} ${this.ago(s.last_success)} ago`
       } else {
         const last = s.last_failure
         if (last) {
           return `Offline, last error: ${last} ${this.ago(last.created_at)}`
         }
         if (this.isZero(s.last_success)) {
-          return `Service has never been online`
+          return this.$t('service_never_online')
         }
-        return `Service has been offline for ${this.ago(s.last_success)}`
+        return `${this.$t('service_offline_time')} ${this.ago(s.last_success)}`
+      }
+    },
+    round_time(frame, val) {
+      switch(frame) {
+        case "15m":
+          return roundToNearestMinutes(val, {nearestTo: 60 * 15})
+        case "30m":
+          return roundToNearestMinutes(val, {nearestTo: 60 * 30})
+        case "1h":
+          return roundToNearestMinutes(val, {nearestTo: 3600})
+        case "3h":
+          return roundToNearestMinutes(val, {nearestTo: 3600 * 3})
+        case "6h":
+          return roundToNearestMinutes(val, {nearestTo: 3600 * 6})
+        case "12h":
+          return roundToNearestMinutes(val, {nearestTo: 3600 * 12})
+        case "24h":
+          return roundToNearestMinutes(val, {nearestTo: 3600 * 24})
       }
     },
     toUnix(val) {
@@ -84,15 +153,14 @@ export default Vue.mixin({
     },
     copy(txt) {
       this.$copyText(txt).then(function (e) {
-        alert('Copied: \n'+txt)
-        console.log(e)
+        alert('Copied: \n' + txt)
       });
     },
     serviceLink(service) {
       if (service.permalink) {
-        service = this.$store.getters.serviceByPermalink(service.permalink)
+        service = this.$store.getters.serviceById(service.permalink)
       }
-      if (service===undefined || this.isEmptyObject(service)) {
+      if (service === undefined || this.isEmptyObject(service)) {
         return `/service/0`
       }
       let link = service.permalink ? service.permalink : service.id
@@ -107,10 +175,6 @@ export default Vue.mixin({
     isAdmin() {
       return this.$store.state.admin
     },
-    loggedIn() {
-      const core = this.$store.getters.core
-      return core.logged_in === true
-    },
     iconName(name) {
       switch (name) {
         case "fas fa-terminal":
@@ -123,6 +187,8 @@ export default Vue.mixin({
           return "bell"
         case "fas fa-mobile-alt":
           return "mobile"
+        case "fa dot-circle":
+          return ["fa", "dot-circle"]
         case "fas envelope-square":
           return ["fas", "envelope-square"]
         case "fab fa-slack":
@@ -150,7 +216,7 @@ export default Vue.mixin({
       })
       return newSet
     },
-    convertToChartData(data = [], multiplier=1, asInt=false) {
+    convertToChartData(data = [], multiplier = 1, asInt = false) {
       if (!data) {
         return {data: []}
       }
@@ -169,9 +235,15 @@ export default Vue.mixin({
     },
     humanTime(val) {
       if (val >= 1000) {
-          return Math.round(val / 1000) + " ms"
+        return Math.round(val / 1000) + " ms"
       }
-        return val + " μs"
+      return val + " μs"
+    },
+    humanTimeNum(val) {
+      if (val >= 1000) {
+        return Math.round(val / 1000)
+      }
+      return val
     },
     firstDayOfMonth(date) {
       return startOfMonth(date)
@@ -181,6 +253,9 @@ export default Vue.mixin({
     },
     addMonths(date, amount) {
       return addMonths(date, amount)
+    },
+    addSeconds(date, amount) {
+      return addSeconds(date, amount)
     }
   }
 });
diff --git a/frontend/src/pages/Dashboard.vue b/frontend/src/pages/Dashboard.vue
index b7f19889..d1b08cfa 100644
--- a/frontend/src/pages/Dashboard.vue
+++ b/frontend/src/pages/Dashboard.vue
@@ -1,16 +1,20 @@
 <template>
-    <div class="container col-md-7 col-sm-12 mt-md-5 bg-light">
+    <div class="container col-md-7 col-sm-12 mt-md-5">
+      <div v-if="modal" class="modal-backdrop"></div>
+      <Modal/>
         <TopNav :admin="admin"/>
         <router-view :admin="admin"/>
     </div>
 </template>
 
 <script>
-  const TopNav = () => import('@/components/Dashboard/TopNav')
+  import Modal from "@/components/Elements/Modal";
+  const TopNav = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/TopNav')
 
   export default {
   name: 'Dashboard',
   components: {
+    Modal,
     TopNav,
   },
   data () {
@@ -20,6 +24,9 @@
       }
   },
     computed: {
+      modal() {
+        return this.$store.getters.modal.visible
+      },
       admin() {
         return this.$store.getters.admin
       },
@@ -35,6 +42,3 @@
   }
 </script>
 
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-</style>
diff --git a/frontend/src/pages/Help.vue b/frontend/src/pages/Help.vue
old mode 100644
new mode 100755
index 232d2d3b..61654a40
--- a/frontend/src/pages/Help.vue
+++ b/frontend/src/pages/Help.vue
@@ -1,9 +1,2301 @@
 <template>
-    <div class="col-12 bg-white p-4" v-html="<a class=\"scrollclick\" href=\"#\" data-id=\"page_0\">Types of Monitoring</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_1\">Features</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_2\">Start Statping</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_3\">Linux</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_4\">Mac</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_5\">Windows</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_6\">AWS EC2</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_7\">Docker</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_8\">Mobile App</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_9\">Heroku</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_10\">API</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_11\">Makefile</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_12\">Notifiers</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_13\">Notifier Events</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_14\">Notifier Example</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_15\">Prometheus Exporter</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_16\">SSL</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_17\">Config with .env File</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_18\">Static Export</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_19\">Statping Plugins</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_20\">Statuper</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_21\">Build and Test</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_22\">Contributing</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_23\">PGP Signature</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_24\">Testing</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_25\">Deployment</a><br>\n\n<div class=\"mt-5\" id=\"page_0\"><h1>Types of Monitoring</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_1\"><h1>Features</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_2\"><h1>Start Statping</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_3\"><h1>Linux</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_4\"><h1>Mac</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_5\"><h1>Windows</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_6\"><h1>AWS EC2</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_7\"><h1>Docker</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_8\"><h1>Mobile App</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_9\"><h1>Heroku</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_10\"><h1>API</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_11\"><h1>Makefile</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_12\"><h1>Notifiers</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_13\"><h1>Notifier Events</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_14\"><h1>Notifier Example</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_15\"><h1>Prometheus Exporter</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_16\"><h1>SSL</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_17\"><h1>Config with .env File</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_18\"><h1>Static Export</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_19\"><h1>Statping Plugins</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_20\"><h1>Statuper</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_21\"><h1>Build and Test</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_22\"><h1>Contributing</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_23\"><h1>PGP Signature</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_24\"><h1>Testing</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_25\"><h1>Deployment</h1></div>\n"></div>
+<div class="col-12">
+<div class="row mb-4">
+	
+	<div class="col">
+	<h4 class="h4 mb-2">Overview</h4>
+		
+			<a @click.prevent='tab="Features"' class="d-block mb-1 text-link" href="#">Features</a>
+		
+			<a @click.prevent='tab="Paid Hosting"' class="d-block mb-1 text-link" href="#">Paid Hosting</a>
+		
+			<a @click.prevent='tab="Types of Monitoring"' class="d-block mb-1 text-link" href="#">Types of Monitoring</a>
+		
+			<a @click.prevent='tab="Notifiers"' class="d-block mb-1 text-link" href="#">Notifiers</a>
+		
+			<a @click.prevent='tab="Bulk Import Services"' class="d-block mb-1 text-link" href="#">Bulk Import Services</a>
+		
+			<a @click.prevent='tab="Environment Variables"' class="d-block mb-1 text-link" href="#">Environment Variables</a>
+		
+			<a @click.prevent='tab="Testing"' class="d-block mb-1 text-link" href="#">Testing</a>
+		
+			<a @click.prevent='tab="Badges"' class="d-block mb-1 text-link" href="#">Badges</a>
+		
+			<a @click.prevent='tab="Contributing"' class="d-block mb-1 text-link" href="#">Contributing</a>
+		
+			<a @click.prevent='tab="Mobile App"' class="d-block mb-1 text-link" href="#">Mobile App</a>
+		
+	</div>
+	
+	<div class="col">
+	<h4 class="h4 mb-2">Installation</h4>
+		
+			<a @click.prevent='tab="Docker"' class="d-block mb-1 text-link" href="#">Docker</a>
+		
+			<a @click.prevent='tab="Docker-Compose"' class="d-block mb-1 text-link" href="#">Docker-Compose</a>
+		
+			<a @click.prevent='tab="AWS EC2"' class="d-block mb-1 text-link" href="#">AWS EC2</a>
+		
+			<a @click.prevent='tab="Mac"' class="d-block mb-1 text-link" href="#">Mac</a>
+		
+			<a @click.prevent='tab="Linux"' class="d-block mb-1 text-link" href="#">Linux</a>
+		
+			<a @click.prevent='tab="Windows"' class="d-block mb-1 text-link" href="#">Windows</a>
+		
+			<a @click.prevent='tab="Cloud Foundry"' class="d-block mb-1 text-link" href="#">Cloud Foundry</a>
+		
+	</div>
+	
+	<div class="col">
+	<h4 class="h4 mb-2">Extras</h4>
+		
+			<a @click.prevent='tab="Development"' class="d-block mb-1 text-link" href="#">Development</a>
+		
+			<a @click.prevent='tab="Makefile"' class="d-block mb-1 text-link" href="#">Makefile</a>
+		
+			<a @click.prevent='tab="GraphQL"' class="d-block mb-1 text-link" href="#">GraphQL</a>
+		
+			<a @click.prevent='tab="SSL"' class="d-block mb-1 text-link" href="#">SSL</a>
+		
+			<a @click.prevent='tab="Config with .env File"' class="d-block mb-1 text-link" href="#">Config with .env File</a>
+		
+			<a @click.prevent='tab="config.yml"' class="d-block mb-1 text-link" href="#">config.yml</a>
+		
+			<a @click.prevent='tab="Static HTML Exporter"' class="d-block mb-1 text-link" href="#">Static HTML Exporter</a>
+		
+			<a @click.prevent='tab="Prometheus Exporter"' class="d-block mb-1 text-link" href="#">Prometheus Exporter</a>
+		
+			<a @click.prevent='tab="PGP Signature"' class="d-block mb-1 text-link" href="#">PGP Signature</a>
+		
+	</div>
+	
+</div>
+
+<div class="col-12" v-if='tab === "Home"'>
+	<div v-pre>
+		<p align="center">
+<img width="60%" src="https://s3-us-west-2.amazonaws.com/gitimgs/statping.png">
+<img width="70%" src="https://img.cjx.io/statuptokenbalance.gif">
+</p>
+
+<p align="center">
+<img alt="GitHub commit activity" src="https://img.shields.io/github/commit-activity/m/statping/statping"> 
+<a href="https://github.com/statping/statping/labels/priority"><img src="https://img.shields.io/github/issues/statping/statping/priority?color=blue&label=priority"></a> <a href="https://github.com/statping/statping/labels/bug"><img src="https://img.shields.io/github/issues/statping/statping/bug?color=red&label=bugs"></a> <a href="https://github.com/statping/statping/labels/feature"><img src="https://img.shields.io/github/issues/statping/statping/feature?color=pink&label=features"></a>
+</p>
+
+<h1>Docker</h1>
+
+<p>View the <a href="https://github.com/statping/statping/wiki/Docker" target="_blank">Docker Wiki</a> for more information and advanced usage.</p>
+
+<pre><code class="language-sh">docker run -it -p 8080:8080 statping/statping
+</code></pre>
+
+<h1>MacOSX</h1>
+
+<p>View the <a href="https://github.com/statping/statping/wiki/Mac" target="_blank">Mac Wiki</a> for more information and other methods.</p>
+
+<pre><code class="language-sh">brew tap statping/statping
+brew install statping
+</code></pre>
+
+<h1>Linux</h1>
+
+<p>View the <a href="https://github.com/statping/statping/wiki/Linux" target="_blank">Linux Wiki</a> for more information and other methods.</p>
+
+<pre><code class="language-sh">curl -o- -L https://statping.com/install.sh | bash
+</code></pre>
+
+<p><a href="https://snapcraft.io/statping" target="_blank"><img src="https://snapcraft.io/static/images/badges/en/snap-store-white.svg" alt="Get it from the Snap Store" /></a></p>
+
+<pre><code class="language-sh">snap install statping
+</code></pre>
+
+<h1>Windows</h1>
+
+<p>Download the <a href="https://github.com/statping/statping/releases/latest" target="_blank">latest version</a> as an <code>.exe</code> from <a href="https://github.com/statping/statping/releases/latest" target="_blank">Releases</a>. View the <a href="https://github.com/statping/statping/wiki/Windows" target="_blank">Windows Wiki</a> for more information and other methods.</p>
+
+<h1>EC2</h1>
+
+<p>// exploring new methods for the AMI image.</p>
+
+<h1>Development</h1>
+
+	</div>
+</div>
+
+	<div class="col-12" v-if='tab === "Features"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Features</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<h1>3 Different Databases</h1>
+
+<p>You can use MySQL, Postgres, or SQLite as a database for your Statping status page. The server will automatically upgrade your database tables depending on which database you have.</p>
+
+<h1>Easy to Startup</h1>
+
+<p>Statping is an extremely easy to setup website monitoring tool without fussing with dependencies or packages. Simply download and install the precompile binary for your operating system. Statping works on Windows, Mac, Linux, Docker, and even the Raspberry Pi.</p>
+
+<h1>Plugins</h1>
+
+<p>Statping is an awesome Status Page generator that allows you to create your own plugins with Golang Plugins! You don&rsquo;t need to request a PR or even tell us about your plugin. Plugin&rsquo;s are compiled and then send as a binary to the Statping <code>/plugins</code> folder. Test your plugins using the <code>statup test plugin</code> command, checkout the <a href="https://github.com/statping/statping/wiki/Statping-Plugins" target="_blank">Plugin Wiki</a> to see detailed information about creating plugins.</p>
+
+<h1>No Maintenance</h1>
+
+<p>Many other website monitoring applications will collect data until the server fails because of hard drive is 100% full. Statping will automatically delete records to make sure your server will stay UP for years. The EC2 AMI Image is a great way to host your status page without worrying about it crashing one day. Statping will automatically upgrade its software when you reboot your computer.</p>
+
+<h1>Email &amp; Slack Notifications</h1>
+
+<p>Receive email notifications if your website or application goes offline. Statping includes SMTP connections so you can use AWS SES, or any other SMTP emailing service. Go in the Email Settings in Settings to configure these options.</p>
+
+<h1>Prometheus Exporter</h1>
+
+<p>If you want a deeper view of your applications status, you can use Grafana and Prometheus to graph all types of data about your services. Read more about the <a href="https://github.com/statping/statping/wiki/Prometheus-Exporter" target="_blank">Prometheus Exporter</a></p>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Paid Hosting"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Paid Hosting</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p><a href="https://statping.com/" target="_blank">Statping.com</a> now provides a service that will host your Statping instance for you! For $6.00/month you won&rsquo;t need to worry about maintaining your own Statping instance. Billing platform is using Stripe and you can cancel at anytime.</p>
+
+<p><a href="https://statping.com/"><img with="70%" src="https://assets.statping.com/pricingtable.png"></a></p>
+
+<p>Help support the project by donating or have us host your Statping instance.</p>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Types of Monitoring"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Types of Monitoring</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>You can monitor your application by using a simple HTTP GET to the endpoint to return back a response and status code. Normally you want a 200 status code on an HTTP request. You might want to require a 404 or 500 error as a response code though. With each service you can include a Timeout in seconds to work with your long running services.</p>
+
+<h1>HTTP Endpoints with Custom POST</h1>
+
+<p>For more advanced monitoring you can add a data as a HTTP POST request. This is useful for automatically submitting JSON, or making sure your signup form is working correctly.</p>
+
+<p align="center">
+<img width="100%" src="https://img.cjx.io/statup-httpservice.png">
+</p>
+
+<p>With a HTTP service, you can POST a JSON string to your endpoint to retrieve any type of response back. You can then use Regex in the Expected Response field to parse a custom response that exactly matches your status requirements.</p>
+
+<h1>TCP/UDP Services</h1>
+
+<p>For other services that don&rsquo;t use HTTP, you can monitor any type of service by using the PORT of the service. If you&rsquo;re Ethereum Blockchain server is running on 8545, you can use TCP to monitor your server. With a TCP service, you can monitor your Docker containers, or remove service running on a custom port. You don&rsquo;t need to include <code>http</code> in the endpoint field, just IP or Hostname.</p>
+
+<p align="center">
+<img width="100%" src="https://img.cjx.io/statup-tcpservice.png">
+</p>
+
+<h1>ICMP Service</h1>
+
+<p>You can send a <a href="https://en.wikipedia.org/wiki/Internet_Control_Message_Protocol" target="_blank">ICMP</a> (ping) to an endpoint rather than HTTP/TCP/UDP request for a quick response. For this service is fully work, you may need to run Statping as a <code>sudo</code> user.</p>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Notifiers"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Notifiers</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p align="center">
+<img width="80%" src="https://s3-us-west-2.amazonaws.com/gitimgs/statupnotifiers.png">
+</p>
+
+<p>Statping includes multiple Notifiers to alert you when your services are offline. You can also create your own notifier and send a Push Request to this repo! Creating a custom notifier is pretty easy as long as you follow the requirements. A notifier will automatically be installed into the users Statping database, and form values will save without any hassles. 💃</p>
+
+<p align="center">
+<a href="https://github.com/statping/statping/wiki/Notifier-Example">Example Code</a> | <a href="https://github.com/statping/statping/wiki/Notifier-Events">Events</a> | <a href="https://github.com/statping/statping/tree/master/notifiers">View Notifiers</a></p>
+
+<h2>Notifier Requirements</h2>
+
+<ul>
+<li>Must have a unique <code>METHOD</code> name</li>
+<li>Struct must have <code>*notifier.Notification</code> pointer in it.</li>
+<li>Must create and add your notifier variable in <code>init()</code></li>
+<li>Should have a form for user to input their variables/keys. <code>Form: []notifier.NotificationForm</code></li>
+</ul>
+
+<h2>Notifier Interface (required)</h2>
+
+<p>Statping has the <code>Notifier</code> interface which you&rsquo;ll need to include in your notifier. Statping includes many other events/triggers for your notifier, checkout <a href="https://github.com/statping/statping/wiki/Notifier-Events">Notifier Events</a> to see all of them.</p>
+
+<pre><code class="language-go">// Notifier interface is required to create a new Notifier
+type Notifier interface {
+        // OnSuccess is triggered when a service is successful
+	OnSuccess(*services.Service) error
+        // OnFailure is triggered when a service is failing
+	OnFailure(*services.Service, *failures.Failure) error
+        // OnTest is triggered for testing
+	OnTest() (string, error)
+}
+</code></pre>
+
+<pre><code class="language-go">var example = &amp;Example{&amp;notifier.Notification{
+	Method: &quot;example&quot;,                               // unique method name
+	Host:   &quot;http://exmaplehost.com&quot;,                // default 'host' field
+	Form: []notifier.NotificationForm{{
+		Type:        &quot;text&quot;,                     // text, password, number, or email
+		Title:       &quot;Host&quot;,                     // The title of value in form
+		Placeholder: &quot;Insert your Host here.&quot;,   // Optional placeholder in input
+		DbField:     &quot;host&quot;,                     // An accepted DbField value (read below)
+	}},
+}
+</code></pre>
+
+<h2>Notifier Form</h2>
+
+<p>Include a form with your notifier so other users can save API keys, username, passwords, and other values.</p>
+
+<pre><code class="language-go">// NotificationForm contains the HTML fields for each variable/input you want the notifier to accept.
+type NotificationForm struct {
+	Type        string `json:&quot;type&quot;`        // the html input type (text, password, email)
+	Title       string `json:&quot;title&quot;`       // include a title for ease of use
+	Placeholder string `json:&quot;placeholder&quot;` // add a placeholder for the input
+	DbField     string `json:&quot;field&quot;`       // true variable key for input
+	SmallText   string `json:&quot;small_text&quot;`  // insert small text under a html input
+	Required    bool   `json:&quot;required&quot;`    // require this input on the html form
+	IsHidden    bool   `json:&quot;hidden&quot;`      // hide this form element from end user
+	IsList      bool   `json:&quot;list&quot;`        // make this form element a comma separated list
+	IsSwitch    bool   `json:&quot;switch&quot;`      // make the notifier a boolean true/false switch
+}
+</code></pre>
+
+<h3>Example Notifier Form</h3>
+
+<p>This is the Slack Notifier <code>Form</code> fields.</p>
+
+<pre><code class="language-go">Form: []notifier.NotificationForm{{
+		Type:        &quot;text&quot;,
+		Title:       &quot;Incoming webhooker Url&quot;,
+		Placeholder: &quot;Insert your slack webhook URL here.&quot;,
+		SmallText:   &quot;Incoming webhooker URL from &lt;a href=\&quot;https://api.slack.com/apps\&quot; target=\&quot;_blank\&quot;&gt;slack Apps&lt;/a&gt;&quot;,
+		DbField:     &quot;Host&quot;,
+		Required:    true,
+	}}
+}
+</code></pre>
+
+<h3>Accepted DbField Values</h3>
+
+<p>The <code>notifier.NotificationForm</code> has a field called <code>DbField</code> which is the column to save the value into the database. Below are the acceptable DbField string names to include in your form.
+- <code>host</code> used for a URL or API endpoint
+- <code>username</code> used for a username
+- <code>password</code> used for a password
+- <code>port</code> used for a integer port number
+- <code>api_key</code> used for some kind of API key
+- <code>api_secret</code> used for some API secret
+- <code>var1</code> used for any type of string
+- <code>var2</code> used for any type of string (extra)</p>
+
+<h3>Form Elements</h3>
+
+<p>You can completely custom your notifications to include a detailed form.
+- <code>Type</code> is a HTML input type for your field
+- <code>Title</code> give your input element a title
+- <code>Placeholder</code> optional field if you want a placeholder in input
+- <code>DbField</code> required field to save variable into database (read above)
+- <code>Placeholder</code> optional field for inserting small hint under the input</p>
+
+<h1>Adding Notifiers</h1>
+
+<p>To add a notifier to the Statping application, simply append your Notifier in the <code>AttachNotifiers()</code> function inside of <a href="https://github.com/statping/statping/blob/master/core/core.go" target="_blank">core/core.go</a>.</p>
+
+<pre><code class="language-go">// AttachNotifiers will attach all the notifier's into the system
+func AttachNotifiers() error {
+	return notifier.AddNotifiers(
+		notifiers.Command,
+		notifiers.Discorder,
+		notifiers.Emailer,
+		notifiers.LineNotify,
+		notifiers.Mobile,
+		notifiers.Slacker,
+		notifiers.Telegram,
+		notifiers.Twilio,
+		notifiers.Webhook,
+	)
+}
+</code></pre>
+
+<h6><a href="https://github.com/statping/statping/blob/master/core/core.go#L183" target="_blank">AttachNotifiers</a></h6>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Bulk Import Services"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Bulk Import Services</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>You can import multiple services when Statping first loads by creating a file named <a href="https://github.com/statping/statping/wiki/services.yml" target="_blank">services.yml</a> in the working directory for Statping. It will insert the new service into the database, and will not be re-added on reboot. All services must be an array under the <code>services:</code> field.</p>
+
+<h2>Dynamic Yaml</h2>
+
+<p>With Yaml, you can insert &ldquo;anchors&rdquo; to make receptive fields simple! Checkout the example below. The <code>&amp;tcpservice</code> anchor will return all the fields belonging to <code>x-tcpservice:</code>. To reuse these fields for each service, you can insert <code>&lt;&lt;: *tcpservice</code> and thats it!</p>
+
+<pre><code class="language-yaml">x-tcpservice: &amp;tcpservice
+  type: tcp
+  check_interval: 60
+  timeout: 15
+  allow_notifications: true
+  notify_after: 0
+  notify_all_changes: true
+  public: true
+  redirect: true
+
+x-httpservice: &amp;httpservice
+  type: http
+  method: GET
+  check_interval: 45
+  timeout: 10
+  expected_status: 200
+  allow_notifications: true
+  notify_after: 2
+  notify_all_changes: true
+  public: true
+  redirect: true
+
+services:
+
+  - name: Statping Demo
+    domain: https://demo.statping.com
+    &lt;&lt;: *httpservice
+
+  - name: Portainer
+    domain: portainer
+    port: 9000
+    &lt;&lt;: *tcpservice
+
+  - name: Statping Github
+    domain: https://github.com/statping/statping
+    &lt;&lt;: *httpservice
+</code></pre>
+
+<h2>Duplicates</h2>
+
+<p>Services that have already been added into the database will not be added again. This is done by creating a SHA256 hash of the following fields&hellip;</p>
+
+<pre><code>sha256(name:EXAMPLEdomain:HTTP://DOMAIN.COMport:8080type:HTTPmethod:GET)
+</code></pre>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Environment Variables"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Environment Variables</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>This page will list all environment variables that could be passed into Statping. You can see all default values in <a href="https://github.com/statping/statping/blob/dev/utils/env.go" target="_blank">utils/env.go</a> file under the <code>InitEnvs()</code> function.</p>
+
+<h3>Statping Server</h3>
+
+<ul>
+<li><code>PORT</code>                      - Set the outgoing port for the HTTP server (or use &ndash;port, default: 8080)</li>
+<li><code>HOST</code>                        - Bind a specific IP address to the HTTP server (or use &ndash;ip)</li>
+<li><code>VERBOSE</code>                   - Display more logs in verbose mode. (1 - 4)</li>
+<li><code>STATPING_DIR</code>              - Set a absolute path for the root path of Statping server (logs, assets, SQL db)</li>
+<li><code>DISABLE_LOGS</code>              - Disable viewing and writing to the log file (default is false)</li>
+<li><code>GO_ENV</code>                    - Run Statping in testmode, will bypass HTTP authentication (if set as &lsquo;test&rsquo;)</li>
+<li><code>REMOVE_AFTER</code>              - Automatically delete records after time (default 3 months, &lsquo;12h = 12 hours&rsquo;)</li>
+<li><code>CLEANUP_INTERVAL</code>          - Interval to check for old records (default 1 hour, &lsquo;1h = 1 hour&rsquo;)</li>
+<li><code>ALLOW_REPORTS</code>             - Send Statping anonymous <a href="https://sentry.io/" target="_blank">error reports</a> so we can see issues (default is false)</li>
+<li><code>SERVER_PORT</code>               - Port number to run Statping HTTP server on (or use -p/&ndash;port)</li>
+</ul>
+
+<h3>Automatic SSL Certificate</h3>
+
+<p>With LetsEncrypt enabled, Statping will run through the SSL process and create the SSL certs in the <code>certs</code> folder. Read more about the SSL Process on the <a href="https://github.com/statping/statping/wiki/SSL" target="_blank">SSL Wiki</a>.
+- <code>LETSENCRYPT_ENABLE</code>        - Set to <strong>true</strong> to have LetsEncrypt enabled. (defaults to false)
+- <code>LETSENCRYPT_HOST</code>          - Domain to generate SSL certificate
+- <code>LETSENCRYPT_EMAIL</code>         - Email address that gets sent with the LetsEncrypt Request
+- <code>LETSENCRYPT_LOCAL</code>         - Set for LetsEncrypt testing</p>
+
+<h3>Database</h3>
+
+<ul>
+<li><code>DB_CONN</code>                   - Database connection (sqlite, postgres, mysql) <strong>Will automatically start if set to &lsquo;sqlite&rsquo;</strong></li>
+<li><code>DB_HOST</code>                   - Database hostname or IP address</li>
+<li><code>DB_USER</code>                   - Database username</li>
+<li><code>DB_PASS</code>                   - Database password</li>
+<li><code>DB_PORT</code>                   - Database port (5432, 3306, &hellip;)</li>
+<li><code>DB_DATABASE</code>               - Database connection&rsquo;s database name</li>
+<li><code>POSTGRES_SSLMODE</code>          - Enable <a href="https://www.postgresql.org/docs/9.1/libpq-ssl.html" target="_blank">Postgres SSL Mode</a> &lsquo;ssl_mode=VALUE&rsquo; (enable/disable/verify-full/verify-ca)</li>
+<li><code>MAX_OPEN_CONN</code>             - Set <a href="https://golang.org/pkg/database/sql/#DB.SetMaxOpenConns" target="_blank">Maximum Open Connections</a> for database server (default: 25)</li>
+<li><code>MAX_IDLE_CONN</code>             - Set <a href="https://golang.org/pkg/database/sql/#DB.SetMaxIdleConns" target="_blank">Maximum Idle Connections</a> for database server (default: 25)</li>
+<li><code>MAX_LIFE_CONN</code>             - Set <a href="https://golang.org/pkg/database/sql/#DB.SetConnMaxLifetime" target="_blank">Maximum Life Connections</a> for database server (default: 25)</li>
+<li><code>PREFIX</code> - Add a prefix string to each Prometheus metric (default is empty)</li>
+</ul>
+
+<h3>Connection</h3>
+
+<ul>
+<li><p><code>BASE_PATH</code>                 - Set the base URL prefix (set to &lsquo;monitor&rsquo; if URL is domain.com/monitor)</p></li>
+
+<li><p><code>PREFIX</code>                    - A Prefix for each value in <a href="https://github.com/statping/statping/wiki/Prometheus-Exporter" target="_blank">Prometheus /metric exporter</a></p></li>
+
+<li><p><code>HTTP_PROXY</code>                - Use a <a href="https://golang.org/pkg/net/http/#ProxyFromEnvironment" target="_blank">HTTP Proxy</a> for HTTP Requests</p></li>
+
+<li><p><code>AUTH_USERNAME</code>             - HTTP Basic Authentication username</p></li>
+
+<li><p><code>AUTH_PASSWORD</code>             - HTTP Basic Authentication password</p></li>
+
+<li><p><code>DISABLE_HTTP</code>              - Disable HTTP server if set to true</p></li>
+
+<li><p><code>DISABLE_COLORS</code>            - Disable colors in terminal logs if set to true</p></li>
+
+<li><p><code>DEBUG</code>                     - Enables pprof golang debugging on port 9090</p></li>
+
+<li><p><code>LOGS_MAX_COUNT</code>            - Maximum amount of log files (defaults to 5)</p></li>
+
+<li><p><code>LOGS_MAX_AGE</code>              - Maximum age for log files (defaults to 28 days)</p></li>
+
+<li><p><code>LOGS_MAX_SIZE</code>             - Maximum size for log files (defaults to 16 MB)</p></li>
+
+<li><p><code>LANGUAGE</code>                  - Language to use (en, fr, ru, more to come&hellip;)</p>
+
+<h3>Assets</h3></li>
+
+<li><p><code>SASS</code>                      - Set the absolute path to the <a href="https://sass-lang.com/" target="_blank">sass</a> binary location (find with <code>which sass</code>)</p></li>
+
+<li><p><code>USE_ASSETS</code>                - Automatically use assets from &lsquo;assets folder&rsquo; (true/false)</p></li>
+</ul>
+
+<h3>Automatic Fills</h3>
+
+<ul>
+<li><code>NAME</code>                      - Set a name for the Statping status page</li>
+<li><code>DESCRIPTION</code>               - Set a description for the Statping status page</li>
+<li><code>DOMAIN</code>                    - Set a URL for the Statping status page</li>
+<li><code>ADMIN_USER</code>                - Username for administrator account (default: admin)</li>
+<li><code>ADMIN_PASSWORD</code>            - Password for administrator account (default: admin)</li>
+<li><code>API_SECRET</code>                - Set a custom API Secret for API Authentication</li>
+<li><code>SAMPLE_DATA</code>               - Insert sample services, groups and more (default: true)</li>
+</ul>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Testing"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Testing</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>If you want to test your updates with the current golang testing units, you can follow the guide below to run a full test process. Each test for Statping will run in MySQL, Postgres, and SQlite to make sure all database types work correctly.</p>
+
+<h2>Requirements</h2>
+
+<ul>
+<li>Golang (1.14.* or whichever <code>go.mod</code> states) <img src="https://img.shields.io/github/go-mod/go-version/statping/statping" alt="GitHub go.mod Go version" />
+
+<ul>
+<li><a href="https://github.com/GeertJohan/go.rice" target="_blank">go.rice</a> Compiles all assets into golang file</li>
+</ul></li>
+<li>Node (currently using <code>10.17</code>)
+
+<ul>
+<li>Yarn</li>
+<li>Sass</li>
+</ul></li>
+</ul>
+
+<h2>Basic Testing</h2>
+
+<p>The easiest way to run local unit testing by using SQLite and following the commands below&hellip;
+1. Make sure you have the requirements above. (being able to run <code>rice</code>)
+2. <code>cd frontend &amp;&amp; yarn</code> Install npm packages for the frontend
+3. <code>make compile</code> Creates production version of Vue frontend and compiles all assets with <code>rice</code>.
+4. <code>make install</code> Will install <code>statping</code> locally so your system test CLI commands/flags.
+5. <code>go test -v ./...</code> Run all tests for Statping.</p>
+
+<blockquote>
+<p>If you run Statping on port 8585, and then run <code>yarn dev</code> the debug Vue server will be running on port 8888.</p>
+</blockquote>
+
+<h2>Notifier Testing</h2>
+
+<p>To test the notifiers, you must include an environment variable that is set in each notifier test. If that notifier test environment variable is not set, it will be skipped.</p>
+
+<h2>Create Docker Databases</h2>
+
+<p>For more advanced testing, you can connect to a different type of database by using the <code>DB_CONN</code> environment variable. You can start them with Docker. Docker is available for Linux, Mac and Windows. You can download/install it by going to the <a href="https://docs.docker.com/install/" target="_blank">Docker Installation</a> site.</p>
+
+<pre><code class="language-bash">docker run -it -d \
+   -p 3306:3306 \
+   -env MYSQL_ROOT_PASSWORD=password123 \
+   -env MYSQL_DATABASE=root mysql
+</code></pre>
+
+<pre><code class="language-bash">docker run -it -d \
+   -p 5432:5432 \
+   -env POSTGRES_PASSWORD=password123 \
+   -env POSTGRES_USER=root \
+   -env POSTGRES_DB=root postgres
+</code></pre>
+
+<p>Once you have MySQL and Postgres running, you can begin the testing. SQLite database will automatically create a <code>statping.db</code> file and will delete after testing.</p>
+
+<h2>Run Tests</h2>
+
+<p>Insert the database environment variables to auto connect the the databases and run the normal test command: <code>go test -v ./...</code>. You&rsquo;ll see a verbose output of each test. If all tests pass, make a push request! 💃</p>
+
+<pre><code class="language-bash">DB_CONN=sqlite \
+DB_DATABASE=root \
+DB_USER=root \
+DB_PASS=password123 \
+DB_HOST=localhost \
+go test -v ./...
+</code></pre>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Badges"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Badges</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>Using shields.io you can easily create Badges for your services. Using the URL below, you can format your own SVG badge:</p>
+
+<pre><code>https://img.shields.io/badge/dynamic/json?url=&lt;URL&gt;&amp;label=&lt;LABEL&gt;&amp;query=&lt;$.DATA.SUBDATA&gt;&amp;color=&lt;COLOR&gt;&amp;prefix=&lt;PREFIX&gt;&amp;suffix=&lt;SUFFIX&gt;
+</code></pre>
+
+<ul>
+<li><code>url</code> - URL for JSON endpoint</li>
+<li><code>label</code> - Text for the left side of the badge</li>
+<li><code>query</code> - <a href="https://jsonpath.com/" target="_blank">JSON Path</a> to be set for right side value</li>
+</ul>
+
+<h2>Examples</h2>
+
+<h4>Service Uptime Percent</h4>
+
+<p><img src="https://img.shields.io/badge/dynamic/json?color=blue&label=%20Statping%20Uptime&query=%24.online_24_hours&url=https%3A%2F%2Fdemo.statping.com%2Fapi%2Fservices%2F1&suffix=%"></p>
+
+<ul>
+<li>URL: <a href="https://demo.statping.com/api/services/1" target="_blank">https://demo.statping.com/api/services/1</a></li>
+<li>JSON Path: <code>$.online_24_hours</code></li>
+<li>Suffix: <code>%</code></li>
+</ul>
+
+<pre><code>https://img.shields.io/badge/dynamic/json?color=blue&amp;label=%20Statping%20Uptime&amp;query=%24.online_24_hours&amp;url=https%3A%2F%2Fdemo.statping.com%2Fapi%2Fservices%2F1&amp;suffix=%
+</code></pre>
+
+<h4>Count Services</h4>
+
+<p><img src="https://img.shields.io/badge/dynamic/json?color=purple&label=Demo%20Site&query=%24.services&url=https://demo.statping.com/health&suffix=%20services"></p>
+
+<ul>
+<li>URL: <a href="https://demo.statping.com/health" target="_blank">https://demo.statping.com/health</a></li>
+<li>JSON Path: <code>$.services</code></li>
+<li>Suffix: <code>services</code></li>
+</ul>
+
+<pre><code>https://img.shields.io/badge/dynamic/json?color=purple&amp;label=Demo%20Site&amp;query=%24.services&amp;url=https://demo.statping.com/health&amp;suffix=%20services
+</code></pre>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Contributing"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Contributing</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>Have a feature you want to implement into Statping!? Awesome! Follow this guide
+to see how you can test, compile and build Statping for production use. I
+recommend you use <code>make</code> with this process, it will save you time and it will
+auto-include many customized parameters to get everything working correctly.</p>
+
+<blockquote>
+<p>Send all PR&rsquo;s to <code>dev</code> branch!</p>
+</blockquote>
+
+<h1>Requirements</h1>
+
+<ul>
+<li>Golang <code>1.14</code></li>
+<li>Node <code>10.15.3</code></li>
+</ul>
+
+<h1>Dependencies</h1>
+
+<p>Statping has a couple of required dependencies when testing and compiling the
+binary. The <a href="https://github.com/statping/statping/blob/master/Makefile" target="_blank">Makefile</a>
+will make these tasks a lot easier. Take a look at the Makefile to see what
+commands are running. Run the command below to get setup right away.</p>
+
+<pre><code class="language-bash">make clean compile build
+</code></pre>
+
+<p>List of requirements for compiling assets, building binary, and testing.
+- <a href="https://golang.org/" target="_blank">Go Language</a>
+- <a href="https://docs.docker.com/" target="_blank">Docker</a>
+- <a href="https://sass-lang.com/install" target="_blank">SASS</a>
+- <a href="https://www.cypress.io/" target="_blank">Cypress</a> (only used for UI testing, <code>make cypress-install</code>)</p>
+
+<h1>Compiling Assets</h1>
+
+<p>This Golang project uses <a href="https://github.com/GeertJohan/go.rice" target="_blank">rice</a> to
+compile static assets into a single file. The file <code>source/rice-box.go</code> is never
+committed to the Github repo, it is automatically created on the build. Statping
+also requires <code>sass</code> to be installed on your local OS. To compile all the
+static assets run the command below:</p>
+
+<pre><code class="language-bash">make compile
+</code></pre>
+
+<p>After this is complete, you&rsquo;ll notice the <code>source/rice-box.go</code> file has been
+generated. You can now continue to build, and test.</p>
+
+<h1>Testing</h1>
+
+<p>Statping includes multiple ways to Test the application, you can run the <code>make</code>
+command, or the normal <code>go test</code> command. To see the full experience of your
+updates, you can even run Cypress tests which are in the <code>.dev/test</code> folder.</p>
+
+<p>Statping will run all tests in the <code>cmd</code> folder on MySQL, Postgres, and SQLite
+databases. You can run <code>make databases</code> to automatically create MySQL and
+Postgres with Docker.</p>
+
+<h6>Golang Testing:</h6>
+
+<pre><code class="language-bash">make test
+</code></pre>
+
+<h6>Cypress UI Testing:</h6>
+
+<pre><code class="language-bash">make cypress-test
+</code></pre>
+
+<h6>Test Everything:</h6>
+
+<pre><code class="language-bash">make test-all
+</code></pre>
+
+<h1>Build</h1>
+
+<p>Statping will build on all operating systems except Windows 32-bit. I
+personally use <a href="https://github.com/karalabe/xgo" target="_blank">xgo</a> to cross-compile on
+multiple systems using Docker. Follow the commands below to build on your local
+system.</p>
+
+<h6>Build for local operating system:</h6>
+
+<pre><code class="language-bash">make compile build
+</code></pre>
+
+<h1>Compile for Production</h1>
+
+<p>Once you&rsquo;ve tested and built locally, you can compile Statping for all available
+operating systems using the command below. This command will require you to have
+<a href="http://docker.io/" target="_blank">Docker</a>.</p>
+
+<pre><code class="language-bash">make build-all
+</code></pre>
+
+<h1>What Now</h1>
+
+<p>Everything tested, compiled and worked out!? Awesome! 💃 You can now commit your
+changes, and submit a Pull Request with the features/bugs you added or removed.</p>
+
+<p>Please remember to also add the Changelog Entry to describe what you have
+changed by using<a href="https://gitlab.com/l0nax/changelog-go" target="_blank">changelog-go</a>.</p>
+
+<p>If your PR is related to an Issue (ie. on a bug fix or when adding a new notifier)
+don&rsquo;t forget adding the related GitHub Issue ID like this: <code>[#270](https://github.com/statping/statping/issues/270)</code>
+Check out the example below.
+Adding <em>one</em> changelog entry should be done in a separate Commit - not only
+because this is a good Committing practice, also because it&rsquo;s separated by your
+Changes.
+When you fix/ add/ &hellip; more than one thing than please describe it a good, short
+and precise sentence. Because everyone wants a good and nice-looking <code>CHANGELOG.md</code>
+where all changes of a new Version are documented.</p>
+
+<h6>Example for fixing a bug in the UI</h6>
+
+<pre><code class="language-bash">~] changelog new &quot;Fix zooming out on graph doesn't load additional data ([#270](https://github.com/statping/statping/issues/270))&quot;
+[0] New Feature          (Added)
+[1] Bug Fix              (Fixed)
+[2] Feature change       (Changed)
+[3] New deprecation      (Deprecated)
+[4] Feature removal      (Removed)
+[5] Security fix         (Security)
+[6] Other                (Other)
+&gt;&gt; 1
+</code></pre>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Mobile App"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Mobile App</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>Statping has a free mobile app so you can monitor your websites and applications without the need of a computer.</p>
+
+<p><img src="https://img.shields.io/itunes/v/1445513219.svg" alt="iTunes App Store" /></p>
+
+<p align="center">
+<a href="https://play.google.com/store/apps/details?id=com.statping"><img src="https://img.cjx.io/google-play.svg"></a>
+<a href="https://itunes.apple.com/us/app/apple-store/id1445513219"><img src="https://img.cjx.io/app-store-badge.svg"></a>
+</p>
+
+<p align="center">
+<img src="https://img.cjx.io/statping_iphone_bk.png">
+</p>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Docker"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Docker</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>Statping is easily ran on Docker with the light weight Alpine linux image. View on <a href="https://hub.docker.com/r/statping/statping" target="_blank">Docker Hub</a>.</p>
+
+<p align="center">
+<img alt="Docker Image Version (tag latest semver)" src="https://img.shields.io/docker/v/statping/statping/latest"> 
+<img alt="Docker Image Size (tag)" src="https://img.shields.io/docker/image-size/statping/statping/latest?label=:latest&color=green"> <img alt="Docker Image Size (tag)" src="https://img.shields.io/docker/image-size/statping/statping/base?label=:base"> <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/statping/statping">
+</p>
+
+<h1>Volume Mount</h1>
+
+<ul>
+<li><code>/app</code> - Working directory in container. This directory will hold all configs, logs, assets, and sqlite database.</li>
+</ul>
+
+<h1>Latest Docker Image</h1>
+
+<p>The <code>latest</code> Docker image uses Alpine Linux to keep it ultra small.</p>
+
+<pre><code class="language-bash">docker run -d \
+  -p 8080:8080 \
+  --restart always \
+  statping/statping
+</code></pre>
+
+<h1>Mounting Volume</h1>
+
+<p>You can mount a volume to the <code>/app</code> Statping directory. This folder will contain <code>logs</code>, <code>config.yml</code>, and static assets if you want to edit the SCSS/CSS.</p>
+
+<pre><code class="language-bash">docker run -d \
+  -p 8080:8080 \
+  -v /mydir/statping:/app \
+  --restart always \
+  statping/statping
+</code></pre>
+
+<h1>Attach a SSL Certificate</h1>
+
+<p>When you mount <code>server.crt</code> and <code>server.key</code> to the <code>/app</code> directory, Statping will run a HTTPS server on port 443. Checkout the <a href="https://github.com/statping/statping/wiki/SSL" target="_blank">SSL Wiki</a> documentation to see more information about this.</p>
+
+<pre><code class="language-bash">docker run -d \
+  -p 443:443 \
+  -v /mydir/domain.crt:/app/server.crt \
+  -v /mydir/domain.key:/app/server.key \
+  -v /mydir:/app \
+  --restart always \
+  statping/statping
+</code></pre>
+
+<h1>Development Docker Image</h1>
+
+<p>If you want to run Statping that was build from the source, use the <code>dev</code> Docker image.</p>
+
+<pre><code class="language-bash">docker run -d -p 8080:8080 statping/statping:dev
+</code></pre>
+
+<h1>Cypress Testing Docker Image</h1>
+
+<p>This Docker image will pull the latest version of Statping and test the web interface with <a href="https://www.cypress.io/" target="_blank">Cypress</a>.</p>
+
+<pre><code class="language-bash">docker run -it -p 8080:8080 statping/statping:cypress
+</code></pre>
+
+<h4>Or use Docker Compose</h4>
+
+<p>This Docker Compose file inlcudes NGINX, Postgres, and Statping.</p>
+
+<h3>Docker Compose with NGINX and Postgres</h3>
+
+<p>Once you initiate the <code>docker-compose.yml</code> file below go to <a href="http://localhost" target="_blank">http://localhost</a> and you&rsquo;ll be forwarded to the /setup page.
+Database Authentication
+- database: <code>postgres</code>
+- port: <code>5432</code>
+- username: <code>statup</code>
+- password: <code>password123</code>
+- database: <code>statup</code></p>
+
+<pre><code class="language-yaml">version: '2.3'
+
+services:
+
+  nginx:
+    container_name: nginx
+    image: jwilder/nginx-proxy
+    ports:
+      - 0.0.0.0:80:80
+      - 0.0.0.0:443:443
+    networks:
+      - internet
+    restart: always
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ./statup/nginx/certs:/etc/nginx/certs:ro
+      - ./statup/nginx/vhost:/etc/nginx/vhost.d
+      - ./statup/nginx/html:/usr/share/nginx/html:ro
+      - ./statup/nginx/dhparam:/etc/nginx/dhparam
+    environment:
+      DEFAULT_HOST: localhost
+
+  statup:
+    container_name: statup
+    image: statping/statping:latest
+    restart: always
+    networks:
+      - internet
+      - database
+    depends_on:
+      - postgres
+    volumes:
+      - ./statup/app:/app
+    environment:
+      VIRTUAL_HOST: localhost
+      VIRTUAL_PORT: 8080
+      DB_CONN: postgres
+      DB_HOST: postgres
+      DB_USER: statup
+      DB_PASS: password123
+      DB_DATABASE: statup
+      NAME: EC2 Example
+      DESCRIPTION: This is a Statping Docker Compose instance
+
+  postgres:
+    container_name: postgres
+    image: postgres:10
+    restart: always
+    networks:
+      - database
+    volumes:
+      - ./statup/postgres:/var/lib/postgresql/data
+    environment:
+      POSTGRES_PASSWORD: password123
+      POSTGRES_USER: statup
+      POSTGRES_DB: statup
+
+networks:
+  internet:
+    driver: bridge
+  database:
+    driver: bridge
+</code></pre>
+
+<p>Or a simple wget&hellip;</p>
+
+<pre><code class="language-bash">wget https://raw.githubusercontent.com/statping/statping/master/servers/docker-compose.yml
+docker-compose up -d
+</code></pre>
+
+<h3>Docker Compose with Automatic SSL</h3>
+
+<p>You can automatically start a Statping server with automatic SSL encryption using this docker-compose file. First point your domain&rsquo;s DNS to the Statping server, and then run this docker-compose command with DOMAIN and EMAIL. Email is for letsencrypt services.</p>
+
+<pre><code class="language-bash">wget https://raw.githubusercontent.com/statping/statping/master/servers/docker-compose-ssl.yml
+
+LETSENCRYPT_HOST=mydomain.com \
+    LETSENCRYPT_EMAIL=info@mydomain.com \
+    docker-compose -f docker-compose-ssl.yml up -d
+</code></pre>
+
+<h4>Full docker-compose with Automatic SSL</h4>
+
+<pre><code class="language-yaml">version: '2.3'
+
+services:
+
+  nginx:
+    container_name: nginx
+    image: jwilder/nginx-proxy
+    ports:
+      - 0.0.0.0:80:80
+      - 0.0.0.0:443:443
+    labels:
+      - &quot;com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy&quot;
+    networks:
+      - internet
+    restart: always
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ./statup/nginx/certs:/etc/nginx/certs:ro
+      - ./statup/nginx/vhost:/etc/nginx/vhost.d
+      - ./statup/nginx/html:/usr/share/nginx/html:ro
+      - ./statup/nginx/dhparam:/etc/nginx/dhparam
+    environment:
+      DEFAULT_HOST: ${LETSENCRYPT_HOST}
+
+  letsencrypt:
+    container_name: letsencrypt
+    image: jrcs/letsencrypt-nginx-proxy-companion
+    networks:
+      - internet
+    restart: always
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - ./statup/nginx/certs:/etc/nginx/certs
+      - ./statup/nginx/vhost:/etc/nginx/vhost.d
+      - ./statup/nginx/html:/usr/share/nginx/html
+      - ./statup/nginx/dhparam:/etc/nginx/dhparam
+
+  statup:
+    container_name: statup
+    image: statping/statping:latest
+    restart: always
+    networks:
+      - internet
+      - database
+    depends_on:
+      - postgres
+    volumes:
+      - ./statup/app:/app
+    environment:
+      VIRTUAL_HOST: ${LETSENCRYPT_HOST}
+      VIRTUAL_PORT: 8080
+      LETSENCRYPT_HOST: ${LETSENCRYPT_HOST}
+      LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL}
+      DB_CONN: postgres
+      DB_HOST: postgres
+      DB_USER: statup
+      DB_PASS: password123
+      DB_DATABASE: statup
+      NAME: SSL Example
+      DESCRIPTION: This Status Status Page should be running ${LETSENCRYPT_HOST} with SSL.
+
+  postgres:
+    container_name: postgres
+    image: postgres:10
+    restart: always
+    networks:
+      - database
+    volumes:
+      - ./statup/postgres:/var/lib/postgresql/data
+    environment:
+      POSTGRES_PASSWORD: password123
+      POSTGRES_USER: statup
+      POSTGRES_DB: statup
+
+networks:
+  internet:
+    driver: bridge
+  database:
+    driver: bridge
+</code></pre>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Docker-Compose"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Docker-Compose</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>This page includes multiple docker-compose.yml setups for you to run. There are many environment variables for additional settings and features, checkout the <a href="https://github.com/statping/statping/wiki/Environment-Variables" target="_blank">Environment Variables Wiki</a> to see them all.</p>
+
+<p align="center">
+<img alt="Docker Image Version (tag latest semver)" src="https://img.shields.io/docker/v/statping/statping/latest"> 
+<img alt="Docker Image Size (tag)" src="https://img.shields.io/docker/image-size/statping/statping/latest?label=:latest&color=green"> <img alt="Docker Image Size (tag)" src="https://img.shields.io/docker/image-size/statping/statping/base?label=:base"> <img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/statping/statping">
+</p>
+
+<h3>Database Configurations</h3>
+
+<ul>
+<li><p><a href="#basic-sqlite-connection">SQLite</a></p></li>
+
+<li><p><a href="#mysql-connection">MySQL</a></p></li>
+
+<li><p><a href="#postgres">Postgres</a></p>
+
+<h3>Web Serving</h3></li>
+
+<li><p><a href="#traefik">Traefik</a></p></li>
+
+<li><p><a href="#nginx-proxy-pass">Nginx as proxy pass</a></p></li>
+
+<li><p><a href="#nginx-proxy-pass-with-ssl-letencrypt">Nginx with LetEncrypt SSL</a></p>
+
+<h3>Metrics</h3></li>
+
+<li>
+<h2><a href="#grafana-dashboard-with-prometheus">Grafana with Prometheus</a></h2></li>
+</ul>
+
+<h1>Docker Volumes</h1>
+
+<ul>
+<li><code>/app</code> - Main Volume that you should mount to a directory on the host machine</li>
+<li><code>/app/config.yml</code> - Config file</li>
+<li><code>/app/logs</code> - Logs folder (rotates every 3 days)</li>
+<li><code>/app/assets</code> - Folder containing all CSS, SCSS, JS and other static files (if you use custom styling)</li>
+<li><code>/app/statping.db</code> - SQLite database file (if you&rsquo;re using SQLite)
+&mdash;</li>
+</ul>
+
+<h1>Basic SQLite Connection</h1>
+
+<p>This docker-compose will start Statping on port 8080 and automatically run on a SQLite database.</p>
+
+<pre><code class="language-yaml">statping:
+  container_name: statping
+  image: statping/statping
+  restart: always
+  ports:
+    - 8080:8080
+  volumes:
+    - ./statping:/app
+  environment:
+    DB_CONN: sqlite
+</code></pre>
+
+<h1>MySQL Connection</h1>
+
+<pre><code class="language-yaml">statping:
+  container_name: statping
+  image: statping/statping
+  restart: always
+  depends_on:
+    - mysql
+  ports:
+    - 8080:8080
+  volumes:
+    - statping_data:/app
+  links:
+    - mysql
+  environment:
+    DB_CONN: mysql
+    DB_HOST: mysql
+    DB_PORT: 3306
+    DB_DATABASE: statping
+    DB_USER: root
+    DB_PASS: password123
+
+mysql:
+  image: mysql:5.7
+  volumes:
+    - mysql_data:/var/lib/mysql
+  restart: always
+  ports:
+    - 3306:3306
+  environment:
+    MYSQL_ROOT_PASSWORD: password123
+    MYSQL_DATABASE: statping
+    MYSQL_USER: root
+    MYSQL_PASSWORD: password
+</code></pre>
+
+<h1>Postgres</h1>
+
+<pre><code class="language-yaml">statping:
+  container_name: statping
+  image: statping/statping
+  restart: always
+  ports:
+    - 8080:8080
+  volumes:
+    - statping_data:/app
+  links:
+    - postgres
+  depends_on:
+    - postgres
+  environment:
+    DB_CONN: postgres
+    DB_HOST: postgres
+    DB_PORT: 5432
+    DB_DATABASE: statping
+    DB_USER: root
+    DB_PASS: password123
+
+postgres:
+  container_name: postgres
+  image: postgres:10.0-alpine
+  ports:
+    - 5432:5432
+  volumes:
+    - pg_data:/var/lib/postgresql/data/pg_data
+  environment:
+    POSTGRES_PASSWORD: password123
+    POSTGRES_DB: statping
+    POSTGRES_USER: root
+    POSTGRES_PORT: 5432
+    PGDATA: /var/lib/postgresql/data/pg_data
+</code></pre>
+
+<h1>Nginx Proxy Pass</h1>
+
+<p>The <a href="https://github.com/jwilder/nginx-proxy" target="_blank">jwilder/nginx-proxy</a> Docker image will automatically redirect a domain to a specific container.</p>
+
+<pre><code class="language-yaml">statping:
+  container_name: statping
+  image: statping/statping
+  restart: always
+  volumes:
+    - statping_data:/app
+  environment:
+    DB_CONN: sqlite
+    VIRTUAL_HOST: demo.statping.com
+    VIRTUAL_PORT: 8080
+
+nginx:
+  container_name: nginx
+  image: jwilder/nginx-proxy
+  ports:
+    - 80:80
+  volumes:
+    - /var/run/docker.sock:/tmp/docker.sock:ro
+</code></pre>
+
+<h1>Nginx Proxy Pass with SSL (jwilder/nginx-proxy)</h1>
+
+<p>Using the <a href="https://github.com/jwilder/nginx-proxy" target="_blank">jwilder/nginx-proxy</a> image along with <a href="https://github.com/JrCs/docker-letsencrypt-nginx-proxy-companion" target="_blank">jrcs/docker-letsencrypt-nginx-proxy-companion</a> you&rsquo;ll be able to automatically generate SSL certificates for your Statping instance.</p>
+
+<pre><code class="language-yaml">statping:
+  container_name: statping
+  image: statping/statping
+  restart: always
+  volumes:
+    - statping_data:/app
+  environment:
+    DB_CONN: sqlite
+    LETSENCRYPT_HOST: demo.statping.com
+    VIRTUAL_HOST: demo.statping.com
+    VIRTUAL_PORT: 8080
+
+nginx:
+  container_name: nginx
+  image: jwilder/nginx-proxy
+  restart: always
+  ports:
+    - 80:80
+    - 443:443
+  volumes:
+    - /var/run/docker.sock:/tmp/docker.sock:ro
+    - cert_volume:/etc/nginx/certs
+    - vhost_volume:/etc/nginx/vhost.d
+    - html_volume:/usr/share/nginx/html
+  environment:
+    DEFAULT_HOST: demo.statping.com
+  labels:
+    - &quot;com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy=true&quot;
+
+nginx-ssl:
+  container_name: nginx-ssl
+  image: jrcs/letsencrypt-nginx-proxy-companion
+  restart: always
+  links:
+    - nginx
+  volumes:
+    - /var/run/docker.sock:/var/run/docker.sock:ro
+    - cert_volume:/etc/nginx/certs
+    - vhost_volume:/etc/nginx/vhost.d
+    - html_volume:/usr/share/nginx/html
+  environment:
+    DEFAULT_EMAIL: info@mydomain.com
+    NGINX_PROXY_CONTAINER: nginx
+</code></pre>
+
+<h1>Grafana Dashboard with Prometheus</h1>
+
+<p>Grafana is an awesome metric visualizer that allows you to create some awesome dashboards. We&rsquo;ve already created a <a href="https://grafana.com/grafana/dashboards/6950" target="_blank">Grafana Dashboard</a> that you can easy import! Checkout the <a href="https://github.com/statping/statping/wiki/Prometheus-Exporter" target="_blank">Grafana Wiki</a> and the <a href="https://github.com/statping/statping/wiki/Prometheus-Exporter" target="_blank">Prometheus Exporter Wiki</a> for more details.</p>
+
+<h5><code>prometheus.yml</code> config file</h5>
+
+<p>This file should be mounted to <code>/etc/prometheus/prometheus.yml</code> in the Prometheus container.</p>
+
+<pre><code class="language-yaml">global:
+  scrape_interval:     30s
+  evaluation_interval: 30s
+
+scrape_configs:
+  - job_name: 'statping'
+    scrape_interval: 30s
+    bearer_token: 'SECRET API KEY HERE'
+    static_configs:
+      - targets: ['statping:8080']
+</code></pre>
+
+<blockquote>
+<p>Be sure to replace <code>SECRET API KEY HERE</code> with your API Secret on the Settings page.</p>
+</blockquote>
+
+<h5><code>docker-compose.yml</code> file for Statping, Grafana and Prometheus</h5>
+
+<pre><code class="language-yaml">statping:
+  container_name: statping
+  image: statping/statping
+  restart: always
+  volumes:
+    - statping_data:/app
+  environment:
+    DB_CONN: sqlite
+    LETSENCRYPT_HOST: demo.statping.com
+    VIRTUAL_HOST: demo.statping.com
+    VIRTUAL_PORT: 8080
+
+prometheus:
+  container_name: prometheus
+  image: prom/prometheus:v2.0.0
+  restart: always
+  ports:
+    - 9090:9090
+  volumes:
+    - prometheus.yml:/etc/prometheus/prometheus.yml # config file is above ^
+    - prometheus_data:/prometheus
+  links:
+    - statping
+  depends_on:
+    - statping
+
+grafana:
+  container_name: grafana
+  image: grafana/grafana
+  restart: always
+  ports:
+    - 3000:3000
+  volumes:
+    - grafana_data:/var/lib/grafana
+  environment:
+    - GF_SECURITY_ADMIN_PASSWORD=password123
+    - GF_USERS_ALLOW_SIGN_UP=false
+  depends_on:
+    - prometheus
+  links:
+    - prometheus
+</code></pre>
+
+<h1>Traefik</h1>
+
+<p>This docker-compose stack will start Statping and <a href="https://docs.traefik.io" target="_blank">Traefik</a> v2.2. You may need to research the Traefik label configs and edit to your own needs. The Traefik server will run on port 80 and 443, and Statping on port 8080.</p>
+
+<pre><code class="language-yaml">version: '3.4'
+
+services:
+
+  traefik:
+    container_name: traefik
+    image: traefik:v2.2.0
+    restart: always
+    command:
+      - --entrypoints.web.address=:80
+      - --entrypoints.websecure.address=:443
+      - --entrypoints.web.http.redirections.entryPoint.to=websecure
+      - --entrypoints.web.http.redirections.entryPoint.scheme=https
+      - --entrypoints.websecure.http.tls.certResolver=leresolverresolver
+      - --providers.docker
+      - --log=true
+      - --log.level=INFO
+    ports:
+      - &quot;80:80&quot;
+      - &quot;443:443&quot;
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    networks:
+      - frontend
+    labels:
+      - &quot;traefik.enable=true&quot;
+      - &quot;traefik.http.routers.traefik.rule=Host(`traefik.statping.com`)&quot;
+      - &quot;traefik.http.routers.traefik.service=api@internal&quot;
+      - &quot;traefik.http.routers.traefik.middlewares=admin&quot;
+      - &quot;traefik.http.routers.traefik.tls.certresolver=leresolver&quot;
+      - &quot;traefik.http.routers.traefik.entrypoints=websecure&quot;
+      - &quot;traefik.http.routers.http-catchall.entrypoints=web&quot;
+      - &quot;traefik.http.routers.http-catchall.rule=HostRegexp(`{host:.+}`)&quot;
+      - &quot;traefik.http.routers.http-catchall.middlewares=redirect-to-https&quot;
+      - &quot;traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https&quot;
+
+  statping:
+    container_name: statping
+    image: statping/statping:latest
+    restart: always
+    networks:
+      - frontend
+    volumes:
+      - ./statping_data:/app
+    environment:
+      DB_CONN: sqlite
+    labels:
+      - &quot;traefik.enable=true&quot;
+      - &quot;traefik.http.routers.statping.rule=Host(`demo.statping.com`)&quot;
+      - &quot;traefik.http.routers.statping.tls.certresolver=leresolver&quot;
+      - &quot;traefik.http.routers.statping.entrypoints=websecure&quot;
+      - &quot;traefik.http.services.statping.loadbalancer.server.port=8080&quot;
+
+networks:
+  frontend:
+    driver: bridge
+</code></pre>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "AWS EC2"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">AWS EC2</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>Running Statping on the smallest EC2 server is very quick using the AWS AMI Image. The AWS AMI Image will automatically start a Statping Docker container that will automatically update to the latest version. Once the EC2 is booted, you can go to the Public DNS domain to view the Statping installation page. The Statping root folder is located at: <code>/statping</code> on the server.</p>
+
+<h1>AMI Image</h1>
+
+<p>Choose the correct AMI Image ID based on your AWS region.
+- us-east-1 <code>ami-09ccd23d9c7afba61</code> (Virginia)
+- us-east-2 <code>ami-0c6c9b714a501cdb3</code> (Ohio)
+- us-west-1 <code>ami-02159cc1fc701a77e</code> (California)
+- us-west-2 <code>ami-007c6990949f5ccee</code> (Oregon)
+- eu-central-1 <code>ami-06e252d6d8b0c2f1f</code> (Frankfurt)</p>
+
+<h1>Upgrading Statping</h1>
+
+<p>You can upgrade the Statping executable by running the commands below on your EC2 instance.</p>
+
+<pre><code>VERSION=$(curl -s &quot;https://github.com/statping/statping/releases/latest&quot; | grep -o 'tag/[v.0-9]*' | awk -F/ '{print $2}')
+wget https://github.com/statping/statping/releases/download/$VERSION/statping-linux-x64.tar.gz
+tar -xvzf statping-linux-x64.tar.gz
+chmod +x statping
+mv statping /usr/local/bin/statping
+</code></pre>
+
+<p>You can test the version number by running <code>statping version</code>.</p>
+
+<h1>Instructions</h1>
+
+<h3>1. Create an EC2 instance from AMI Image</h3>
+
+<p>Go to the main EC2 dashboard and click &lsquo;Launch Instance&rsquo;. Then type <code>Statping</code> inside the search field for &lsquo;Community AMI&rsquo;. Once you&rsquo;ve found it in your region, click Select!</p>
+
+<p><img src="https://img.cjx.io/statpingaws-ami.png"></p>
+
+<h3>2. Get the Public DNS for EC2 Instance</h3>
+
+<p>Copy the &lsquo;Public DNS&rsquo; URL and paste it into your browser.</p>
+
+<p><img src="https://img.cjx.io/statping-aws-ec2.png"></p>
+
+<h3>3. Setup Statping</h3>
+
+<p>Use SQLite if you don&rsquo;t want to connect to a remote MySQL or Postgres database.</p>
+
+<p><img src="https://img.cjx.io/statping-setup.png"></p>
+
+<h1>EC2 Server Features</h1>
+
+<p>Running your Statping server on a small EC2 instance is perfect for most users. Below you&rsquo;ll find some commands to get up and running in seconds.
+- Super cheap on the t2.nano (~$4.60 monthly)
+- Small usage, 8gb of hard drive
+- Automatic SSL certificate if you require it
+- Automatic reboot when the server needs it
+- Automatic database cleanup, so you&rsquo;ll never be at 100% full.
+- Automatic docker containers/images removal</p>
+
+<h2>Create Security Groups</h2>
+
+<p>Using the AWS CLI you can copy and paste the commands below to auto create everything for you. The server opens port 80 and 443.</p>
+
+<pre><code class="language-bash">aws ec2 create-security-group --group-name StatpingPublicHTTP --description &quot;Statping HTTP Server on port 80 and 443&quot;
+# will response back a Group ID. Copy ID and use it for --group-id below.
+</code></pre>
+
+<pre><code class="language-bash">GROUPS=sg-7e8b830f
+aws ec2 authorize-security-group-ingress --group-id $GROUPS --protocol tcp --port 80 --cidr 0.0.0.0/0
+aws ec2 authorize-security-group-ingress --group-id $GROUPS --protocol tcp --port 443 --cidr 0.0.0.0/0
+</code></pre>
+
+<h2>Create EC2 without SSL</h2>
+
+<p>Once your server has started, go to the EC2 Public DNS endpoint. You should be redirected to /setup to continue your installation process! The database information is already inputed for you.</p>
+
+<pre><code class="language-bash">GROUPS=sg-7e8b830f
+KEY=MYKEYHERE
+AMI_IMAGE=ami-7be8a103
+
+aws ec2 run-instances \
+    --image-id $AMI_IMAGE \
+    --count 1 --instance-type t2.nano \
+    --key-name $KEY \
+    --security-group-ids $GROUPS
+</code></pre>
+
+<h3>EC2 Server Specs</h3>
+
+<ul>
+<li>t2.nano ($4.60 monthly)</li>
+<li>8gb SSD Memory</li>
+<li>0.5gb RAM</li>
+<li>Docker with Docker Compose installed</li>
+<li>Running Statping, NGINX, and Postgres</li>
+<li>boot scripts to automatically clean unused containers.</li>
+</ul>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Mac"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Mac</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<h1>Installing on Mac</h1>
+
+<p>Statping includes an easy to use <a href="https://github.com/statping/homebrew-statping" target="_blank">Homebrew Formula</a> to quick get your Status Page up and running locally. Statping on brew is automatically generated for each new release to master. Install with the commands below,</p>
+
+<h6>Using Homebrew</h6>
+
+<pre><code class="language-bash">brew tap statping/statping
+brew install statping
+</code></pre>
+
+<h6>Using the Terminal</h6>
+
+<pre><code class="language-shell">curl -o- -L https://statping.com/install.sh | bash
+</code></pre>
+
+<p align="center">
+<img width="80%" src="https://img.cjx.io/statupbrewinstall.gif">
+</p>
+
+<p>Once you&rsquo;ve installed it, checkout which version you have by running <code>statping version</code>.</p>
+
+<h1>Compiling SCSS for Custom Theme</h1>
+
+<p>Statping requires <code>sass</code> to be installed to the local machine to compile SCSS into CSS if you want to use the Custom Theme features.</p>
+
+<ul>
+<li>Node: <code>npm install sass -g</code></li>
+<li>Ruby: <code>gem install sass</code></li>
+</ul>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Linux"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Linux</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<h1>Installing on Linux</h1>
+
+<p>Installing and updating Statping on Linux can be done by downloading the latest tar.gz file, unzipping, and running the executable. Or run the install/upgrade script below.</p>
+
+<pre><code class="language-shell">curl -o- -L https://statping.com/install.sh | bash
+</code></pre>
+
+<h2>Install using Snapcraft</h2>
+
+<p><a href="https://snapcraft.io/statping" target="_blank"><img src="https://snapcraft.io/static/images/badges/en/snap-store-white.svg" alt="Get it from the Snap Store" /></a></p>
+
+<p>If you are using <a href="https://snapcraft.io/statping" target="_blank">snap</a>, you can simply run this command to install Statping.</p>
+
+<pre><code class="language-shell">sudo snap install statping
+</code></pre>
+
+<p><a href="https://snapcraft.io/statping">
+<img alt="statping" src="https://snapcraft.io/statping/badge.svg" />
+</a></p>
+
+<h1>Compiling SCSS for Custom Theme</h1>
+
+<p>Statping requires <code>sass</code> to be installed to the local machine to compile SCSS into CSS if you want to use the Custom Theme features.</p>
+
+<ul>
+<li>Apt: <code>apt install ruby-sass -y</code></li>
+<li>Node: <code>npm install sass -g</code></li>
+<li>Ruby: <code>gem install sass</code></li>
+</ul>
+
+<h2>Systemd Service</h2>
+
+<p>Setting up a systemd service is a great way to make sure your Statping server will automatically reboot when needed. You can use the file below for your service. You should have Statping already installed by this step.</p>
+
+<h6>/etc/systemd/system/statping.service</h6>
+
+<pre><code>[Unit]
+Description=Statping Server
+After=network.target
+After=systemd-user-sessions.service
+After=network-online.target
+
+[Service]
+Type=simple
+Restart=always
+ExecStart=/usr/local/bin/statping
+WorkingDirectory=/usr/local/bin
+
+[Install]
+WantedBy=multi-user.target
+</code></pre>
+
+<p>Then you can enable and start your systemd service with:</p>
+
+<pre><code>systemctl daemon-reload
+
+systemctl enable statping.service
+
+systemctl start statping
+</code></pre>
+
+<p>You&rsquo;re Statping server will now automatically restart when your server restarts.</p>
+
+<p>Please note that Statping&rsquo;s files (logs, config and database) will be created inside &ldquo;/usr/local/bin/&rdquo; after the service is ran for the first time, unless you change &ldquo;WorkingDirectory&rdquo; configuration option in the systemd service configuration as seen above.</p>
+
+<h2>Raspberry Pi</h2>
+
+<p>You can even run Statping on your Raspberry Pi by installing the precompiled binary from <a href="https://github.com/statping/statping/releases/latest" target="_blank">Latest Releases</a>. For the Raspberry Pi 3 you&rsquo;ll want to download the <code>statping-linux-arm7.tar.gz</code> file. Be sure to change <code>VERSION</code> to the latest version in Releases, and include the &lsquo;v&rsquo;.</p>
+
+<pre><code>VERSION=$(curl -sL &quot;https://github.com/statping/statping/releases/latest&quot; | grep -o 'tag/[v.0-9]*' | awk -F/ '{print $2}' | head -n1)
+wget https://github.com/statping/statping/releases/download/$VERSION/statping-linux-arm-7.tar.gz
+tar -xvzf statping-linux-arm-7.tar.gz
+chmod +x statping
+mv statping /usr/local/bin/statping
+
+statping version
+</code></pre>
+
+<h2>Alpine Linux</h2>
+
+<p>The Docker image is using the Statping Alpine binary since it&rsquo;s so incredibly small. You can run it on your own alpine image by downloading <code>statping-linux-alpine.tar.gz</code> from <a href="https://github.com/statping/statping/releases/latest" target="_blank">Latest Releases</a>.</p>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Windows"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Windows</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<h1>Installing on Windows</h1>
+
+<p>Currently, Statping only works on Windows 64-bit computers. Just download the exe file from <a href="https://github.com/statping/statping/releases/latest" target="_blank">Latest Releases</a> and run it in your command prompt. It will create a HTTP server on port 8080, so you can visit <code>http://localhost:8080</code> to see your Statping Status Page.</p>
+
+<h1>Compiling SCSS for Custom Theme</h1>
+
+<p>Statping requires <code>sass</code> to be installed to the local machine to compile SCSS into CSS if you want to use the Custom Theme features.</p>
+
+<ul>
+<li>Node: <code>npm install sass -g</code></li>
+<li>Ruby: <code>gem install sass</code></li>
+</ul>
+
+<h1>Running Statping as a Service</h1>
+
+<p>To ensure Statping is always running, it can be installed to run as a service on a Windows machine. The easiest way to do that is by using NSSM, the <a href="https://nssm.cc/download" target="_blank">Non-Sucking Service Manager</a>. Download and unzip the compressed file to a location on your machine running Statping to get started:
+1. Open an administrative command prompt.
+2. Change to the folder that contains the 64 bit version of NSSM.
+3. Type &ldquo;nssm install Statping&rdquo; and press enter.
+4. For the properties, use the following as an example:
+    Path: C:\Program Files\Statping\statping.exe
+    Startup directory: C:\Program Files\Statping
+5. Click &ldquo;Install&rdquo;.
+6. Launch the windows services manager.
+7. Run Statping.</p>
+
+<h2>Known Issues with Windows</h2>
+
+<p>Unfortunately, Statping only works on Windows 64-bit processors. If you have more than 4gb of ram, there&rsquo;s a good chance you already have a 64-bit processor. Download the <a href="https://github.com/statping/statping/releases/latest" target="_blank">Latest Releases</a> of Statping, extract the ZIP file, then double click on the <code>statping.exe</code> file. You can use a SQLite database for a quick setup, or connect to a local/remote Postgres or MySQL database server.</p>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Cloud Foundry"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Cloud Foundry</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<h3>Installation</h3>
+
+<p>For OSX, you can install the <a href="https://github.com/cloudfoundry/cli" target="_blank">Cloud Foundry CLI</a> tool from Brew.</p>
+
+<pre><code class="language-shell">brew install cloudfoundry/tap/cf-cli
+</code></pre>
+
+<h3>Statping Yaml Config</h3>
+
+<p>You can include multiple environment variables to the configg file. If you include <code>DB_CONN</code> Statping will attempt to automatically connect to that database. View the <a href="https://github.com/statping/statping/wiki/Config-with-.env-File" target="_blank">Full List of Environment Variables</a> to fully customize this config.</p>
+
+<pre><code class="language-yaml">applications:
+- name: statping
+  docker:
+    image: statping/statping
+  timeout: 180
+  env:
+    DB_CONN: sqlite / mysql / postgres
+    DB_HOST: ...
+    DB_PORT: ...
+    DB_DATABASE: ...
+    DB_USER: ...
+    DB_PASS: ...
+</code></pre>
+
+<p>Save this file as <code>manifest.yml</code> and then run: <code>cf push</code></p>
+
+<h3>Advanced Yaml Config</h3>
+
+<pre><code class="language-yaml">applications:
+- name: statping
+  docker:
+    image: statping/statping:((version))
+  timeout: 180
+  env: ((env))
+</code></pre>
+
+<p>Then you can run a command like:</p>
+
+<pre><code class="language-shell">cf push --var version=v0.80.53 --var env='DB_CONN: sqlite'
+</code></pre>
+
+<p>Thank you <a href="https://github.com/giner" target="_blank">@giner</a> for creating this documentation.</p>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Development"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Development</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<h1>Useful Codebase</h1>
+
+<ul>
+<li><p><a href="https://github.com/statping/statping/blob/master/handlers/routes.go" target="_blank">handlers/routes.go</a> - Contains all the HTTP request routes</p></li>
+
+<li><p><a href="https://github.com/statping/statping/blob/master/cmd/commands.go" target="_blank">cmd/commands.go</a> - CLI Commands</p></li>
+
+<li><p><a href="https://github.com/statping/statping/blob/master/types/services/struct.go" target="_blank">types/service/struct.go</a> - Service struct</p></li>
+
+<li><p><a href="https://github.com/statping/statping/blob/master/types/core/struct.go" target="_blank">types/core/struct.go</a> - Core struct</p></li>
+</ul>
+
+<h1>Deployment Process</h1>
+
+<p>Statping is a pretty cool server for monitoring your services. The way we deploy might be a little cooler though. Statping is using the most bleeding edge technology to release updates and distribute binary files automatically.</p>
+
+<ol>
+<li>Source code commits get pushed to Github</li>
+<li><a href="https://github.com/GeertJohan/go.rice" target="_blank">go.rice</a> will compile all the static assets into 1 file (rice-box.go in source)</li>
+<li>SASS will generate  a compiled version of the CSS.</li>
+<li>Statping Help page is generated by cloning the Wiki repo using <code>go generate</code>.</li>
+<li>Travis-CI tests the Golang application.</li>
+<li>Travis-CI tests the Statping API using <a href="https://github.com/statping/statping/blob/master/source/tmpl/postman.json" target="_blank">Postman</a>.</li>
+<li>If all tests are successful, Travis-CI will compile the binaries using <a href="https://github.com/karalabe/xgo" target="_blank">xgo</a>.</li>
+<li>Binaries are code signed using the official <a href="https://github.com/statping/statping/wiki/PGP-Signature" target="_blank">PGP key</a> and compressed.</li>
+<li><a href="https://cloud.docker.com/repository/docker/statping/statping/builds" target="_blank">Docker</a> receives a trigger to build for the <code>latest</code> tag.</li>
+<li>Travis-CI uploads the <a href="https://github.com/statping/statping/releases" target="_blank">latest release</a> as a tagged version on Github.</li>
+<li>Travis-CI updates the <a href="https://github.com/hunterlong/homebrew-statping" target="_blank">homebrew-statping</a> repo with the latest version.</li>
+</ol>
+
+<p>And that&rsquo;s it! Statping is ready to be shipped and installed.</p>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Makefile"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Makefile</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>Here&rsquo;s a simple list of Makefile commands you can run using <code>make</code>. The <a href="https://github.com/statping/statping/blob/master/Makefile" target="_blank">Makefile</a> may change often, so i&rsquo;ll try to keep this Wiki up-to-date.</p>
+
+<p align="center">
+<a href="https://github.com/statping/statping/blob/master/Makefile">View Makefile</a>
+</p>
+
+<h1>Useful Commands</h1>
+
+<ul>
+<li><code>make clean</code> - Cleans the Statping directory for a fresh start</li>
+<li><code>make test-deps</code> - Installs required golang libraries for compiling and building</li>
+</ul>
+
+<h1>Building</h1>
+
+<ul>
+<li><code>make build</code> - Build the golang Statping binary for native OS</li>
+<li><code>make compile</code> - Compiles the production frontend Vue</li>
+<li><code>make build-all</code> - Cleans, compiles, and builds all binaries</li>
+<li><code>make build-linux</code> - Builds Linux binaries</li>
+<li><code>make build-mac</code> - Builds MacOSX binaries</li>
+<li><code>make build-win</code> - Builds Windows binaries</li>
+</ul>
+
+<h1>Testing</h1>
+
+<ul>
+<li><code>make test</code> - Cleans, compiles and runs golang unit testing</li>
+<li><code>make test-api</code> - Test postman API endpoints</li>
+<li><code>make test-cli</code> - Test that run on Github Actions using <code>sqlite</code></li>
+</ul>
+
+<h1>Docker</h1>
+
+<ul>
+<li><code>make docker-latest</code> - Builds the <code>base</code> and <code>latest</code> Statping images</li>
+<li><code>make start</code> - Run the entire Statping stack with multiple databases and Grafana</li>
+<li><code>make stop</code> - Stop the entire Statping stack</li>
+<li><code>make lite</code> - Run a lite Statping stack that includes Postgres</li>
+</ul>
+
+<h1>Required System Libraries</h1>
+
+<ul>
+<li>Ubuntu <code>apt-get install build-essential</code></li>
+<li>MacOSX <code>sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer</code></li>
+<li>Windows <a href="http://gnuwin32.sourceforge.net/packages/make.htm" target="_blank">Install Guide for GNU make utility</a></li>
+<li>CentOS/RedHat <code>yum groupinstall &quot;Development Tools&quot;</code></li>
+</ul>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "GraphQL"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">GraphQL</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>Statping implements the <a href="https://graphql.org/" target="_blank">GraphQL</a> API interface so you can customize the exact data you need within a query. The GraphQL endpoint is at <code>/graphql</code> on your Statping instance and is only available for Authenticated users or while sending the <code>Authorization</code> API Secret.</p>
+
+<p align="center">
+<a href="https://github.com/statping/statping/blob/master/handlers/graphql/schema.graphql">View schema.graphql</a>
+</p>
+
+<hr>
+
+<h3>Example Queries</h3>
+
+<p>Retrieve the <code>id</code>, <code>name</code>, and <code>public</code> parameters from <code>service</code> #2.</p>
+
+<h6>GraphQL Query:</h6>
+
+<pre><code class="language-graphql">{
+  service(id: 2) {
+    id
+    name
+    public
+  }
+}
+</code></pre>
+
+<h6>Response:</h6>
+
+<pre><code class="language-json">{
+  &quot;data&quot;: {
+    &quot;service&quot;: {
+      &quot;id&quot;: 2,
+      &quot;name&quot;: &quot;Statping Github&quot;,
+      &quot;public&quot;: true
+    }
+  }
+}
+</code></pre>
+
+<hr>
+
+<h3>GraphQL Integration Checklist</h3>
+
+<ul>
+<li><p>[x] Core (read)</p></li>
+
+<li><p>[x] Services (read)</p></li>
+
+<li><p>[x] Groups (read)</p></li>
+
+<li><p>[x] Users (read)</p></li>
+
+<li><p>[x] Messages (read)</p></li>
+
+<li><p>[x] Failures (read)</p></li>
+
+<li><p>[x] Checkins (read)</p></li>
+
+<li><p>[ ] Core (update)</p></li>
+
+<li><p>[ ] Services (update/create)</p></li>
+
+<li><p>[ ] Groups (update/create)</p></li>
+
+<li><p>[ ] Users (update/create)</p></li>
+
+<li><p>[ ] Messages (update/create)</p></li>
+
+<li><p>[ ] Failures (update/create)</p></li>
+
+<li><p>[ ] Checkins (update/create)</p></li>
+</ul>
+
+<hr>
+
+<p>The code for handling GraphQL requests is in <a href="https://github.com/statping/statping/tree/master/handlers/graphql" target="_blank">handlers/graphql</a> and is using <a href="https://github.com/99designs/gqlgen" target="_blank">gqlgen</a> to automatically generate the schema based on the golang structs.</p>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "SSL"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">SSL</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>You can run Statping with a valid certificate by including 2 files in the root directory. Although, I personally recommend using NGINX or Apache to serve the SSL and then have the webserver direct traffic to the Statping instance. This guide will show you how to implement SSL onto your Statping server with multiple options.</p>
+
+<h2>LetsEncrypt</h2>
+
+<p>You can have Statping generate SSL certificates with LetsEncrypt by entering the following environment variables. Make sure the domain name is pointing to the address of your Statping instance. Once certificates are generated, they will be stored in the <code>certs</code> folder and will automatically renew 30 days before they expire.</p>
+
+<ul>
+<li><code>LETSENCRYPT_ENABLE</code> - Set to <strong>true</strong> to have LetsEncrypt enabled. (defaults to false)</li>
+<li><code>LETSENCRYPT_HOST</code> - Domain to generate SSL certificate</li>
+<li><code>LETSENCRYPT_EMAIL</code> - Email address that gets sent with the LetsEncrypt Request</li>
+</ul>
+
+<h2>SSL Certificate with Statping</h2>
+
+<p>If you have your own SSL certificates, use this method. To run the Statping HTTP server in SSL mode, you must include 2 files in the root directory of your Statping application. The 2 files you must include are:
+- <code>server.crt</code> SSL Certificate File
+- <code>server.key</code> SSL Certificate Key File</p>
+
+<p>The filenames and extensions must match the exact naming above. If these 2 files are found, Statping will automatically start the HTTP server in SSL mode using your certificates. You can also generate your own SSL certificates, but you will receive a &ldquo;ERR_CERT_AUTHORITY_INVALID&rdquo; error. To generate your own, follow the commands below:</p>
+
+<pre><code class="language-shell">openssl req -new -sha256 -key server.key -out server.csr
+openssl x509 -req -sha256 -in server.csr -signkey server.key -out server.crt -days 3650
+</code></pre>
+
+<p>This will generate a self signed certificate that you can use for your Statup instance. I recommend using a web server to do SSL termination for your server though.</p>
+
+<h2>Choose a Web Server or Environment</h2>
+
+<p><strong>Choose the environment running the Statping instance.</strong>
+- <a href="#docker">Docker</a>
+- <a href="#nginx">NGINX</a>
+- <a href="#apache">Apache</a></p>
+
+<h2>Docker</h2>
+
+<p>Docker might be the easiest way to get up and running with a SSL certificate. Below is a <code>docker-compose.yml</code> file that will run NGINX, LetEncrypt, and Statping.</p>
+
+<ol>
+<li><p>Point your domain or subdomain to the IP address of the Docker server. This would be done on CloudFlare, Route53, or some other DNS provider.</p></li>
+
+<li><p>Replace the <code>docker-compose.yml</code> contents:</p></li>
+</ol>
+
+<ul>
+<li><code>MY.DOMAIN.COM</code> with the domain you want to use</li>
+<li><code>MY@EMAIL.COM</code> with your email address</li>
+</ul>
+
+<ol>
+<li>Run the docker container by running command <code>docker-compose up -d</code>. Give a little bit of time for LetEncrypt to automatically generate your SSL certificate.</li>
+</ol>
+
+<h6><code>docker-compose.yml</code></h6>
+
+<pre><code class="language-yaml">version: '2.3'
+services:
+  nginx:
+    container_name: nginx
+    image: jwilder/nginx-proxy
+    ports:
+      - 0.0.0.0:80:80
+      - 0.0.0.0:443:443
+    labels:
+      - &quot;com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy&quot;
+    networks:
+      - internet
+    restart: always
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ./statping/nginx/certs:/etc/nginx/certs:ro
+      - ./statping/nginx/vhost:/etc/nginx/vhost.d
+      - ./statping/nginx/html:/usr/share/nginx/html:ro
+      - ./statping/nginx/dhparam:/etc/nginx/dhparam
+    environment:
+      DEFAULT_HOST: MY.DOMAIN.COM
+
+  letsencrypt:
+    container_name: letsencrypt
+    image: jrcs/letsencrypt-nginx-proxy-companion
+    networks:
+      - internet
+    restart: always
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - ./statping/nginx/certs:/etc/nginx/certs
+      - ./statping/nginx/vhost:/etc/nginx/vhost.d
+      - ./statping/nginx/html:/usr/share/nginx/html
+      - ./statping/nginx/dhparam:/etc/nginx/dhparam
+
+  statping:
+    container_name: statping
+    image: statping/statping:latest
+    restart: always
+    networks:
+      - internet
+    depends_on:
+      - nginx
+    volumes:
+      - ./statping/app:/app
+    environment:
+      VIRTUAL_HOST: MY.DOMAIN.COM
+      VIRTUAL_PORT: 8080
+      LETSENCRYPT_HOST: MY.DOMAIN.COM
+      LETSENCRYPT_EMAIL: MY@EMAIL.COM
+
+networks:
+  internet:
+    driver: bridge
+</code></pre>
+
+<h2>NGINX</h2>
+
+<p>If you already have a NGINX web server running, you just have to add a proxy pass and your SSL certs to the nginx config or as a vhost. By default Statping runs on port 8080, you can change this port by starting server with <code>statping --ip 127.0.0.1 --port 9595</code>.</p>
+
+<ul>
+<li>Replace <code>/my/absolute/directory/for/cert/server.crt</code> with SSL certificate file.</li>
+<li>Replace <code>/my/absolute/directory/for/key/server.key</code> with SSL key file.</li>
+<li>Run <code>service nginx restart</code> and try out https on your domain.</li>
+</ul>
+
+<h5>Tutorials</h5>
+
+<ul>
+<li><a href="https://docs.nginx.com/nginx/admin-guide/security-controls/terminating-ssl-http/" target="_blank">NGINX Guide</a></li>
+<li><a href="https://www.digitalocean.com/community/tutorials/how-to-set-up-nginx-load-balancing-with-ssl-termination" target="_blank">How To Set Up Nginx Load Balancing with SSL Termination</a></li>
+</ul>
+
+<h6><code>/etc/nginx/nginx.conf</code></h6>
+
+<pre><code>#user  nobody;
+worker_processes  1;
+events {
+    worker_connections  1024;
+}
+http {
+    include            mime.types;
+    default_type       application/octet-stream;
+    send_timeout       1800;
+    sendfile           on;
+    keepalive_timeout  6500;
+    server {
+        listen       80;
+        server_name  localhost;
+        location / {
+          proxy_pass          http://localhost:8080;
+          proxy_set_header    Host             $host;
+          proxy_set_header    X-Real-IP        $remote_addr;
+          proxy_set_header    X-Forwarded-For  $proxy_add_x_forwarded_for;
+          proxy_set_header    X-Client-Verify  SUCCESS;
+          proxy_set_header    X-Client-DN      $ssl_client_s_dn;
+          proxy_set_header    X-SSL-Subject    $ssl_client_s_dn;
+          proxy_set_header    X-SSL-Issuer     $ssl_client_i_dn;
+          proxy_read_timeout 1800;
+          proxy_connect_timeout 1800;
+        }
+    }
+    # HTTPS server
+
+    server {
+        listen       443;
+        server_name  localhost;
+
+        ssl                  on;
+        ssl_certificate      /my/absolute/directory/for/cert/server.crt;
+        ssl_certificate_key  /my/absolute/directory/for/key/server.key;
+        ssl_session_timeout  5m;
+
+        ssl_protocols  SSLv2 SSLv3 TLSv1;
+        ssl_ciphers  ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
+        ssl_prefer_server_ciphers   on;
+
+        location / {
+          proxy_pass          http://localhost:8080;
+          proxy_set_header    Host             $host;
+          proxy_set_header    X-Real-IP        $remote_addr;
+          proxy_set_header    X-Forwarded-For  $proxy_add_x_forwarded_for;
+          proxy_set_header    X-Client-Verify  SUCCESS;
+          proxy_set_header    X-Client-DN      $ssl_client_s_dn;
+          proxy_set_header    X-SSL-Subject    $ssl_client_s_dn;
+          proxy_set_header    X-SSL-Issuer     $ssl_client_i_dn;
+          proxy_read_timeout 1800;
+          proxy_connect_timeout 1800;
+        }
+    }
+}
+</code></pre>
+
+<h2>Apache</h2>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Config with .env File"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Config with .env File</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>It may be useful to load your environment using a <code>.env</code> file in the root directory of your Statping server. The .env file will be automatically loaded on startup and will overwrite all values you have in config.yml.</p>
+
+<p>If you have the <code>DB_CONN</code> environment variable set Statping will bypass all values in config.yml and will require you to have the other DB_* variables in place. You can pass in these environment variables without requiring a .env file.</p>
+
+<h2><code>.env</code> File</h2>
+
+<pre><code class="language-bash">DB_CONN=postgres
+DB_HOST=0.0.0.0
+DB_PORT=5432
+DB_USER=root
+DB_PASS=password123
+DB_DATABASE=root
+
+NAME=Demo
+DESCRIPTION=This is an awesome page
+DOMAIN=https://domain.com
+ADMIN_USER=admin
+ADMIN_PASSWORD=admin
+ADMIN_EMAIL=info@admin.com
+USE_CDN=true
+POSTGRES_SSLMODE=false # enable ssl_mode for postgres (To enable use require)
+DISABLE_LOGS=false # disable logs from appearing and writing to disk
+
+IS_DOCKER=false
+IS_AWS=false
+SASS=/usr/local/bin/sass
+CMD_FILE=/bin/bash
+</code></pre>
+
+<p>This .env file will include additional variables in the future, subscribe to this repo to keep up-to-date with changes and updates.</p>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "config.yml"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">config.yml</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>The <code>config.yml</code> file contains all of the Statping database settings and API keys/secrets. When Statping loads, it will attempt to open this file to parse it&rsquo;s core values. You can view the Go type file on <a href="https://github.com/statping/statping/blob/master/types/types.go#L40" target="_blank">types/types.go</a>.</p>
+
+<h3><code>config.yml</code> Parameters</h3>
+
+<ul>
+<li><strong>connection</strong>: sqlite (sqlite, mysql, postgres)</li>
+<li><strong>host</strong>: 0.0.0.0 (database host)</li>
+<li><strong>user</strong>: root (database username)</li>
+<li><strong>password</strong>: password123 (database password)</li>
+<li><strong>database</strong>: root (Statping database name)</li>
+<li><strong>port</strong>: 5432 (database port)</li>
+<li><strong>api_key</strong>: 1d31a96a8b3&hellip; (Public API Key)</li>
+<li><strong>api_secret</strong>: 18cd0a7373cb&hellip; (Private API Key)</li>
+<li><strong>location</strong>: /Users/username/statping_dir (Statping absolute directory)</li>
+</ul>
+
+<p>The <code>location</code> setting will contain core files/folders for Statping like, <code>logs</code>, <code>assets</code>, and should contain the <code>config.yml</code> file.</p>
+
+<h2>Using Environment Variables instead of <code>config.yml</code></h2>
+
+<p>You technically don&rsquo;t need this <code>config.yml</code> file to run Statping. You can also run the Statping server by including environment variables when you start the server. You can view all the available variables by viewing the <a href="https://github.com/statping/statping/wiki/Config-with-.env-File" target="_blank">Config with .env</a> Wiki page.</p>
+
+<p><strong>Statping will auto run with environment variables if</strong> <code>DB_CONN</code> <strong>is set!</strong></p>
+
+<h2>Example <code>config.yml</code></h2>
+
+<pre><code class="language-yaml">connection: mysql
+host: localhost
+user: root
+password: password123
+database: root
+port: 3306
+api_secret: apisecretcanbeset
+location: /app/statping
+</code></pre>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Static HTML Exporter"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Static HTML Exporter</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>You might have a server that won&rsquo;t allow you to run command that run longer for 60 seconds, or maybe you just want to export your status page to a static HTML file. Using the Statping exporter you can easily do this with 1 command.</p>
+
+<pre><code>statping export
+</code></pre>
+
+<h6>&lsquo;index.html&rsquo; is created in current directory with static CDN url&rsquo;s.</h6>
+
+<h2>Push to Github</h2>
+
+<p>Once you have the <code>index.html</code> file, you could technically send it to an FTP server, Email it, Pastebin it, or even push to your Github repo for Status updates directly from repo.</p>
+
+<pre><code class="language-bash">git add index.html
+git commit -m &quot;Updated Status Page&quot;
+git push -u origin/master
+</code></pre>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "Prometheus Exporter"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">Prometheus Exporter</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>Statping includes a prometheus exporter so you can have even more monitoring power with your services. The prometheus exporter can be seen on <code>/metrics</code>, simply create another exporter in your prometheus config. Use your Statping API Secret for the Authorization Bearer header, the <code>/metrics</code> URL is dedicated for Prometheus and requires the correct API Secret has <code>Authorization</code> header.</p>
+
+<h1>Grafana Dashboard</h1>
+
+<p>Statping has a <a href="https://grafana.com/dashboards/6950" target="_blank">Grafana Dashboard</a> that you can quickly implement if you&rsquo;ve added your Statping service to Prometheus. Import Dashboard ID: <code>6950</code> into your Grafana dashboard and watch the metrics come in!</p>
+
+<p align="center"><img width="80%" src="https://img.cjx.io/statupgrafana.png"></p>
+
+<h2>Basic Prometheus Exporter</h2>
+
+<p>If you have Statping and the Prometheus server in the same Docker network, you can use the yaml config below.</p>
+
+<pre><code class="language-yaml">scrape_configs:
+  - job_name: 'statping'
+    scrape_interval: 30s
+    bearer_token: 'SECRET API KEY HERE'
+    static_configs:
+      - targets: ['statping:8080']
+</code></pre>
+
+<h2>Remote URL Prometheus Exporter</h2>
+
+<p>This exporter yaml below has <code>scheme: https</code>, which you can remove if you arn&rsquo;t using HTTPS.</p>
+
+<pre><code class="language-yaml">scrape_configs:
+  - job_name: 'statping'
+    scheme: https
+    scrape_interval: 30s
+    bearer_token: 'SECRET API KEY HERE'
+    static_configs:
+      - targets: ['status.mydomain.com']
+</code></pre>
+
+<h3><code>/metrics</code> Output</h3>
+
+<pre><code>statping_total_failures 206
+statping_total_services 4
+statping_service_failures{id=&quot;1&quot; name=&quot;Google&quot;} 0
+statping_service_latency{id=&quot;1&quot; name=&quot;Google&quot;} 12
+statping_service_online{id=&quot;1&quot; name=&quot;Google&quot;} 1
+statping_service_status_code{id=&quot;1&quot; name=&quot;Google&quot;} 200
+statping_service_response_length{id=&quot;1&quot; name=&quot;Google&quot;} 10777
+statping_service_failures{id=&quot;2&quot; name=&quot;Statping.com&quot;} 0
+statping_service_latency{id=&quot;2&quot; name=&quot;Statping.com&quot;} 3
+statping_service_online{id=&quot;2&quot; name=&quot;Statping.com&quot;} 1
+statping_service_status_code{id=&quot;2&quot; name=&quot;Statping.com&quot;} 200
+statping_service_response_length{id=&quot;2&quot; name=&quot;Statping.com&quot;} 2
+</code></pre>
+
+		</div>
+	</div>
+
+	<div class="col-12" v-if='tab === "PGP Signature"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">PGP Signature</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				<p>You can check if the Statping binary you downloaded is authentic by running a few commands.</p>
+
+<h3>Steps to Authenticate</h3>
+
+<ol>
+<li>Download the Statping <code>tar.gz</code> file from <a href="https://github.com/statping/statping/releases/latest" target="_blank">Latest Releases</a> and extract the <code>statping</code> binary and the <code>statup.asc</code> file.</li>
+<li>Run command: <code>gpg --verify statping.asc</code></li>
+<li>You should see <code>Good signature from &quot;Hunter Long &lt;info@statping.com&gt;&quot; [ultimate]</code>.</li>
+</ol>
+
+<h1>Statping Public Key</h1>
+
+<ul>
+<li><a href="https://statping.com/statping.gpg" target="_blank">https://statping.com/statping.gpg</a></li>
+</ul>
+
+<p>You can also download the key with the command below:</p>
+
+<pre><code>wget https://statping.com/statping.gpg
+</code></pre>
+
+<h6><code>statping.gpg</code></h6>
+
+<pre><code>-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFwGUYIBEADNsDY4aUOx8EoZuTRFPtjuadJzFRyKtHhw/tLlAnoFACanZPIT
+NZoRYvRR5v6lMDXdxsteDbJEOhZ1WDiKIr4OyMahPsyyH6ULzSBKgePUswa0sDef
+UnXYzPFQCzqQyQQFbp9AYfDP7dW6dTL9I6qU2NqlJvjxJiiZTAq87SmsLqHiASnI
++ottnQuu6vJQBJz2PFIuaS1c3js/+HBbth9GK5B9YN1BIIyZoFmWKVU9HnJf+aM3
+Us6OLjjwYwWzQH38ZV84IjVXyiP9PQVhlCXeHK7XdhPZvnSP1m5Wszj/jowwY6Mz
+LgLotfL540X7yOJ7hJTFYLFBOtJdJr/3Ov8SH4HXdPFPVG+UqxsmtmPqUQ9iAxAE
+jRFfkAxBvH5Szf2WZdaLnlrrOcOKJIIjZgHqalquBTAhlh5ul0lUVSSPxetwIBlW
+60L41k94NJFGDt8xOJ+122mLcywmQ1CzhDfeIKlxl6JDiVHjoRqlQQrqIoNZMV85
+rzGfrmbuwv1MXGBJoiNy3330ujOBmhQ9dQVwKpxhBKdjnAgIGM9szbUYxIkGgM1O
+U4b1WF3AF/9JOpKJ0LewslpM3BFFYnemGsHXAv3TBPqKidNdwMAiBOtNykGoXF6i
+0D6jOW/IB1da0gUA+kr5JdAOwIG7JXKhur2MO7Ncid59DL2N8RePRWj+jwARAQAB
+tB9IdW50ZXIgTG9uZyA8aW5mb0BzdGF0cGluZy5jb20+iQJOBBMBCAA4FiEEt21h
++qbbdZRm6D2ZZLnGquLVUngFAlwGUYICGwMFCwkIBwIGFQoJCAsCBBYCAwECHgEC
+F4AACgkQZLnGquLVUnizwA//c7vmwTMq/8LYlbo37WM2kDE9AKIrz6VSMq4RhGbC
+LikH0X0epa+if79n9BZrVU/Af3aKTn7vu2J4XrvzcdCXtcsR0YmCWML2Y6OSFmhX
+w3o6woiFcp+SUWdcM/kithRun+j9sKV4akdgkdBQUdh/RMVln+radz1c6G59iTdh
+S+Ip3ObO7Gn5VnrLwxix+W9Jhg8YhDgDGEDt8e1yvjuMRY+WhjHFlwEMoE0kvQL8
+QvQH2dGD3dExWAuIL7+0xC0ZGU0PR8vRrq1ukdIsWlDY+42vvhcyPZKFFDTM/QLF
+FcCNiPSGhiK/NQq67xnRMFdh0fnqbydWj2atMpacIrheEkOt8db2/UMyDOwlIxgy
+KOG8x+yNKiG9LyvW4axRLctN608/+TbvtFo5TVOFJYxJQp4b5uz7LgJAJw7PBvfC
+bqx64BH8WGzgyGcAl9unQEtpDuxXoKvP2kbsS7hjvhK0gJgW9llpV4sRJJGApTBc
+WtbcS9DBGs3k1aZdA72bxnayD32syVz7czl4+tkRsbQZ4VgJh1yrHIDsdWQXFnYu
+EQJfCgX5HvvC13MpDUth0NWCFtWQirY3EFbIgSuhB/D5iXA+Dt1Dq5c1u7wQlUVi
+LQCU++oMGrlU3gZrnov5lnBGCEjn0O9bKQm8zmLdEcENFxUZvfPjOIY64YprZxD9
+Bv65Ag0EXAZRggEQAMmjHmnvH8SvNJhku/oI96dFKen3bg9xdaFUD1vAuNglCalH
+wgXcCZd0RdobYNG46cXTzTQadtHS4hi/UBJ+oy5ZUpIRglW12eTYtqM2G11VbcQi
+j6rLITP9NIP+G1xBICSYK4UwmH55BolMEQ/1ZX0a9rESM9stDNglheCCudbMGR/1
+ZYnufdEsh0yPwyC/1upZeu8LPWK62pt9mE/gccx77QTeDi5OJcRf1fPbUTCm3vSS
+wPPV2AGANodIhostjDymt5vh0tGwc7oUZZLnVdErfuctv7yMgZdiCpYu0jFy1NYf
+JgOpZasrcK7/1ozGzsfAo/sSU4kIkMwuWGgqfx5kGRK2CgU4T0i7oI6DMpOX9ZS8
+s3+oCWu83X0ofvm5R2CbjiUj2gR6JOhBQbJpCeTkLe+SFcUpnyrr7lG8B8QZHm5N
+nBi05V/s63RE3g/6WpR/fWuh+uswe01uqlSx9deW7jT49BL/MdSxwjfwLBLz/hLM
+0ld385XAd9bqMjUtp0XhZX2YORx3f/aKY7PYA62baGibb5RdPRw6viEAWU20eb+8
+X9Pa7hGmwUeal5lka4SD/TGl7wdY+g4oYP+jtKinH/ZftWA5wHTe3jWT5bdWrT2d
+e+0qA0SBkmKIDLpktvtTa19w2nfwBIwJ6fN36ZjYpOn/stxR7aRtnhSqvzxbABEB
+AAGJAjYEGAEIACAWIQS3bWH6ptt1lGboPZlkucaq4tVSeAUCXAZRggIbDAAKCRBk
+ucaq4tVSeGWmD/9Pg1x6s98zdZCQa2apmUnuoQAQA9Gf2RBBuglCDGsY67wbvdHZ
+9wdFRs2QEhl2O3oFmidxthBOBRl9z62nXliLwNn1Lcy/yDfaB8wH6gMm4jn2N/z9
+vQXnyIzg8m4PItZ1p5mnY3qH5lpGF8r9Gb7tzK10rqulM2XTDojZOevlEGI6LGw8
+FjccXtNquqGZwxzytmKF3T7UBmpmt2qock8N5iJn987m6WeYmbFNc0ii0guHfdtO
+zQcItz2ngCdyvfgQPwCAoAv72ysSGhz5KZgAXRrEdcqj6Jw3ivoEUKq1aUrYncXQ
+3zC3ED6AjWOGRzjvTZzj22IVacUZ0gqx0x/oldXLOhMB9u6nFXHKj1n9nc0XHMNi
+Lp9EuvQgcNLjFZGE9sxh25u9V+OhItfT/aarYEu/Xq0IkUUcdz4GehXth1/Cq1wH
+lSUie4nCs7I7OWhqMNClqP7ywElDXsQ66MCgvf01Dh64YUVjJNnyyK0QiYlCx/JQ
+Z85hNLtVXZfYqC5BRZlVFp8I8Rs2Qos9YEgn2M22+Rj+RIeD74LZFB7Q4myRvTMB
+/P466dFI83KYhwvjBYOP3jPTrV7Ky8poEGifQp2mM294CFIPS7z0z7a8+yMzcsRP
+OluFxewsEO0QNDrfFb+0gnjYlnGqOFcZjUMXbDdY5oLSPtXohynuTK1qyQ==
+=Xn0G
+-----END PGP PUBLIC KEY BLOCK-----
+</code></pre>
+
+		</div>
+	</div>
+
+
+<div class="col-12 shadow-md mt-5">
+	<div class="text-dim" v-pre>
+		<p align="center">
+<a href="https://statping.com">Statping.com</a> | <a href="https://demo.statping.com">Demo</a> | <a href="https://hub.docker.com/r/statping/statping">Docker</a> | <a href="https://github.com/statping/statping/wiki/Notifiers">Notifiers</a> | <a href="https://documenter.getpostman.com/view/1898229/RzfiJUd6">API</a>
+</p>
+
+	</div>
+</div>
+
+<div class="text-center small text-dim" v-pre>
+Automatically generated from Statping's Wiki on 2020-09-15 19:09:14.703237 &#43;0000 UTC
+</div>
+
+</div>
 </template>
 
 <script>
 export default {
   name: 'Help',
+	data () {
+		  return {
+			  tab: "Home",
+		  }
+	  }
 }
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+IMG {
+	max-width: 80%;
+	alignment: center;
+	display: block;
+}
+</style>
diff --git a/frontend/src/pages/Index.vue b/frontend/src/pages/Index.vue
index 6d8ff3a7..78197ea8 100644
--- a/frontend/src/pages/Index.vue
+++ b/frontend/src/pages/Index.vue
@@ -1,30 +1,36 @@
 <template>
-    <div class="container col-md-7 col-sm-12 sm-container index_container">
+    <div class="container col-md-7 col-sm-12 sm-container">
 
-        <Header/>
+      <Header/>
+
+      <div v-if="!loaded" class="row mt-5 mb-5">
+        <div class="col-12 mt-5 mb-2 text-center">
+          <font-awesome-icon icon="circle-notch" class="text-dim" size="2x" spin/>
+        </div>
+        <div class="col-12 text-center mt-3 mb-3">
+          <span class="text-dim">{{loading_text}}</span>
+        </div>
+      </div>
 
         <div class="col-12 full-col-12">
             <div v-for="service in services_no_group" v-bind:key="service.id" class="list-group online_list mb-4">
-                <a class="service_li list-group-item list-group-item-action">
+                <div class="list-group-item list-group-item-action">
                     <router-link class="no-decoration font-3" :to="serviceLink(service)">{{service.name}}</router-link>
                     <span class="badge float-right" :class="{'bg-success': service.online, 'bg-danger': !service.online }">{{service.online ? "ONLINE" : "OFFLINE"}}</span>
                     <GroupServiceFailures :service="service"/>
                     <IncidentsBlock :service="service"/>
-                </a>
+                </div>
             </div>
         </div>
 
-        <div>
-            <Group v-for="group in groups" v-bind:key="group.id" :group=group />
-        </div>
-
+      <Group v-for="group in groups" v-bind:key="group.id" :group=group />
         <div class="col-12 full-col-12">
             <MessageBlock v-for="message in messages" v-bind:key="message.id" :message="message" />
         </div>
 
         <div class="col-12 full-col-12">
             <div v-for="service in services" :ref="service.id" v-bind:key="service.id">
-                <ServiceBlock :in_service=service />
+                <ServiceBlock :service="service" />
             </div>
         </div>
 
@@ -32,29 +38,47 @@
 </template>
 
 <script>
-const Group = () => import('@/components/Index/Group')
-const Header = () => import('@/components/Index/Header')
-const MessageBlock = () => import('@/components/Index/MessageBlock')
-const ServiceBlock = () => import('@/components/Service/ServiceBlock')
-const GroupServiceFailures = () => import('@/components/Index/GroupServiceFailures')
-const IncidentsBlock = () => import('@/components/Index/IncidentsBlock')
+import Api from "@/API";
+const Group = () => import(/* webpackChunkName: "index" */ '@/components/Index/Group')
+const Header = () => import(/* webpackChunkName: "index" */ '@/components/Index/Header')
+const MessageBlock = () => import(/* webpackChunkName: "index" */ '@/components/Index/MessageBlock')
+const ServiceBlock = () => import(/* webpackChunkName: "index" */ '@/components/Service/ServiceBlock')
+const GroupServiceFailures = () => import(/* webpackChunkName: "index" */ '@/components/Index/GroupServiceFailures')
+const IncidentsBlock = () => import(/* webpackChunkName: "index" */ '@/components/Index/IncidentsBlock')
 
 export default {
     name: 'Index',
     components: {
       IncidentsBlock,
       GroupServiceFailures,
-        ServiceBlock,
-        MessageBlock,
-        Group,
-        Header
+      ServiceBlock,
+      MessageBlock,
+      Group,
+      Header
     },
     data() {
         return {
-            logged_in: false
+            logged_in: false,
         }
     },
     computed: {
+      loading_text() {
+        if (!this.$store.getters.core.version) {
+          return "Loading Core"
+        } else if (this.$store.getters.groups.length === 0) {
+          return "Loading Groups"
+        } else if (this.$store.getters.services.length === 0) {
+          return "Loading Services"
+        } else if (this.$store.getters.messages == null) {
+          return "Loading Announcements"
+        }
+      },
+      loaded() {
+        return this.$store.getters.core.version && this.$store.getters.services.length !== 0
+      },
+        core() {
+          return this.$store.getters.core
+        },
         messages() {
             return this.$store.getters.messages.filter(m => this.inRange(m) && m.service === 0)
         },
@@ -67,27 +91,27 @@ export default {
         services_no_group() {
             return this.$store.getters.servicesNoGroup
         }
-    },
-    async created() {
-        this.logged_in = this.loggedIn()
-    },
-    async mounted() {
-
     },
     methods: {
+        async checkLogin() {
+          const token = this.$cookies.get('statping_auth')
+          if (!token) {
+            this.$store.commit('setLoggedIn', false)
+            return
+          }
+          try {
+            const jwt = await Api.check_token(token)
+            this.$store.commit('setAdmin', jwt.admin)
+            if (jwt.username) {
+              this.$store.commit('setLoggedIn', true)
+            }
+          } catch (e) {
+            console.error(e)
+          }
+        },
         inRange(message) {
             return this.isBetween(this.now(), message.start_on, message.start_on === message.end_on ? this.maxDate().toISOString() : message.end_on)
         }
     }
 }
 </script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-    .fade-enter-active, .fade-leave-active {
-        transition: opacity .5s;
-    }
-    .fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
-        opacity: 0;
-    }
-</style>
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 2ecefd46..2de88b73 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -1,16 +1,18 @@
 <template>
-    <div class="container col-md-7 col-sm-12 mt-md-5 bg-light">
-        <div class="col-10 offset-1 col-md-8 offset-md-2 mt-md-2">
-            <div class="col-12 col-md-8 offset-md-2 mb-4">
-                <img alt="Statping Login" class="col-12 mt-5 mt-md-0" style="max-width:650px" src="banner.png">
-            </div>
+    <div class="offset-md-3 offset-lg-4 offset-0 col-lg-4 col-md-6 mt-5">
+
+      <div class="offset-1 offset-lg-2 col-lg-8 col-10 mb-4 mb-md-3">
+        <img alt="Statping Login" class="embed-responsive" src="banner.png">
+      </div>
+
+      <div class="login_container col-12 p-4">
             <FormLogin/>
         </div>
     </div>
 </template>
 
 <script>
-  const FormLogin = () => import('@/forms/Login')
+  const FormLogin = () => import(/* webpackChunkName: "index" */ '@/forms/Login')
 
   export default {
   name: 'Login',
@@ -22,7 +24,10 @@
 
     }
   },
-  methods: {
+    mounted() {
+
+    },
+    methods: {
 
   }
 }
diff --git a/frontend/src/pages/Logs.vue b/frontend/src/pages/Logs.vue
index f8de9c8f..293f84df 100644
--- a/frontend/src/pages/Logs.vue
+++ b/frontend/src/pages/Logs.vue
@@ -1,9 +1,25 @@
 <template>
-    <div class="col-12 bg-white p-4">
-        <p v-if="logs.length === 0" class="text-monospace sm">
-            Loading Logs...
-        </p>
-        <p v-for="(log, index) in logs" class="text-monospace sm">{{log}}</p>
+    <div class="col-12">
+        <div class="card contain-card mb-4">
+            <div class="card-header">
+                Logs
+                <div class="input-group input-group-sm float-right col-6">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text" id="inputGroup-sizing-sm">Search</span>
+                    </div>
+                    <input v-model="search" type="text" class="form-control">
+                </div>
+            </div>
+                <div class="card-body">
+                <p v-if="logs.length === 0" class="text-monospace sm">
+                    Loading Logs...
+                </p>
+                    <div v-for="(log, index) in logs">
+                        <span class="badge badge-secondary small mr-2">{{log.time}}</span>
+                        <span class="text-monospace small">{{log.message}}</span>
+                    </div>
+            </div>
+        </div>
     </div>
 </template>
 
@@ -14,49 +30,60 @@ export default {
     name: 'Logs',
     data() {
         return {
-            logs: [],
+            logs_record: [],
             last: "",
+            search: "",
             t: null
         }
     },
+  computed: {
+      logs() {
+        if (this.search) {
+          return this.logs_record.filter(o => o.message.includes(this.search));
+        } else {
+          return this.logs_record
+        }
+      }
+  },
     async created() {
         await this.getLogs()
         if (!this.t) {
             this.t = setInterval(async () => {
                 await this.lastLog()
-            }, 650)
+            }, 1000)
         }
     },
     beforeDestroy() {
         clearInterval(this.t)
     },
     methods: {
+        parseLog(data) {
+          const ts = data.match(/[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]) (2[0-3]|[01][0-9]):[0-5][0-9]:[0-5][0-9]/gm)
+          return {
+            time: ts[0],
+            message: data.split(ts+": ")[1]
+          }
+        },
         cleanLog(l) {
             const splitLog = l.split(": ")
             const last = splitLog.slice(1);
             return last.join(": ")
         },
         async getLogs() {
-            const logs = await Api.logs()
-            const l = logs.reverse()
+            const l = await Api.logs()
+          l.forEach((d) => {
+            this.logs_record.push(this.parseLog(d))
+          })
             this.last = this.cleanLog(l[l.length - 1])
-            this.logs = l
         },
         async lastLog() {
             const log = await Api.logs_last()
             const cleanLast = this.cleanLog(log)
             if (this.last !== cleanLast) {
                 this.last = cleanLast
-                this.logs.reverse().push(log)
+                this.logs_record.unshift(this.parseLog(log))
             }
         }
     }
 }
 </script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-    .sm {
-        font-size: 8pt;
-    }
-</style>
diff --git a/frontend/src/pages/Service.vue b/frontend/src/pages/Service.vue
index 3ca4a122..947985e5 100644
--- a/frontend/src/pages/Service.vue
+++ b/frontend/src/pages/Service.vue
@@ -1,58 +1,89 @@
 <template>
-    <div class="container col-md-7 col-sm-12 mt-md-5 bg-light">
-
-        <div class="col-12 mb-4">
+    <div class="container col-md-7 col-sm-12 mt-md-5">
+      <div v-if="!ready" class="row mt-5">
+        <div class="col-12 text-center">
+          <font-awesome-icon icon="circle-notch" size="3x" spin/>
+        </div>
+        <div class="col-12 text-center mt-3 mb-3">
+          <span class="text-muted">Loading Service</span>
+        </div>
+      </div>
 
+        <div v-if="ready && service" class="col-12 mb-4">
             <span class="mt-3 mb-3 text-white d-md-none btn d-block d-md-none text-uppercase" :class="{'bg-success': service.online, 'bg-danger': !service.online}">
                 {{service.online ? $t('online') : $t('offline')}}
             </span>
 
-            <h4 class="mt-2">
+            <span class="mt-2 font-3">
                 <router-link to="/" class="text-black-50 text-decoration-none">{{core.name}}</router-link> - <span class="text-muted">{{service.name}}</span>
                 <span class="badge float-right d-none d-md-block text-uppercase" :class="{'bg-success': service.online, 'bg-danger': !service.online}">
                     {{service.online ? $t('online') : $t('offline')}}
                 </span>
-            </h4>
+            </span>
 
-            <ServiceTopStats :service="service"/>
+            <ServiceTopStats v-if="loaded" :service="service"/>
 
-            <MessageBlock v-for="message in messagesInRange" v-bind:key="message.id" :message="message"/>
+            <MessageBlock v-if="loaded" v-for="message in messagesInRange" v-bind:key="message.id" :message="message"/>
+
+            <div class="card text-black-50 bg-white mt-3">
+                <div class="card-header text-capitalize">Timeframe</div>
+                <div class="card-body pb-4">
+                    <div class="row">
+                        <div class="col">
+                            <flatPickr :disabled="!loaded" @on-change="reload" v-model="start_time" :config="{ wrap: true, allowInput: true, enableTime: true, dateFormat: 'Z', altInput: true, altFormat: 'Y-m-d h:i K', maxDate: this.endOf('today') }" type="text" class="form-control text-left" required />
+                            <small class="d-block">From {{this.format(new Date(start_time))}}</small>
+                        </div>
+                        <div class="col">
+                            <flatPickr :disabled="!loaded" @on-change="reload" v-model="end_time" :config="{ wrap: true, allowInput: true, enableTime: true, dateFormat: 'Z', altInput: true, altFormat: 'Y-m-d h:i K', maxDate: this.endOf('today') }" type="text" class="form-control text-left" required />
+                            <small class="d-block">To {{this.format(new Date(end_time))}}</small>
+                        </div>
+                        <div class="col">
+                            <select :disabled="!loaded" @change="chartHits(service)" v-model="group" class="form-control">
+                                <option value="1m">1 Minute</option>
+                                <option value="5m">5 Minutes</option>
+                                <option value="15m">15 Minute</option>
+                                <option value="30m">30 Minutes</option>
+                                <option value="1h">1 Hour</option>
+                                <option value="3h">3 Hours</option>
+                                <option value="6h">6 Hours</option>
+                                <option value="12h">12 Hours</option>
+                                <option value="24h">1 Day</option>
+                                <option value="168h">7 Days</option>
+                                <option value="360h">15 Days</option>
+                            </select>
+                            <small class="d-block d-md-none d-block">Increment Timeframe</small>
+                        </div>
+                    </div>
 
-            <div class="row mt-5 mb-4">
-                <div class="col-12 col-md-5 font-2 mb-3 mb-md-0">
-                    <flatPickr :disabled="loading" @on-change="onnn" v-model="start_time" :config="{ enableTime: true, altInput: true, altFormat: 'Y-m-d h:i K', maxDate: new Date() }" type="text" class="btn btn-white text-left" required />
-                    <small class="d-block">From {{this.format(new Date(start_time))}}</small>
-                </div>
-                <div class="col-12 col-md-5 font-2 mb-3 mb-md-0">
-                    <flatPickr :disabled="loading" @on-change="onnn" v-model="end_time" :config="{ enableTime: true, altInput: true, altFormat: 'Y-m-d h:i K', maxDate: new Date()}" type="text" class="btn btn-white text-left" required />
-                    <small class="d-block">To {{this.format(new Date(end_time))}}</small>
-                </div>
-                <div class="col-12 col-md-2">
-                    <select :disabled="loading" @change="chartHits" v-model="group" class="form-control">
-                        <option value="1m">1 Minute</option>
-                        <option value="5m">5 Minutes</option>
-                        <option value="15m">15 Minute</option>
-                        <option value="30m">30 Minutes</option>
-                        <option value="1h">1 Hour</option>
-                        <option value="3h">3 Hours</option>
-                        <option value="6h">6 Hours</option>
-                        <option value="12h">12 Hours</option>
-                        <option value="24h">1 Day</option>
-                        <option value="168h">7 Days</option>
-                        <option value="360h">15 Days</option>
-                    </select>
-                    <small class="d-block d-md-none d-block">Increment Timeframe</small>
                 </div>
             </div>
 
-            <AdvancedChart :group="group" :updated="updated_chart" :start="start_time.toString()" :end="end_time.toString()" :service="service"/>
+            <div class="card text-black-50 bg-white mt-3 mb-3">
+                <div class="card-header text-capitalize">Service Latency</div>
+                <div v-if="loaded" class="card-body">
+                    <div class="row">
+                      <AdvancedChart :group="group" :updated="updated_chart" :start="start_time.toString()" :end="end_time.toString()" :service="service"/>
+                    </div>
+                  <div>
+                    <FailuresBarChart :service="service" :start="start_time.toString()" :end="end_time.toString()" :group="group"/>
+                  </div>
+
+                </div>
+              <div v-else class="row mt-3 mb-3">
+                <div class="col-12 text-center">
+                  <font-awesome-icon icon="circle-notch" size="3x" spin/>
+                </div>
+              </div>
 
-            <div v-if="!loading" class="col-12">
-                <apexchart width="100%" height="120" type="rangeBar" :options="timeRangeOptions" :series="uptime_data"></apexchart>
             </div>
 
-            <div class="service-chart-heatmap mt-5 mb-4">
-                <ServiceHeatmap :service="service"/>
+            <div class="card text-black-50 bg-white mb-3">
+                <div class="card-header text-capitalize">Service Failures</div>
+                <div class="card-body">
+                    <div class="service-chart-heatmap mt-5 mb-4">
+                        <ServiceHeatmap :service="service"/>
+                    </div>
+                </div>
             </div>
 
         </div>
@@ -62,15 +93,17 @@
 
 <script>
   import Api from "../API"
-  const MessageBlock = () => import('@/components/Index/MessageBlock')
-  const ServiceFailures = () => import('@/components/Service/ServiceFailures')
-  const Checkin = () => import('@/forms/Checkin')
-  const ServiceHeatmap = () => import('@/components/Service/ServiceHeatmap')
-  const ServiceTopStats = () => import('@/components/Service/ServiceTopStats')
-  const AdvancedChart = () => import('@/components/Service/AdvancedChart')
+  const MessageBlock = () => import(/* webpackChunkName: "index" */ '@/components/Index/MessageBlock')
+  const ServiceFailures = () => import(/* webpackChunkName: "service" */ '@/components/Service/ServiceFailures')
+  const Checkin = () => import(/* webpackChunkName: "dashboard" */ '@/forms/Checkin')
+  const ServiceHeatmap = () => import(/* webpackChunkName: "service" */ '@/components/Service/ServiceHeatmap')
+  const ServiceTopStats = () => import(/* webpackChunkName: "service" */ '@/components/Service/ServiceTopStats')
+  const AdvancedChart = () => import(/* webpackChunkName: "service" */ '@/components/Service/AdvancedChart')
+  const FailuresBarChart = () => import(/* webpackChunkName: "service" */ '@/components/Service/FailuresBarChart')
 
   import flatPickr from 'vue-flatpickr-component';
   import 'flatpickr/dist/flatpickr.css';
+
   const timeoptions = { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' };
 
   const axisOptions = {
@@ -100,6 +133,7 @@
 export default {
     name: 'Service',
     components: {
+      FailuresBarChart,
       AdvancedChart,
         ServiceTopStats,
         ServiceHeatmap,
@@ -110,17 +144,18 @@ export default {
     },
     data() {
         return {
+            id: null,
             tab: "failures",
             authenticated: false,
-            ready: true,
-            group: "1h",
+            ready: false,
+            group: "15m",
             data: null,
             uptime_data: null,
-            loading: true,
+            loaded: false,
             messages: [],
             failures: [],
-            start_time: this.nowSubtract(84600 * 30),
-            end_time: this.nowSubtract(0),
+            start_time: this.beginningOf('day', this.nowSubtract(259200 * 3)),
+            end_time: this.endOf('today'),
             timedata: null,
             load_timedata: false,
             dailyRangeOpts: {
@@ -133,7 +168,8 @@ export default {
           timeRangeOptions: {
             chart: {
               id: 'uptime',
-              height: 120,
+              height: 220,
+              width: '100%',
               type: 'rangeBar',
               toolbar: {
                 show: false
@@ -167,7 +203,7 @@ export default {
               type: 'datetime'
             },
             yaxis: {
-              show: false
+              show: true,
             },
             grid: {
               row: {
@@ -196,7 +232,7 @@ export default {
                         window.console.log(event)
                       },
                       updated: (chartContext, config) => {
-                        window.console.log('updated')
+                        window.console.log('updated chart')
                       },
                         beforeZoom: (chartContext, { xaxis }) => {
                             const start = (xaxis.min / 1000).toFixed(0)
@@ -234,14 +270,14 @@ export default {
                     },
                     stroke: {
                         show: false,
-                        curve: 'smooth',
+                        curve: 'stepline',
                         lineCap: 'butt',
                     },
                 },
               xaxis: {
                 type: "datetime",
                 labels: {
-                  show: true
+                  format: 'MM yyyy'
                 },
                 tooltip: {
                   enabled: false
@@ -325,19 +361,19 @@ export default {
             },
         }
     },
+    watch: {
+      '$route': 'fetchData'
+    },
     computed: {
-      service () {
-        return this.$store.getters.serviceByAll(this.id)
-      },
       core () {
         return this.$store.getters.core
       },
+      service() {
+        return this.$store.getters.serviceByAll(this.$route.params.id)
+      },
       params () {
         return {start: this.toUnix(new Date(this.start_time)), end: this.toUnix(new Date(this.end_time))}
       },
-      id () {
-          return this.$route.params.id;
-      },
       uptimeSeries () {
         return this.timedata.series
       },
@@ -351,42 +387,47 @@ export default {
         return this.$store.getters.serviceMessages(this.service.id).filter(m => this.inRange(m))
       },
     },
-    watch: {
-      service: function(n, o) {
-        this.onnn()
-      },
-      load_timedata: function(n, o) {
-        this.onnn()
-      }
+    created() {
+      this.fetchData()
+    },
+    mounted() {
+      this.fetchData()
     },
-  async mounted() {
-    if (!this.$store.getters.service) {
-      const s = await Api.service(this.id)
-      this.$store.commit('setService', s)
-    }
-  },
     methods: {
+      fetchData () {
+        if (!this.$route.params.id) {
+          this.ready = false
+          return
+        }
+        this.reload()
+        this.ready = true
+        this.loaded = true
+      },
+      async reload() {
+        if (!this.ready || !this.service) {
+          return
+        }
+        await this.chartHits()
+        await this.chartFailures()
+        await this.fetchUptime()
+      },
       async updated_chart(start, end) {
+        this.loaded = false
         this.start_time = start
         this.end_time = end
-        this.loading = false
-      },
-      async onnn() {
-        this.loading = true
-        await this.chartHits()
-        await this.fetchUptime()
-        this.loading = false
+        this.loaded = true
       },
       async fetchUptime() {
-         const uptime = await Api.service_uptime(this.id, this.params.start, this.params.end)
-        window.console.log(uptime)
+        const uptime = await Api.service_uptime(this.service.id, this.params.start, this.params.end)
         this.uptime_data = this.parse_uptime(uptime)
       },
       parse_uptime(timedata) {
+        if (!timedata.series) {
+          return []
+        }
         const data = timedata.series.filter((g) => g.online) || []
         const offData = timedata.series.filter((g) => !g.online) || []
         let arr = [];
-        window.console.log(data)
         if (data) {
           data.forEach((d) => {
             arr.push({
@@ -416,21 +457,12 @@ export default {
       inRange(message) {
         return this.isBetween(this.now(), message.start_on, message.start_on === message.end_on ? this.maxDate().toISOString() : message.end_on)
       },
-        async getService() {
-            await this.chartHits()
-            await this.serviceFailures()
-        },
-        async serviceFailures() {
-            this.failures = await Api.service_failures(this.service.id, this.params.start, this.params.end)
-        },
-        async chartHits(start=0, end=99999999999) {
-            this.data = await Api.service_hits(this.service.id, this.params.start, this.params.end, this.group, false)
-            if (this.data.length === 0 && this.group !== "1h") {
-                this.group = "1h"
-                await this.chartHits("1h")
-            }
-            this.ready = true
-        }
+      async chartHits(start=0, end=99999999999) {
+        this.data = await Api.service_hits(this.service.id, this.params.start, this.params.end, this.group, false)
+      },
+      async chartFailures(start=0, end=99999999999) {
+        this.failures_data = await Api.service_failures_data(this.service.id, this.params.start, this.params.end, this.group, true)
+      }
     }
 }
 </script>
diff --git a/frontend/src/pages/Settings.vue b/frontend/src/pages/Settings.vue
index ec5c1369..1f8a8016 100644
--- a/frontend/src/pages/Settings.vue
+++ b/frontend/src/pages/Settings.vue
@@ -3,22 +3,41 @@
         <div class="row">
             <div class="col-md-3 col-sm-12 mb-4 mb-md-0">
                 <div class="nav flex-column nav-pills" id="v-pills-tab" role="tablist" aria-orientation="vertical">
-                    <h6 class="text-muted">{{ $t('settings.main') }}</h6>
+
+                    <div v-if="version_below" class="col-12 small text-center mt-0 pt-0 pb-0 mb-3">
+                      Update {{github.tag_name}} Available
+                      <div class="row">
+                        <div class="col-6">
+                          <a href="https://github.com/statping/statping/releases/latest" class="btn btn-sm text-success mt-2">Download</a>
+                        </div>
+                        <div class="col-6">
+                          <a href="https://github.com/statping/statping/blob/master/CHANGELOG.md" class="btn btn-sm text-dim mt-2">Changelog</a>
+                        </div>
+                      </div>
+                    </div>
+
+                    <h6 class="text-muted">{{ $t('main_settings') }}</h6>
 
                     <a @click.prevent="changeTab" class="nav-link" v-bind:class="{active: liClass('v-pills-home-tab')}" id="v-pills-home-tab" data-toggle="pill" href="#v-pills-home" role="tab" aria-controls="v-pills-home" aria-selected="true">
-                        <font-awesome-icon icon="cog" class="mr-2"/> {{ $t('setting') }}
+                        <font-awesome-icon icon="cog" class="mr-2"/> {{ $t('settings') }}
                     </a>
                     <a @click.prevent="changeTab" class="nav-link" v-bind:class="{active: liClass('v-pills-style-tab')}" id="v-pills-style-tab" data-toggle="pill" href="#v-pills-style" role="tab" aria-controls="v-pills-style" aria-selected="false">
-                        <font-awesome-icon icon="image" class="mr-2"/> {{ $t('settings.theme') }}
+                        <font-awesome-icon icon="image" class="mr-2"/> {{ $t('theme') }}
                     </a>
                     <a @click.prevent="changeTab" class="nav-link" v-bind:class="{active: liClass('v-pills-cache-tab')}" id="v-pills-cache-tab" data-toggle="pill" href="#v-pills-cache" role="tab" aria-controls="v-pills-cache" aria-selected="false">
-                        <font-awesome-icon icon="paperclip" class="mr-2"/> {{ $t('settings.cache') }}
-                    </a>
-                    <a @click.prevent="changeTab" class="nav-link" v-bind:class="{active: liClass('v-pills-oauth-tab')}" id="v-pills-oauth-tab" data-toggle="pill" href="#v-pills-oauth" role="tab" aria-controls="v-pills-oauth" aria-selected="false">
-                        <font-awesome-icon icon="key" class="mr-2"/> {{ $t('settings.oauth') }}
+                        <font-awesome-icon icon="paperclip" class="mr-2"/> {{ $t('cache') }}
                     </a>
+                  <a @click.prevent="changeTab" class="nav-link" v-bind:class="{active: liClass('v-pills-oauth-tab')}" id="v-pills-oauth-tab" data-toggle="pill" href="#v-pills-oauth" role="tab" aria-controls="v-pills-oauth" aria-selected="false">
+                    <font-awesome-icon icon="key" class="mr-2"/> {{ $t('authentication') }}
+                  </a>
+                  <a @click.prevent="changeTab" class="nav-link" v-bind:class="{active: liClass('v-pills-import-tab')}" id="v-pills-import-tab" data-toggle="pill" href="#v-pills-import" role="tab" aria-controls="v-pills-import" aria-selected="false">
+                    <font-awesome-icon icon="cloud-download-alt" class="mr-2"/> {{ $t('import') }}
+                  </a>
+                  <a @click.prevent="changeTab" class="nav-link" v-bind:class="{active: liClass('v-pills-configs-tab')}" id="v-pills-configs-tab" data-toggle="pill" href="#v-pills-configs" role="tab" aria-controls="v-pills-configs" aria-selected="false">
+                    <font-awesome-icon icon="cogs" class="mr-2"/> {{ $t('configs') }}
+                  </a>
 
-                    <h6 class="mt-4 text-muted">Notifiers</h6>
+                    <h6 class="mt-4 text-muted">{{$t('notifiers')}}</h6>
 
                     <div id="notifiers_tabs">
                         <a v-for="(notifier, index) in notifiers" v-bind:key="`${notifier.method}`" @click.prevent="changeTab" class="nav-link text-capitalize" v-bind:class="{active: liClass(`v-pills-${notifier.method.toLowerCase()}-tab`)}" v-bind:id="`v-pills-${notifier.method.toLowerCase()}-tab`" data-toggle="pill" v-bind:href="`#v-pills-${notifier.method.toLowerCase()}`" role="tab" v-bind:aria-controls="`v-pills-${notifier.method.toLowerCase()}`" aria-selected="false">
@@ -26,31 +45,32 @@
                             <span v-if="notifier.enabled" class="badge badge-pill float-right mt-1" :class="{'badge-success': !liClass(`v-pills-${notifier.method.toLowerCase()}-tab`), 'badge-light': liClass(`v-pills-${notifier.method.toLowerCase()}-tab`), 'text-dark': liClass(`v-pills-${notifier.method.toLowerCase()}-tab`)}">ON</span>
                         </a>
                         <a @click.prevent="changeTab" class="nav-link text-capitalize" v-bind:class="{active: liClass(`v-pills-notifier-docs-tab`)}" v-bind:id="`v-pills-notifier-docs-tab`" data-toggle="pill" v-bind:href="`#v-pills-notifier-docs`" role="tab" v-bind:aria-controls="`v-pills-notifier-docs`" aria-selected="false">
-                            <font-awesome-icon icon="question" class="mr-2"/> Variables
+                            <font-awesome-icon icon="question" class="mr-2"/> {{$t('variables')}}
                         </a>
                     </div>
 
-                    <h6 class="mt-4 mb-3 text-muted">Statping Links</h6>
+                    <h6 class="mt-4 mb-3 text-muted">Statping {{$t('links')}}</h6>
 
                     <a href="https://github.com/statping/statping/wiki" class="mb-2 font-2 text-decoration-none text-muted">
-                        <font-awesome-icon icon="question" class="mr-3"/> {{$t('settings.docs')}}
+                        <font-awesome-icon icon="question" class="mr-3"/> {{$t('docs')}}
                     </a>
 
                     <a href="https://github.com/statping/statping/wiki/API" class="mb-2 font-2 text-decoration-none text-muted">
-                        <font-awesome-icon icon="laptop" class="mr-2"/> API {{$t('settings.docs')}}
+                        <font-awesome-icon icon="laptop" class="mr-2"/> API {{$t('docs')}}
                     </a>
 
                     <a href="https://raw.githubusercontent.com/statping/statping/master/CHANGELOG.md" class="mb-2 font-2 text-decoration-none text-muted">
-                        <font-awesome-icon icon="book" class="mr-3"/> {{$t('settings.changelog')}}
+                        <font-awesome-icon icon="book" class="mr-3"/> {{$t('changelog')}}
                     </a>
 
                     <a href="https://github.com/statping/statping" class="mb-2 font-2 text-decoration-none text-muted">
-                        <font-awesome-icon icon="code-branch" class="mr-3"/> {{$t('settings.repo')}}
+                        <font-awesome-icon icon="code-branch" class="mr-3"/> {{$t('repo')}}
                     </a>
 
-                    <div class="row justify-content-center mt-2">
-                        <github-button href="https://github.com/statping/statping" data-icon="octicon-star" data-show-count="true" aria-label="Star Statping on GitHub">Star</github-button>
-                    </div>
+                  <span class="small text-dim text-center mt-5">Statping v{{core.version}}<br>
+                    <a class="small text-muted no-decoration" v-if="core.commit" v-bind:href="`https://github.com/statping/statping/commit/${core.commit}`">{{core.commit.slice(0,8)}}</a>
+                  </span>
+
 
                 </div>
 
@@ -60,30 +80,28 @@
                 <div class="tab-content" id="v-pills-tabContent">
                     <div class="tab-pane fade" v-bind:class="{active: liClass('v-pills-home-tab'), show: liClass('v-pills-home-tab')}" id="v-pills-home" role="tabpanel" aria-labelledby="v-pills-home-tab">
 
-                        <div class="card text-black-50 bg-white">
-                            <div class="card-header">Statping Settings</div>
-                            <div class="card-body">
-                                <CoreSettings/>
-                            </div>
-                        </div>
+                        <CoreSettings/>
 
-                        <div class="card text-black-50 bg-white mt-3">
-                            <div class="card-header">API Settings</div>
+                        <div class="card mt-3">
+                            <div class="card-header">API {{$t('settings')}}</div>
                             <div class="card-body">
                                 <div class="form-group row">
-                                    <label class="col-sm-3 col-form-label">API Secret</label>
+                                    <label class="col-sm-3 col-form-label">API {{$t('secret')}}</label>
                                     <div class="col-sm-9">
                                         <div class="input-group">
                                         <input v-model="core.api_secret" @focus="$event.target.select()" type="text" class="form-control select-input" id="api_secret" readonly>
                                             <div class="input-group-append copy-btn">
-                                                <button @click="copy(core.api_secret)" class="btn btn-outline-secondary" type="button">Copy</button>
+                                                <button @click="copy(core.api_secret)" class="btn btn-outline-secondary" type="button">{{$t('copy')}}</button>
                                             </div>
                                         </div>
-                                        <small class="form-text text-muted">API Secret is used for read, create, update and delete routes</small>
-                                        <small class="form-text text-muted">You can <a href="#" id="regenkeys" @click="renewApiKeys">Regenerate API Keys</a> if you need to.</small>
+                                        <small class="form-text text-muted">{{$t('regen_desc')}}</small>
+
                                     </div>
                                 </div>
                             </div>
+                            <div class="card-footer">
+                                <button id="regenkeys" @click="renewApiKeys" class="btn btn-sm btn-danger float-right">{{$t('regen_api')}}</button>
+                            </div>
                         </div>
 
                     </div>
@@ -96,9 +114,17 @@
                         <Cache/>
                     </div>
 
-                    <div class="tab-pane fade" v-bind:class="{active: liClass('v-pills-oauth-tab'), show: liClass('v-pills-oauth-tab')}" id="v-pills-oauth" role="tabpanel" aria-labelledby="v-pills-oauth-tab">
-                        <OAuth/>
-                    </div>
+                  <div class="tab-pane fade" v-bind:class="{active: liClass('v-pills-oauth-tab'), show: liClass('v-pills-oauth-tab')}" id="v-pills-oauth" role="tabpanel" aria-labelledby="v-pills-oauth-tab">
+                    <OAuth/>
+                  </div>
+
+                  <div class="tab-pane fade" v-bind:class="{active: liClass('v-pills-configs-tab'), show: liClass('v-pills-configs-tab')}" id="v-pills-configs" role="tabpanel" aria-labelledby="v-pills-configs-tab">
+                    <Configs/>
+                  </div>
+
+                  <div class="tab-pane fade" v-bind:class="{active: liClass('v-pills-import-tab'), show: liClass('v-pills-import-tab')}" id="v-pills-import" role="tabpanel" aria-labelledby="v-pills-import-tab">
+                    <Importer/>
+                  </div>
 
                     <div class="tab-pane fade" v-bind:class="{active: liClass(`v-pills-notifier-docs-tab`), show: liClass(`v-pills-notifier-docs-tab`)}" v-bind:id="`v-pills-notifier-docs-tab`" role="tabpanel" v-bind:aria-labelledby="`v-pills-notifier-docs-tab`">
                         <Variables/>
@@ -117,21 +143,24 @@
 
 <script>
   import Api from '../API';
-  import GithubButton from 'vue-github-button'
-  import Variables from "@/components/Dashboard/Variables";
+  const semver = require('semver')
 
-  const CoreSettings = () => import('@/forms/CoreSettings')
-  const FormIntegration = () => import('@/forms/Integration')
-  const Notifier = () => import('@/forms/Notifier')
-  const OAuth = () => import('@/forms/OAuth')
-  const ThemeEditor = () => import('@/components/Dashboard/ThemeEditor')
-  const Cache = () => import('@/components/Dashboard/Cache')
+  const CoreSettings = () => import(/* webpackChunkName: "dashboard" */ '@/forms/CoreSettings')
+  const FormIntegration = () => import(/* webpackChunkName: "dashboard" */ '@/forms/Integration')
+  const Notifier = () => import(/* webpackChunkName: "dashboard" */ '@/forms/Notifier')
+  const OAuth = () => import(/* webpackChunkName: "dashboard" */ '@/forms/OAuth')
+  const ThemeEditor = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/ThemeEditor')
+  const Cache = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/Cache')
+  const Importer = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/Importer')
+  const Variables = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/Variables')
+  const Configs = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/Configs')
 
   export default {
       name: 'Settings',
       components: {
+        Configs,
+        Importer,
         Variables,
-        GithubButton,
         OAuth,
           Cache,
           ThemeEditor,
@@ -142,6 +171,7 @@
       data() {
           return {
               tab: "v-pills-home-tab",
+            github: null,
           }
       },
       computed: {
@@ -149,22 +179,32 @@
               return this.$store.getters.core
           },
           notifiers() {
-              return this.$store.getters.notifiers
-          }
+            return this.$store.getters.notifiers
+          },
+        version_below() {
+            if (!this.github || !this.core.version) {
+              return false
+            }
+            return semver.gt(semver.coerce(this.github.tag_name), semver.coerce(this.core.version))
+        }
       },
     mounted() {
-        this.update()
+
       },
     created() {
-          this.update()
+      this.update()
       },
       methods: {
         async update() {
-          const c = await Api.core()
-          this.$store.commit('setCore', c)
-          const n = await Api.notifiers()
-          this.$store.commit('setNotifiers', n)
           this.cache = await Api.cache()
+          await this.getGithub()
+        },
+        async getGithub() {
+          try {
+            this.github = await Api.github_release()
+          } catch(e) {
+            console.error(e)
+          }
         },
           changeTab(e) {
               this.tab = e.target.id
@@ -172,20 +212,33 @@
           liClass(id) {
               return this.tab === id
           },
-        async renewApiKeys() {
-          let r = confirm("Are you sure you want to reset the API keys?");
-          if (r === true) {
-            await Api.renewApiKeys()
-            const core = await Api.core()
-            this.$store.commit('setCore', core)
-            this.core = core
-          }
+        async renew() {
+          await Api.renewApiKeys()
+          const core = await Api.core()
+          this.$store.commit('setCore', core)
+          this.core = core
+          await this.logout()
         },
+        async renewApiKeys() {
+          const modal = {
+            visible: true,
+            title: "Reset API Key",
+            body: `Are you sure you want to reset the API keys? You will be logged out.`,
+            btnColor: "btn-danger",
+            btnText: "Reset",
+            func: () => this.renew(),
+          }
+          this.$store.commit("setModal", modal)
+        },
+        async logout () {
+          await Api.logout()
+          this.$store.commit('setHasAllData', false)
+          this.$store.commit('setToken', null)
+          this.$store.commit('setAdmin', false)
+          this.$store.commit('setUser', false)
+          // this.$cookies.remove("statping_auth")
+          await this.$router.push('/logout')
+        }
       }
   }
 </script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-
-</style>
diff --git a/frontend/src/routes.js b/frontend/src/routes.js
index ab1ad3c5..2b2a82ad 100644
--- a/frontend/src/routes.js
+++ b/frontend/src/routes.js
@@ -1,28 +1,38 @@
-const Index = () => import('@/pages/Index')
-const Dashboard = () => import('@/pages/Dashboard')
-const DashboardIndex = () => import('@/components/Dashboard/DashboardIndex')
-const DashboardUsers = () => import('@/components/Dashboard/DashboardUsers')
-const DashboardServices = () => import('@/components/Dashboard/DashboardServices')
-const DashboardMessages = () => import('@/components/Dashboard/DashboardMessages')
-const EditService = () => import('@/components/Dashboard/EditService')
-const Logs = () => import('@/pages/Logs')
-const Settings = () => import('@/pages/Settings')
-const Login = () => import('@/pages/Login')
-const Service = () => import('@/pages/Service')
-const Setup = () => import('@/forms/Setup')
-const Incidents = () => import('@/components/Dashboard/Incidents')
-const Checkins = () => import('@/components/Dashboard/Checkins')
-const Failures = () => import('@/components/Dashboard/Failures')
-const NotFound = () => import('@/pages/NotFound')
+const Index = () => import(/* webpackChunkName: "index" */ '@/pages/Index')
+const Dashboard = () => import(/* webpackChunkName: "dashboard" */ '@/pages/Dashboard')
+const DashboardIndex = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/DashboardIndex')
+const DashboardUsers = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/DashboardUsers')
+const DashboardServices = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/DashboardServices')
+const DashboardMessages = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/DashboardMessages')
+const EditService = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/EditService')
+const Logs = () => import(/* webpackChunkName: "dashboard" */ '@/pages/Logs')
+const Help = () => import(/* webpackChunkName: "dashboard" */ '@/pages/Help')
+const Settings = () => import(/* webpackChunkName: "dashboard" */ '@/pages/Settings')
+const Login = () => import(/* webpackChunkName: "index" */ '@/pages/Login')
+const Service = () => import(/* webpackChunkName: "index" */ '@/pages/Service')
+const Setup = () => import(/* webpackChunkName: "index" */ '@/forms/Setup')
+const Incidents = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/Incidents')
+const Checkins = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/Checkins')
+const Failures = () => import(/* webpackChunkName: "dashboard" */ '@/components/Dashboard/Failures')
+const NotFound = () => import(/* webpackChunkName: "index" */ '@/pages/NotFound')
+const Importer = () => import(/* webpackChunkName: "index" */ '@/components/Dashboard/Importer')
 
 import VueRouter from "vue-router";
 import Api from "./API";
+import store from "./store"
+
+const Loading = {
+  template: '<div class="jumbotron">LOADING</div>'
+}
 
 const routes = [
   {
     path: '/setup',
     name: 'Setup',
-    component: Setup
+    component: Setup,
+    meta: {
+      title: 'Statping Setup',
+    }
   },
   {
     path: '/',
@@ -33,14 +43,37 @@ const routes = [
     path: '/dashboard',
     component: Dashboard,
     meta: {
-      requiresAuth: true
+      requiresAuth: true,
+      title: 'Statping - Dashboard',
     },
     beforeEnter: async (to, from, next) => {
       if (to.matched.some(record => record.meta.requiresAuth)) {
-        let tk = await Api.token()
-        if (to.path !== '/login' && !tk) {
-          next('/login')
-          return
+        if (to.path !== '/login') {
+          if(store.getters.loggedIn) {
+            next()
+            return
+          }
+          const token = $cookies.get('statping_auth')
+          if (!token) {
+            next('/login')
+            return
+          }
+          try {
+            const jwt = await Api.check_token(token)
+            store.commit('setAdmin', jwt.admin)
+            if (jwt.admin) {
+              store.commit('setLoggedIn', true)
+              store.commit('setUser', true)
+            } else {
+              store.commit('setLoggedIn', false)
+              next('/login')
+              return
+            }
+          } catch (e) {
+            console.error(e)
+            next('/login')
+            return
+          }
         }
         next()
       } else {
@@ -51,80 +84,103 @@ const routes = [
       path: '',
       component: DashboardIndex,
       meta: {
-        requiresAuth: true
+        requiresAuth: true,
+        title: 'Statping - Dashboard',
       }
     },{
       path: 'users',
       component: DashboardUsers,
+      loading: Loading,
         meta: {
-            requiresAuth: true
+            requiresAuth: true,
+          title: 'Statping - Users',
         }
     },{
       path: 'services',
       component: DashboardServices,
         meta: {
-            requiresAuth: true
+            requiresAuth: true,
+          title: 'Statping - Services',
         }
     },{
       path: 'create_service',
       component: EditService,
         meta: {
-            requiresAuth: true
+            requiresAuth: true,
+          title: 'Statping - Create Service',
         }
     },{
       path: 'edit_service/:id',
       component: EditService,
       meta: {
-        requiresAuth: true
+        requiresAuth: true,
+        title: 'Statping - Edit Service',
       }
     },{
       path: 'service/:id/incidents',
       component: Incidents,
       meta: {
-        requiresAuth: true
+        requiresAuth: true,
+        title: 'Statping - Incidents',
       }
     },{
       path: 'service/:id/checkins',
       component: Checkins,
       meta: {
-        requiresAuth: true
+        requiresAuth: true,
+        title: 'Statping - Checkins',
       }
     },{
       path: 'service/:id/failures',
       component: Failures,
       meta: {
-        requiresAuth: true
+        requiresAuth: true,
+        title: 'Statping - Service Failures',
       }
     },{
       path: 'messages',
       component: DashboardMessages,
         meta: {
-            requiresAuth: true
+            requiresAuth: true,
+          title: 'Statping - Messages',
         }
     },{
       path: 'settings',
       component: Settings,
         meta: {
-            requiresAuth: true
+            requiresAuth: true,
+          title: 'Statping - Settings',
         }
     },{
       path: 'logs',
       component: Logs,
         meta: {
-            requiresAuth: true
+            requiresAuth: true,
+          title: 'Statping - Logs',
         }
     },{
       path: 'help',
-      component: Logs,
+      component: Help,
         meta: {
-            requiresAuth: true
+            requiresAuth: true,
+          title: 'Statping - Help',
         }
+    },{
+      path: 'import',
+      component: Importer,
+      meta: {
+        requiresAuth: true,
+        title: 'Statping - Import',
+      }
     }]
   },
   {
     path: '/login',
     name: 'Login',
-    component: Login
+    component: Login,
+    meta: {
+      title: 'Statping - Login',
+    }
   },
   { path: '/logout', redirect: '/' },
   {
@@ -152,23 +208,23 @@ const router = new VueRouter({
     routes
 })
 
-let CheckAuth = (to, from, next) => {
-  if (to.matched.some(record => record.meta.requiresAuth)) {
-    let item = this.$cookies.get("statping_auth")
-    window.console.log(item)
-    if (to.path !== '/login' && !item) {
-      next('/login')
-      return
-    }
-    const auth = JSON.parse(item)
-    if (!auth.token) {
-      next('/login')
-      return
-    }
-    next()
-  } else {
-    next()
-  }
-}
+router.beforeEach((to, from, next) => {
+  const nearestWithTitle = to.matched.slice().reverse().find(r => r.meta && r.meta.title);
+  const nearestWithMeta = to.matched.slice().reverse().find(r => r.meta && r.meta.metaTags);
+  const previousNearestWithMeta = from.matched.slice().reverse().find(r => r.meta && r.meta.metaTags);
+  if (nearestWithTitle) document.title = nearestWithTitle.meta.title;
+  Array.from(document.querySelectorAll('[data-vue-router-controlled]')).map(el => el.parentNode.removeChild(el));
+  if (!nearestWithMeta) return next();
+  nearestWithMeta.meta.metaTags.map(tagDef => {
+    const tag = document.createElement('meta');
+    Object.keys(tagDef).forEach(key => {
+      tag.setAttribute(key, tagDef[key]);
+    });
+    tag.setAttribute('data-vue-router-controlled', '');
+    return tag;
+  })
+    .forEach(tag => document.head.appendChild(tag));
+  next();
+});
 
 export default router
diff --git a/frontend/src/store.js b/frontend/src/store.js
index c8738d22..66d923e1 100644
--- a/frontend/src/store.js
+++ b/frontend/src/store.js
@@ -16,168 +16,183 @@ export const GET_NOTIFIERS = 'GET_NOTIFIERS'
 export const GET_USERS = 'GET_USERS'
 
 export default new Vuex.Store({
-        state: {
-            hasAllData: false,
-            hasPublicData: false,
-            core: {},
-            oauth: {},
-            token: null,
-            services: [],
-            service: null,
-            groups: [],
-            messages: [],
-            users: [],
-            notifiers: [],
-            checkins: [],
-            admin: false,
-            user: false
-        },
-    getters: {
-        hasAllData: state => state.hasAllData,
-        hasPublicData: state => state.hasPublicData,
-        core: state => state.core,
-        oauth: state => state.oauth,
-        token: state => state.token,
-        services: state => state.services,
-        service: state => state.service,
-        groups: state => state.groups,
-        messages: state => state.messages,
-        incidents: state => state.incidents,
-        users: state => state.users,
-        notifiers: state => state.notifiers,
-        checkins: state => state.checkins,
-
-        isAdmin: state => state.admin,
-        isUser: state => state.user,
-
-        servicesInOrder: state => state.services.sort((a, b) => a.order_id - b.order_id),
-        servicesNoGroup: state => state.services.filter(g => g.group_id === 0).sort((a, b) => a.order_id - b.order_id),
-        groupsInOrder: state => state.groups.sort((a, b) => a.order_id - b.order_id),
-        groupsClean: state => state.groups.filter(g => g.name !== '').sort((a, b) => a.order_id - b.order_id),
-        groupsCleanInOrder: state => state.groups.filter(g => g.name !== '').sort((a, b) => a.order_id - b.order_id).sort((a, b) => a.order_id - b.order_id),
-
-        serviceCheckins: (state) => (id) => {
-            return state.checkins.filter(c => c.service_id === id)
-        },
-        serviceByAll: (state) => (element) => {
-            if (element % 1 === 0) {
-                return state.services.find(s => s.id == element)
-            } else {
-                return state.services.find(s => s.permalink === element)
-            }
-        },
-        serviceById: (state) => (id) => {
-            return state.services.find(s => s.id == id)
-        },
-        serviceByPermalink: (state) => (permalink) => {
-            return state.services.find(s => s.permalink === permalink)
-        },
-        servicesInGroup: (state) => (id) => {
-            return state.services.filter(s => s.group_id === id).sort((a, b) => a.order_id - b.order_id)
-        },
-        serviceMessages: (state) => (id) => {
-            return state.messages.filter(s => s.service === id)
-        },
-        onlineServices: (state) => (online) => {
-            return state.services.filter(s => s.online === online)
-        },
-        groupById: (state) => (id) => {
-            return state.groups.find(g => g.id === id)
-        },
-        cleanGroups: (state) => () => {
-            return state.groups.filter(g => g.name !== '').sort((a, b) => a.order_id - b.order_id)
-        },
-        userById: (state) => (id) => {
-            return state.users.find(u => u.id === id)
-        },
-        messageById: (state) => (id) => {
-            return state.messages.find(m => m.id === id)
-        },
-    },
-    mutations: {
-        setHasAllData (state, bool) {
-            state.hasAllData = bool
-        },
-        setHasPublicData (state, bool) {
-            state.hasPublicData = bool
-        },
-        setCore (state, core) {
-            state.core = core
-        },
-        setToken (state, token) {
-            state.token = token
-        },
-        setService (state, service) {
-          state.service = service
-        },
-        setServices (state, services) {
-            state.services = services
-        },
-        setCheckins (state, checkins) {
-            state.checkins = checkins
-        },
-        setGroups (state, groups) {
-            state.groups = groups
-        },
-        setMessages (state, messages) {
-            state.messages = messages
-        },
-        setUsers (state, users) {
-            state.users = users
-        },
-        setNotifiers (state, notifiers) {
-            state.notifiers = notifiers
-        },
-        setAdmin (state, admin) {
-            state.admin = admin
-        },
-      setUser (state, user) {
-        state.user = user
-      },
-      setOAuth (state, oauth) {
-        state.oauth = oauth
-      },
-    },
-    actions: {
-        async getAllServices(context) {
-            const services = await Api.services()
-            context.commit("setServices", services);
-        },
-      async loadCore(context) {
-        const core = await Api.core()
-        const token = await Api.token()
-        context.commit("setCore", core);
-        context.commit('setAdmin', token)
-        context.commit('setCore', core)
-        context.commit('setUser', token!==undefined)
-      },
-        async loadRequired(context) {
-            const groups = await Api.groups()
-            context.commit("setGroups", groups);
-            const services = await Api.services()
-            context.commit("setServices", services);
-            const messages = await Api.messages()
-            context.commit("setMessages", messages)
-            const oauth = await Api.oauth()
-            context.commit("setOAuth", oauth);
-            context.commit("setHasPublicData", true)
-        },
-        async loadAdmin(context) {
-            const groups = await Api.groups()
-            context.commit("setGroups", groups);
-            const services = await Api.services()
-            context.commit("setServices", services);
-          const messages = await Api.messages()
-          context.commit("setMessages", messages)
-          context.commit("setHasPublicData", true)
-          const checkins = await Api.checkins()
-          context.commit("setCheckins", checkins);
-            const notifiers = await Api.notifiers()
-            context.commit("setNotifiers", notifiers);
-          const users = await Api.users()
-          context.commit("setUsers", users);
-          const oauth = await Api.oauth()
-          context.commit("setOAuth", oauth);
-        }
+  state: {
+    hasAllData: false,
+    hasPublicData: false,
+    core: {},
+    oauth: {},
+    token: null,
+    services: [],
+    service: null,
+    groups: [],
+    messages: [],
+    users: [],
+    notifiers: [],
+    checkins: [],
+    admin: false,
+    user: false,
+    loggedIn: false,
+    modal: {
+      visible: false,
+      title: "Modal Header",
+      body: "This is the content for the modal body",
+      btnText: "Save Changes",
+      btnColor: "btn-primary",
+      func: null,
     }
+  },
+  getters: {
+    hasAllData: state => state.hasAllData,
+    hasPublicData: state => state.hasPublicData,
+    admin: state => state.admin,
+    core: state => state.core,
+    oauth: state => state.oauth,
+    token: state => state.token,
+    services: state => state.services,
+    service: state => state.service,
+    groups: state => state.groups,
+    messages: state => state.messages,
+    incidents: state => state.incidents,
+    users: state => state.users,
+    notifiers: state => state.notifiers,
+    checkins: state => state.checkins,
+    loggedIn: state => state.loggedIn,
+    modal: state => state.modal,
+
+    isAdmin: state => state.admin,
+    isUser: state => state.user,
+
+    globalMessages: state => state.messages.filter(s => !s.service || s.service === 0),
+    servicesInOrder: state => state.services.sort((a, b) => a.order_id - b.order_id),
+    servicesNoGroup: state => state.services.filter(g => g.group_id === 0).sort((a, b) => a.order_id - b.order_id),
+    groupsInOrder: state => state.groups.sort((a, b) => a.order_id - b.order_id),
+    groupsClean: state => state.groups.filter(g => g.name !== '').sort((a, b) => a.order_id - b.order_id),
+    groupsCleanInOrder: state => state.groups.filter(g => g.name !== '').sort((a, b) => a.order_id - b.order_id).sort((a, b) => a.order_id - b.order_id),
+    serviceCheckins: (state) => (id) => {
+      return state.checkins.filter(c => c.service_id === id)
+    },
+    serviceByAll: (state) => (element) => {
+      if (!isNaN(parseFloat(element)) && isFinite(element)) {
+        return state.services.find(s => s.id === parseInt(element))
+      } else {
+        return state.services.find(s => s.permalink === element)
+      }
+    },
+    serviceById: (state) => (id) => {
+      return state.services.find(s => s.permalink === id || s.id === id)
+    },
+    servicesInGroup: (state) => (id) => {
+      return state.services.filter(s => s.group_id === id).sort((a, b) => a.order_id - b.order_id)
+    },
+    serviceMessages: (state) => (id) => {
+      return state.messages.filter(s => s.service === id)
+    },
+    onlineServices: (state) => (online) => {
+      return state.services.filter(s => s.online === online)
+    },
+    groupById: (state) => (id) => {
+      return state.groups.find(g => g.id === id)
+    },
+    cleanGroups: (state) => () => {
+      return state.groups.filter(g => g.name !== '').sort((a, b) => a.order_id - b.order_id)
+    },
+    userById: (state) => (id) => {
+      return state.users.find(u => u.id === id)
+    },
+    messageById: (state) => (id) => {
+      return state.messages.find(m => m.id === id)
+    },
+  },
+  mutations: {
+    setHasAllData(state, bool) {
+      state.hasAllData = bool
+    },
+    setHasPublicData(state, bool) {
+      state.hasPublicData = bool
+    },
+    setCore(state, core) {
+      state.core = core
+    },
+    setToken(state, token) {
+      state.token = token
+    },
+    setService(state, service) {
+      state.service = service
+    },
+    setServices(state, services) {
+      state.services = services
+    },
+    setCheckins(state, checkins) {
+      state.checkins = checkins
+    },
+    setGroups(state, groups) {
+      state.groups = groups
+    },
+    setMessages(state, messages) {
+      state.messages = messages
+    },
+    setUsers(state, users) {
+      state.users = users
+    },
+    setNotifiers(state, notifiers) {
+      state.notifiers = notifiers
+    },
+    setAdmin(state, admin) {
+      state.admin = admin
+    },
+    setLoggedIn(state, loggedIn) {
+      state.loggedIn = loggedIn
+    },
+    setUser(state, user) {
+      state.user = user
+    },
+    setOAuth(state, oauth) {
+      state.oauth = oauth
+    },
+    setModal(state, modal) {
+      state.modal = modal
+    },
+  },
+  actions: {
+    async getAllServices(context) {
+      const services = await Api.services()
+      context.commit("setServices", services);
+    },
+    async loadCore(context) {
+      const core = await Api.core()
+      const token = await Api.token()
+      context.commit("setCore", core);
+      context.commit('setAdmin', token)
+      context.commit('setCore', core)
+      context.commit('setUser', token !== undefined)
+    },
+    async loadRequired(context) {
+      const groups = await Api.groups()
+      context.commit("setGroups", groups);
+      const services = await Api.services()
+      context.commit("setServices", services);
+      const messages = await Api.messages()
+      context.commit("setMessages", messages)
+      const oauth = await Api.oauth()
+      context.commit("setOAuth", oauth);
+      context.commit("setHasPublicData", true)
+    },
+    async loadAdmin(context) {
+      const groups = await Api.groups()
+      context.commit("setGroups", groups);
+      const services = await Api.services()
+      context.commit("setServices", services);
+      const messages = await Api.messages()
+      context.commit("setMessages", messages)
+      context.commit("setHasPublicData", true)
+      const checkins = await Api.checkins()
+      context.commit("setCheckins", checkins);
+      const notifiers = await Api.notifiers()
+      context.commit("setNotifiers", notifiers);
+      const users = await Api.users()
+      context.commit("setUsers", users);
+      const oauth = await Api.oauth()
+      context.commit("setOAuth", oauth);
+    }
+  }
 });
diff --git a/frontend/vue.config.js b/frontend/vue.config.js
index 39d5beb2..8a3ee963 100644
--- a/frontend/vue.config.js
+++ b/frontend/vue.config.js
@@ -2,6 +2,9 @@ module.exports = {
   baseUrl: '/',
   assetsDir: 'assets',
   filenameHashing: false,
+  productionTip: process.env.NODE_ENV !== 'production',
+  devtools: process.env.NODE_ENV !== 'production',
+  performance: process.env.NODE_ENV !== 'production',
   devServer: {
     disableHostCheck: true,
     proxyTable: {
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index e916a4cf..5c077b22 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2,277 +2,283 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz#d5481c5095daa1c57e16e54c6f9198443afb49ff"
-  integrity sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
+  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
   dependencies:
-    "@babel/highlight" "^7.10.1"
+    "@babel/highlight" "^7.10.4"
 
-"@babel/compat-data@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.1.tgz#b1085ffe72cd17bf2c0ee790fc09f9626011b2db"
-  integrity sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==
+"@babel/compat-data@^7.10.4", "@babel/compat-data@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz#e9f73efe09af1355b723a7f39b11bad637d7c99c"
+  integrity sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==
   dependencies:
     browserslist "^4.12.0"
     invariant "^2.2.4"
     semver "^5.5.0"
 
 "@babel/core@>=7.9.0", "@babel/core@^7.9.0", "@babel/core@^7.9.6":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.2.tgz#bd6786046668a925ac2bd2fd95b579b92a23b36a"
-  integrity sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==
+  version "7.11.1"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.1.tgz#2c55b604e73a40dc21b0e52650b11c65cf276643"
+  integrity sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ==
   dependencies:
-    "@babel/code-frame" "^7.10.1"
-    "@babel/generator" "^7.10.2"
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helpers" "^7.10.1"
-    "@babel/parser" "^7.10.2"
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.2"
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.11.0"
+    "@babel/helper-module-transforms" "^7.11.0"
+    "@babel/helpers" "^7.10.4"
+    "@babel/parser" "^7.11.1"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.11.0"
+    "@babel/types" "^7.11.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
     json5 "^2.1.2"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
     resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.10.1", "@babel/generator@^7.10.2":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.2.tgz#0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9"
-  integrity sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==
+"@babel/generator@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.0.tgz#4b90c78d8c12825024568cbe83ee6c9af193585c"
+  integrity sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==
   dependencies:
-    "@babel/types" "^7.10.2"
+    "@babel/types" "^7.11.0"
     jsesc "^2.5.1"
-    lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz#f6d08acc6f70bbd59b436262553fb2e259a1a268"
-  integrity sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==
+"@babel/helper-annotate-as-pure@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
+  integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz#0ec7d9be8174934532661f87783eb18d72290059"
-  integrity sha512-cQpVq48EkYxUU0xozpGCLla3wlkdRRqLWu1ksFMXA9CM5KQmyyRpSEsYXbao7JUkOw/tAaYKCaYyZq6HOFYtyw==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
+  integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-explode-assignable-expression" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-compilation-targets@^7.10.2", "@babel/helper-compilation-targets@^7.9.6":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz#a17d9723b6e2c750299d2a14d4637c76936d8285"
-  integrity sha512-hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA==
+"@babel/helper-compilation-targets@^7.10.4", "@babel/helper-compilation-targets@^7.9.6":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz#804ae8e3f04376607cc791b9d47d540276332bd2"
+  integrity sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==
   dependencies:
-    "@babel/compat-data" "^7.10.1"
+    "@babel/compat-data" "^7.10.4"
     browserslist "^4.12.0"
     invariant "^2.2.4"
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/helper-create-class-features-plugin@^7.10.1", "@babel/helper-create-class-features-plugin@^7.3.0", "@babel/helper-create-class-features-plugin@^7.3.4":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz#7474295770f217dbcf288bf7572eb213db46ee67"
-  integrity sha512-5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ==
+"@babel/helper-create-class-features-plugin@^7.10.4", "@babel/helper-create-class-features-plugin@^7.10.5", "@babel/helper-create-class-features-plugin@^7.3.0", "@babel/helper-create-class-features-plugin@^7.3.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz#9f61446ba80e8240b0a5c85c6fdac8459d6f259d"
+  integrity sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==
   dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-member-expression-to-functions" "^7.10.1"
-    "@babel/helper-optimise-call-expression" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-member-expression-to-functions" "^7.10.5"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
 
-"@babel/helper-create-regexp-features-plugin@^7.10.1", "@babel/helper-create-regexp-features-plugin@^7.8.3":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz#1b8feeab1594cbcfbf3ab5a3bbcabac0468efdbd"
-  integrity sha512-Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA==
+"@babel/helper-create-regexp-features-plugin@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz#fdd60d88524659a0b6959c0579925e425714f3b8"
+  integrity sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-regex" "^7.10.1"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-regex" "^7.10.4"
     regexpu-core "^4.7.0"
 
-"@babel/helper-define-map@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz#5e69ee8308648470dd7900d159c044c10285221d"
-  integrity sha512-+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg==
+"@babel/helper-define-map@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30"
+  integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==
   dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/types" "^7.10.1"
-    lodash "^4.17.13"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/types" "^7.10.5"
+    lodash "^4.17.19"
 
-"@babel/helper-explode-assignable-expression@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz#e9d76305ee1162ca467357ae25df94f179af2b7e"
-  integrity sha512-vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg==
+"@babel/helper-explode-assignable-expression@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz#40a1cd917bff1288f699a94a75b37a1a2dbd8c7c"
+  integrity sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==
   dependencies:
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-function-name@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz#92bd63829bfc9215aca9d9defa85f56b539454f4"
-  integrity sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==
+"@babel/helper-function-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
+  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-get-function-arity@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz#7303390a81ba7cb59613895a192b93850e373f7d"
-  integrity sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==
+"@babel/helper-get-function-arity@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
+  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-hoist-variables@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz#7e77c82e5dcae1ebf123174c385aaadbf787d077"
-  integrity sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==
+"@babel/helper-hoist-variables@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
+  integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-member-expression-to-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz#432967fd7e12a4afef66c4687d4ca22bc0456f15"
-  integrity sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==
+"@babel/helper-member-expression-to-functions@^7.10.4", "@babel/helper-member-expression-to-functions@^7.10.5":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df"
+  integrity sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.11.0"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.1", "@babel/helper-module-imports@^7.8.3":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz#dd331bd45bccc566ce77004e9d05fe17add13876"
-  integrity sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620"
+  integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-module-transforms@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz#24e2f08ee6832c60b157bb0936c86bef7210c622"
-  integrity sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==
+"@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5", "@babel/helper-module-transforms@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359"
+  integrity sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==
   dependencies:
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-simple-access" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
-    lodash "^4.17.13"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-simple-access" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.11.0"
+    lodash "^4.17.19"
 
-"@babel/helper-optimise-call-expression@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz#b4a1f2561870ce1247ceddb02a3860fa96d72543"
-  integrity sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==
+"@babel/helper-optimise-call-expression@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
+  integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.1", "@babel/helper-plugin-utils@^7.8.0":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz#ec5a5cf0eec925b66c60580328b122c01230a127"
-  integrity sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
+  integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
 
-"@babel/helper-regex@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.1.tgz#021cf1a7ba99822f993222a001cc3fec83255b96"
-  integrity sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==
+"@babel/helper-regex@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
+  integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==
   dependencies:
-    lodash "^4.17.13"
+    lodash "^4.17.19"
 
-"@babel/helper-remap-async-to-generator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz#bad6aaa4ff39ce8d4b82ccaae0bfe0f7dbb5f432"
-  integrity sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A==
+"@babel/helper-remap-async-to-generator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz#fce8bea4e9690bbe923056ded21e54b4e8b68ed5"
+  integrity sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-wrap-function" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-wrap-function" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-replace-supers@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz#ec6859d20c5d8087f6a2dc4e014db7228975f13d"
-  integrity sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==
+"@babel/helper-replace-supers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf"
+  integrity sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.10.1"
-    "@babel/helper-optimise-call-expression" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/helper-member-expression-to-functions" "^7.10.4"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-simple-access@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz#08fb7e22ace9eb8326f7e3920a1c2052f13d851e"
-  integrity sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==
+"@babel/helper-simple-access@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461"
+  integrity sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==
   dependencies:
-    "@babel/template" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/helper-split-export-declaration@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz#c6f4be1cbc15e3a868e4c64a17d5d31d754da35f"
-  integrity sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==
+"@babel/helper-skip-transparent-expression-wrappers@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz#eec162f112c2f58d3af0af125e3bb57665146729"
+  integrity sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==
   dependencies:
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.11.0"
 
-"@babel/helper-validator-identifier@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz#5770b0c1a826c4f53f5ede5e153163e0318e94b5"
-  integrity sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==
-
-"@babel/helper-wrap-function@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz#956d1310d6696257a7afd47e4c42dfda5dfcedc9"
-  integrity sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ==
+"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
+  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
   dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/types" "^7.11.0"
 
-"@babel/helpers@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.1.tgz#a6827b7cb975c9d9cef5fd61d919f60d8844a973"
-  integrity sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==
-  dependencies:
-    "@babel/template" "^7.10.1"
-    "@babel/traverse" "^7.10.1"
-    "@babel/types" "^7.10.1"
+"@babel/helper-validator-identifier@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
+  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
-"@babel/highlight@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.1.tgz#841d098ba613ba1a427a2b383d79e35552c38ae0"
-  integrity sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==
+"@babel/helper-wrap-function@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz#8a6f701eab0ff39f765b5a1cfef409990e624b87"
+  integrity sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.10.1"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@babel/helpers@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044"
+  integrity sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==
+  dependencies:
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
+"@babel/highlight@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
+  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.10.1", "@babel/parser@^7.10.2":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0"
-  integrity sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==
+"@babel/parser@^7.0.0", "@babel/parser@^7.10.4", "@babel/parser@^7.11.0", "@babel/parser@^7.11.1":
+  version "7.11.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.2.tgz#0882ab8a455df3065ea2dcb4c753b2460a24bead"
+  integrity sha512-Vuj/+7vLo6l1Vi7uuO+1ngCDNeVmNbTngcJFKCR/oEtz8tKz0CJxZEGmPt9KcIloZhOZ3Zit6xbpXT2MDlS9Vw==
 
-"@babel/plugin-proposal-async-generator-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz#6911af5ba2e615c4ff3c497fe2f47b35bf6d7e55"
-  integrity sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw==
+"@babel/plugin-proposal-async-generator-functions@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz#3491cabf2f7c179ab820606cec27fed15e0e8558"
+  integrity sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-remap-async-to-generator" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-class-properties@^7.10.1", "@babel/plugin-proposal-class-properties@^7.8.3":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz#046bc7f6550bb08d9bd1d4f060f5f5a4f1087e01"
-  integrity sha512-sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw==
+"@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807"
+  integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-proposal-class-properties@~7.3":
   version "7.3.4"
@@ -283,13 +289,13 @@
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-proposal-decorators@^7.8.3":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.1.tgz#9373c2d8db45345c6e30452ad77b469758e5c8f7"
-  integrity sha512-xBfteh352MTke2U1NpclzMDmAmCdQ2fBZjhZQQfGTjXw6qcRYMkt528sA1U8o0ThDCSeuETXIj5bOGdxN+5gkw==
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.5.tgz#42898bba478bc4b1ae242a703a953a7ad350ffb4"
+  integrity sha512-Sc5TAQSZuLzgY0664mMDn24Vw2P8g/VhyLyGPaWiHahhgLqeZvcGeyBZOrJW0oSKIK2mvQ22a1ENXBIQLhrEiQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-decorators" "^7.10.1"
+    "@babel/helper-create-class-features-plugin" "^7.10.5"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-decorators" "^7.10.4"
 
 "@babel/plugin-proposal-decorators@~7.3":
   version "7.3.0"
@@ -300,20 +306,28 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-decorators" "^7.2.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz#e36979dc1dc3b73f6d6816fc4951da2363488ef0"
-  integrity sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA==
+"@babel/plugin-proposal-dynamic-import@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz#ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e"
+  integrity sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
-"@babel/plugin-proposal-json-strings@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz#b1e691ee24c651b5a5e32213222b2379734aff09"
-  integrity sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg==
+"@babel/plugin-proposal-export-namespace-from@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz#570d883b91031637b3e2958eea3c438e62c05f54"
+  integrity sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
+"@babel/plugin-proposal-json-strings@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db"
+  integrity sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
 "@babel/plugin-proposal-json-strings@~7.2":
@@ -324,62 +338,71 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz#02dca21673842ff2fe763ac253777f235e9bbf78"
-  integrity sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA==
+"@babel/plugin-proposal-logical-assignment-operators@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz#9f80e482c03083c87125dee10026b58527ea20c8"
+  integrity sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"
+  integrity sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz#a9a38bc34f78bdfd981e791c27c6fdcec478c123"
-  integrity sha512-jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA==
+"@babel/plugin-proposal-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz#ce1590ff0a65ad12970a609d78855e9a4c1aef06"
+  integrity sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz#cba44908ac9f142650b4a65b8aa06bf3478d5fb6"
-  integrity sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==
+"@babel/plugin-proposal-object-rest-spread@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz#bd81f95a1f746760ea43b6c2d3d62b11790ad0af"
+  integrity sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.10.1"
+    "@babel/plugin-transform-parameters" "^7.10.4"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz#c9f86d99305f9fa531b568ff5ab8c964b8b223d2"
-  integrity sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==
+"@babel/plugin-proposal-optional-catch-binding@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz#31c938309d24a78a49d68fdabffaa863758554dd"
+  integrity sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz#15f5d6d22708629451a91be28f8facc55b0e818c"
-  integrity sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA==
+"@babel/plugin-proposal-optional-chaining@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz#de5866d0646f6afdaab8a566382fe3a221755076"
+  integrity sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-private-methods@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz#ed85e8058ab0fe309c3f448e5e1b73ca89cdb598"
-  integrity sha512-RZecFFJjDiQ2z6maFprLgrdnm0OzoC23Mx89xf1CcEsxmHuzuXOdniEuI+S3v7vjQG4F5sa6YtUp+19sZuSxHg==
+"@babel/plugin-proposal-private-methods@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz#b160d972b8fdba5c7d111a145fc8c421fc2a6909"
+  integrity sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-create-class-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.10.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz#dc04feb25e2dd70c12b05d680190e138fa2c0c6f"
-  integrity sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==
+"@babel/plugin-proposal-unicode-property-regex@^7.10.4", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz#4483cda53041ce3413b7fe2f00022665ddfaa75d"
+  integrity sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-async-generators@^7.8.0":
   version "7.8.4"
@@ -388,19 +411,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz#d5bc0645913df5b17ad7eda0fa2308330bde34c5"
-  integrity sha512-Gf2Yx/iRs1JREDtVZ56OrjjgFHCaldpTnuy9BHla10qyVT3YkIIGEtoDWhyop0ksu1GvNjHIoYRBqm3zoR1jyQ==
+"@babel/plugin-syntax-class-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz#6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c"
+  integrity sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-decorators@^7.10.1", "@babel/plugin-syntax-decorators@^7.2.0":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.1.tgz#16b869c4beafc9a442565147bda7ce0967bd4f13"
-  integrity sha512-a9OAbQhKOwSle1Vr0NJu/ISg1sPfdEkfRKWpgPuzhnWWzForou2gIeUIIwjAMHRekhhpJ7eulZlYs0H14Cbi+g==
+"@babel/plugin-syntax-decorators@^7.10.4", "@babel/plugin-syntax-decorators@^7.2.0":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.4.tgz#6853085b2c429f9d322d02f5a635018cdeb2360c"
+  integrity sha512-2NaoC6fAk2VMdhY1eerkfHV+lVYC1u8b+jmRJISqANCJlTxYy19HGdIkkQtix2UtkcPuPu+IlDgrVseZnU03bw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -416,6 +439,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-export-namespace-from@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
 "@babel/plugin-syntax-import-meta@~7.2":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.2.0.tgz#2333ef4b875553a3bcd1e93f8ebc09f5b9213a40"
@@ -431,11 +461,18 @@
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-jsx@^7.2.0", "@babel/plugin-syntax-jsx@^7.8.3":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.1.tgz#0ae371134a42b91d5418feb3c8c8d43e1565d2da"
-  integrity sha512-+OxyOArpVFXQeXKLO9o+r2I4dIoVoy6+Uu0vKELrlweDM3QJADZj+Z+5ERansZqIZBcLj42vHnDI8Rz9BnRIuQ==
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz#39abaae3cbf710c4373d8429484e6ba21340166c"
+  integrity sha512-KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
   version "7.8.3"
@@ -444,12 +481,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz#25761ee7410bc8cf97327ba741ee94e4a61b7d99"
-  integrity sha512-uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg==
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-object-rest-spread@^7.8.0":
   version "7.8.3"
@@ -472,273 +509,273 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz#8b8733f8c57397b3eaa47ddba8841586dcaef362"
-  integrity sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ==
+"@babel/plugin-syntax-top-level-await@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz#4bbeb8917b54fcf768364e0a81f560e33a3ef57d"
+  integrity sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-arrow-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz#cb5ee3a36f0863c06ead0b409b4cc43a889b295b"
-  integrity sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA==
+"@babel/plugin-transform-arrow-functions@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz#e22960d77e697c74f41c501d44d73dbf8a6a64cd"
+  integrity sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-async-to-generator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz#e5153eb1a3e028f79194ed8a7a4bf55f862b2062"
-  integrity sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg==
+"@babel/plugin-transform-async-to-generator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz#41a5017e49eb6f3cda9392a51eef29405b245a37"
+  integrity sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-remap-async-to-generator" "^7.10.1"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.10.4"
 
-"@babel/plugin-transform-block-scoped-functions@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz#146856e756d54b20fff14b819456b3e01820b85d"
-  integrity sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q==
+"@babel/plugin-transform-block-scoped-functions@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz#1afa595744f75e43a91af73b0d998ecfe4ebc2e8"
+  integrity sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoping@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz#47092d89ca345811451cd0dc5d91605982705d5e"
-  integrity sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw==
+"@babel/plugin-transform-block-scoping@^7.10.4":
+  version "7.11.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz#5b7efe98852bef8d652c0b28144cd93a9e4b5215"
+  integrity sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    lodash "^4.17.13"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-classes@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz#6e11dd6c4dfae70f540480a4702477ed766d733f"
-  integrity sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ==
+"@babel/plugin-transform-classes@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz#405136af2b3e218bc4a1926228bc917ab1a0adc7"
+  integrity sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-define-map" "^7.10.1"
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-optimise-call-expression" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-define-map" "^7.10.4"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.10.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz#59aa399064429d64dce5cf76ef9b90b7245ebd07"
-  integrity sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ==
+"@babel/plugin-transform-computed-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz#9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb"
+  integrity sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-destructuring@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz#abd58e51337815ca3a22a336b85f62b998e71907"
-  integrity sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==
+"@babel/plugin-transform-destructuring@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz#70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5"
+  integrity sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-dotall-regex@^7.10.1", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz#920b9fec2d78bb57ebb64a644d5c2ba67cc104ee"
-  integrity sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==
+"@babel/plugin-transform-dotall-regex@^7.10.4", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz#469c2062105c1eb6a040eaf4fac4b488078395ee"
+  integrity sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-duplicate-keys@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz#c900a793beb096bc9d4d0a9d0cde19518ffc83b9"
-  integrity sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA==
+"@babel/plugin-transform-duplicate-keys@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz#697e50c9fee14380fe843d1f306b295617431e47"
+  integrity sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-exponentiation-operator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz#279c3116756a60dd6e6f5e488ba7957db9c59eb3"
-  integrity sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA==
+"@babel/plugin-transform-exponentiation-operator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz#5ae338c57f8cf4001bdb35607ae66b92d665af2e"
+  integrity sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-for-of@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz#ff01119784eb0ee32258e8646157ba2501fcfda5"
-  integrity sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w==
+"@babel/plugin-transform-for-of@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz#c08892e8819d3a5db29031b115af511dbbfebae9"
+  integrity sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-function-name@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz#4ed46fd6e1d8fde2a2ec7b03c66d853d2c92427d"
-  integrity sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw==
+"@babel/plugin-transform-function-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz#6a467880e0fc9638514ba369111811ddbe2644b7"
+  integrity sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==
   dependencies:
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz#5794f8da82846b22e4e6631ea1658bce708eb46a"
-  integrity sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw==
+"@babel/plugin-transform-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz#9f42ba0841100a135f22712d0e391c462f571f3c"
+  integrity sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-member-expression-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz#90347cba31bca6f394b3f7bd95d2bbfd9fce2f39"
-  integrity sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA==
+"@babel/plugin-transform-member-expression-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz#b1ec44fcf195afcb8db2c62cd8e551c881baf8b7"
+  integrity sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-modules-amd@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz#65950e8e05797ebd2fe532b96e19fc5482a1d52a"
-  integrity sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==
+"@babel/plugin-transform-modules-amd@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz#1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1"
+  integrity sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz#d5ff4b4413ed97ffded99961056e1fb980fb9301"
-  integrity sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==
+"@babel/plugin-transform-modules-commonjs@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz#66667c3eeda1ebf7896d41f1f16b17105a2fbca0"
+  integrity sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-simple-access" "^7.10.1"
+    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-simple-access" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz#9962e4b0ac6aaf2e20431ada3d8ec72082cbffb6"
-  integrity sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==
+"@babel/plugin-transform-modules-systemjs@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz#6270099c854066681bae9e05f87e1b9cadbe8c85"
+  integrity sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.10.1"
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-hoist-variables" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.10.5"
+    "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz#ea080911ffc6eb21840a5197a39ede4ee67b1595"
-  integrity sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA==
+"@babel/plugin-transform-modules-umd@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz#9a8481fe81b824654b3a0b65da3df89f3d21839e"
+  integrity sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-module-transforms" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
-  integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz#78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6"
+  integrity sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
 
-"@babel/plugin-transform-new-target@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz#6ee41a5e648da7632e22b6fb54012e87f612f324"
-  integrity sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw==
+"@babel/plugin-transform-new-target@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz#9097d753cb7b024cb7381a3b2e52e9513a9c6888"
+  integrity sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-object-super@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz#2e3016b0adbf262983bf0d5121d676a5ed9c4fde"
-  integrity sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw==
+"@babel/plugin-transform-object-super@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz#d7146c4d139433e7a6526f888c667e314a093894"
+  integrity sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-replace-supers" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.10.4"
 
-"@babel/plugin-transform-parameters@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz#b25938a3c5fae0354144a720b07b32766f683ddd"
-  integrity sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==
+"@babel/plugin-transform-parameters@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz#59d339d58d0b1950435f4043e74e2510005e2c4a"
+  integrity sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-property-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz#cffc7315219230ed81dc53e4625bf86815b6050d"
-  integrity sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==
+"@babel/plugin-transform-property-literals@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz#f6fe54b6590352298785b83edd815d214c42e3c0"
+  integrity sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-regenerator@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz#10e175cbe7bdb63cc9b39f9b3f823c5c7c5c5490"
-  integrity sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw==
+"@babel/plugin-transform-regenerator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz#2015e59d839074e76838de2159db421966fd8b63"
+  integrity sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz#0fc1027312b4d1c3276a57890c8ae3bcc0b64a86"
-  integrity sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==
+"@babel/plugin-transform-reserved-words@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz#8f2682bcdcef9ed327e1b0861585d7013f8a54dd"
+  integrity sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-runtime@^7.9.6":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.1.tgz#fd1887f749637fb2ed86dc278e79eb41df37f4b1"
-  integrity sha512-4w2tcglDVEwXJ5qxsY++DgWQdNJcCCsPxfT34wCUwIf2E7dI7pMpH8JczkMBbgBTNzBX62SZlNJ9H+De6Zebaw==
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.0.tgz#e27f78eb36f19448636e05c33c90fd9ad9b8bccf"
+  integrity sha512-LFEsP+t3wkYBlis8w6/kmnd6Kb1dxTd+wGJ8MlxTGzQo//ehtqlVL4S9DNUa53+dtPSQobN2CXx4d81FqC58cw==
   dependencies:
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
     resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz#e8b54f238a1ccbae482c4dce946180ae7b3143f3"
-  integrity sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==
+"@babel/plugin-transform-shorthand-properties@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz#9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6"
+  integrity sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-spread@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz#0c6d618a0c4461a274418460a28c9ccf5239a7c8"
-  integrity sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw==
+"@babel/plugin-transform-spread@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz#fa84d300f5e4f57752fe41a6d1b3c554f13f17cc"
+  integrity sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
 
-"@babel/plugin-transform-sticky-regex@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz#90fc89b7526228bed9842cff3588270a7a393b00"
-  integrity sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==
+"@babel/plugin-transform-sticky-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz#8f3889ee8657581130a29d9cc91d7c73b7c4a28d"
+  integrity sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/helper-regex" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-regex" "^7.10.4"
 
-"@babel/plugin-transform-template-literals@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz#914c7b7f4752c570ea00553b4284dad8070e8628"
-  integrity sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg==
+"@babel/plugin-transform-template-literals@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz#78bc5d626a6642db3312d9d0f001f5e7639fde8c"
+  integrity sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-typeof-symbol@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz#60c0239b69965d166b80a84de7315c1bc7e0bb0e"
-  integrity sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==
+"@babel/plugin-transform-typeof-symbol@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz#9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc"
+  integrity sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-unicode-escapes@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz#add0f8483dab60570d9e03cecef6c023aa8c9940"
-  integrity sha512-zZ0Poh/yy1d4jeDWpx/mNwbKJVwUYJX73q+gyh4bwtG0/iUlzdEu0sLMda8yuDFS6LBQlT/ST1SJAR6zYwXWgw==
+"@babel/plugin-transform-unicode-escapes@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz#feae523391c7651ddac115dae0a9d06857892007"
+  integrity sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-unicode-regex@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz#6b58f2aea7b68df37ac5025d9c88752443a6b43f"
-  integrity sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw==
+"@babel/plugin-transform-unicode-regex@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz#e56d71f9282fac6db09c82742055576d5e6d80a8"
+  integrity sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
+    "@babel/helper-create-regexp-features-plugin" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/polyfill@~7.2":
   version "7.2.5"
@@ -749,69 +786,73 @@
     regenerator-runtime "^0.12.0"
 
 "@babel/preset-env@^7.9.5", "@babel/preset-env@^7.9.6":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.2.tgz#715930f2cf8573b0928005ee562bed52fb65fdfb"
-  integrity sha512-MjqhX0RZaEgK/KueRzh+3yPSk30oqDKJ5HP5tqTSB1e2gzGS3PLy7K0BIpnp78+0anFuSwOeuCf1zZO7RzRvEA==
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.0.tgz#860ee38f2ce17ad60480c2021ba9689393efb796"
+  integrity sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==
   dependencies:
-    "@babel/compat-data" "^7.10.1"
-    "@babel/helper-compilation-targets" "^7.10.2"
-    "@babel/helper-module-imports" "^7.10.1"
-    "@babel/helper-plugin-utils" "^7.10.1"
-    "@babel/plugin-proposal-async-generator-functions" "^7.10.1"
-    "@babel/plugin-proposal-class-properties" "^7.10.1"
-    "@babel/plugin-proposal-dynamic-import" "^7.10.1"
-    "@babel/plugin-proposal-json-strings" "^7.10.1"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.1"
-    "@babel/plugin-proposal-numeric-separator" "^7.10.1"
-    "@babel/plugin-proposal-object-rest-spread" "^7.10.1"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.10.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.10.1"
-    "@babel/plugin-proposal-private-methods" "^7.10.1"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.10.1"
+    "@babel/compat-data" "^7.11.0"
+    "@babel/helper-compilation-targets" "^7.10.4"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-proposal-async-generator-functions" "^7.10.4"
+    "@babel/plugin-proposal-class-properties" "^7.10.4"
+    "@babel/plugin-proposal-dynamic-import" "^7.10.4"
+    "@babel/plugin-proposal-export-namespace-from" "^7.10.4"
+    "@babel/plugin-proposal-json-strings" "^7.10.4"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.11.0"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4"
+    "@babel/plugin-proposal-numeric-separator" "^7.10.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.11.0"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.10.4"
+    "@babel/plugin-proposal-optional-chaining" "^7.11.0"
+    "@babel/plugin-proposal-private-methods" "^7.10.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-class-properties" "^7.10.1"
+    "@babel/plugin-syntax-class-properties" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.1"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.10.1"
-    "@babel/plugin-transform-arrow-functions" "^7.10.1"
-    "@babel/plugin-transform-async-to-generator" "^7.10.1"
-    "@babel/plugin-transform-block-scoped-functions" "^7.10.1"
-    "@babel/plugin-transform-block-scoping" "^7.10.1"
-    "@babel/plugin-transform-classes" "^7.10.1"
-    "@babel/plugin-transform-computed-properties" "^7.10.1"
-    "@babel/plugin-transform-destructuring" "^7.10.1"
-    "@babel/plugin-transform-dotall-regex" "^7.10.1"
-    "@babel/plugin-transform-duplicate-keys" "^7.10.1"
-    "@babel/plugin-transform-exponentiation-operator" "^7.10.1"
-    "@babel/plugin-transform-for-of" "^7.10.1"
-    "@babel/plugin-transform-function-name" "^7.10.1"
-    "@babel/plugin-transform-literals" "^7.10.1"
-    "@babel/plugin-transform-member-expression-literals" "^7.10.1"
-    "@babel/plugin-transform-modules-amd" "^7.10.1"
-    "@babel/plugin-transform-modules-commonjs" "^7.10.1"
-    "@babel/plugin-transform-modules-systemjs" "^7.10.1"
-    "@babel/plugin-transform-modules-umd" "^7.10.1"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.10.1"
-    "@babel/plugin-transform-object-super" "^7.10.1"
-    "@babel/plugin-transform-parameters" "^7.10.1"
-    "@babel/plugin-transform-property-literals" "^7.10.1"
-    "@babel/plugin-transform-regenerator" "^7.10.1"
-    "@babel/plugin-transform-reserved-words" "^7.10.1"
-    "@babel/plugin-transform-shorthand-properties" "^7.10.1"
-    "@babel/plugin-transform-spread" "^7.10.1"
-    "@babel/plugin-transform-sticky-regex" "^7.10.1"
-    "@babel/plugin-transform-template-literals" "^7.10.1"
-    "@babel/plugin-transform-typeof-symbol" "^7.10.1"
-    "@babel/plugin-transform-unicode-escapes" "^7.10.1"
-    "@babel/plugin-transform-unicode-regex" "^7.10.1"
+    "@babel/plugin-syntax-top-level-await" "^7.10.4"
+    "@babel/plugin-transform-arrow-functions" "^7.10.4"
+    "@babel/plugin-transform-async-to-generator" "^7.10.4"
+    "@babel/plugin-transform-block-scoped-functions" "^7.10.4"
+    "@babel/plugin-transform-block-scoping" "^7.10.4"
+    "@babel/plugin-transform-classes" "^7.10.4"
+    "@babel/plugin-transform-computed-properties" "^7.10.4"
+    "@babel/plugin-transform-destructuring" "^7.10.4"
+    "@babel/plugin-transform-dotall-regex" "^7.10.4"
+    "@babel/plugin-transform-duplicate-keys" "^7.10.4"
+    "@babel/plugin-transform-exponentiation-operator" "^7.10.4"
+    "@babel/plugin-transform-for-of" "^7.10.4"
+    "@babel/plugin-transform-function-name" "^7.10.4"
+    "@babel/plugin-transform-literals" "^7.10.4"
+    "@babel/plugin-transform-member-expression-literals" "^7.10.4"
+    "@babel/plugin-transform-modules-amd" "^7.10.4"
+    "@babel/plugin-transform-modules-commonjs" "^7.10.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.10.4"
+    "@babel/plugin-transform-modules-umd" "^7.10.4"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.10.4"
+    "@babel/plugin-transform-new-target" "^7.10.4"
+    "@babel/plugin-transform-object-super" "^7.10.4"
+    "@babel/plugin-transform-parameters" "^7.10.4"
+    "@babel/plugin-transform-property-literals" "^7.10.4"
+    "@babel/plugin-transform-regenerator" "^7.10.4"
+    "@babel/plugin-transform-reserved-words" "^7.10.4"
+    "@babel/plugin-transform-shorthand-properties" "^7.10.4"
+    "@babel/plugin-transform-spread" "^7.11.0"
+    "@babel/plugin-transform-sticky-regex" "^7.10.4"
+    "@babel/plugin-transform-template-literals" "^7.10.4"
+    "@babel/plugin-transform-typeof-symbol" "^7.10.4"
+    "@babel/plugin-transform-unicode-escapes" "^7.10.4"
+    "@babel/plugin-transform-unicode-regex" "^7.10.4"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.10.2"
+    "@babel/types" "^7.11.0"
     browserslist "^4.12.0"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
@@ -830,106 +871,62 @@
     esutils "^2.0.2"
 
 "@babel/runtime-corejs2@^7.0.0":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.10.2.tgz#532f20b839684615f97e9f700f630e995efed426"
-  integrity sha512-ZLwsFnNm3WpIARU1aLFtufjMHsmEnc8TjtrfAjmbgMbeoyR+LuQoyESoNdTfeDhL6IdY12SpeycXMgSgl8XGXA==
+  version "7.11.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.11.2.tgz#700a03945ebad0d31ba6690fc8a6bcc9040faa47"
+  integrity sha512-AC/ciV28adSSpEkBglONBWq4/Lvm6GAZuxIoyVtsnUpZMl0bxLtoChEnYAkP+47KyOCayZanojtflUEUJtR/6Q==
   dependencies:
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
 "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.6":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839"
-  integrity sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==
+  version "7.11.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
+  integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811"
-  integrity sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==
+"@babel/template@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
+  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
   dependencies:
-    "@babel/code-frame" "^7.10.1"
-    "@babel/parser" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/code-frame" "^7.10.4"
+    "@babel/parser" "^7.10.4"
+    "@babel/types" "^7.10.4"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.10.1":
-  version "7.10.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz#bbcef3031e4152a6c0b50147f4958df54ca0dd27"
-  integrity sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.0.tgz#9b996ce1b98f53f7c3e4175115605d56ed07dd24"
+  integrity sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==
   dependencies:
-    "@babel/code-frame" "^7.10.1"
-    "@babel/generator" "^7.10.1"
-    "@babel/helper-function-name" "^7.10.1"
-    "@babel/helper-split-export-declaration" "^7.10.1"
-    "@babel/parser" "^7.10.1"
-    "@babel/types" "^7.10.1"
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.11.0"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/parser" "^7.11.0"
+    "@babel/types" "^7.11.0"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.1", "@babel/types@^7.10.2", "@babel/types@^7.4.4":
-  version "7.10.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz#30283be31cad0dbf6fb00bd40641ca0ea675172d"
-  integrity sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.4.4":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.0.tgz#2ae6bf1ba9ae8c3c43824e5861269871b206e90d"
+  integrity sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.10.1"
-    lodash "^4.17.13"
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@cypress/listr-verbose-renderer@0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#a77492f4b11dcc7c446a34b3e28721afd33c642a"
-  integrity sha1-p3SS9LEdzHxEajSz4ochr9M8ZCo=
-  dependencies:
-    chalk "^1.1.3"
-    cli-cursor "^1.0.2"
-    date-fns "^1.27.2"
-    figures "^1.7.0"
-
-"@cypress/request@2.88.5":
-  version "2.88.5"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.5.tgz#8d7ecd17b53a849cfd5ab06d5abe7d84976375d7"
-  integrity sha512-TzEC1XMi1hJkywWpRfD2clreTa/Z+lOrXDCxxBTBPEcY5azdPi56A6Xw+O4tWJnaJH3iIE7G5aDXZC6JgRZLcA==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-"@cypress/xvfb@1.2.4":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.2.4.tgz#2daf42e8275b39f4aa53c14214e557bd14e7748a"
-  integrity sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==
-  dependencies:
-    debug "^3.1.0"
-    lodash.once "^4.1.1"
-
 "@fortawesome/fontawesome-common-types@^0.1.2-1":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.7.tgz#4336c4b06d0b5608ff1215464b66fcf9f4795284"
   integrity sha512-ego8jRVSHfq/iq4KRZJKQeUAdi3ZjGNrqw4oPN3fNdvTBnLCSntwVCnc37bsAJP9UB8MhrTfPnZYxkv2vpS4pg==
 
-"@fortawesome/fontawesome-common-types@^0.2.28":
-  version "0.2.28"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.28.tgz#1091bdfe63b3f139441e9cba27aa022bff97d8b2"
-  integrity sha512-gtis2/5yLdfI6n0ia0jH7NJs5i/Z/8M/ZbQL6jXQhCthEOe5Cr5NcQPhgTvFxNOtURE03/ZqUcEskdn2M+QaBg==
+"@fortawesome/fontawesome-common-types@^0.2.30":
+  version "0.2.30"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.30.tgz#2f1cc5b46bd76723be41d0013a8450c9ba92b777"
+  integrity sha512-TsRwpTuKwFNiPhk1UfKgw7zNPeV5RhNp2Uw3pws+9gDAkPGKrtjR1y2lI3SYn7+YzyfuNknflpBA1LRKjt7hMg==
 
 "@fortawesome/fontawesome-free-solid@^5.1.0-3":
   version "5.1.0-3"
@@ -939,40 +936,40 @@
     "@fortawesome/fontawesome-common-types" "^0.1.2-1"
 
 "@fortawesome/fontawesome-svg-core@^1.2.26":
-  version "1.2.28"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.28.tgz#e5b8c8814ef375f01f5d7c132d3c3a2f83a3abf9"
-  integrity sha512-4LeaNHWvrneoU0i8b5RTOJHKx7E+y7jYejplR7uSVB34+mp3Veg7cbKk7NBCLiI4TyoWS1wh9ZdoyLJR8wSAdg==
+  version "1.2.30"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.30.tgz#f56dc6791861fe5d1af04fb8abddb94658c576db"
+  integrity sha512-E3sAXATKCSVnT17HYmZjjbcmwihrNOCkoU7dVMlasrcwiJAHxSKeZ+4WN5O+ElgO/FaYgJmASl8p9N7/B/RttA==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.28"
+    "@fortawesome/fontawesome-common-types" "^0.2.30"
 
 "@fortawesome/free-brands-svg-icons@^5.12.1":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.13.0.tgz#e79de73ba6555055204828dca9c0691e7ce5242b"
-  integrity sha512-/6xXiJFCMEQxqxXbL0FPJpwq5Cv6MRrjsbJEmH/t5vOvB4dILDpnY0f7zZSlA8+TG7jwlt12miF/yZpZkykucA==
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.14.0.tgz#98555518ba41bdff82fbae2f4d1bc36cd3b1c043"
+  integrity sha512-WsqPFTvJFI7MYkcy0jeFE2zY+blC4OrnB9MJOcn1NxRXT/sSfEEhrI7CwzIkiYajLiVDBKWeErYOvpsMeodmCQ==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.28"
+    "@fortawesome/fontawesome-common-types" "^0.2.30"
 
 "@fortawesome/free-solid-svg-icons@^5.12.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.13.0.tgz#44d9118668ad96b4fd5c9434a43efc5903525739"
-  integrity sha512-IHUgDJdomv6YtG4p3zl1B5wWf9ffinHIvebqQOmV3U+3SLw4fC+LUCCgwfETkbTtjy5/Qws2VoVf6z/ETQpFpg==
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.14.0.tgz#970453f5e8c4915ad57856c3a0252ac63f6fec18"
+  integrity sha512-M933RDM8cecaKMWDSk3FRYdnzWGW7kBBlGNGfvqLVwcwhUPNj9gcw+xZMrqBdRqxnSXdl3zWzTCNNGEtFUq67Q==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.28"
+    "@fortawesome/fontawesome-common-types" "^0.2.30"
 
 "@fortawesome/vue-fontawesome@^0.1.9":
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.9.tgz#d3af6d4e50f337327de90447fe35fa1e117a2fbe"
-  integrity sha512-h/emhmZz+DfB2zOGLWawNwXq82UYhn9waTfUjLLmeaIqtnIyNt6kYlpQT/vzJjLZRDRvY2IEJAh1di5qKpKVpA==
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-0.1.10.tgz#eeeec1e4e8850bed0468f938292b06cda793bf34"
+  integrity sha512-b2+SLF31h32LSepVcXe+BQ63yvbq5qmTCy4KfFogCYm2bn68H5sDWUnX+U7MBqnM2aeEk9M7xSoqGnu+wSdY6w==
 
-"@hapi/address@2.x.x", "@hapi/address@^2.1.2":
+"@hapi/address@2.x.x":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
   integrity sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==
 
 "@hapi/address@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.0.1.tgz#267301ddf7bc453718377a6fb3832a2f04a721dd"
-  integrity sha512-0oEP5UiyV4f3d6cBL8F3Z5S7iWSX39Knnl0lY8i+6gfmmIBj44JCBNtcMgwyS+5v7j3VYavNay0NFHDS+UGQcw==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.1.0.tgz#d60c5c0d930e77456fdcde2598e77302e2955e1d"
+  integrity sha512-SkszZf13HVgGmChdHo/PxchnSaCJ6cetVqLzyciudzZRT0jcOouIF/Q93mgjw8cce+D+4F4C1Z/WrfFN+O3VHQ==
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
@@ -981,17 +978,12 @@
   resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-1.3.2.tgz#0a7095adea067243ce3283e1b56b8a8f453b242a"
   integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==
 
-"@hapi/formula@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@hapi/formula/-/formula-1.2.0.tgz#994649c7fea1a90b91a0a1e6d983523f680e10cd"
-  integrity sha512-UFbtbGPjstz0eWHb+ga/GM3Z9EzqKXFWIbSOFURU0A/Gku0Bky4bCk9/h//K2Xr3IrCfjFNhMm4jyZ5dbCewGA==
-
 "@hapi/formula@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@hapi/formula/-/formula-2.0.0.tgz#edade0619ed58c8e4f164f233cda70211e787128"
   integrity sha512-V87P8fv7PI0LH7LiVi8Lkf3x+KCO7pQozXRssAHNXXL9L1K+uyu4XypLXwxqVDKgyQai6qj3/KteNlrqDx4W5A==
 
-"@hapi/hoek@8.x.x", "@hapi/hoek@^8.2.4", "@hapi/hoek@^8.3.0":
+"@hapi/hoek@8.x.x", "@hapi/hoek@^8.3.0":
   version "8.5.1"
   resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz#fde96064ca446dec8c55a8c2f130957b070c6e06"
   integrity sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==
@@ -1011,17 +1003,6 @@
     "@hapi/hoek" "8.x.x"
     "@hapi/topo" "3.x.x"
 
-"@hapi/joi@^16.1.8":
-  version "16.1.8"
-  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.1.8.tgz#84c1f126269489871ad4e2decc786e0adef06839"
-  integrity sha512-wAsVvTPe+FwSrsAurNt5vkg3zo+TblvC5Bb1zMVK6SJzZqw9UrJnexxR+76cpePmtUZKHAPxcQ2Bf7oVHyahhg==
-  dependencies:
-    "@hapi/address" "^2.1.2"
-    "@hapi/formula" "^1.2.0"
-    "@hapi/hoek" "^8.2.4"
-    "@hapi/pinpoint" "^1.0.2"
-    "@hapi/topo" "^3.1.3"
-
 "@hapi/joi@^17.1.1":
   version "17.1.1"
   resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-17.1.1.tgz#9cc8d7e2c2213d1e46708c6260184b447c661350"
@@ -1033,17 +1014,12 @@
     "@hapi/pinpoint" "^2.0.0"
     "@hapi/topo" "^5.0.0"
 
-"@hapi/pinpoint@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-1.0.2.tgz#025b7a36dbbf4d35bf1acd071c26b20ef41e0d13"
-  integrity sha512-dtXC/WkZBfC5vxscazuiJ6iq4j9oNx1SHknmIr8hofarpKUZKmlUVYVIhNVzIEgK5Wrc4GMHL5lZtt1uS2flmQ==
-
 "@hapi/pinpoint@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-2.0.0.tgz#805b40d4dbec04fc116a73089494e00f073de8df"
   integrity sha512-vzXR5MY7n4XeIvLpfl3HtE3coZYO4raKXW766R6DZw/6aLqR26iuZ109K7a0NtF2Db0jxqh7xz2AxkUwpUFybw==
 
-"@hapi/topo@3.x.x", "@hapi/topo@^3.1.3":
+"@hapi/topo@3.x.x":
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.6.tgz#68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29"
   integrity sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==
@@ -1118,81 +1094,65 @@
     "@nodelib/fs.scandir" "2.1.3"
     fastq "^1.6.0"
 
-"@nuxt/opencollective@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.3.0.tgz#11d8944dcf2d526e31660bb69570be03f8fb72b7"
-  integrity sha512-Vf09BxCdj1iT2IRqVwX5snaY2WCTkvM0O4cWWSO1ThCFuc4if0Q/nNwAgCxRU0FeYHJ7DdyMUNSdswCLKlVqeg==
+"@sentry/browser@^5.20.1":
+  version "5.20.1"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.20.1.tgz#be59522d0914d58309e1367d997d4b3cd5385d7e"
+  integrity sha512-ClykuvrEsMKgAvifx5VHzRjchwYbJFX8YiIicYx+Wr3MXL2jLG6OEfHHJwJeyBL2C3vxd5O0KPK3pGMR9wPMLA==
   dependencies:
-    chalk "^2.4.2"
-    consola "^2.10.1"
-    node-fetch "^2.6.0"
-
-"@samverschueren/stream-to-observable@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
-  integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==
-  dependencies:
-    any-observable "^0.3.0"
-
-"@sentry/browser@^5.13.2":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.17.0.tgz#0c3796cb02df3ec8db13341564fae0bc83e148c5"
-  integrity sha512-++pXpCHtdek1cRUwVeLvlxUJ2w1s+eiC9qN1N+7+HdAjHpBz2/tA1sKBCqwwVQZ490Cf2GLll9Ao7fuPPmveRQ==
-  dependencies:
-    "@sentry/core" "5.17.0"
-    "@sentry/types" "5.17.0"
-    "@sentry/utils" "5.17.0"
+    "@sentry/core" "5.20.1"
+    "@sentry/types" "5.20.1"
+    "@sentry/utils" "5.20.1"
     tslib "^1.9.3"
 
-"@sentry/core@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.17.0.tgz#b2deef95465c766076d5cffd8534a67100f9b821"
-  integrity sha512-Kfx4rGKDC7V1YJjTGJXyl12VVHxM8Cjpu61YOyF8kXoXXg9u06C3n0G1dmfzLQERKXasUVMtXRBdKx/OjYpl1g==
+"@sentry/core@5.20.1":
+  version "5.20.1"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.20.1.tgz#857cc7186931c37ff032a1bcb573600ebacde961"
+  integrity sha512-gG622/UY2TePruF6iUzgVrbIX5vN8w2cjlWFo1Est8MvCfQsz8agGaLMCAyl5hCGJ6K2qTUZDOlbCNIKoMclxg==
   dependencies:
-    "@sentry/hub" "5.17.0"
-    "@sentry/minimal" "5.17.0"
-    "@sentry/types" "5.17.0"
-    "@sentry/utils" "5.17.0"
+    "@sentry/hub" "5.20.1"
+    "@sentry/minimal" "5.20.1"
+    "@sentry/types" "5.20.1"
+    "@sentry/utils" "5.20.1"
     tslib "^1.9.3"
 
-"@sentry/hub@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.17.0.tgz#b7d255ca3f766385911d9414af97f388e869d996"
-  integrity sha512-lyUbEmshwaMYdAzy4iwgizgvKODVVloB2trnefpq90AuWCdvzcxMLIGULx1ou+KohccqdNorYICKWeuRscKq5A==
+"@sentry/hub@5.20.1":
+  version "5.20.1"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.20.1.tgz#05e83ba972a96e9d7225a64c7d3728aa9fcefc4e"
+  integrity sha512-Nv5BXf14BEc08acDguW6eSqkAJLVf8wki283FczEvTsQZZuSBHM9cJ5Hnehr6n+mr8wWpYLgUUYM0oXXigUmzQ==
   dependencies:
-    "@sentry/types" "5.17.0"
-    "@sentry/utils" "5.17.0"
+    "@sentry/types" "5.20.1"
+    "@sentry/utils" "5.20.1"
     tslib "^1.9.3"
 
-"@sentry/integrations@^5.13.2":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.17.0.tgz#afff7759d82111de030b4a6703388c423fdbe6e7"
-  integrity sha512-H4CLH+fej/EjbI5WKXnAVkyVK3MeHUcTMbnjPcUlAsxpu1+PckFzpw3t4S5la9WGwcfL3WDo24b+fb4iKf9t4Q==
+"@sentry/integrations@^5.20.1":
+  version "5.20.1"
+  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.20.1.tgz#c42dd53c2162b96bf4da641cd1c2bd53c0bbdce3"
+  integrity sha512-VpeZHYT8Fvw1J5478MqXXORf3Ftpt34YM4e+sTPuGrmf4Gro7lXdyownqiSaa7kwwNVQEV3zMlRDczVZzXQThw==
   dependencies:
-    "@sentry/types" "5.17.0"
-    "@sentry/utils" "5.17.0"
+    "@sentry/types" "5.20.1"
+    "@sentry/utils" "5.20.1"
     tslib "^1.9.3"
 
-"@sentry/minimal@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.17.0.tgz#b40e4b4109b098840277def3b51cc20ae6767164"
-  integrity sha512-v8xfkySXKrliZO6er6evlVe/ViUcqN0O8BhGyauK28Mf+KnKEOs5W6oWbt4qCDIttw9ynKIYyRrkAl/9oUR76A==
+"@sentry/minimal@5.20.1":
+  version "5.20.1"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.20.1.tgz#2e2b63d9cd265b7e2f593f3eab4e9874bd87eeef"
+  integrity sha512-2PeJKDTHNsUd1jtSLQBJ6oRI+xrIJrYDQmsyK/qs9D7HqHfs+zNAMUjYseiVeSAFGas5IcNSuZbPRV4BnuoZ0w==
   dependencies:
-    "@sentry/hub" "5.17.0"
-    "@sentry/types" "5.17.0"
+    "@sentry/hub" "5.20.1"
+    "@sentry/types" "5.20.1"
     tslib "^1.9.3"
 
-"@sentry/types@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.17.0.tgz#b8d245ac7d5caa749c549e9f72aab2d6522afe63"
-  integrity sha512-1z8EXzvg8GcsBNnSXgB5/G7mz2PwmMt9mjOrVG1jhtSGH1c7WvB32F5boqoMcjIJmy5MrBGaaXwrF/RRJrwUQg==
+"@sentry/types@5.20.1":
+  version "5.20.1"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.20.1.tgz#ccc4fa4c9d0f94d93014b04e674762d5d5cd30a2"
+  integrity sha512-OU+i/lcjGpDJv0XkNpsKrI2r1VPp8qX0H6Knq8NuZrlZe3AbvO3jRJJK0pH14xFv8Xok5jbZZpKKoQLxYfxqsw==
 
-"@sentry/utils@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.17.0.tgz#b809b067665f3ebaea77ba7b5d1d1d14a4ed76cb"
-  integrity sha512-qn8WgZcSkV/rx0ezp9q/xFjP7aMaYZO1/JYLXV4o6pYrQ9tvMmmwAZT39FpJunhhbkR36WNEuRB9C2K250cb/A==
+"@sentry/utils@5.20.1":
+  version "5.20.1"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.20.1.tgz#68cfae0d0e3b321b4649b59f30265024b29eae63"
+  integrity sha512-dhK6IdO6g7Q2CoxCbB+q8gwUapDUH5VjraFg0UBzgkrtNhtHLylqmwx0sWQvXCcp14Q/3MuzEbb4euvoh8o8oA==
   dependencies:
-    "@sentry/types" "5.17.0"
+    "@sentry/types" "5.20.1"
     tslib "^1.9.3"
 
 "@soda/friendly-errors-webpack-plugin@^1.7.1":
@@ -1205,14 +1165,14 @@
     string-width "^2.0.0"
 
 "@soda/get-current-script@^1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@soda/get-current-script/-/get-current-script-1.0.1.tgz#f4afffcb36e069a801d5339c90499601c47a2516"
-  integrity sha512-zeOomWIE52M9JpYXlsR3iOf7TXTTmNQHnSbqjMsQZ5phzfAenHzL/1+vQ0ZoJfagocK11LNf8vnn2JG0ufRMUQ==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@soda/get-current-script/-/get-current-script-1.0.2.tgz#a53515db25d8038374381b73af20bb4f2e508d87"
+  integrity sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w==
 
 "@stylelint/postcss-css-in-js@^0.37.1":
-  version "0.37.1"
-  resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.1.tgz#41e5e7660f73d88227610e18c6ebb262d56ac125"
-  integrity sha512-UMf2Rni3JGKi3ZwYRGMYJ5ipOA5ENJSKMtYA/pE1ZLURwdh7B5+z2r73RmWvub+N0UuH1Lo+TGfCgYwPvqpXNw==
+  version "0.37.2"
+  resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz#7e5a84ad181f4234a2480803422a47b8749af3d2"
+  integrity sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==
   dependencies:
     "@babel/core" ">=7.9.0"
 
@@ -1235,9 +1195,9 @@
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
 "@types/glob@^7.1.1":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.2.tgz#06ca26521353a545d94a0adc74f38a59d232c987"
-  integrity sha512-VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA==
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
+  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
   dependencies:
     "@types/minimatch" "*"
     "@types/node" "*"
@@ -1283,9 +1243,9 @@
   integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
 "@types/node@*":
-  version "14.0.13"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.13.tgz#ee1128e881b874c371374c1f72201893616417c9"
-  integrity sha512-rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA==
+  version "14.0.27"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.27.tgz#a151873af5a5e851b51b3b065c9e63390a9e0eb1"
+  integrity sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1302,16 +1262,6 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
   integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==
 
-"@types/sinonjs__fake-timers@6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.1.tgz#681df970358c82836b42f989188d133e218c458e"
-  integrity sha512-yYezQwGWty8ziyYLdZjwxyMb0CZR49h8JALHGrxjQHWlqGgc8kLdHEgWrgL0uZ29DMvEVBDnHU2Wg36zKSIUtA==
-
-"@types/sizzle@2.3.2":
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
-  integrity sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==
-
 "@types/source-list-map@*":
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
@@ -1323,14 +1273,14 @@
   integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
 
 "@types/tapable@*", "@types/tapable@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.5.tgz#9adbc12950582aa65ead76bffdf39fe0c27a3c02"
-  integrity sha512-/gG2M/Imw7cQFp8PGvz/SwocNrmKFjFsm5Pb8HdbHkZ1K8pmuPzOX4VeVoiEecFCVf4CsN1r3/BRvx+6sNqwtQ==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74"
+  integrity sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==
 
 "@types/uglify-js@*":
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.9.2.tgz#01992579debba674e1e359cd6bcb1a1d0ab2e02b"
-  integrity sha512-d6dIfpPbF+8B7WiCi2ELY7m0w1joD8cRW4ms88Emdb2w062NeEpbNCeWwVCgzLRpVG+5e74VFSg4rgJ2xXjEiQ==
+  version "3.9.3"
+  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.9.3.tgz#d94ed608e295bc5424c9600e6b8565407b6b4b6b"
+  integrity sha512-KswB5C7Kwduwjj04Ykz+AjvPcfgv/37Za24O2EDzYNbwyzOo8+ydtvzUfZ5UMguiVu29Gx44l1A6VsPPcmYu9w==
   dependencies:
     source-map "^0.6.1"
 
@@ -1340,18 +1290,18 @@
   integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
 
 "@types/webpack-sources@*":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-1.4.0.tgz#e58f1f05f87d39a5c64cf85705bdbdbb94d4d57e"
-  integrity sha512-c88dKrpSle9BtTqR6ifdaxu1Lvjsl3C5OsfvuUbUwdXymshv1TkufUAXBajCCUM/f/TmnkZC/Esb03MinzSiXQ==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-1.4.2.tgz#5d3d4dea04008a779a90135ff96fb5c0c9e6292c"
+  integrity sha512-77T++JyKow4BQB/m9O96n9d/UUHWLQHlcqXb9Vsf4F1+wKNrrlWNFPDLKNT92RJnCSL6CieTc+NDXtCVZswdTw==
   dependencies:
     "@types/node" "*"
     "@types/source-list-map" "*"
     source-map "^0.7.3"
 
 "@types/webpack@^4.4.31", "@types/webpack@^4.41.8":
-  version "4.41.17"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.17.tgz#0a69005e644d657c85b7d6ec1c826a71bebd1c93"
-  integrity sha512-6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw==
+  version "4.41.21"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.21.tgz#cc685b332c33f153bb2f5fc1fa3ac8adeb592dee"
+  integrity sha512-2j9WVnNrr/8PLAB5csW44xzQSJwS26aOnICsP3pSGCEdsu6KYtfQ6QJsVUKHWRnm1bL7HziJsfh5fHqth87yKA==
   dependencies:
     "@types/anymatch" "*"
     "@types/node" "*"
@@ -1389,10 +1339,10 @@
     lodash.kebabcase "^4.1.1"
     svg-tags "^1.0.0"
 
-"@vue/babel-preset-app@^4.1.2", "@vue/babel-preset-app@^4.4.1":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-4.4.1.tgz#97c6796183cd0abf96a17297dc335c4c702fd8c4"
-  integrity sha512-VHVROEBBiW0dnuNuzlFElkncXo+zxh5Px0MZ51Th5da8UPbQodf43mnpotMnFtmCPTXAFL58tzDttu1FgrgfpQ==
+"@vue/babel-preset-app@^4.1.2", "@vue/babel-preset-app@^4.4.6":
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-4.4.6.tgz#92aef916e83f1abe0a2ed1e9e2cef5b332f958c4"
+  integrity sha512-urIa6Qk3lKacLvscrzxMNyYlTqKFcPAUo5MohOjv1ISZ9PssHw693WTOrqSC0XksdMLtp/rnLvc6l5G8Muk0lw==
   dependencies:
     "@babel/core" "^7.9.6"
     "@babel/helper-compilation-targets" "^7.9.6"
@@ -1457,48 +1407,48 @@
     "@vue/babel-plugin-transform-vue-jsx" "^1.1.2"
     camelcase "^5.0.0"
 
-"@vue/cli-overlay@^4.4.1":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-4.4.1.tgz#f1f51f31f7a00d371e9a5b5a941525184475bf8b"
-  integrity sha512-EQqAVy7O/qqGOfSYIGL073FWlr/s6QFA0wA1wY8pHnTS5WPwAiHT+D+xe+fgXKZ3KeL7v7u/le7YFIEVXFVXOg==
+"@vue/cli-overlay@^4.4.6":
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-4.4.6.tgz#58f996066d8c0a0a45ad4b5c6f3f213f9945a9ba"
+  integrity sha512-fzjg2gWQt+jw5fyLsD9HZNxGNQgZjLDI2s9bLWJwRucdfmncSi9neqA0TZyszGrgcJA4Qu4V5KgV0qwVSBYCaw==
 
 "@vue/cli-plugin-babel@^4.1.0":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.4.1.tgz#2c6e969fe51f1b4b211bea84afb7cad18240f70f"
-  integrity sha512-dmhymfm2UnZDw13k/zKT6YIj7je53mE37Y+jEJxpRUlCKFmZUDuYkJ8i5HmO0SnaCnEGqNELaBkoIFnY3aE2Gw==
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.4.6.tgz#d5d750d4f74900c00836e19c164193650df26f3b"
+  integrity sha512-9cX9mN+4DIbcqw3rV6UBOA0t5zikIkrBLQloUzsOBOu5Xb7/UoD7inInFj7bnyHUflr5LqbdWJ+etCQcWAIIXA==
   dependencies:
     "@babel/core" "^7.9.6"
-    "@vue/babel-preset-app" "^4.4.1"
-    "@vue/cli-shared-utils" "^4.4.1"
+    "@vue/babel-preset-app" "^4.4.6"
+    "@vue/cli-shared-utils" "^4.4.6"
     babel-loader "^8.1.0"
     cache-loader "^4.1.0"
     thread-loader "^2.1.3"
     webpack "^4.0.0"
 
-"@vue/cli-plugin-router@^4.4.1":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-4.4.1.tgz#07d09df0f4bea816e637da814f578b808f1f93b2"
-  integrity sha512-kCSsJG7pjDvCJDjGtcCI5l0UjmqwNigOR41RkeGSjSUvzV4ArSniXjFqrOmtpMp36S5xCtwtt9MFm/K4fCubkQ==
+"@vue/cli-plugin-router@^4.4.6":
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-4.4.6.tgz#db5bb1c92afd2046376e4faa90270d6363d4b9b8"
+  integrity sha512-TkLdn0ZYo3zgn78Rk8doPlR+4UkGjGW2R1eGEaZEkue/mw2VhUWtTk9cKLZaYrw0eY8Ro/j+OV6mD+scyrairg==
   dependencies:
-    "@vue/cli-shared-utils" "^4.4.1"
+    "@vue/cli-shared-utils" "^4.4.6"
 
-"@vue/cli-plugin-vuex@^4.4.1":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.4.1.tgz#98d18fc5d36fa6e0d1fc2ecaeea37aa965564f19"
-  integrity sha512-FtOFsDP0qznwVaCz0BZmTzUm5vhHSJzX2/XD3L5dLTkrNxyDEbZmbKoX0n1OzBcQwZC7dkJZP2tdoCQx0mX//g==
+"@vue/cli-plugin-vuex@^4.4.6":
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.4.6.tgz#44b596f0d5236e0a2ce1aa4757bda5207c230be0"
+  integrity sha512-Ho0YzUivn8BLPqFoFypntR8CMTEXYYHVr0GdnZW99XL+DbGw75f+tJfnrV9UFHDTfvZt7uewKiXDMlrzQ0l3Ug==
 
 "@vue/cli-service@^4.2.3":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-4.4.1.tgz#b26a435d8c953bc7efaf7b784c9835c1415bcf1c"
-  integrity sha512-DVV0zr5Sw7pzdm3z3PRrfqihLgoJP/d9AgNFcSSQF/J9Gtvjf1t0PTJJFeLANHSL3kDWte+3kjc22sXayu0BJQ==
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-4.4.6.tgz#83ca058d081eb145bbc1ae2fe8069d2d9ddf7e18"
+  integrity sha512-k5OFGh2NnvRymCyq9DfBiNJvECUuun3pl5KMm3557IZyA5E5csv+RHoSW3dX8HHe0zXq18g52VswP1llvR9POw==
   dependencies:
     "@intervolga/optimize-cssnano-plugin" "^1.0.5"
     "@soda/friendly-errors-webpack-plugin" "^1.7.1"
     "@soda/get-current-script" "^1.0.0"
-    "@vue/cli-overlay" "^4.4.1"
-    "@vue/cli-plugin-router" "^4.4.1"
-    "@vue/cli-plugin-vuex" "^4.4.1"
-    "@vue/cli-shared-utils" "^4.4.1"
+    "@vue/cli-overlay" "^4.4.6"
+    "@vue/cli-plugin-router" "^4.4.6"
+    "@vue/cli-plugin-vuex" "^4.4.6"
+    "@vue/cli-shared-utils" "^4.4.6"
     "@vue/component-compiler-utils" "^3.1.2"
     "@vue/preload-webpack-plugin" "^1.1.0"
     "@vue/web-component-wrapper" "^1.2.0"
@@ -1545,10 +1495,10 @@
     webpack-dev-server "^3.11.0"
     webpack-merge "^4.2.2"
 
-"@vue/cli-shared-utils@^4.4.1":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.4.1.tgz#930304ade5a9f9bf0d2fd67d9305cad83d04aae1"
-  integrity sha512-teevHgI7XUsKVMOncx3M+6iLjO28woGfRwgUG4hR83moVBHQe5x2OCr2i5t/58bwpv269RD5RYXBQCGtIXuxZw==
+"@vue/cli-shared-utils@^4.4.6":
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.4.6.tgz#0ec59880920736c6dd79079ac0b5ceac29fa55e1"
+  integrity sha512-ba+FZZCjiTSu2otnLjY4qXqASe7ZIQ/QBljk5oRPgqrR0p1NUkDPUcZhqa041aOaSW1yAfSfhOD7Q84nMnWhzQ==
   dependencies:
     "@hapi/joi" "^15.0.1"
     chalk "^2.4.2"
@@ -1560,7 +1510,6 @@
     ora "^3.4.0"
     read-pkg "^5.1.1"
     request "^2.88.2"
-    request-promise-native "^1.0.8"
     semver "^6.1.0"
     strip-ansi "^6.0.0"
 
@@ -1580,9 +1529,9 @@
     vue-template-es2015-compiler "^1.9.0"
 
 "@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.1.2.tgz#8213a5ff3202f9f2137fe55370f9e8b9656081c3"
-  integrity sha512-QLq9z8m79mCinpaEeSURhnNCN6djxpHw0lpP/bodMlt5kALfONpryMthvnrQOlTcIKoF+VoPi+lPHUYeDFPXug==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.2.0.tgz#8f85182ceed28e9b3c75313de669f83166d11e5d"
+  integrity sha512-lejBLa7xAMsfiZfNp7Kv51zOzifnb29FwdnMLa96z26kXErPFioSf9BMcePVIQ6/Gc6/mC0UrPpxAWIHyae0vw==
   dependencies:
     consolidate "^0.15.1"
     hash-sum "^1.0.2"
@@ -1596,9 +1545,9 @@
     prettier "^1.18.2"
 
 "@vue/preload-webpack-plugin@^1.1.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.1.tgz#18723530d304f443021da2292d6ec9502826104a"
-  integrity sha512-8VCoJeeH8tCkzhkpfOkt+abALQkS11OIHhte5MBzYaKMTqK0A3ZAKEUVAffsOklhEv7t0yrQt696Opnu9oAx+w==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz#ceb924b4ecb3b9c43871c7a429a02f8423e621ab"
+  integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==
 
 "@vue/test-utils@^1.0.0-beta.31":
   version "1.0.3"
@@ -1916,9 +1865,9 @@
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
 abab@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
-  integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.4.tgz#6dfa57b417ca06d21b2478f0e638302f99c2405c"
+  integrity sha512-Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ==
 
 abbrev@1:
   version "1.1.1"
@@ -1952,9 +1901,9 @@ acorn-jsx@^5.0.0:
   integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
 
 acorn-walk@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e"
-  integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
+  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
 acorn@^6.0.2, acorn@^6.0.5, acorn@^6.0.7, acorn@^6.4.1:
   version "6.4.1"
@@ -1962,9 +1911,9 @@ acorn@^6.0.2, acorn@^6.0.5, acorn@^6.0.7, acorn@^6.4.1:
   integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
 acorn@^7.1.1, acorn@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz#17ea7e40d7c8640ff54a694c889c26f31704effe"
-  integrity sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
+  integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
 
 address@^1.1.2:
   version "1.1.2"
@@ -1985,14 +1934,14 @@ ajv-errors@^1.0.0:
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
 ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
-  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.5.5, ajv@^6.9.1:
-  version "6.12.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
-  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.9.1:
+  version "6.12.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
+  integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -2004,11 +1953,6 @@ alphanum-sort@^1.0.0:
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
 
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
 ansi-colors@3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
@@ -2019,7 +1963,7 @@ ansi-colors@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
-ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
+ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
@@ -2069,11 +2013,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
-any-observable@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
-  integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
-
 any-promise@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
@@ -2095,10 +2034,10 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-apexcharts@^3.15.0:
-  version "3.19.2"
-  resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.19.2.tgz#d46113bf253e79f15e67d00721e5bb12af73914e"
-  integrity sha512-hMFLRE2Lyx4WrN9pYfQLvBDcn+HOodZrqRwc+kucxM+hcUmI2NHY4z+GI14+VcSFmD4aKiMbS3z3Q2jiBxUrcg==
+apexcharts@^3.6.6:
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.20.0.tgz#768bb963d2bd87abe3a37a6ee35c7fc7d43bbfb7"
+  integrity sha512-DuQ9SlFPJBJwamYudzwf/Z6KMaIRUhnVBQk/TBa3mXzN2SwS3GgGz7V39OS1GfcPlPUTTy8vXv91M8pYmfFkCg==
   dependencies:
     svg.draggable.js "^2.2.2"
     svg.easing.js "^2.0.0"
@@ -2107,29 +2046,16 @@ apexcharts@^3.15.0:
     svg.resize.js "^1.4.3"
     svg.select.js "^3.0.1"
 
-aproba@^1.0.3, aproba@^1.1.1:
+aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-arch@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e"
-  integrity sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==
-
 arch@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.2.tgz#0c52bbe7344bb4fa260c443d2cbad9c00ff2f0bf"
   integrity sha512-NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2152,11 +2078,6 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-find-index@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
-
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -2243,11 +2164,6 @@ async-each@^1.0.1:
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
   integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
-async-foreach@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
-  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
-
 async-limiter@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
@@ -2260,10 +2176,10 @@ async@^2.6.2:
   dependencies:
     lodash "^4.17.14"
 
-async@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
-  integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
+async@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9"
+  integrity sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -2276,16 +2192,16 @@ atob@^2.1.2:
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^9.8.0:
-  version "9.8.0"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.0.tgz#68e2d2bef7ba4c3a65436f662d0a56a741e56511"
-  integrity sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==
+  version "9.8.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
+  integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
   dependencies:
     browserslist "^4.12.0"
-    caniuse-lite "^1.0.30001061"
-    chalk "^2.4.2"
+    caniuse-lite "^1.0.30001109"
+    colorette "^1.2.1"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.30"
+    postcss "^7.0.32"
     postcss-value-parser "^4.1.0"
 
 aws-sign2@~0.7.0:
@@ -2298,7 +2214,7 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2"
   integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==
 
-axios@^0.19.1:
+axios@^0.19.1, axios@^0.19.2:
   version "0.19.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
   integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
@@ -2411,9 +2327,9 @@ binary-extensions@^1.0.0:
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
 binary-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
-  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9"
+  integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==
 
 bindings@^1.5.0:
   version "1.5.0"
@@ -2422,18 +2338,16 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
-  dependencies:
-    inherits "~2.0.0"
-
 bluebird@3.7.2, bluebird@^3.1.1, bluebird@^3.5.1, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
+bluebird@^2.9.34:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
+  integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=
+
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
   version "4.11.9"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
@@ -2477,21 +2391,10 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-bootstrap-vue@^2.6.1:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.15.0.tgz#0dfc12c054496c0f10efed510da1def41697cf3c"
-  integrity sha512-ncxWkDG0mKFVot314wWKJELi+ESO7k6ngV//qvJFs9iVzlFI8Hx3rBVbpcPW2vrJ+0vitH8N2SOwn4fdQ3frMQ==
-  dependencies:
-    "@nuxt/opencollective" "^0.3.0"
-    bootstrap ">=4.5.0 <5.0.0"
-    popper.js "^1.16.1"
-    portal-vue "^2.1.7"
-    vue-functional-data-merge "^3.1.0"
-
-"bootstrap@>=4.5.0 <5.0.0", bootstrap@^4.4.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.0.tgz#97d9dbcb5a8972f8722c9962483543b907d9b9ec"
-  integrity sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA==
+bootstrap@^3.3.7:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72"
+  integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -2579,15 +2482,15 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.0.tgz#545d0b1b07e6b2c99211082bf1b12cce7a0b0e11"
-  integrity sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
+  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
   dependencies:
     bn.js "^5.1.1"
     browserify-rsa "^4.0.1"
     create-hash "^1.2.0"
     create-hmac "^1.1.7"
-    elliptic "^6.5.2"
+    elliptic "^6.5.3"
     inherits "^2.0.4"
     parse-asn1 "^5.1.5"
     readable-stream "^3.6.0"
@@ -2601,19 +2504,14 @@ browserify-zlib@^0.2.0:
     pako "~1.0.5"
 
 browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.8.5:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
-  integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.0.tgz#2908951abfe4ec98737b72f34c3bcedc8d43b000"
+  integrity sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==
   dependencies:
-    caniuse-lite "^1.0.30001043"
-    electron-to-chromium "^1.3.413"
-    node-releases "^1.1.53"
-    pkg-up "^2.0.0"
-
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+    caniuse-lite "^1.0.30001111"
+    electron-to-chromium "^1.3.523"
+    escalade "^3.0.2"
+    node-releases "^1.1.60"
 
 buffer-from@^1.0.0:
   version "1.1.1"
@@ -2770,11 +2668,6 @@ cache-loader@^4.1.0:
     neo-async "^2.6.1"
     schema-utils "^2.0.0"
 
-cachedir@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8"
-  integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==
-
 call-me-maybe@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
@@ -2820,14 +2713,6 @@ camel-case@^4.1.1:
     pascal-case "^3.1.1"
     tslib "^1.10.0"
 
-camelcase-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
-  dependencies:
-    camelcase "^2.0.0"
-    map-obj "^1.0.0"
-
 camelcase-keys@^6.2.2:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
@@ -2837,11 +2722,6 @@ camelcase-keys@^6.2.2:
     map-obj "^4.0.0"
     quick-lru "^4.0.1"
 
-camelcase@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
-
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -2867,10 +2747,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001061:
-  version "1.0.30001081"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001081.tgz#40615a3c416a047c5a4d45673e5257bf128eb3b5"
-  integrity sha512-iZdh3lu09jsUtLE6Bp8NAbJskco4Y3UDtkR3GTCJGsbMowBU5IWDFF79sV2ws7lSqTzWyKazxam2thasHymENQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001111:
+  version "1.0.30001112"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001112.tgz#0fffc3b934ff56ff0548c37bc9dad7d882bcf672"
+  integrity sha512-J05RTQlqsatidif/38aN3PGULCLrg8OYQOlJUKbeYVzC2mGZkZLIztwRlB3MtrfLmawUmjFlNJvy/uhwniIe1Q==
 
 case-sensitive-paths-webpack-plugin@^2.3.0:
   version "2.3.0"
@@ -2887,16 +2767,7 @@ ccount@^1.0.0:
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.5.tgz#ac82a944905a65ce204eb03023157edf29425c17"
   integrity sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==
 
-chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.0.0, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
@@ -2907,6 +2778,15 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chalk@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
@@ -2915,7 +2795,7 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0:
+chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
   integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
@@ -2973,6 +2853,21 @@ chokidar@3.3.0:
   optionalDependencies:
     fsevents "~2.1.1"
 
+"chokidar@>=2.0.0 <4.0.0", chokidar@^3.4.1:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz#38dc8e658dec3809741eb3ef7bb0a47fe424232d"
+  integrity sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.4.0"
+  optionalDependencies:
+    fsevents "~2.1.2"
+
 chokidar@^2.0.0, chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -2992,21 +2887,6 @@ chokidar@^2.0.0, chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
-  integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.4.0"
-  optionalDependencies:
-    fsevents "~2.1.2"
-
 chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -3019,11 +2899,6 @@ chrome-trace-event@^1.0.0, chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -3062,14 +2937,7 @@ clean-webpack-plugin@^3.0.0:
     "@types/webpack" "^4.4.31"
     del "^4.1.1"
 
-cli-cursor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-  integrity sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=
-  dependencies:
-    restore-cursor "^1.0.1"
-
-cli-cursor@^2.0.0, cli-cursor@^2.1.0:
+cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
@@ -3089,27 +2957,9 @@ cli-highlight@^2.1.4:
     yargs "^15.0.0"
 
 cli-spinners@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.3.0.tgz#0632239a4b5aa4c958610142c34bb7a651fc8df5"
-  integrity sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==
-
-cli-table3@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
-  integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==
-  dependencies:
-    object-assign "^4.1.0"
-    string-width "^2.1.1"
-  optionalDependencies:
-    colors "^1.1.2"
-
-cli-truncate@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
-  integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=
-  dependencies:
-    slice-ansi "0.0.4"
-    string-width "^1.0.1"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.4.0.tgz#c6256db216b878cfba4720e719cec7cf72685d7f"
+  integrity sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==
 
 cli-width@^2.0.0:
   version "2.2.1"
@@ -3202,14 +3052,14 @@ code-point-at@^1.0.0:
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 codemirror-colorpicker@^1.9.66:
-  version "1.9.70"
-  resolved "https://registry.yarnpkg.com/codemirror-colorpicker/-/codemirror-colorpicker-1.9.70.tgz#fd21fefc4d4ec84c2c91ac5580f07f8bfa206b6b"
-  integrity sha512-ApcfoYi2B7e0h2CfllnUqobIHZHwZphPPYo0cpkh/AR8FERD253ynCJjm/F19yMoWD0DdJ8uIdNAweJuDzbisA==
+  version "1.9.72"
+  resolved "https://registry.yarnpkg.com/codemirror-colorpicker/-/codemirror-colorpicker-1.9.72.tgz#e6c9cb29e4e4bb7fe27cc8f8f0bbc4386996cf37"
+  integrity sha512-ZD8IenGqnj3gfutn2mxuinvEkBZnLJalcs/v6809KQe7UjevYrwx0BWSmXpp/kHp/o/cpoSrdUnrlkaI6d8t5Q==
 
 codemirror@^5.41.0:
-  version "5.54.0"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.54.0.tgz#82b6adf662b29eeb7b867fe7839d49e25e4a0b38"
-  integrity sha512-Pgf3surv4zvw+KaW3doUU7pGjF0BPU8/sj7eglWJjzni46U/DDW8pu3nZY0QgQKUcICDXRkq8jZmq0y6KhxM3Q==
+  version "5.56.0"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.56.0.tgz#675640fcc780105cd22d3faa738b5d7ea6426f61"
+  integrity sha512-MfKVmYgifXjQpLSgpETuih7A7WTTIsxvKfSLGseTY5+qt0E1UD1wblZGM6WLenORo8sgmf+3X+WTe2WF7mufyw==
 
 collapse-white-space@^1.0.2:
   version "1.0.6"
@@ -3264,10 +3114,15 @@ color@^3.0.0:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
-colors@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+colorette@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
+  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+
+colors@1.0.x:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
 
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
@@ -3281,12 +3136,7 @@ commander@2.17.x:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
   integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
-commander@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.0.tgz#545983a0603fe425bc672d66c9e3c89c42121a83"
-  integrity sha512-NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw==
-
-commander@^2.18.0, commander@^2.19.0, commander@^2.20.0:
+commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@^2.8.1:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -3306,11 +3156,6 @@ commander@~2.19.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
-common-tags@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
-  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
-
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -3358,7 +3203,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.6.2:
+concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -3390,21 +3235,11 @@ connect-history-api-fallback@^1.3.0, connect-history-api-fallback@^1.6.0:
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
 
-consola@^2.10.1:
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/consola/-/consola-2.12.2.tgz#9610f158e7b0a9ecc8f8bb0c4fc8e7c52bf41d05"
-  integrity sha512-c9mzemrAk57s3UIjepn8KKkuEH5fauMdot5kFSJUnqHcnApVS9Db8Rbv5AZ1Iz6lXzaGe9z1crQXhJtGX4h/Og==
-
 console-browserify@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 consolidate@^0.15.1:
   version "0.15.1"
   resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
@@ -3499,7 +3334,7 @@ core-js@^2.5.7, core-js@^2.6.5:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
-core-js@^3.4.4, core-js@^3.6.5:
+core-js@^3.6.5:
   version "3.6.5"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
   integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
@@ -3531,12 +3366,12 @@ cosmiconfig@^6.0.0:
     yaml "^1.7.2"
 
 create-ecdh@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
-  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
+  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
   dependencies:
     bn.js "^4.1.0"
-    elliptic "^6.0.0"
+    elliptic "^6.5.3"
 
 create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
   version "1.2.0"
@@ -3568,14 +3403,6 @@ cross-env@^7.0.2:
   dependencies:
     cross-spawn "^7.0.1"
 
-cross-spawn@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
-  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
 cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -3627,22 +3454,22 @@ css-declaration-sorter@^4.0.1:
     timsort "^0.3.0"
 
 css-loader@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.5.3.tgz#95ac16468e1adcd95c844729e0bb167639eb0bcf"
-  integrity sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"
+  integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==
   dependencies:
     camelcase "^5.3.1"
     cssesc "^3.0.0"
     icss-utils "^4.1.1"
     loader-utils "^1.2.3"
     normalize-path "^3.0.0"
-    postcss "^7.0.27"
+    postcss "^7.0.32"
     postcss-modules-extract-imports "^2.0.0"
     postcss-modules-local-by-default "^3.0.2"
     postcss-modules-scope "^2.2.0"
     postcss-modules-values "^3.0.0"
-    postcss-value-parser "^4.0.3"
-    schema-utils "^2.6.6"
+    postcss-value-parser "^4.1.0"
+    schema-utils "^2.7.0"
     semver "^6.3.0"
 
 css-loader@~2.1:
@@ -3815,61 +3642,16 @@ cssstyle@^2.2.0:
   dependencies:
     cssom "~0.3.6"
 
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
-  dependencies:
-    array-find-index "^1.0.1"
+cycle@1.0.x:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
+  integrity sha1-IegLK+hYD5i0aPN5QwZisEbDStI=
 
 cyclist@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
-cypress@^4.3.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-4.8.0.tgz#8fe731db77f39310511d83e81439d06ae3388554"
-  integrity sha512-Lsff8lF8pq6k/ioNua783tCsxGSLp6gqGXecdIfqCkqjYiOA53XKuEf1CaQJLUVs1dHSf49eDUp/sb620oJjVQ==
-  dependencies:
-    "@cypress/listr-verbose-renderer" "0.4.1"
-    "@cypress/request" "2.88.5"
-    "@cypress/xvfb" "1.2.4"
-    "@types/sinonjs__fake-timers" "6.0.1"
-    "@types/sizzle" "2.3.2"
-    arch "2.1.1"
-    bluebird "3.7.2"
-    cachedir "2.3.0"
-    chalk "2.4.2"
-    check-more-types "2.24.0"
-    cli-table3 "0.5.1"
-    commander "4.1.0"
-    common-tags "1.8.0"
-    debug "4.1.1"
-    eventemitter2 "4.1.2"
-    execa "1.0.0"
-    executable "4.1.1"
-    extract-zip "1.7.0"
-    fs-extra "8.1.0"
-    getos "3.1.4"
-    is-ci "2.0.0"
-    is-installed-globally "0.1.0"
-    lazy-ass "1.6.0"
-    listr "0.14.3"
-    lodash "4.17.15"
-    log-symbols "3.0.0"
-    minimist "1.2.5"
-    moment "2.24.0"
-    ospath "1.2.2"
-    pretty-bytes "5.3.0"
-    ramda "0.26.1"
-    request-progress "3.0.0"
-    supports-color "7.1.0"
-    tmp "0.1.0"
-    untildify "4.0.0"
-    url "0.11.0"
-    yauzl "2.10.0"
-
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -3886,15 +3668,19 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
-date-fns@^1.27.2:
-  version "1.30.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
-  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
+datauri@^1.0.5:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/datauri/-/datauri-1.1.0.tgz#c6184ff6b928ede4e41ccc23ab954c7839c4fb39"
+  integrity sha512-0q+cTTKx7q8eDteZRIQLTFJuiIsVing17UbWTPssY4JLSMaYsk/VKpNulBDo9NSgQWcvlPrkEHW8kUO67T/7mQ==
+  dependencies:
+    image-size "^0.6.2"
+    mimer "^0.3.2"
+    semver "^5.5.0"
 
 date-fns@^2.9.0:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.14.0.tgz#359a87a265bb34ef2e38f93ecf63ac453f9bc7ba"
-  integrity sha512-1zD+68jhFgDIM0rF05rcwYO8cExdNqxjq4xP1QKM60Q45mnO6zaMWB4tOzrIr4M4GSLntsKeE4c9Bdl2jhL/yw==
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.15.0.tgz#424de6b3778e4e69d3ff27046ec136af58ae5d5f"
+  integrity sha512-ZCPzAMJZn3rNUvvQIMlXhDr4A+Ar07eLeGsGREoWU19a3Pqf5oYa+ccd+B3F6XVtQY6HANMFdOQ8A+ipFnvJdQ==
 
 de-indent@^1.0.2:
   version "1.0.2"
@@ -3908,7 +3694,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
+debug@3.2.6, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -3937,7 +3723,7 @@ decamelize-keys@^1.1.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0:
+decamelize@^1.1.0, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -4004,7 +3790,7 @@ default-gateway@^5.0.5:
   dependencies:
     execa "^3.3.0"
 
-defaults@^1.0.3:
+defaults@^1.0.2, defaults@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
   integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
@@ -4075,11 +3861,6 @@ delegate@^3.1.2:
   resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
   integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -4319,20 +4100,15 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
-electron-to-chromium@^1.3.413:
-  version "1.3.466"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.466.tgz#89f716db3afc4bb482ea2aaaa16c4808f89f762a"
-  integrity sha512-eieqkoM2hCkZZRhETKyCouMziDV3l4XEKHRLuzcHG+HV+P7PeODU/z9HAmBgMQkzvHg2DoyQhfIDmmeguLZT/Q==
+electron-to-chromium@^1.3.523:
+  version "1.3.524"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.524.tgz#dd49646594466192de35956a5369bb20d616aa78"
+  integrity sha512-ZUvklIBkfXQyA6IeiEss1nfKRICcdB5afAGZAaPGaExdfrkpUu/WWVO+X7QpNnphaVMllXnAcvKnVPdyM+DCPQ==
 
-elegant-spinner@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
-  integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
-
-elliptic@^6.0.0, elliptic@^6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
-  integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
+elliptic@^6.5.3:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
+  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -4374,10 +4150,10 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
-  integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
+enhanced-resolve@^4.1.0, enhanced-resolve@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
+  integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.5.0"
@@ -4415,21 +4191,21 @@ error-stack-parser@^2.0.0:
     stackframe "^1.1.1"
 
 es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5:
-  version "1.17.5"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
-  integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==
+  version "1.17.6"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
+  integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==
   dependencies:
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
     has "^1.0.3"
     has-symbols "^1.0.1"
-    is-callable "^1.1.5"
-    is-regex "^1.0.5"
+    is-callable "^1.2.0"
+    is-regex "^1.1.0"
     object-inspect "^1.7.0"
     object-keys "^1.1.1"
     object.assign "^4.1.0"
-    string.prototype.trimleft "^2.1.1"
-    string.prototype.trimright "^2.1.1"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
@@ -4440,6 +4216,11 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
+escalade@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4"
+  integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==
+
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -4451,9 +4232,9 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@^1.14.1:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.2.tgz#14ab71bf5026c2aa08173afba22c6f3173284a84"
-  integrity sha512-InuOIiKk8wwuOFg6x9BQXbzjrQhtyXh46K9bqVTPzSo2FnyMBaYGBMC6PhQy7yxxil9vIedFBweQBMK74/7o8A==
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
+  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
   dependencies:
     esprima "^4.0.1"
     estraverse "^4.2.0"
@@ -4479,9 +4260,9 @@ eslint-friendly-formatter@~3.0:
     text-table "^0.2.0"
 
 eslint-import-resolver-node@^0.3.1:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404"
-  integrity sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
+  integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
   dependencies:
     debug "^2.6.9"
     resolve "^1.13.1"
@@ -4572,9 +4353,9 @@ eslint-utils@^1.3.1:
     eslint-visitor-keys "^1.1.0"
 
 eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.2.0.tgz#74415ac884874495f78ec2a97349525344c981fa"
-  integrity sha512-WFb4ihckKil6hu3Dp798xdzSfddwKKU3+nGniKF6HfeW6OLd2OUDEPP7TcHtB5+QXOKg2s6B2DaMPE1Nn/kxKQ==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
 eslint@~5.16:
   version "5.16.0"
@@ -4661,9 +4442,9 @@ estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 estraverse@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
-  integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
 
 esutils@^2.0.2:
   version "2.0.3"
@@ -4693,20 +4474,15 @@ event-stream@=3.3.4:
     stream-combiner "~0.0.4"
     through "~2.3.1"
 
-eventemitter2@4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-4.1.2.tgz#0e1a8477af821a6ef3995b311bf74c23a5247f15"
-  integrity sha1-DhqEd6+CGm7zmVsxG/dMI6UkfxU=
-
 eventemitter3@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
   integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
 
 events@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"
-  integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
+  integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
 
 eventsource@^1.0.7:
   version "1.0.7"
@@ -4723,19 +4499,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-execa@1.0.0, execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@3.4.0, execa@^3.3.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89"
@@ -4765,6 +4528,19 @@ execa@^0.10.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 execall@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz#16a06b5fe5099df7d00be5d9c06eecded1663b45"
@@ -4772,18 +4548,6 @@ execall@^2.0.0:
   dependencies:
     clone-regexp "^2.1.0"
 
-executable@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
-  integrity sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==
-  dependencies:
-    pify "^2.2.0"
-
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-  integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=
-
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -4895,16 +4659,6 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-zip@1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
-  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
-  dependencies:
-    concat-stream "^1.6.2"
-    debug "^2.6.9"
-    mkdirp "^0.5.4"
-    yauzl "^2.10.0"
-
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -4915,6 +4669,11 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
+eyes@0.1.x:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
+  integrity sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=
+
 fast-deep-equal@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -4933,9 +4692,9 @@ fast-glob@^2.2.6:
     micromatch "^3.1.10"
 
 fast-glob@^3.0.3, fast-glob@^3.1.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d"
-  integrity sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
+  integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -4975,26 +4734,11 @@ faye-websocket@~0.11.1:
   dependencies:
     websocket-driver ">=0.5.1"
 
-fd-slicer@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
-  dependencies:
-    pend "~1.2.0"
-
 figgy-pudding@^3.5.1:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
   integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
-figures@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -5183,11 +4927,9 @@ follow-redirects@1.5.10:
     debug "=3.1.0"
 
 follow-redirects@^1.0.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb"
-  integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==
-  dependencies:
-    debug "^3.0.0"
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.12.1.tgz#de54a6205311b93d60398ebc01cf7015682312b6"
+  integrity sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -5247,14 +4989,15 @@ from@~0:
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
   integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
 
-fs-extra@8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+fs-extra@^0.23.1:
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.23.1.tgz#6611dba6adf2ab8dc9c69fab37cddf8818157e3d"
+  integrity sha1-ZhHbpq3yq43Jxp+rN83fiBgVfj0=
   dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+    path-is-absolute "^1.0.0"
+    rimraf "^2.2.8"
 
 fs-extra@^7.0.1:
   version "7.0.1"
@@ -5300,16 +5043,6 @@ fsevents@~2.1.1, fsevents@~2.1.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
   integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
 
-fstream@^1.0.0, fstream@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
-  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -5320,27 +5053,6 @@ functional-red-black-tree@^1.0.1:
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-gaze@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
-  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
-  dependencies:
-    globule "^1.0.0"
-
 gensync@^1.0.0-beta.1:
   version "1.0.0-beta.1"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
@@ -5356,11 +5068,6 @@ get-caller-file@^2.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
-
 get-stdin@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
@@ -5390,13 +5097,6 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
-getos@3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/getos/-/getos-3.1.4.tgz#29cdf240ed10a70c049add7b6f8cb08c81876faf"
-  integrity sha512-UORPzguEB/7UG5hqiZai8f0vQ7hzynMQyJLxStoQ8dPGAcmgsfXOPA4iE/fGtweHYkK+z4zc9V0g+CIFRf5HYw==
-  dependencies:
-    async "^3.1.0"
-
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -5405,9 +5105,28 @@ getpass@^0.1.1:
     assert-plus "^1.0.0"
 
 github-buttons@^2.8.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/github-buttons/-/github-buttons-2.11.0.tgz#e05acef43e670be0a93912a1ec67c5432acccfa7"
-  integrity sha512-tbCpCh1SiI2yK0u1wzDHVhI7V/O52dDlIEF9h8zj7dcmLI6nb8wcEJfENrZy0wKGc/m4sYKSbNVoJNh+AxFdCQ==
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/github-buttons/-/github-buttons-2.14.0.tgz#32ce381651091accda09217cd7a6e4c77f91e222"
+  integrity sha512-rAwKwFOiWoyhb3g5ZyXjI3XXprAa36jCd0tm467aEUYtiDZkqEXkepuzNg9LryLbnuLRQmcifIPTxLUBnuYpXQ==
+
+github-wikito-converter@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/github-wikito-converter/-/github-wikito-converter-1.5.2.tgz#ae78bfdcdee86dc0137064d585543c59dbe47cc1"
+  integrity sha512-m7CcUUovtUCH5kwxmClxDnC0Q/QgepGr1SCZpyqIjshxTBdx1o7mKOmKboMQzdbXk/8DRLZ1Bbc1h3cKWx2IRw==
+  dependencies:
+    bluebird "^2.9.34"
+    bootstrap "^3.3.7"
+    commander "^2.8.1"
+    datauri "^1.0.5"
+    defaults "^1.0.2"
+    fs-extra "^0.23.1"
+    highlight.js "^9.12.0"
+    jquery "^2.1.4"
+    marked "^0.3.6"
+    node-dir "^0.1.9"
+    open "0.0.5"
+    winston "^1.0.1"
+    wkhtmltopdf "^0.1.5"
 
 glob-parent@5.1.0:
   version "5.1.0"
@@ -5448,7 +5167,7 @@ glob@7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1:
+glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -5460,13 +5179,6 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-dirs@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
-  integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
-  dependencies:
-    ini "^1.3.4"
-
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -5576,15 +5288,6 @@ globjoin@^0.1.4:
   resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
   integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=
 
-globule@^1.0.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz#d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4"
-  integrity sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==
-  dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.10"
-    minimatch "~3.0.2"
-
 gonzales-pe@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
@@ -5599,7 +5302,7 @@ good-listener@^1.2.2:
   dependencies:
     delegate "^3.1.2"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
@@ -5628,11 +5331,11 @@ har-schema@^2.0.0:
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
-  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
   dependencies:
-    ajv "^6.5.5"
+    ajv "^6.12.3"
     har-schema "^2.0.0"
 
 hard-rejection@^2.1.0:
@@ -5662,11 +5365,6 @@ has-symbols@^1.0.0, has-symbols@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -5742,10 +5440,10 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-highlight.js@^9.6.0:
-  version "9.18.1"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c"
-  integrity sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==
+highlight.js@^9.12.0, highlight.js@^9.6.0:
+  version "9.18.3"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.3.tgz#a1a0a2028d5e3149e2380f8a865ee8516703d634"
+  integrity sha512-zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -6020,6 +5718,11 @@ ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
+image-size@^0.6.2:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.3.tgz#e7e5c65bb534bd7cdcedd6cb5166272a85f75fb2"
+  integrity sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA==
+
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
@@ -6068,23 +5771,6 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-in-publish@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.1.tgz#948b1a535c8030561cea522f73f78f4be357e00c"
-  integrity sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==
-
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
-  dependencies:
-    repeating "^2.0.0"
-
-indent-string@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
-
 indent-string@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
@@ -6108,7 +5794,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -6276,18 +5962,11 @@ is-buffer@^2.0.0, is-buffer@~2.0.3:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
   integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
 
-is-callable@^1.1.4, is-callable@^1.1.5:
+is-callable@^1.1.4, is-callable@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
   integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
 
-is-ci@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
-  dependencies:
-    ci-info "^2.0.0"
-
 is-color-stop@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
@@ -6348,9 +6027,9 @@ is-directory@^0.3.1:
   integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
 is-docker@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz#2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"
-  integrity sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
+  integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
@@ -6369,11 +6048,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-finite@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
-  integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
-
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
@@ -6410,14 +6084,6 @@ is-hexadecimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
   integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
 
-is-installed-globally@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
-  integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=
-  dependencies:
-    global-dirs "^0.1.0"
-    is-path-inside "^1.0.0"
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -6435,13 +6101,6 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
-is-observable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
-  integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==
-  dependencies:
-    symbol-observable "^1.1.0"
-
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -6502,15 +6161,10 @@ is-potential-custom-element-name@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
   integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
 
-is-promise@^2.1.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
-  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
-
-is-regex@^1.0.4, is-regex@^1.0.5:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff"
-  integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==
+is-regex@^1.0.4, is-regex@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
+  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
   dependencies:
     has-symbols "^1.0.1"
 
@@ -6553,11 +6207,6 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
 is-whitespace-character@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
@@ -6612,7 +6261,7 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isstream@~0.1.2:
+isstream@0.1.x, isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
@@ -6674,10 +6323,10 @@ jest-worker@^25.4.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-js-base64@^2.1.8:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz#313b6274dda718f714d00b3330bbae6e38e90209"
-  integrity sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==
+jquery@^2.1.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
+  integrity sha1-LInWiJterFIqfuoywUUhVZxsvwI=
 
 js-beautify@^1.11.0, js-beautify@^1.6.12:
   version "1.11.0"
@@ -6734,9 +6383,9 @@ jsdom-global@^3.0.2:
   integrity sha1-a9KZwTsMRiay2iwDk81DhdYGrLk=
 
 jsdom@^16.2.0:
-  version "16.2.2"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.2.2.tgz#76f2f7541646beb46a938f5dc476b88705bedf2b"
-  integrity sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg==
+  version "16.3.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.3.0.tgz#75690b7dac36c67be49c336dcd7219bbbed0810c"
+  integrity sha512-zggeX5UuEknpdZzv15+MS1dPYG0J/TftiiNunOeNxSl3qr8Z6cIlQpN0IdJa44z9aFxZRIVqRncvEhQ7X5DtZg==
   dependencies:
     abab "^2.0.3"
     acorn "^7.1.1"
@@ -6758,7 +6407,7 @@ jsdom@^16.2.0:
     tough-cookie "^3.0.1"
     w3c-hr-time "^1.0.2"
     w3c-xmlserializer "^2.0.0"
-    webidl-conversions "^6.0.0"
+    webidl-conversions "^6.1.0"
     whatwg-encoding "^1.0.5"
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
@@ -6824,6 +6473,13 @@ json5@^2.1.1, json5@^2.1.2:
   dependencies:
     minimist "^1.2.5"
 
+jsonfile@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -6935,61 +6591,6 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
-listr-silent-renderer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
-  integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=
-
-listr-update-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"
-  integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==
-  dependencies:
-    chalk "^1.1.3"
-    cli-truncate "^0.2.1"
-    elegant-spinner "^1.0.1"
-    figures "^1.7.0"
-    indent-string "^3.0.0"
-    log-symbols "^1.0.2"
-    log-update "^2.3.0"
-    strip-ansi "^3.0.1"
-
-listr-verbose-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db"
-  integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==
-  dependencies:
-    chalk "^2.4.1"
-    cli-cursor "^2.1.0"
-    date-fns "^1.27.2"
-    figures "^2.0.0"
-
-listr@0.14.3:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586"
-  integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==
-  dependencies:
-    "@samverschueren/stream-to-observable" "^0.3.0"
-    is-observable "^1.1.0"
-    is-promise "^2.1.0"
-    is-stream "^1.1.0"
-    listr-silent-renderer "^1.1.1"
-    listr-update-renderer "^0.5.0"
-    listr-verbose-renderer "^0.5.0"
-    p-map "^2.0.0"
-    rxjs "^6.3.3"
-
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
@@ -7075,11 +6676,6 @@ lodash.memoize@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
-lodash.once@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
-  integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -7095,10 +6691,10 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@4.17.15, lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5:
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
 
 log-symbols@3.0.0:
   version "3.0.0"
@@ -7107,13 +6703,6 @@ log-symbols@3.0.0:
   dependencies:
     chalk "^2.4.2"
 
-log-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
-  integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=
-  dependencies:
-    chalk "^1.0.0"
-
 log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
@@ -7128,15 +6717,6 @@ log-symbols@^4.0.0:
   dependencies:
     chalk "^4.0.0"
 
-log-update@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
-  integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg=
-  dependencies:
-    ansi-escapes "^3.0.0"
-    cli-cursor "^2.0.0"
-    wrap-ansi "^3.0.1"
-
 loglevel@^1.4.1, loglevel@^1.6.8:
   version "1.6.8"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
@@ -7154,14 +6734,6 @@ loose-envify@^1.0.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
-  dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
-
 lower-case@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
@@ -7174,7 +6746,7 @@ lower-case@^2.0.1:
   dependencies:
     tslib "^1.10.0"
 
-lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.5:
+lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -7228,7 +6800,7 @@ map-cache@^0.2.2:
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
   integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
-map-obj@^1.0.0, map-obj@^1.0.1:
+map-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
   integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
@@ -7262,6 +6834,11 @@ markdown-table@^2.0.0:
   dependencies:
     repeat-string "^1.0.0"
 
+marked@^0.3.6:
+  version "0.3.19"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790"
+  integrity sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==
+
 mathml-tag-names@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
@@ -7323,22 +6900,6 @@ memory-fs@^0.5.0:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
-  dependencies:
-    camelcase-keys "^2.0.0"
-    decamelize "^1.1.2"
-    loud-rejection "^1.0.0"
-    map-obj "^1.0.1"
-    minimist "^1.1.3"
-    normalize-package-data "^2.3.4"
-    object-assign "^4.0.1"
-    read-pkg-up "^1.0.1"
-    redent "^1.0.0"
-    trim-newlines "^1.0.0"
-
 meow@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/meow/-/meow-7.0.1.tgz#1ed4a0a50b3844b451369c48362eb0515f04c1dc"
@@ -7442,6 +7003,11 @@ mime@^2.3.1, mime@^2.4.4:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
   integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
 
+mimer@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/mimer/-/mimer-0.3.2.tgz#0b83aabdf48eaacfd2e093ed4c0ed3d38eda8073"
+  integrity sha512-N6NcgDQAevhP/02DQ/epK6daLy4NKrIHyTlJcO6qBiYn98q+Y4a/knNsAATCe1xLS2F0nEmJp+QYli2s8vKwyQ==
+
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -7486,7 +7052,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -7502,7 +7068,7 @@ minimist-options@^4.0.2:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@1.2.5, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
+minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
@@ -7522,9 +7088,9 @@ minipass-flush@^1.0.5:
     minipass "^3.0.0"
 
 minipass-pipeline@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz#55f7839307d74859d6e8ada9c3ebe72cec216a34"
-  integrity sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
   dependencies:
     minipass "^3.0.0"
 
@@ -7575,7 +7141,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.5, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.5, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -7640,16 +7206,6 @@ mochapack@^1.1.13:
     toposort "^2.0.2"
     yargs "14.0.0"
 
-moment@2.24.0:
-  version "2.24.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
-  integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
-
-moment@^2.19.2:
-  version "2.26.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.26.0.tgz#5e1f82c6bafca6e83e808b30c8705eed0dcbd39a"
-  integrity sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw==
-
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -7704,7 +7260,7 @@ mz@^2.4.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nan@^2.12.1, nan@^2.13.2:
+nan@^2.12.1:
   version "2.14.1"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
   integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
@@ -7737,9 +7293,9 @@ negotiator@0.6.2:
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
 neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
-  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -7761,6 +7317,13 @@ no-case@^3.0.3:
     lower-case "^2.0.1"
     tslib "^1.10.0"
 
+node-dir@^0.1.9:
+  version "0.1.17"
+  resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
+  integrity sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=
+  dependencies:
+    minimatch "^3.0.2"
+
 node-environment-flags@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
@@ -7769,34 +7332,11 @@ node-environment-flags@1.0.6:
     object.getownpropertydescriptors "^2.0.3"
     semver "^5.7.0"
 
-node-fetch@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
-
 node-forge@0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
   integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==
 
-node-gyp@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
-  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
-  dependencies:
-    fstream "^1.0.0"
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3 || 4"
-    osenv "0"
-    request "^2.87.0"
-    rimraf "2"
-    semver "~5.3.0"
-    tar "^2.0.0"
-    which "1"
-
 node-ipc@^9.1.1:
   version "9.1.1"
   resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.1.1.tgz#4e245ed6938e65100e595ebc5dc34b16e8dd5d69"
@@ -7835,46 +7375,16 @@ node-libs-browser@^2.0.0, node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
-node-releases@^1.1.53:
-  version "1.1.58"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935"
-  integrity sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==
-
-node-sass@^4.13.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5"
-  integrity sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^1.1.1"
-    cross-spawn "^3.0.0"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    in-publish "^2.0.0"
-    lodash "^4.17.15"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    nan "^2.13.2"
-    node-gyp "^3.8.0"
-    npmlog "^4.0.0"
-    request "^2.88.0"
-    sass-graph "2.2.5"
-    stdout-stream "^1.4.0"
-    "true-case-path" "^1.0.2"
+node-releases@^1.1.60:
+  version "1.1.60"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084"
+  integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==
 
 nodent-runtime@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/nodent-runtime/-/nodent-runtime-3.2.1.tgz#9e2755d85e39f764288f0d4752ebcfe3e541e00e"
   integrity sha512-7Ws63oC+215smeKJQCxzrK21VFVlCFBkwl0MOObt0HOpVQXs3u483sAmtkF33nNqZ5rSOQjB76fgyPBmAUrtCA==
 
-"nopt@2 || 3":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
-  dependencies:
-    abbrev "1"
-
 nopt@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
@@ -7883,7 +7393,7 @@ nopt@^4.0.3:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0:
+normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -7944,16 +7454,6 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
 nth-check@^1.0.2, nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -8001,9 +7501,9 @@ object-hash@^1.1.4:
   integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
 
 object-inspect@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
-  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
+  integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
 
 object-is@^1.0.1:
   version "1.1.2"
@@ -8084,11 +7584,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-  integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=
-
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
@@ -8097,12 +7592,17 @@ onetime@^2.0.0:
     mimic-fn "^1.0.0"
 
 onetime@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
-  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.1.tgz#5c8016847b0d67fcedb7eef254751cfcdc7e9418"
+  integrity sha512-ZpZpjcJeugQfWsfyQlshVoowIIQ1qBGSVll4rfDq6JJVO//fesjoX808hXWfBjY+ROZgpKDI5TRSRBSoJiZ8eg==
   dependencies:
     mimic-fn "^2.1.0"
 
+open@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/open/-/open-0.0.5.tgz#42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"
+  integrity sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=
+
 open@^6.3.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
@@ -8185,7 +7685,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@0, osenv@^0.1.4:
+osenv@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
@@ -8193,11 +7693,6 @@ osenv@0, osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-ospath@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b"
-  integrity sha1-EnZjl3Sj+O8lcvf+QoDg6kVQwHs=
-
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -8363,9 +7858,9 @@ parse-json@^4.0.0:
     json-parse-better-errors "^1.0.1"
 
 parse-json@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f"
-  integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.1.tgz#7cfe35c1ccd641bce3981467e6c2ece61b3b3878"
+  integrity sha512-ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     error-ex "^1.3.1"
@@ -8464,15 +7959,6 @@ path-to-regexp@0.1.7:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
@@ -8510,11 +7996,6 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
-
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -8525,7 +8006,7 @@ picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
-pify@^2.0.0, pify@^2.2.0:
+pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
@@ -8580,12 +8061,10 @@ pkg-dir@^4.1.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
-  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
-  dependencies:
-    find-up "^2.1.0"
+pkginfo@0.3.x:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.3.1.tgz#5b29f6a81f70717142e09e765bbeab97b4f81e21"
+  integrity sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE=
 
 pnp-webpack-plugin@^1.6.4:
   version "1.6.4"
@@ -8594,24 +8073,14 @@ pnp-webpack-plugin@^1.6.4:
   dependencies:
     ts-pnp "^1.1.6"
 
-popper.js@^1.16.1:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
-  integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
-
-portal-vue@^2.1.7:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.7.tgz#ea08069b25b640ca08a5b86f67c612f15f4e4ad4"
-  integrity sha512-+yCno2oB3xA7irTt0EU5Ezw22L2J51uKAacE/6hMPMoO/mx3h4rXFkkBkT4GFsMDv/vEe8TNKC3ujJJ0PTwb6g==
-
 portfinder@^1.0.26, portfinder@^1.0.9:
-  version "1.0.26"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz#475658d56ca30bed72ac7f1378ed350bd1b64e70"
-  integrity sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==
+  version "1.0.28"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
+  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
   dependencies:
     async "^2.6.2"
     debug "^3.1.1"
-    mkdirp "^0.5.1"
+    mkdirp "^0.5.5"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
@@ -8619,9 +8088,9 @@ posix-character-classes@^0.1.0:
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-calc@^7.0.1:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz#504efcd008ca0273120568b0792b16cdcde8aac1"
-  integrity sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.3.tgz#d65cca92a3c52bf27ad37a5f732e0587b74f1623"
+  integrity sha512-IB/EAEmZhIMEIhG7Ov4x+l47UaXOS1n2f4FBUk/aKllQhtSCxWhTzn0nJgkqN7fo/jcWySvWTSB6Syk9L+31bA==
   dependencies:
     postcss "^7.0.27"
     postcss-selector-parser "^6.0.2"
@@ -8790,14 +8259,14 @@ postcss-modules-local-by-default@^2.0.6:
     postcss-value-parser "^3.3.1"
 
 postcss-modules-local-by-default@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915"
-  integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0"
+  integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==
   dependencies:
     icss-utils "^4.1.1"
-    postcss "^7.0.16"
+    postcss "^7.0.32"
     postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.0.0"
+    postcss-value-parser "^4.1.0"
 
 postcss-modules-scope@^2.1.0, postcss-modules-scope@^2.2.0:
   version "2.2.0"
@@ -9034,12 +8503,12 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.0.3, postcss-value-parser@^4.1.0:
+postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.30, postcss@^7.0.31, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.31, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
   version "7.0.32"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
   integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
@@ -9068,11 +8537,6 @@ prettier@^1.18.2:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
-pretty-bytes@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2"
-  integrity sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==
-
 pretty-error@^2.0.2, pretty-error@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
@@ -9100,11 +8564,6 @@ pretty@^2.0.0:
     extend-shallow "^2.0.1"
     js-beautify "^1.6.12"
 
-private@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
-
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -9255,11 +8714,6 @@ quick-lru@^4.0.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
-ramda@0.26.1:
-  version "0.26.1"
-  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
-  integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
-
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -9295,14 +8749,6 @@ react-is@^16.12.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
@@ -9320,15 +8766,6 @@ read-pkg-up@^7.0.1:
     read-pkg "^5.2.0"
     type-fest "^0.8.1"
 
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
 read-pkg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
@@ -9348,7 +8785,7 @@ read-pkg@^5.1.1, read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -9393,14 +8830,6 @@ readdirp@~3.4.0:
   dependencies:
     picomatch "^2.2.1"
 
-redent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
-  dependencies:
-    indent-string "^2.1.0"
-    strip-indent "^1.0.1"
-
 redent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
@@ -9427,17 +8856,16 @@ regenerator-runtime@^0.12.0:
   integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
 
 regenerator-runtime@^0.13.4:
-  version "0.13.5"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
-  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
+  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
 
 regenerator-transform@^0.14.2:
-  version "0.14.4"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
-  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
+  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
   dependencies:
     "@babel/runtime" "^7.8.4"
-    private "^0.1.8"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
@@ -9490,9 +8918,9 @@ relateurl@0.2.x, relateurl@^0.2.7:
   integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
 
 remark-parse@^8.0.0:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.2.tgz#5999bc0b9c2e3edc038800a64ff103d0890b318b"
-  integrity sha512-eMI6kMRjsAGpMXXBAywJwiwAse+KNpmt+BK55Oofy4KvBZEqUDj6mWbGLJZrujoPIPPxDXzn3T9baRlpsm2jnQ==
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1"
+  integrity sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==
   dependencies:
     ccount "^1.0.0"
     collapse-white-space "^1.0.2"
@@ -9512,9 +8940,9 @@ remark-parse@^8.0.0:
     xtend "^4.0.1"
 
 remark-stringify@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-8.1.0.tgz#1e555f4402e445c364fb23d12fc5f5e0337ec8b7"
-  integrity sha512-FSPZv1ds76oAZjurhhuV5qXSUSoz6QRPuwYK38S41sLHwg4oB7ejnmZshj7qwjgYLf93kdz6BOX9j5aidNE7rA==
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-8.1.1.tgz#e2a9dc7a7bf44e46a155ec78996db896780d8ce5"
+  integrity sha512-q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A==
   dependencies:
     ccount "^1.0.0"
     is-alphanumeric "^1.0.0"
@@ -9532,9 +8960,9 @@ remark-stringify@^8.0.0:
     xtend "^4.0.1"
 
 remark@^12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/remark/-/remark-12.0.0.tgz#d1c145c07341c9232f93b2f8539d56da15a2548c"
-  integrity sha512-oX4lMIS0csgk8AEbzY0h2jdR0ngiCHOpwwpxjmRa5TqAkeknY+tkhjRJGZqnCmvyuWh55/0SW5WY3R3nn3PH9A==
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/remark/-/remark-12.0.1.tgz#f1ddf68db7be71ca2bad0a33cd3678b86b9c709f"
+  integrity sha512-gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw==
   dependencies:
     remark-parse "^8.0.0"
     remark-stringify "^8.0.0"
@@ -9566,42 +8994,28 @@ repeat-string@^1.0.0, repeat-string@^1.5.4, repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-repeating@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
-  dependencies:
-    is-finite "^1.0.0"
-
 replace-ext@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
   integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
 
-request-progress@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe"
-  integrity sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4=
+request-promise-core@1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
+  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
   dependencies:
-    throttleit "^1.0.0"
-
-request-promise-core@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
-  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
-  dependencies:
-    lodash "^4.17.15"
+    lodash "^4.17.19"
 
 request-promise-native@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
-  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
+  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
   dependencies:
-    request-promise-core "1.1.3"
+    request-promise-core "1.1.4"
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
-request@^2.87.0, request@^2.88.0, request@^2.88.2:
+request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -9689,14 +9103,6 @@ resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.
   dependencies:
     path-parse "^1.0.6"
 
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-  integrity sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=
-  dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
-
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -9730,13 +9136,6 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -9744,6 +9143,13 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
+rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -9769,10 +9175,10 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.5.4, rxjs@^6.5.5:
-  version "6.5.5"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
-  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
+rxjs@^6.4.0, rxjs@^6.5.5:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.2.tgz#8096a7ac03f2cc4fe5860ef6e572810d9e01c0d2"
+  integrity sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==
   dependencies:
     tslib "^1.9.0"
 
@@ -9798,16 +9204,6 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-graph@2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz#a981c87446b8319d96dce0671e487879bd24c2e8"
-  integrity sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==
-  dependencies:
-    glob "^7.0.0"
-    lodash "^4.0.0"
-    scss-tokenizer "^0.2.3"
-    yargs "^13.3.2"
-
 sass-loader@^8.0.2:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz#debecd8c3ce243c76454f2e8290482150380090d"
@@ -9819,6 +9215,13 @@ sass-loader@^8.0.2:
     schema-utils "^2.6.1"
     semver "^6.3.0"
 
+sass@^1.26.10:
+  version "1.26.10"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.26.10.tgz#851d126021cdc93decbf201d1eca2a20ee434760"
+  integrity sha512-bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw==
+  dependencies:
+    chokidar ">=2.0.0 <4.0.0"
+
 sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
@@ -9848,7 +9251,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.6.6:
+schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
   integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
@@ -9857,14 +9260,6 @@ schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.1, schema-utils@^2.6
     ajv "^6.12.2"
     ajv-keywords "^3.4.1"
 
-scss-tokenizer@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
-  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
-  dependencies:
-    js-base64 "^2.1.8"
-    source-map "^0.4.2"
-
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -9887,7 +9282,7 @@ selfsigned@^1.10.7, selfsigned@^1.9.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@5.3.0, semver@~5.3.0:
+semver@5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
   integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
@@ -9902,6 +9297,11 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.3.2:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+
 send@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -9961,7 +9361,7 @@ serve-static@1.14.1:
     parseurl "~1.3.3"
     send "0.17.1"
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -10052,6 +9452,11 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
+slang@>=0.2:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/slang/-/slang-0.3.0.tgz#13af75b4f0c018c6a8193d704f65b23be4fbabdc"
+  integrity sha1-E691tPDAGMaoGT1wT2WyO+T7q9w=
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -10067,11 +9472,6 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-  integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
-
 slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -10193,13 +9593,6 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
-  dependencies:
-    amdefine ">=0.0.4"
-
 source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
@@ -10330,6 +9723,11 @@ stable@^0.1.8:
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
   integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
+stack-trace@0.0.x:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+  integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
+
 stack-utils@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
@@ -10341,9 +9739,9 @@ stackframe@^1.1.1:
   integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA==
 
 start-server-and-test@^1.10.11:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.11.0.tgz#1b1a83d062b0028ee6e296bb4e0231f2d8b2f4af"
-  integrity sha512-FhkJFYL/lvbd0tKWvbxWNWjtFtq3Zpa09QDjA8EUH88AsgNL4hkAAKYNmbac+fFM8/GIZoJ1Mj4mm3SMI0X1bA==
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.11.2.tgz#9144b7b6f25197148f159f261ae80119afbb17d5"
+  integrity sha512-rk1zS5WQvdbc8slE5hPtzfji1dFSnBAfm+vSjToZNrBvozHJvuAG80xE5u8N4tQjg3Ej1Crjc19J++r28HGJgg==
   dependencies:
     bluebird "3.7.2"
     check-more-types "2.24.0"
@@ -10351,7 +9749,7 @@ start-server-and-test@^1.10.11:
     execa "3.4.0"
     lazy-ass "1.6.0"
     ps-tree "1.2.0"
-    wait-on "4.0.0"
+    wait-on "5.1.0"
 
 state-toggle@^1.0.0:
   version "1.0.3"
@@ -10371,13 +9769,6 @@ static-extend@^0.1.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-stdout-stream@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
-  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
-  dependencies:
-    readable-stream "^2.0.1"
-
 stealthy-require@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
@@ -10462,7 +9853,7 @@ string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-string.prototype.trimend@^1.0.0:
+string.prototype.trimend@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
   integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
@@ -10470,25 +9861,7 @@ string.prototype.trimend@^1.0.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
-string.prototype.trimleft@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
-  integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimstart "^1.0.0"
-
-string.prototype.trimright@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
-  integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimend "^1.0.0"
-
-string.prototype.trimstart@^1.0.0:
+string.prototype.trimstart@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
   integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
@@ -10549,13 +9922,6 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -10571,13 +9937,6 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
-  dependencies:
-    get-stdin "^4.0.1"
-
 strip-indent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
@@ -10634,9 +9993,9 @@ stylelint-order@^4.0.0:
     postcss-sorting "^5.0.1"
 
 stylelint-scss@^3.4.0:
-  version "3.17.2"
-  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.17.2.tgz#4d849a153f9241834396f5880db2c3c964def4e3"
-  integrity sha512-e0dmxqsofy/HZj4urcGSJw4S6yHDJxiQdT20/1ciCsd5lomisa7YM4+Qtt1EG4hsqEG1dbEeF855tec1UyqcSA==
+  version "3.18.0"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.18.0.tgz#8f06371c223909bf3f62e839548af1badeed31e9"
+  integrity sha512-LD7+hv/6/ApNGt7+nR/50ft7cezKP2HM5rI8avIdGaUWre3xlHfV4jKO/DRZhscfuN+Ewy9FMhcTq0CcS0C/SA==
   dependencies:
     lodash "^4.17.15"
     postcss-media-query-parser "^0.2.3"
@@ -10645,15 +10004,15 @@ stylelint-scss@^3.4.0:
     postcss-value-parser "^4.1.0"
 
 stylelint@^13.2.1:
-  version "13.6.0"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.6.0.tgz#3528bc402a71f2af2a3de32fa4e9f1c24e49666d"
-  integrity sha512-55gG2pNjVr183JJM/tlr3KAua6vTVX7Ho/lgKKuCIWszTZ1gmrXjX4Wok53SI8wRYFPbwKAcJGULQ77OJxTcNw==
+  version "13.6.1"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.6.1.tgz#cc1d76338116d55e8ff2be94c4a4386c1239b878"
+  integrity sha512-XyvKyNE7eyrqkuZ85Citd/Uv3ljGiuYHC6UiztTR6sWS9rza8j3UeQv/eGcQS9NZz/imiC4GKdk1EVL3wst5vw==
   dependencies:
     "@stylelint/postcss-css-in-js" "^0.37.1"
     "@stylelint/postcss-markdown" "^0.36.1"
     autoprefixer "^9.8.0"
     balanced-match "^1.0.0"
-    chalk "^4.0.0"
+    chalk "^4.1.0"
     cosmiconfig "^6.0.0"
     debug "^4.1.1"
     execall "^2.0.0"
@@ -10712,13 +10071,6 @@ supports-color@6.0.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@7.1.0, supports-color@^7.0.0, supports-color@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
-  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
-  dependencies:
-    has-flag "^4.0.0"
-
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -10738,6 +10090,13 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^7.0.0, supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  dependencies:
+    has-flag "^4.0.0"
+
 svg-tags@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
@@ -10817,11 +10176,6 @@ svgo@^1.0.0:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
-symbol-observable@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
-
 symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -10842,15 +10196,6 @@ tapable@^1.0.0, tapable@^1.1.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
-  integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.12"
-    inherits "2"
-
 terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.4.3:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz#2c63544347324baafa9a56baaddf1634c8abfc2f"
@@ -10882,9 +10227,9 @@ terser-webpack-plugin@^2.3.6:
     webpack-sources "^1.4.3"
 
 terser@^4.1.2, terser@^4.6.12, terser@^4.6.3:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.7.0.tgz#15852cf1a08e3256a80428e865a2fa893ffba006"
-  integrity sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -10903,9 +10248,9 @@ thenify-all@^1.0.0:
     thenify ">= 3.1.0 < 4"
 
 "thenify@>= 3.1.0 < 4":
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
-  integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
+  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
   dependencies:
     any-promise "^1.0.0"
 
@@ -10918,11 +10263,6 @@ thread-loader@^2.1.3:
     loader-utils "^1.1.0"
     neo-async "^2.6.0"
 
-throttleit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
-  integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=
-
 through2@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
@@ -10958,13 +10298,6 @@ tiny-emitter@^2.0.0:
   resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
   integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
 
-tmp@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
-  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
-  dependencies:
-    rimraf "^2.6.3"
-
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -11053,11 +10386,6 @@ tr46@^2.0.2:
   dependencies:
     punycode "^2.1.1"
 
-trim-newlines@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
-
 trim-newlines@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
@@ -11078,13 +10406,6 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
   integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
-"true-case-path@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
-  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
-  dependencies:
-    glob "^7.1.2"
-
 tryer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
@@ -11221,9 +10542,9 @@ unicode-property-aliases-ecmascript@^1.0.4:
   integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
 
 unified@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-9.0.0.tgz#12b099f97ee8b36792dbad13d278ee2f696eed1d"
-  integrity sha512-ssFo33gljU3PdlWLjNp15Inqb77d6JnJSfyplGJPT/a+fNRNyCBeveBAYJdO5khKdF6WVHa/yYCC7Xl6BDwZUQ==
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-9.1.0.tgz#7ba82e5db4740c47a04e688a9ca8335980547410"
+  integrity sha512-VXOv7Ic6twsKGJDeZQ2wwPqXs2hM0KNu5Hkg9WgAZbSD1pxhZ7p8swqg583nw1Je2fhwHy6U8aEjiI79x1gvag==
   dependencies:
     bail "^1.0.0"
     extend "^3.0.0"
@@ -11293,17 +10614,17 @@ unist-util-stringify-position@^2.0.0:
     "@types/unist" "^2.0.2"
 
 unist-util-visit-parents@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.0.2.tgz#d4076af3011739c71d2ce99d05de37d545f4351d"
-  integrity sha512-yJEfuZtzFpQmg1OSCyS9M5NJRrln/9FbYosH3iW0MG402QbdbaB8ZESwUv9RO6nRfLAKvWcMxCwdLWOov36x/g==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.0.tgz#4dd262fb9dcfe44f297d53e882fc6ff3421173d5"
+  integrity sha512-0g4wbluTF93npyPrp/ymd3tCDTMnP0yo2akFD2FIBAYXq/Sga3lwaU1D8OYKbtpioaI6CkDcQ6fsMnmtzt7htw==
   dependencies:
     "@types/unist" "^2.0.0"
     unist-util-is "^4.0.0"
 
 unist-util-visit@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.2.tgz#3843782a517de3d2357b4c193b24af2d9366afb7"
-  integrity sha512-HoHNhGnKj6y+Sq+7ASo2zpVdfdRifhTgX2KTU3B/sO/TTlZchp7E3S4vjRzDJ7L60KmrCPsQkVK3lEF3cz36XQ==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c"
+  integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==
   dependencies:
     "@types/unist" "^2.0.0"
     unist-util-is "^4.0.0"
@@ -11332,11 +10653,6 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-untildify@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
-  integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
-
 upath@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
@@ -11376,7 +10692,7 @@ url-parse@^1.4.3:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
-url@0.11.0, url@^0.11.0:
+url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
   integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
@@ -11487,9 +10803,9 @@ vfile-message@^2.0.0:
     unist-util-stringify-position "^2.0.0"
 
 vfile@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.1.1.tgz#282d28cebb609183ac51703001bc18b3e3f17de9"
-  integrity sha512-lRjkpyDGjVlBA7cDQhQ+gNcvB1BGaTHYuSOcY3S7OhDmBtnzX95FhtZZDecSTDm6aajFymyve6S5DN4ZHGezdQ==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.0.tgz#26c78ac92eb70816b01d4565e003b7e65a2a0e01"
+  integrity sha512-a/alcwCvtuc8OX92rqqo7PflxiCgXRFjdyoGVuYV+qbgCb0GgZJRvIgCD4+U/Kl1yhaRsaTwksF88xbPyGsgpw==
   dependencies:
     "@types/unist" "^2.0.0"
     is-buffer "^2.0.0"
@@ -11502,10 +10818,10 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
-vue-apexcharts@^1.5.2:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/vue-apexcharts/-/vue-apexcharts-1.5.3.tgz#9fde83727d944707da5c8c2fa9f09a051b48d082"
-  integrity sha512-ImbvQxgwbLMrEc9/veDIJ7lzncf1fJDSNqqK0x2YDNUCq5tE9uqM4Gb/ZYUB5WlDM3vDpzwDEmsidWcaO6/WXQ==
+vue-apexcharts@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/vue-apexcharts/-/vue-apexcharts-1.6.0.tgz#c7d3afd93f712433d404e5ceeb4e3aa65f422af2"
+  integrity sha512-sT6tuVTLBwfH3TA7azecDNS/W70bmz14ZJI7aE7QIqcG9I6OywyH7x3hcOeY1v1DxttI8Svc5RuYj4Dd+A5F4g==
 
 vue-clipboard2@^0.3.1:
   version "0.3.1"
@@ -11523,9 +10839,9 @@ vue-codemirror@^4.0.6:
     diff-match-patch "^1.0.0"
 
 vue-cookies@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/vue-cookies/-/vue-cookies-1.7.0.tgz#dd8f147ff1579e0cbd5f352dc5dff2696d8760b8"
-  integrity sha512-vuEUm6wYMMrFAHFCrkzIUAy8+MgPAbBGmYXnk2M6X6O2KHbMT1wuDD2izacmsSUp6ZM02e23MJRtPRobl88VMg==
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/vue-cookies/-/vue-cookies-1.7.3.tgz#de8da757ecb01cd4c5731fcff7f3f86781acc5e8"
+  integrity sha512-94AhF6LDHuZkrkWe1miDFkMALD6r9sKYZ+kT0TV9e6L97HST+Ozj+cKaWf97+fWSadJu50a2w/Cgo0iKQhNtKg==
 
 vue-eslint-parser@^4.0.2:
   version "4.0.3"
@@ -11546,11 +10862,6 @@ vue-flatpickr-component@^8.1.5:
   dependencies:
     flatpickr "^4.6.1"
 
-vue-functional-data-merge@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/vue-functional-data-merge/-/vue-functional-data-merge-3.1.0.tgz#08a7797583b7f35680587f8a1d51d729aa1dc657"
-  integrity sha512-leT4kdJVQyeZNY1kmnS1xiUlQ9z1B/kdBFCILIjYYQDqZgLqCLa0UhjSSeRX6c3mUe6U5qYeM8LrEqkHJ1B4LA==
-
 vue-github-button@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/vue-github-button/-/vue-github-button-1.2.0.tgz#5624a2807b16bdac61589f55503b8a492d2a9d5b"
@@ -11564,14 +10875,14 @@ vue-hot-reload-api@^2.3.0:
   integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
 
 vue-i18n@^8.18.1:
-  version "8.18.2"
-  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.18.2.tgz#cd7c12f2e178e6faa23b0e3cfd2f7bac9305f8fc"
-  integrity sha512-0X5nBTCZAVjlwcrPaYJwNs3iipBBTv0AUHwQUOa8yP3XbQGWKbRHqBb3OhCYtum/IHDD21d/df5Xd2VgyxbxfA==
+  version "8.20.0"
+  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.20.0.tgz#c81b01d6541182b28565316cafe881b65a3c0f1b"
+  integrity sha512-ZiAOoeR4d/JtKpbjipx3I80ey7cYG1ki5gQ7HwzWm4YFio9brA15BEYHjalEoBaEfzF5OBEZP+Y2MvAaWnyXXg==
 
 vue-loader@^15.9.2:
-  version "15.9.2"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.2.tgz#ae01f5f4c9c6a04bff4483912e72ef91a402c1ae"
-  integrity sha512-oXBubaY//CYEISBlHX+c2YPJbmOH68xXPXjFv4MAgPqQvUsnjrBAjCJi8HXZ/r/yfn0tPL5VZj1Zcp8mJPI8VA==
+  version "15.9.3"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.3.tgz#0de35d9e555d3ed53969516cac5ce25531299dda"
+  integrity sha512-Y67VnGGgVLH5Voostx8JBZgPQTlDQeOVBLOEsjc2cXbCYBKexSKEpOA56x0YZofoDOTszrLnIShyOX1p9uCEHA==
   dependencies:
     "@vue/component-compiler-utils" "^3.1.0"
     hash-sum "^1.0.2"
@@ -11590,13 +10901,6 @@ vue-loader@~15.6:
     vue-hot-reload-api "^2.3.0"
     vue-style-loader "^4.1.0"
 
-vue-moment@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/vue-moment/-/vue-moment-4.1.0.tgz#092a8ff723a96c6f85a0a8e23ad30f0bf320f3b0"
-  integrity sha512-Gzisqpg82ItlrUyiD9d0Kfru+JorW2o4mQOH06lEDZNgxci0tv/fua1Hl0bo4DozDV2JK1r52Atn/8QVCu8qQw==
-  dependencies:
-    moment "^2.19.2"
-
 vue-observe-visibility@^0.4.6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz#878cb8ebcf3078e40807af29774e97105ebd519e"
@@ -11634,16 +10938,16 @@ vue@^2.6.11:
   integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==
 
 vuedraggable@^2.23.2:
-  version "2.23.2"
-  resolved "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-2.23.2.tgz#0d95d7fdf4f02f56755a26b3c9dca5c7ca9cfa72"
-  integrity sha512-PgHCjUpxEAEZJq36ys49HfQmXglattf/7ofOzUrW2/rRdG7tu6fK84ir14t1jYv4kdXewTEa2ieKEAhhEMdwkQ==
+  version "2.24.0"
+  resolved "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-2.24.0.tgz#1ee069eeb91f61fcb540faf20f1c6b2d4d990a26"
+  integrity sha512-IlslPpc+iZ2zPNSJbydFZIDrE+don5u+Nc/bjT2YaF+Azidc+wxxJKfKT0NwE68AKk0syb0YbZneAcnynqREZQ==
   dependencies:
     sortablejs "^1.10.1"
 
 vuex@^3.1.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.4.0.tgz#20cc086062d750769fce1febb34e7fceeaebde45"
-  integrity sha512-ajtqwEW/QhnrBZQsZxCLHThZZaa+Db45c92Asf46ZDXu6uHXgbfVuBaJ4gzD2r4UX0oMJHstFwd2r2HM4l8umg==
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.5.1.tgz#f1b8dcea649bc25254cf4f4358081dbf5da18b3d"
+  integrity sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw==
 
 w3c-hr-time@^1.0.2:
   version "1.0.2"
@@ -11659,17 +10963,16 @@ w3c-xmlserializer@^2.0.0:
   dependencies:
     xml-name-validator "^3.0.0"
 
-wait-on@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-4.0.0.tgz#4d7e4485ca759968897fd3b0cc50720c0b4ca959"
-  integrity sha512-QrW3J8LzS5ADPfD9Rx5S6KJck66xkqyiFKQs9jmUTkIhiEOmkzU7WRZc+MjsnmkrgjitS2xQ4bb13hnlQnKBUQ==
+wait-on@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-5.1.0.tgz#b697f21c6fea0908b9c7ad6ed56ace4736768b66"
+  integrity sha512-JM0kgaE+V0nCDvSl72iM05W8NDt2E2M56WC5mzR7M+T+k6xjt2yYpyom+xA8RasSunFGzbxIpAXbVzXqtweAnA==
   dependencies:
-    "@hapi/joi" "^16.1.8"
-    lodash "^4.17.15"
-    minimist "^1.2.0"
-    request "^2.88.0"
-    request-promise-native "^1.0.8"
-    rxjs "^6.5.4"
+    "@hapi/joi" "^17.1.1"
+    axios "^0.19.2"
+    lodash "^4.17.19"
+    minimist "^1.2.5"
+    rxjs "^6.5.5"
 
 wait-on@^4.0.1:
   version "4.0.2"
@@ -11690,15 +10993,15 @@ watchpack-chokidar2@^2.0.0:
   dependencies:
     chokidar "^2.1.8"
 
-watchpack@^1.5.0, watchpack@^1.6.1:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.2.tgz#c02e4d4d49913c3e7e122c3325365af9d331e9aa"
-  integrity sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==
+watchpack@^1.5.0, watchpack@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz#6e9da53b3c80bb2d6508188f5b200410866cd30b"
+  integrity sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==
   dependencies:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
   optionalDependencies:
-    chokidar "^3.4.0"
+    chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.0"
 
 wbuf@^1.1.0, wbuf@^1.7.3:
@@ -11720,7 +11023,7 @@ webidl-conversions@^5.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
   integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
 
-webidl-conversions@^6.0.0:
+webidl-conversions@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
@@ -11745,9 +11048,9 @@ webpack-bundle-analyzer@^3.7.0, webpack-bundle-analyzer@^3.8.0:
     ws "^6.0.0"
 
 webpack-chain@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/webpack-chain/-/webpack-chain-6.4.0.tgz#22f0b27b6a9bc9ee3cba4f9e6513cf66394034e2"
-  integrity sha512-f97PYqxU+9/u0IUqp/ekAHRhBD1IQwhBv3wlJo2nvyELpr2vNnUqO3XQEk+qneg0uWGP54iciotszpjfnEExFA==
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/webpack-chain/-/webpack-chain-6.5.1.tgz#4f27284cbbb637e3c8fbdef43eef588d4d861206"
+  integrity sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA==
   dependencies:
     deepmerge "^1.5.2"
     javascript-stringify "^2.0.1"
@@ -11899,9 +11202,9 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.3.0, webpack-
     source-map "~0.6.1"
 
 webpack@^4.0.0:
-  version "4.43.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6"
-  integrity sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==
+  version "4.44.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.1.tgz#17e69fff9f321b8f117d1fda714edfc0b939cc21"
+  integrity sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
@@ -11911,7 +11214,7 @@ webpack@^4.0.0:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.1.0"
+    enhanced-resolve "^4.3.0"
     eslint-scope "^4.0.3"
     json-parse-better-errors "^1.0.2"
     loader-runner "^2.4.0"
@@ -11924,7 +11227,7 @@ webpack@^4.0.0:
     schema-utils "^1.0.0"
     tapable "^1.1.3"
     terser-webpack-plugin "^1.4.3"
-    watchpack "^1.6.1"
+    watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
 webpack@~4.29:
@@ -12004,7 +11307,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@1.3.1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
+which@1.3.1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -12018,13 +11321,33 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@1.1.3, wide-align@^1.1.0:
+wide-align@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
   integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
     string-width "^1.0.2 || 2"
 
+winston@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-1.1.2.tgz#68edd769ff79d4f9528cf0e5d80021aade67480c"
+  integrity sha1-aO3Xaf951PlSjPDl2AAhqt5nSAw=
+  dependencies:
+    async "~1.0.0"
+    colors "1.0.x"
+    cycle "1.0.x"
+    eyes "0.1.x"
+    isstream "0.1.x"
+    pkginfo "0.3.x"
+    stack-trace "0.0.x"
+
+wkhtmltopdf@^0.1.5:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/wkhtmltopdf/-/wkhtmltopdf-0.1.6.tgz#e9db84eb10d4ee50a40f4c3a7f58ca3d5d365ec4"
+  integrity sha1-6duE6xDU7lCkD0w6f1jKPV02XsQ=
+  dependencies:
+    slang ">=0.2"
+
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -12045,14 +11368,6 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
-wrap-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
-  integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-
 wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
@@ -12101,9 +11416,9 @@ ws@^6.0.0, ws@^6.2.1:
     async-limiter "~1.0.0"
 
 ws@^7.2.3:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz#4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd"
-  integrity sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
+  integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
@@ -12173,7 +11488,7 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^18.1.1, yargs-parser@^18.1.3:
+yargs-parser@^18.1.2, yargs-parser@^18.1.3:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
   integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
@@ -12260,9 +11575,9 @@ yargs@^12.0.4:
     yargs-parser "^11.1.1"
 
 yargs@^15.0.0:
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
-  integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
   dependencies:
     cliui "^6.0.0"
     decamelize "^1.2.0"
@@ -12274,12 +11589,4 @@ yargs@^15.0.0:
     string-width "^4.2.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^18.1.1"
-
-yauzl@2.10.0, yauzl@^2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.1.0"
+    yargs-parser "^18.1.2"
diff --git a/go.mod b/go.mod
index 5e1a7155..4316ede4 100644
--- a/go.mod
+++ b/go.mod
@@ -5,43 +5,36 @@ go 1.14
 
 require (
 	github.com/GeertJohan/go.rice v1.0.0
-	github.com/ararog/timeago v0.0.0-20160328174124-e9969cf18b8d
+	github.com/aws/aws-sdk-go v1.30.20
+	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/dustin/go-humanize v1.0.0
 	github.com/fatih/structs v1.1.0
-	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/foomo/simplecert v1.7.5
+	github.com/foomo/tlsconfig v0.0.0-20180418120404-b67861b076c9
 	github.com/getsentry/sentry-go v0.5.1
 	github.com/go-mail/mail v2.3.1+incompatible
-	github.com/golang/protobuf v1.3.5 // indirect
 	github.com/gorilla/mux v1.7.4
-	github.com/gorilla/securecookie v1.1.1
 	github.com/hako/durafmt v0.0.0-20200605151348-3a43fc422dd9
 	github.com/jinzhu/gorm v1.9.12
-	github.com/magiconair/properties v1.8.1
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible
-	github.com/mitchellh/mapstructure v1.2.2 // indirect
-	github.com/pelletier/go-toml v1.7.0 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v0.9.3
-	github.com/russross/blackfriday/v2 v2.0.1
-	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/afero v1.2.2 // indirect
-	github.com/spf13/cast v1.3.1 // indirect
+	github.com/pquerna/cachecontrol v0.0.0-20200819021114-67c6ae64274f // indirect
+	github.com/prometheus/client_golang v1.1.0
+	github.com/sirupsen/logrus v1.5.0
 	github.com/spf13/cobra v1.0.0
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.6.3
-	github.com/stretchr/testify v1.5.1
+	github.com/statping/emails v1.0.0
+	github.com/stretchr/testify v1.6.1
 	github.com/t-tiger/gorm-bulk-insert/v2 v2.0.1
-	golang.org/x/crypto v0.0.0-20200406173513-056763e48d71
-	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b // indirect
-	golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be
-	golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 // indirect
-	golang.org/x/text v0.3.2 // indirect
-	google.golang.org/grpc v1.28.0
-	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
-	gopkg.in/ini.v1 v1.55.0 // indirect
-	gopkg.in/mail.v2 v2.3.1 // indirect
+	github.com/tensorflow/tensorflow v2.3.0+incompatible // indirect
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
+	google.golang.org/grpc v1.28.1
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/yaml.v2 v2.2.8
+	gorm.io/driver/mysql v1.0.1
+	gorm.io/driver/postgres v1.0.0
+	gorm.io/driver/sqlite v1.1.1
+	gorm.io/gorm v1.20.0
+	gorm.io/plugin/dbresolver v1.0.0
 )
diff --git a/go.sum b/go.sum
index 892d8179..c49f49fe 100755
--- a/go.sum
+++ b/go.sum
@@ -1,8 +1,75 @@
 cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0 h1:WRz29PgAsVEyPSDHyk+0fpEkwEFyfhHn+JbksT6gIL4=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
+github.com/Azure/azure-sdk-for-go v32.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/azure-sdk-for-go v41.3.0+incompatible h1:W5px0x53aa47nmIAuF1XWR1ZzFuUnkJBGUuzHnNp+Nk=
+github.com/Azure/azure-sdk-for-go v41.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/go-autorest/autorest v0.1.0/go.mod h1:AKyIcETwSUFxIcs/Wnq/C+kwCtlEYGUVd7FPNb2slmg=
+github.com/Azure/go-autorest/autorest v0.5.0/go.mod h1:9HLKlQjVBH6U3oDfsXOeVc56THsLPw1L03yban4xThw=
+github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
+github.com/Azure/go-autorest/autorest v0.9.3/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0=
+github.com/Azure/go-autorest/autorest v0.10.0 h1:mvdtztBqcL8se7MdrUweNieTNi4kfNG6GOJuurQJpuY=
+github.com/Azure/go-autorest/autorest v0.10.0/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630=
+github.com/Azure/go-autorest/autorest/adal v0.1.0/go.mod h1:MeS4XhScH55IST095THyTxElntu7WqB7pNbZo8Q5G3E=
+github.com/Azure/go-autorest/autorest/adal v0.2.0/go.mod h1:MeS4XhScH55IST095THyTxElntu7WqB7pNbZo8Q5G3E=
+github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
+github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc=
+github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
+github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
+github.com/Azure/go-autorest/autorest/adal v0.8.3 h1:O1AGG9Xig71FxdX9HO5pGNyZ7TbSyHaVg+5eJO/jSGw=
+github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
+github.com/Azure/go-autorest/autorest/azure/auth v0.1.0/go.mod h1:Gf7/i2FUpyb/sGBLIFxTBzrNzBo7aPXXE3ZVeDRwdpM=
+github.com/Azure/go-autorest/autorest/azure/auth v0.4.2 h1:iM6UAvjR97ZIeR93qTcwpKNMpV+/FTWjwEbuPD495Tk=
+github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod h1:90gmfKdlmKgfjUpnCEpOJzsUEjrWDSLwHIG73tSXddM=
+github.com/Azure/go-autorest/autorest/azure/cli v0.1.0/go.mod h1:Dk8CUAt/b/PzkfeRsWzVG9Yj3ps8mS8ECztu43rdU8U=
+github.com/Azure/go-autorest/autorest/azure/cli v0.3.1 h1:LXl088ZQlP0SBppGFsRZonW6hSvwgL5gRByMbvUbx8U=
+github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod h1:ZG5p860J94/0kI9mNJVoIoLgXcirM2gF5i2kWloofxw=
+github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
+github.com/Azure/go-autorest/autorest/date v0.2.0 h1:yW+Zlqf26583pE43KhfnhFcdmSWlm5Ew6bxipnr/tbM=
+github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g=
+github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/autorest/mocks v0.3.0 h1:qJumjCaCudz+OcqE9/XtEPfvtOjOmKaui4EOpFI6zZc=
+github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM=
+github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc=
+github.com/Azure/go-autorest/autorest/to v0.3.0 h1:zebkZaadz7+wIQYgC7GXaz3Wb28yKYfVkkBKwc38VF8=
+github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA=
+github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8=
+github.com/Azure/go-autorest/autorest/validation v0.2.0 h1:15vMO4y76dehZSq7pAaOLQxC6dZYsSrj2GQpflyM/L4=
+github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI=
+github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY=
+github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
+github.com/Azure/go-autorest/tracing v0.1.0/go.mod h1:ROEEAFwXycQw7Sn3DXNtEedEvdeRAgDr0izn4z5Ij88=
+github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k=
+github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw=
 github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w=
 github.com/DATA-DOG/go-sqlmock v1.4.1 h1:ThlnYciV1iM/V0OSF/dtkqWb6xo5qITT1TJBG1MRDJM=
@@ -14,34 +81,68 @@ github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtix
 github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
 github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87 h1:xPMsUicZ3iosVPSIP7bW5EcGUzjiiMl1OYTe14y/R24=
+github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87/go.mod h1:iGLljf5n9GjT6kc0HBvyI1nOKnGQbNB66VzSNbK5iks=
+github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398 h1:WDC6ySpJzbxGWFh4aMxFFC28wwGp5pEuoTtvA4q/qQ4=
 github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
+github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
+github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
+github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.8/go.mod h1:aVvklgKsPENRkl29bNwrHISa1F+YLGTHArMxZMBqWM8=
+github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.11 h1:QGjNHMwoPYxE5NpOAc8kpd2KTY293/oFk5BWdjkza+k=
+github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.11/go.mod h1:L+HB2uBoDgi3+r1pJEJcbGwyyHhd2QXaGsKLbDwtm8Q=
 github.com/akavel/rsrc v0.8.0 h1:zjWn7ukO9Kc5Q62DOJCcxGpXC18RawVtYAGdz2aLlfw=
 github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/ararog/timeago v0.0.0-20160328174124-e9969cf18b8d h1:ZX0t+GA3MWiP7LWt5xWOphWRQd5JwL4VW5uLW83KM8g=
-github.com/ararog/timeago v0.0.0-20160328174124-e9969cf18b8d/go.mod h1:EcJ034SpbWy4heOSDiBZJRn3b5wKJM1b4sFfYeVAkI4=
+github.com/aliyun/alibaba-cloud-sdk-go v1.61.112/go.mod h1:pUKYbK5JQ+1Dfxk80P0qxGqe5dkxDoabbZS7zOcouyA=
+github.com/aliyun/alibaba-cloud-sdk-go v1.61.131 h1:ePFkFbwr/u1HM9/p+azqI5UaxwY1hYKv+H8dkaRCLs4=
+github.com/aliyun/alibaba-cloud-sdk-go v1.61.131/go.mod h1:pUKYbK5JQ+1Dfxk80P0qxGqe5dkxDoabbZS7zOcouyA=
+github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
+github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/aws/aws-sdk-go v1.30.20 h1:ktsy2vodSZxz/arYqo7DlpkIeNohHL+4Rmjdo7YGtrE=
+github.com/aws/aws-sdk-go v1.30.20/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/cenkalti/backoff/v4 v4.0.0/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg=
+github.com/cenkalti/backoff/v4 v4.0.2 h1:JIufpQLbh4DkbQoii76ItQIUFzevQSqOLZca4eamEDs=
+github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg=
+github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudflare/cloudflare-go v0.10.2/go.mod h1:qhVI5MKwBGhdNU89ZRz2plgYutcJ5PCekLxXn56w6SY=
+github.com/cloudflare/cloudflare-go v0.11.6 h1:gErXaYucoS8aHdmoJnF4RMFiXJH449sk6rCtoP6EhrE=
+github.com/cloudflare/cloudflare-go v0.11.6/go.mod h1:lmCbgQdBeSQlMv0W0OSqoGgl8aFrgc5oXHhWMt47dh0=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
+github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk=
+github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/cpu/goacmedns v0.0.2 h1:hYAgjnPu7HogTgb8trqQouR/RrBgXq1TPBgmxbK9eRA=
+github.com/cpu/goacmedns v0.0.2/go.mod h1:4MipLkI+qScwqtVxcNO6okBhbgRrr7/tKXUSgSL0teQ=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/daaku/go.zipexe v1.0.0 h1:VSOgZtH418pH9L16hC/JrgSNJbbAL26pj7lmD1+CGdY=
 github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E=
@@ -57,19 +158,35 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
+github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TRo4=
+github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
+github.com/dnaeon/go-vcr v0.0.0-20180814043457-aafff18a5cc2/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
+github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
+github.com/dnsimple/dnsimple-go v0.60.0 h1:N+q+ML1CZGf+5r4udu9Opy7WJNtOaFT9aM86Af9gLhk=
+github.com/dnsimple/dnsimple-go v0.60.0/go.mod h1:O5TJ0/U6r7AfT8niYNlmohpLbCSG+c71tQlGr9SeGrg=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
+github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
+github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y=
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
 github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
+github.com/exoscale/egoscale v0.18.1 h1:1FNZVk8jHUx0AvWhOZxLEDNlacTU0chMXUUNkm9EZaI=
+github.com/exoscale/egoscale v0.18.1/go.mod h1:Z7OOdzzTOz1Q1PjQXumlz9Wn/CddH0zSYdCF3rnBKXE=
 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA=
+github.com/foomo/simplecert v1.7.5 h1:5654G52nAaFGdIjQsjCbccqkQraN9oa2qvh4Ugtc+rM=
+github.com/foomo/simplecert v1.7.5/go.mod h1:RojYROT3nMm8GtJZAPUz0sM5YuSQ/6MIdZvtLTqsxbc=
+github.com/foomo/tlsconfig v0.0.0-20180418120404-b67861b076c9 h1:RPOsDNbnDUFaSt/3bCxUsaGCJsKqA6dGubevl20nE9g=
+github.com/foomo/tlsconfig v0.0.0-20180418120404-b67861b076c9/go.mod h1:OdiGKKgTAfMv7x9Hh9qYFueue77tr09LUAxwy2+M8wY=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
@@ -80,15 +197,26 @@ github.com/getsentry/sentry-go v0.5.1/go.mod h1:B8H7x8TYDPkeWPRzGpIiFO97LZP6rL8A
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
 github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
+github.com/go-acme/lego/v3 v3.7.0 h1:qC5/8/CbltyAE8fGLE6bGlqucj7pXc/vBxiLwLOsmAQ=
+github.com/go-acme/lego/v3 v3.7.0/go.mod h1:4eDjjYkAsDXyNcwN8IhhZAwxz9Ltiks1Zmpv0q20J7A=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
+github.com/go-cmd/cmd v1.0.5/go.mod h1:y8q8qlK5wQibcw63djSl/ntiHUHXHGdCkPk0j4QeW4s=
 github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
+github.com/go-errors/errors v1.0.2 h1:xMxH9j2fNg/L4hLn/4y3M0IUsn0M6Wbu/Uh9QlOfBh4=
+github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-mail/mail v2.3.1+incompatible h1:UzNOn0k5lpfVtO31cK3hn6I4VEVGhe3lX8AJBAxXExM=
 github.com/go-mail/mail v2.3.1+incompatible/go.mod h1:VPWjmmNyRsWXQZHVHT3g0YbIINUkSmuKOiLIDkWbL6M=
 github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
+github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8=
+github.com/go-resty/resty/v2 v2.2.0 h1:vgZ1cdblp8Aw4jZj3ZsKh6yKAlMg3CHMrqFSFFd+jgY=
+github.com/go-resty/resty/v2 v2.2.0/go.mod h1:nYW/8rxqQCmI3bPz9Fsmjbr2FBjGuR2Mzt6kDh3zZ7w=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
@@ -97,44 +225,101 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
+github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
 github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/gomarkdown/markdown v0.0.0-20200820230800-3724143f5294 h1:rSb2ZQZ3B1rlWBWamxobyn0jTuGZHbPO5Rmjw48uWRM=
+github.com/gomarkdown/markdown v0.0.0-20200820230800-3724143f5294/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU=
 github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/gophercloud/gophercloud v0.3.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
+github.com/gophercloud/gophercloud v0.10.0 h1:Et+UGxoD72pK6K+46uOwyVxbtXJ6KBkWAegXBmqlf6c=
+github.com/gophercloud/gophercloud v0.10.0/go.mod h1:gmC5oQqMDOMO1t1gq5DquX/yAU808e/4mzjjDA76+Ss=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
 github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
-github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
+github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
 github.com/hako/durafmt v0.0.0-20200605151348-3a43fc422dd9 h1:IEhIezS5kcD4ZzOwVl8dAyJ9JCi4Xo6tg44Vj/z7UsI=
 github.com/hako/durafmt v0.0.0-20200605151348-3a43fc422dd9/go.mod h1:5Scbynm8dF1XAPwIwkGPqzkM/shndPm79Jd1003hTjE=
+github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
+github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxCsHI=
+github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
+github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM=
+github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df h1:MZf03xP9WdakyXhOWuAD5uPK3wHh96wCsqe3hCMKh8E=
+github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df/go.mod h1:QMZY7/J/KSQEhKWFeDesPjMj+wCHReeknARU3wqlyN4=
 github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
@@ -145,6 +330,56 @@ github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/
 github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI=
 github.com/iris-contrib/schema v0.0.1 h1:10g/WnoRR+U+XXHWKBHeNy/+tZmM2kcAVGLOsz+yaDA=
 github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw=
+github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
+github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
+github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
+github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
+github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
+github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
+github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
+github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
+github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk=
+github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
+github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
+github.com/jackc/pgconn v1.6.4 h1:S7T6cx5o2OqmxdHaXLH1ZeD1SbI8jBznyYE9Ec0RCQ8=
+github.com/jackc/pgconn v1.6.4/go.mod h1:w2pne1C2tZgP+TvjqLpOigGzNqjBgQW9dUw/4Chex78=
+github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
+github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
+github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
+github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
+github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
+github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
+github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
+github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
+github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.0.2 h1:q1Hsy66zh4vuNsajBUF2PNqfAMMfxU5mk594lPE9vjY=
+github.com/jackc/pgproto3/v2 v2.0.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
+github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=
+github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
+github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
+github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
+github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
+github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0=
+github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po=
+github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ=
+github.com/jackc/pgtype v1.4.2 h1:t+6LWm5eWPLX1H5Se702JSBcirq6uWa4jiG4wV1rAWY=
+github.com/jackc/pgtype v1.4.2/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=
+github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
+github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
+github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
+github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA=
+github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o=
+github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg=
+github.com/jackc/pgx/v4 v4.8.1 h1:SUbCLP2pXvf/Sr/25KsuI4aTxiFYIvpfk4l6aTSdyCw=
+github.com/jackc/pgx/v4 v4.8.1/go.mod h1:4HOLxrl8wToZJReD04/yB20GDwf4KBYETvlHciCnwW0=
+github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jinzhu/gorm v1.9.12 h1:Drgk1clyWT9t9ERbzHza6Mj/8FY/CqMyVzOiHviMo6Q=
@@ -155,10 +390,18 @@ github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M=
 github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E=
 github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc=
+github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q=
@@ -174,36 +417,70 @@ github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6i
 github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d h1:V5Rs9ztEWdp58oayPq/ulmlqJJZeJP6pP79uP3qjcao=
 github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.9.0 h1:GhthINjveNZAdFUD8QoQYfjxnOONZgztK/Yr6M23UTY=
 github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
+github.com/kolo/xmlrpc v0.0.0-20190717152603-07c4ee3fd181/go.mod h1:o03bZfuBwAXHetKXuInt4S7omeXUu62/A845kiycsSQ=
+github.com/kolo/xmlrpc v0.0.0-20200310150728-e0350524596b h1:DzHy0GlWeF0KAglaTMY7Q+khIFoG8toHP+wLFBVBQJc=
+github.com/kolo/xmlrpc v0.0.0-20200310150728-e0350524596b/go.mod h1:o03bZfuBwAXHetKXuInt4S7omeXUu62/A845kiycsSQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/labbsr0x/bindman-dns-webhook v1.0.2 h1:I7ITbmQPAVwrDdhd6dHKi+MYJTJqPCK0jE6YNBAevnk=
+github.com/labbsr0x/bindman-dns-webhook v1.0.2/go.mod h1:p6b+VCXIR8NYKpDr8/dg1HKfQoRHCdcsROXKvmoehKA=
+github.com/labbsr0x/goh v1.0.1 h1:97aBJkDjpyBZGPbQuOK5/gHcSFbcr5aRsq3RSRJFpPk=
+github.com/labbsr0x/goh v1.0.1/go.mod h1:8K2UhVoaWXcCU7Lxoa2omWnC8gyW8px7/lmO61c027w=
 github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
+github.com/lextoumbourou/goodhosts v2.1.0+incompatible h1:1U1p5Z1wrXl23/fW/GY4zdTbQ8UJbyvrkPbqAZ6tzbw=
+github.com/lextoumbourou/goodhosts v2.1.0+incompatible/go.mod h1:89s48k108X3gKDWn8AHk3gUzUGTcMZCCAOsE4QU1bbo=
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/linode/linodego v0.10.0/go.mod h1:cziNP7pbvE3mXIPneHj0oRY8L1WtGEIKlZ8LANE4eXA=
+github.com/linode/linodego v0.14.0 h1:0APKMjiVGyry2TTUVDiok72H6cWpFNMMrFWBFn14aFU=
+github.com/linode/linodego v0.14.0/go.mod h1:2ce3S00NrDqJfp4i55ZuSlT0U3cKNELNYACWBPI8Tnw=
+github.com/liquidweb/liquidweb-go v1.6.0/go.mod h1:UDcVnAMDkZxpw4Y7NOHkqoeiGacVLEIG/i5J9cyixzQ=
+github.com/liquidweb/liquidweb-go v1.6.1 h1:O51RbJo3ZEWFkZFfP32zIF6MCoZzwuuybuXsvZvVEEI=
+github.com/liquidweb/liquidweb-go v1.6.1/go.mod h1:UDcVnAMDkZxpw4Y7NOHkqoeiGacVLEIG/i5J9cyixzQ=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
+github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
+github.com/mattn/go-sqlite3 v1.14.2/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
 github.com/mattn/go-sqlite3 v2.0.1+incompatible h1:xQ15muvnzGBHpIpdrNi1DA5x0+TcBZzsIDwmw9uTHzw=
 github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE=
 github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -211,8 +488,12 @@ github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.
 github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ=
 github.com/microcosm-cc/bluemonday v1.0.2 h1:5lPfLTTAvAbtS0VqT+94yOtFnGfUWYyx0+iToC3Os3s=
 github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
+github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
+github.com/miekg/dns v1.1.29 h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg=
+github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed/go.mod h1:3rdaFaCv4AyBgu5ALFM0+tSuHrBh6v692nyQe3ikrq0=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.2.2 h1:dxe5oCinTXiTIcfgmZecdCzPmAJKd46KsCWc35r0TV4=
@@ -225,21 +506,46 @@ github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04 h1:o6uBwrhM5C8Ll3MAAxrQxRHEu7FkapwTuI2WmL1rw4g=
+github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04/go.mod h1:5sN+Lt1CaY4wsPvgQH/jsuJi4XO2ssZbdsIizr4CVC8=
 github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM=
 github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
+github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4=
+github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229 h1:E2B8qYyeSgv5MXpmzZXRNp8IAQ4vjxIjhpAf5hv/tAg=
 github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E=
+github.com/nrdcg/auroradns v1.0.1 h1:m/kBq83Xvy3cU261MOknd8BdnOk12q4lAWM+kOdsC2Y=
+github.com/nrdcg/auroradns v1.0.1/go.mod h1:y4pc0i9QXYlFCWrhWrUSIETnZgrf4KuwjDIWmmXo3JI=
+github.com/nrdcg/dnspod-go v0.4.0 h1:c/jn1mLZNKF3/osJ6mz3QPxTudvPArXTjpkmYj0uK6U=
+github.com/nrdcg/dnspod-go v0.4.0/go.mod h1:vZSoFSFeQVm2gWLMkyX61LZ8HI3BaqtHZWgPTGKr6KQ=
+github.com/nrdcg/goinwx v0.6.1 h1:AJnjoWPELyCtofhGcmzzcEMFd9YdF2JB/LgutWsWt/s=
+github.com/nrdcg/goinwx v0.6.1/go.mod h1:XPiut7enlbEdntAqalBIqcYcTEVhpv/dKWgDCX2SwKQ=
+github.com/nrdcg/namesilo v0.2.1 h1:kLjCjsufdW/IlC+iSfAqj0iQGgKjlbUUeDJio5Y6eMg=
+github.com/nrdcg/namesilo v0.2.1/go.mod h1:lwMvfQTyYq+BbjJd30ylEG4GPSS6PII0Tia4rRpRiyw=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
+github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
+github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
+github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/oracle/oci-go-sdk v17.4.0+incompatible h1:W9yFhlwQ9+p0mE2oPrS++v821eIT17gTUpJXkmGZb9o=
+github.com/oracle/oci-go-sdk v17.4.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
+github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014 h1:37VE5TYj2m/FLA9SNr4z0+A0JefvTmR60Zwf8XSEV7c=
+github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ=
+github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
+github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
 github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -248,34 +554,68 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pquerna/cachecontrol v0.0.0-20200819021114-67c6ae64274f h1:JDEmUDtyiLMyMlFwiaDOv2hxUp35497fkwePcLeV7j4=
+github.com/pquerna/cachecontrol v0.0.0-20200819021114-67c6ae64274f/go.mod h1:hoLfEwdY11HjRfKFH6KqnPsfxlo3BP6bJehpDv8t6sQ=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v0.9.3 h1:9iH4JKXLzFbOAdtqv/a+j8aewx2Y8lAjAydhbaScPF8=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.1.0 h1:BQ53HtBmfOitExawJ6LokA4x8ov/z0SYYb0+HxJfRI8=
+github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.0 h1:7etb9YClo3a6HjLzfl6rIQaU+FDfi0VSX39io3aQ+DM=
 github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.6.0 h1:kRhiuYSXR3+uv2IbVbZhUxK5zVD/2pp3Gd2PpvPkpEo=
+github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084 h1:sofwID9zm4tzrgykg80hfFph1mryUeLRsUfoocVVmRY=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE=
+github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2/go.mod h1:7tZKcyumwBO6qip7RNQ5r77yrssm9bfCowcLEBcU5IA=
+github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
+github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
+github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/sacloud/libsacloud v1.26.1/go.mod h1:79ZwATmHLIFZIMd7sxA3LwzVy/B77uj3LDoToVTxDoQ=
+github.com/sacloud/libsacloud v1.36.1 h1:tCpFjWsvu/2Im8/SDmRZ49SttVXy7nHerobRc1LU9pI=
+github.com/sacloud/libsacloud v1.36.1/go.mod h1:P7YAOVmnIn3DKHqCZcUKYUXmSwGBm3yS7IBEjKVSrjg=
+github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
+github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
+github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
+github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
+github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -304,22 +644,44 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/spf13/viper v1.6.3 h1:pDDu1OyEDTKzpJwdq4TiuLyMsUgRa/BT5cn5O62NoHs=
 github.com/spf13/viper v1.6.3/go.mod h1:jUMtyi0/lB5yZH/FjyGAoH7IMNrIhlBf6pXZmbMDvzw=
+github.com/statping/emails v1.0.0 h1:90hGweEhr8wIFiy34KCkiFqGJlkug2gAQLVR6oSCFNU=
+github.com/statping/emails v1.0.0/go.mod h1:xFU85jXaiWQadqHqu/jDrGsAn6WPSk1WgKyTVuFm0TI=
+github.com/statping/statping v0.90.64/go.mod h1:lbyNPB73IjWtnommV4wSejYfgUT1yLhhqelMjl1ZBb8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/t-tiger/gorm-bulk-insert/v2 v2.0.1 h1:HGVkRrwDCbmSP6h1CoBDj6l/mhnvsP5JbYaQ4ss0R6o=
 github.com/t-tiger/gorm-bulk-insert/v2 v2.0.1/go.mod h1:I3xbaE9ud9/TEXzehwkHx86SyJwqeSNsX2X5oV61jIg=
+github.com/tdewolff/minify/v2 v2.8.0 h1:t3tOPWkTpKhsgxm3IM9Sy8hE2eIt30Oaa+2havJGGIE=
+github.com/tdewolff/minify/v2 v2.8.0/go.mod h1:6zN8VLhMfFxNrwHROcboYNo2+huPNu4SV8DPh3PUQ8E=
+github.com/tdewolff/parse/v2 v2.4.4 h1:uMdbQRtYbKR/msP9CbI7li9wK6pionYiH6s7ipltyGY=
+github.com/tdewolff/parse/v2 v2.4.4/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho=
+github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
+github.com/tensorflow/tensorflow v1.15.3 h1:xE0S0nl5ZTJPyvHm9jisVaovZWVSj58eWJz637ASW7Q=
+github.com/tensorflow/tensorflow v2.3.0+incompatible h1:FbjZGMOzvKFeLAnToZb+J7PJEpki6Ee1uC1w07cu/yI=
+github.com/tensorflow/tensorflow v2.3.0+incompatible/go.mod h1:itOSERT4trABok4UOoG+X4BoKds9F3rIsySdn+Lvu90=
+github.com/timewasted/linode v0.0.0-20160829202747-37e84520dcf7 h1:CpHxIaZzVy26GqJn8ptRyto8fuoYOd1v0fXm9bG3wQ8=
+github.com/timewasted/linode v0.0.0-20160829202747-37e84520dcf7/go.mod h1:imsgLplxEC/etjIhdr3dNzV3JeT27LbVu5pYWm0JCBY=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/transip/gotransip/v6 v6.0.2 h1:rOCMY607PYF+YvMHHtJt7eZRd0mx/uhyz6dsXWPmn+4=
+github.com/transip/gotransip/v6 v6.0.2/go.mod h1:pQZ36hWWRahCUXkFWlx9Hs711gLd8J4qdgLdRzmtY+g=
+github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
+github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli v1.22.3/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
@@ -327,6 +689,13 @@ github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBn
 github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
+github.com/vultr/govultr v0.1.4/go.mod h1:9H008Uxr/C4vFNGLqKx232C206GL0PBHzOP0809bGNA=
+github.com/vultr/govultr v0.3.3 h1:fVaF4h9u3VzTXxFsxvgBUCiM52EiahLqAPkizamLzYM=
+github.com/vultr/govultr v0.3.3/go.mod h1:TUuUizMOFc7z+PNMssb6iGjKjQfpw5arIaOLfocVudQ=
+github.com/wellington/go-libsass v0.9.2 h1:6Ims04UDdBs6/CGSVK5JC8FNikR5ssrsMMKE/uaO5Q8=
+github.com/wellington/go-libsass v0.9.2/go.mod h1:mxgxgam0N0E+NAUMHLcu20Ccfc3mVpDkyrLDayqfiTs=
+github.com/wellington/sass v0.0.0-20160911051022-cab90b3986d6 h1:qPS12y9iMXyKr2flmOG7RgiyUGkQxQibp1hx7uug9IQ=
+github.com/wellington/sass v0.0.0-20160911051022-cab90b3986d6/go.mod h1:ncYBwTYUjmb7N+sZbf8WJYynLivoqFL+U2f8uOX2Yzk=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
@@ -336,88 +705,309 @@ github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmv
 github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
 github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
+go.uber.org/ratelimit v0.0.0-20180316092928-c15da0234277/go.mod h1:2X8KaoNd1J0lZV+PxJk/5+DGbO/tpwLR1m++a7FnB/Y=
+go.uber.org/ratelimit v0.1.0 h1:U2AruXqeTb4Eh9sYQSTrMhH8Cb7M0Ian2ibBOnBcnAw=
+go.uber.org/ratelimit v0.1.0/go.mod h1:2X8KaoNd1J0lZV+PxJk/5+DGbO/tpwLR1m++a7FnB/Y=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
+go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=
+golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
+golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200406173513-056763e48d71 h1:DOmugCavvUtnUD114C1Wh+UgTgQZ4pMLzXxi1pSt+/Y=
 golang.org/x/crypto v0.0.0-20200406173513-056763e48d71/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200420201142-3c4aac89819a h1:y6sBfNd1b9Wy08a6K1Z1DZc4aXABUN5TKjkYhz7UKmo=
+golang.org/x/crypto v0.0.0-20200420201142-3c4aac89819a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180611182652-db08ff08e862/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190930134127-c5a3c61f89f3/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180622082034-63fc586f45fe/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 h1:opSr2sbRXk5X5/givKrrKj9HXxFpW2sdCiP8MJSKLQY=
-golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f h1:gWF768j/LaZugp8dyS4UwsslYCYz9XgFxvlgsn0n9H8=
+golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c=
+golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI=
+golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4 h1:kDtqNkeBrZb8B+atrj50B5XLHpzXXqcCdZPP/ApQ5NY=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.21.0 h1:zS+Q/CJJnVlXpXQVIz+lH0ZT2lBuT2ac7XD8Y/3w6hY=
+google.golang.org/api v0.21.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200420144010-e5e8543f8aeb h1:nAFaltAMbNVA0rixtwvdnqgSVLX3HFUUvMkEklmzbYM=
+google.golang.org/genproto v0.0.0-20200420144010-e5e8543f8aeb/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4=
 google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.28.1 h1:C1QC6KzgSiLyBabDi87BbjaGreoRgGUF5nOyvfrAZ1k=
+google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0 h1:qdOKuR/EIArgaWNjetjgTzgVTAZ+S/WXVrq9HW9zimw=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
@@ -425,13 +1015,20 @@ gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
+gopkg.in/h2non/gock.v1 v1.0.15 h1:SzLqcIlb/fDfg7UvukMpNcWsu7sI5tWwL+KCATZqks0=
+gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE=
+gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
+gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.55.0 h1:E8yzL5unfpW3M6fz/eB7Cb5MQAYSZ7GKo4Qth+N2sgQ=
 gopkg.in/ini.v1 v1.55.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mail.v2 v2.3.1 h1:WYFn/oANrAGP2C0dcV6/pbkPzv8yGzqTjPmTeO7qoXk=
@@ -439,13 +1036,42 @@ gopkg.in/mail.v2 v2.3.1/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw=
 gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/ns1/ns1-go.v2 v2.0.0-20190730140822-b51389932cbc/go.mod h1:VV+3haRsgDiVLxyifmMBrBIuCWFBPYKbRssXB9z67Hw=
+gopkg.in/ns1/ns1-go.v2 v2.3.0 h1:do9yiDbSfrxpqEnsxBmpxA2DC0fMcRobdXUmI2K+Fkw=
+gopkg.in/ns1/ns1-go.v2 v2.3.0/go.mod h1:GMnKY+ZuoJ+lVLL+78uSTjwTz2jMazq6AfGKQOYhsPk=
+gopkg.in/resty.v1 v1.9.1/go.mod h1:vo52Hzryw9PnPHcJfPsBiFW62XhNx5OczbV9y+IMpgc=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
+gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/square/go-jose.v2 v2.5.0 h1:OZ4sdq+Y+SHfYB7vfthi1Ei8b0vkP8ZPQgUfUwdUSqo=
+gopkg.in/square/go-jose.v2 v2.5.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/driver/mysql v1.0.1 h1:omJoilUzyrAp0xNoio88lGJCroGdIOen9hq2A/+3ifw=
+gorm.io/driver/mysql v1.0.1/go.mod h1:KtqSthtg55lFp3S5kUXqlGaelnWpKitn4k1xZTnoiPw=
+gorm.io/driver/postgres v1.0.0 h1:Yh4jyFQ0a7F+JPU0Gtiam/eKmpT/XFc1FKxotGqc6FM=
+gorm.io/driver/postgres v1.0.0/go.mod h1:wtMFcOzmuA5QigNsgEIb7O5lhvH1tHAF1RbWmLWV4to=
+gorm.io/driver/sqlite v1.1.1 h1:qtWqNAEUyi7gYSUAJXeiAMz0lUOdakZF5ia9Fqnp5G4=
+gorm.io/driver/sqlite v1.1.1/go.mod h1:hm2olEcl8Tmsc6eZyxYSeznnsDaMqamBvEXLNtBg4cI=
+gorm.io/gorm v1.9.19 h1:NMrwpxOZIHWJEFzZ0MM8PdYlcXyKLaXTHWfpDEDdBNg=
+gorm.io/gorm v1.9.19/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+gorm.io/gorm v1.20.0 h1:qfIlyaZvrF7kMWY3jBdEBXkXJ2M5MFYMTppjILxS3fQ=
+gorm.io/gorm v1.20.0/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+gorm.io/plugin/dbresolver v1.0.0 h1:fHIWRRkoDmXkBPYyg9GMmLugcM9fcbZiG0Zy/cwiPlM=
+gorm.io/plugin/dbresolver v1.0.0/go.mod h1:sK1Alv120lfrjRQXrzyAw4ssxDPJjamm2cbBOZBHM68=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/handlers/api.go b/handlers/api.go
index c5acf04e..9e19fd30 100644
--- a/handlers/api.go
+++ b/handlers/api.go
@@ -3,6 +3,7 @@ package handlers
 import (
 	"fmt"
 	"github.com/statping/statping/types/checkins"
+	"github.com/statping/statping/types/configs"
 	"github.com/statping/statping/types/core"
 	"github.com/statping/statping/types/errors"
 	"github.com/statping/statping/types/groups"
@@ -31,10 +32,12 @@ func apiIndexHandler(r *http.Request) interface{} {
 }
 
 func apiRenewHandler(w http.ResponseWriter, r *http.Request) {
-	var err error
-	core.App.ApiSecret = utils.NewSHA256Hash()
-	err = core.App.Update()
-	if err != nil {
+	newApi := utils.Params.GetString("API_SECRET")
+	if newApi == "" {
+		newApi = utils.NewSHA256Hash()
+	}
+	core.App.ApiSecret = newApi
+	if err := core.App.Update(); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
@@ -88,10 +91,22 @@ func apiCoreHandler(w http.ResponseWriter, r *http.Request) {
 	if c.Domain != app.Domain {
 		app.Domain = c.Domain
 	}
+	if c.Language != app.Language {
+		app.Language = c.Language
+	}
+	utils.Params.Set("LANGUAGE", app.Language)
 	app.UseCdn = null.NewNullBool(c.UseCdn.Bool)
 	app.AllowReports = null.NewNullBool(c.AllowReports.Bool)
-	utils.SentryInit(nil, app.AllowReports.Bool)
-	err = app.Update()
+	utils.SentryInit(app.AllowReports.Bool)
+	if err := app.Update(); err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+	if err := configs.Save(); err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+
 	returnJson(core.App, w, r)
 }
 
diff --git a/handlers/api_test.go b/handlers/api_test.go
index 6fcb1550..d3745f84 100644
--- a/handlers/api_test.go
+++ b/handlers/api_test.go
@@ -9,12 +9,15 @@ import (
 	_ "github.com/statping/statping/notifiers"
 	"github.com/statping/statping/source"
 	"github.com/statping/statping/types"
+	"github.com/statping/statping/types/checkins"
 	"github.com/statping/statping/types/core"
 	"github.com/statping/statping/types/groups"
+	"github.com/statping/statping/types/messages"
 	"github.com/statping/statping/types/services"
 	"github.com/statping/statping/types/users"
 	"github.com/statping/statping/utils"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -32,7 +35,7 @@ func init() {
 	utils.InitLogs()
 	source.Assets()
 	dir = utils.Directory
-	core.New("test")
+	core.New("test", "testcommithere")
 }
 
 func TestFailedHTTPServer(t *testing.T) {
@@ -112,6 +115,9 @@ func TestSetupRoutes(t *testing.T) {
 				if !core.App.Setup {
 					return errors.New("core has not been setup")
 				}
+				if core.App.ApiSecret == "" {
+					return errors.New("API Key has not been set")
+				}
 				if len(services.AllInOrder()) == 0 {
 					return errors.New("no services where found")
 				}
@@ -202,12 +208,6 @@ func TestMainApiRoutes(t *testing.T) {
 				return nil
 			},
 		},
-		{
-			Name:           "404 Error Page",
-			URL:            "/api/missing_404_page",
-			Method:         "GET",
-			ExpectedStatus: 404,
-		},
 		{
 			Name:             "Health Check endpoint",
 			URL:              "/health",
@@ -251,6 +251,32 @@ func TestMainApiRoutes(t *testing.T) {
 				`go_threads`,
 			},
 		},
+		{
+			Name:           "Index Page",
+			URL:            "/",
+			Method:         "GET",
+			ExpectedStatus: 200,
+		},
+		{
+			Name:           "Export Settings",
+			URL:            "/api/settings/export",
+			Method:         "GET",
+			ExpectedStatus: 200,
+			BeforeTest:     SetTestENV,
+			AfterTest:      UnsetTestENV,
+			ResponseFunc: func(r *httptest.ResponseRecorder, t *testing.T, bytes []byte) error {
+				var data ExportData
+				err := json.Unmarshal(r.Body.Bytes(), &data)
+				require.Nil(t, err)
+				assert.Len(t, data.Services, len(services.All()))
+				assert.Len(t, data.Groups, len(groups.All()))
+				assert.Len(t, data.Notifiers, len(services.AllNotifiers()))
+				assert.Len(t, data.Users, len(users.All()))
+				assert.Len(t, data.Messages, len(messages.All()))
+				assert.Len(t, data.Checkins, len(checkins.All()))
+				return nil
+			},
+		},
 	}
 
 	for _, v := range tests {
@@ -264,7 +290,7 @@ func TestMainApiRoutes(t *testing.T) {
 
 type HttpFuncTest func(*testing.T) error
 
-type ResponseFunc func(*testing.T, []byte) error
+type ResponseFunc func(*httptest.ResponseRecorder, *testing.T, []byte) error
 
 // HTTPTest contains all the parameters for a HTTP Unit Test
 type HTTPTest struct {
@@ -350,7 +376,7 @@ func RunHTTPTest(test HTTPTest, t *testing.T) (string, *testing.T, error) {
 		assert.Nil(t, err)
 	}
 	if test.ResponseFunc != nil {
-		err := test.ResponseFunc(t, body)
+		err := test.ResponseFunc(rr, t, body)
 		assert.Nil(t, err)
 	}
 
diff --git a/handlers/cache.go b/handlers/cache.go
index 82de3e60..bc0e7b97 100644
--- a/handlers/cache.go
+++ b/handlers/cache.go
@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"github.com/statping/statping/utils"
+	"net/url"
 	"sync"
 	"time"
 )
@@ -106,6 +107,13 @@ func (s Storage) Delete(key string) {
 func (s Storage) Set(key string, content []byte, duration time.Duration) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
+	u, err := url.Parse(key)
+	if err != nil {
+		return
+	}
+	if u.Query().Get("v") != "" {
+		return
+	}
 	s.items[key] = Item{
 		Content:    content,
 		Expiration: utils.Now().Add(duration).UnixNano(),
diff --git a/handlers/checkin.go b/handlers/checkin.go
index 9783308f..d30a386f 100644
--- a/handlers/checkin.go
+++ b/handlers/checkin.go
@@ -24,8 +24,7 @@ func findCheckin(r *http.Request) (*checkins.Checkin, string, error) {
 }
 
 func apiAllCheckinsHandler(w http.ResponseWriter, r *http.Request) {
-	chks := checkins.All()
-	returnJson(chks, w, r)
+	returnJson(checkins.All(), w, r)
 }
 
 func apiCheckinHandler(w http.ResponseWriter, r *http.Request) {
@@ -39,8 +38,7 @@ func apiCheckinHandler(w http.ResponseWriter, r *http.Request) {
 
 func checkinCreateHandler(w http.ResponseWriter, r *http.Request) {
 	var checkin *checkins.Checkin
-	err := DecodeJSON(r, &checkin)
-	if err != nil {
+	if err := DecodeJSON(r, &checkin); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
@@ -63,22 +61,27 @@ func checkinHitHandler(w http.ResponseWriter, r *http.Request) {
 		sendErrorJson(err, w, r)
 		return
 	}
+	log.Infof("Checking %s was requested", checkin.Name)
+
 	ip, _, _ := net.SplitHostPort(r.RemoteAddr)
 
+	if last := checkin.LastHit(); last == nil {
+		checkin.Start()
+	}
+
 	hit := &checkins.CheckinHit{
 		Checkin:   checkin.Id,
 		From:      ip,
 		CreatedAt: utils.Now(),
 	}
-	log.Infof("Checking %s was requested", checkin.Name)
 
-	err = hit.Create()
-	if err != nil {
+	if err := hit.Create(); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
 	checkin.Failing = false
 	checkin.LastHitTime = utils.Now()
+
 	sendJsonAction(hit.Id, "update", w, r)
 }
 
diff --git a/handlers/checkins_test.go b/handlers/checkins_test.go
index feb86f19..8cc6df11 100644
--- a/handlers/checkins_test.go
+++ b/handlers/checkins_test.go
@@ -45,8 +45,7 @@ func TestApiCheckinRoutes(t *testing.T) {
 			Body: `{
 						"name": "Example Checkin",
 						"service_id": 1,
-						"checkin_interval": 300,
-						"grace_period": 60,
+						"interval": 300,
 						"api_key": "example"
 					}`,
 		},
diff --git a/handlers/dashboard.go b/handlers/dashboard.go
index 915163f8..4d50323d 100644
--- a/handlers/dashboard.go
+++ b/handlers/dashboard.go
@@ -1,12 +1,24 @@
 package handlers
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"github.com/statping/statping/source"
+	"github.com/statping/statping/types/checkins"
+	"github.com/statping/statping/types/configs"
+	"github.com/statping/statping/types/core"
 	"github.com/statping/statping/types/errors"
+	"github.com/statping/statping/types/groups"
+	"github.com/statping/statping/types/incidents"
+	"github.com/statping/statping/types/messages"
+	"github.com/statping/statping/types/notifications"
+	"github.com/statping/statping/types/services"
 	"github.com/statping/statping/types/users"
 	"github.com/statping/statping/utils"
+	"gopkg.in/yaml.v2"
+	"io"
+	"io/ioutil"
 	"net/http"
 	"os"
 )
@@ -33,12 +45,15 @@ func logsHandler(w http.ResponseWriter, r *http.Request) {
 type themeApi struct {
 	Directory string `json:"directory,omitempty"`
 	Base      string `json:"base"`
-	Variables string `json:"variables"`
+	Forms     string `json:"forms"`
+	Layout    string `json:"layout"`
+	Mixins    string `json:"mixins"`
 	Mobile    string `json:"mobile"`
+	Variables string `json:"variables"`
 }
 
 func apiThemeViewHandler(w http.ResponseWriter, r *http.Request) {
-	var base, variables, mobile, dir string
+	var base, forms, layout, mixins, variables, mobile, dir string
 	assets := utils.Directory + "/assets"
 
 	if _, err := os.Stat(assets); err == nil {
@@ -49,10 +64,16 @@ func apiThemeViewHandler(w http.ResponseWriter, r *http.Request) {
 		base, _ = utils.OpenFile(dir + "/scss/base.scss")
 		variables, _ = utils.OpenFile(dir + "/scss/variables.scss")
 		mobile, _ = utils.OpenFile(dir + "/scss/mobile.scss")
+		layout, _ = utils.OpenFile(dir + "/scss/layout.scss")
+		forms, _ = utils.OpenFile(dir + "/scss/forms.scss")
+		mixins, _ = utils.OpenFile(dir + "/scss/mixin.scss")
 	} else {
 		base, _ = source.TmplBox.String("scss/base.scss")
 		variables, _ = source.TmplBox.String("scss/variables.scss")
 		mobile, _ = source.TmplBox.String("scss/mobile.scss")
+		layout, _ = source.TmplBox.String("scss/layout.scss")
+		forms, _ = source.TmplBox.String("scss/forms.scss")
+		mixins, _ = source.TmplBox.String("scss/mixin.scss")
 	}
 
 	resp := &themeApi{
@@ -60,6 +81,9 @@ func apiThemeViewHandler(w http.ResponseWriter, r *http.Request) {
 		Base:      base,
 		Variables: variables,
 		Mobile:    mobile,
+		Layout:    layout,
+		Forms:     forms,
+		Mixins:    mixins,
 	}
 	returnJson(resp, w, r)
 }
@@ -72,19 +96,35 @@ func apiThemeSaveHandler(w http.ResponseWriter, r *http.Request) {
 		sendErrorJson(err, w, r)
 		return
 	}
+	defer r.Body.Close()
+
+	fmt.Println(themes.Variables)
+
 	if err := source.SaveAsset([]byte(themes.Base), "scss/base.scss"); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
+	if err := source.SaveAsset([]byte(themes.Layout), "scss/layout.scss"); err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
 	if err := source.SaveAsset([]byte(themes.Variables), "scss/variables.scss"); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
+	if err := source.SaveAsset([]byte(themes.Forms), "scss/forms.scss"); err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+	if err := source.SaveAsset([]byte(themes.Mixins), "scss/mixin.scss"); err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
 	if err := source.SaveAsset([]byte(themes.Mobile), "scss/mobile.scss"); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
-	if err := source.CompileSASS(source.DefaultScss...); err != nil {
+	if err := source.CompileSASS(); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
@@ -102,14 +142,14 @@ func apiThemeCreateHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	utils.Log.Infof("creating assets in folder: %s/%s", dir, "assets")
 	if err := source.CreateAllAssets(dir); err != nil {
-		log.Errorln(err)
-		sendErrorJson(err, w, r)
-		return
-	}
-	if err := source.CompileSASS(source.DefaultScss...); err != nil {
-		source.CopyToPublic(source.TmplBox, "css", "main.css")
-		source.CopyToPublic(source.TmplBox, "css", "base.css")
-		log.Errorln("Default 'base.css' was inserted because SASS did not work.")
+		if err := source.CopyToPublic(source.TmplBox, "css", "style.css"); err != nil {
+			log.Errorln(err)
+			sendErrorJson(err, w, r)
+			return
+		} else {
+			log.Errorln(err)
+			sendErrorJson(err, w, r)
+		}
 	}
 	resetRouter()
 	sendJsonAction(dir+"/assets", "created", w, r)
@@ -119,9 +159,166 @@ func apiThemeRemoveHandler(w http.ResponseWriter, r *http.Request) {
 	if err := source.DeleteAllAssets(utils.Directory); err != nil {
 		log.Errorln(fmt.Errorf("error deleting all assets %v", err))
 	}
+	resetRouter()
 	sendJsonAction(utils.Directory+"/assets", "deleted", w, r)
 }
 
+type ExportData struct {
+	Config          *configs.DbConfig            `json:"config,omitempty"`
+	Core            *core.Core                   `json:"core"`
+	Services        []services.Service           `json:"services"`
+	Messages        []*messages.Message          `json:"messages"`
+	Incidents       []*incidents.Incident        `json:"incidents"`
+	IncidentUpdates []*incidents.IncidentUpdate  `json:"incident_updates"`
+	Checkins        []*checkins.Checkin          `json:"checkins"`
+	Users           []*users.User                `json:"users"`
+	Groups          []*groups.Group              `json:"groups"`
+	Notifiers       []notifications.Notification `json:"notifiers"`
+}
+
+func (e *ExportData) JSON() []byte {
+	d, _ := json.Marshal(e)
+	return d
+}
+
+func ExportSettings() (*ExportData, error) {
+	var notifiers []notifications.Notification
+	for _, n := range services.AllNotifiers() {
+		notifiers = append(notifiers, *n.Select())
+	}
+
+	data := &ExportData{
+		Core:      core.App,
+		Notifiers: notifiers,
+		Checkins:  checkins.All(),
+		Users:     users.All(),
+		Services:  services.AllInOrder(),
+		Groups:    groups.All(),
+		Messages:  messages.All(),
+	}
+	return data, nil
+}
+
+func settingsImportHandler(w http.ResponseWriter, r *http.Request) {
+	data, err := ioutil.ReadAll(r.Body)
+	if err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+	defer r.Body.Close()
+
+	var exportData *ExportData
+	if err := json.Unmarshal(data, &exportData); err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+
+	if exportData.Core != nil {
+		core.App = exportData.Core
+		if err := core.App.Update(); err != nil {
+			sendErrorJson(err, w, r)
+			return
+		}
+	}
+
+	if exportData.Groups != nil {
+		for _, s := range exportData.Groups {
+			s.Id = 0
+			if err := s.Create(); err != nil {
+				sendErrorJson(err, w, r)
+				return
+			}
+		}
+	}
+
+	if exportData.Services != nil {
+		for _, s := range exportData.Services {
+			s.Id = 0
+			if err := s.Create(); err != nil {
+				sendErrorJson(err, w, r)
+				return
+			}
+		}
+	}
+
+	if exportData.Users != nil {
+		for _, s := range exportData.Users {
+			s.Id = 0
+			if err := s.Create(); err != nil {
+				sendErrorJson(err, w, r)
+				return
+			}
+		}
+	}
+
+	if exportData.Notifiers != nil {
+		for _, s := range exportData.Notifiers {
+			notif := services.ReturnNotifier(s.Method)
+			n := notif.Select().UpdateFields(&s)
+			if err := n.Update(); err != nil {
+				sendErrorJson(err, w, r)
+				return
+			}
+		}
+	}
+
+	sendJsonAction(exportData, "import", w, r)
+}
+
+func configsSaveHandler(w http.ResponseWriter, r *http.Request) {
+	data, err := ioutil.ReadAll(r.Body)
+	if err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+	defer r.Body.Close()
+
+	var cfg *configs.DbConfig
+	if err := yaml.Unmarshal(data, &cfg); err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+
+	oldCfg, err := configs.LoadConfigs(utils.Directory + "/configs.yml")
+	if err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+
+	newCfg := cfg.Merge(oldCfg)
+	if err := newCfg.Save(utils.Directory); err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+
+	sendJsonAction(newCfg.Clean(), "updated", w, r)
+}
+
+func configsViewHandler(w http.ResponseWriter, r *http.Request) {
+	db, err := configs.LoadConfigs(utils.Directory + "/configs.yml")
+	if err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+	w.Write(db.Clean().ToYAML())
+}
+
+func settingsExportHandler(w http.ResponseWriter, r *http.Request) {
+	exported, err := ExportSettings()
+	if err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+
+	file := bytes.NewBuffer(exported.JSON())
+
+	w.Header().Set("Content-Disposition", "attachment; filename=statping.json")
+	w.Header().Set("Content-Type", "application/json")
+	w.Header().Set("Content-Length", utils.ToString(len(exported.JSON())))
+
+	io.Copy(w, file)
+}
+
 func logsLineHandler(w http.ResponseWriter, r *http.Request) {
 	if lastLine := utils.GetLastLine(); lastLine != nil {
 		w.Header().Set("Content-Type", "text/plain")
diff --git a/handlers/groups_test.go b/handlers/groups_test.go
index e52d7032..4e18fac9 100644
--- a/handlers/groups_test.go
+++ b/handlers/groups_test.go
@@ -141,7 +141,7 @@ func TestGroupAPIRoutes(t *testing.T) {
 		},
 		{
 			Name:           "Statping View Unknown Group",
-			URL:            "/api/groups/8383883838",
+			URL:            "/api/groups/38383",
 			Method:         "GET",
 			BeforeTest:     SetTestENV,
 			ExpectedStatus: 404,
diff --git a/handlers/handlers.go b/handlers/handlers.go
index 93db3860..2a2f22b0 100644
--- a/handlers/handlers.go
+++ b/handlers/handlers.go
@@ -56,7 +56,9 @@ func RunHTTPServer() error {
 	resetCookies()
 	httpError = make(chan error)
 
-	if usingSSL {
+	if utils.Params.GetBool("LETSENCRYPT_ENABLE") {
+		go startLetsEncryptServer(ip)
+	} else if usingSSL {
 		go startSSLServer(ip)
 	} else {
 		go startServer(host)
diff --git a/handlers/incident.go b/handlers/incident.go
index 83996ae9..e2579df3 100644
--- a/handlers/incident.go
+++ b/handlers/incident.go
@@ -26,7 +26,16 @@ func findIncident(r *http.Request) (*incidents.Incident, int64, error) {
 
 func apiServiceIncidentsHandler(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
-	incids := incidents.FindByService(utils.ToInt(vars["id"]))
+	id := vars["id"]
+	if utils.NotNumber(id) {
+		sendErrorJson(errors.NotNumber, w, r)
+		return
+	}
+	incids := incidents.FindByService(utils.ToInt(id))
+	if incids == nil {
+		sendErrorJson(errors.Missing(&incidents.Incident{}, id), w, r)
+		return
+	}
 	returnJson(incids, w, r)
 }
 
@@ -36,7 +45,7 @@ func apiIncidentUpdatesHandler(w http.ResponseWriter, r *http.Request) {
 		sendErrorJson(err, w, r)
 		return
 	}
-	returnJson(incid.Updates(), w, r)
+	returnJson(incid.Updates, w, r)
 }
 
 func apiCreateIncidentUpdateHandler(w http.ResponseWriter, r *http.Request) {
@@ -54,8 +63,7 @@ func apiCreateIncidentUpdateHandler(w http.ResponseWriter, r *http.Request) {
 
 	update.IncidentId = incid.Id
 
-	err = update.Create()
-	if err != nil {
+	if err := update.Create(); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
@@ -74,8 +82,7 @@ func apiCreateIncidentHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	incident.ServiceId = service.Id
-	err = incident.Create()
-	if err != nil {
+	if err := incident.Create(); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
@@ -93,8 +100,7 @@ func apiIncidentUpdateHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	updates := incident.Updates()
-	sendJsonAction(updates, "update", w, r)
+	sendJsonAction(incident.Updates, "update", w, r)
 }
 
 func apiDeleteIncidentHandler(w http.ResponseWriter, r *http.Request) {
@@ -103,8 +109,7 @@ func apiDeleteIncidentHandler(w http.ResponseWriter, r *http.Request) {
 		sendErrorJson(err, w, r)
 		return
 	}
-	err = incident.Delete()
-	if err != nil {
+	if err := incident.Delete(); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
@@ -118,8 +123,7 @@ func apiDeleteIncidentUpdateHandler(w http.ResponseWriter, r *http.Request) {
 		sendErrorJson(err, w, r)
 		return
 	}
-	err = update.Delete()
-	if err != nil {
+	if err := update.Delete(); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
diff --git a/handlers/index.go b/handlers/index.go
index bbfba8df..b94c5a45 100644
--- a/handlers/index.go
+++ b/handlers/index.go
@@ -14,6 +14,10 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 	ExecuteResponse(w, r, "base.gohtml", core.App, nil)
 }
 
+func baseHandler(w http.ResponseWriter, r *http.Request) {
+	ExecuteResponse(w, r, "base.gohtml", core.App, nil)
+}
+
 func healthCheckHandler(w http.ResponseWriter, r *http.Request) {
 	health := map[string]interface{}{
 		"services": len(services.All()),
diff --git a/handlers/jwt.go b/handlers/jwt.go
index 4c57b15a..959039b8 100644
--- a/handlers/jwt.go
+++ b/handlers/jwt.go
@@ -51,17 +51,9 @@ func setJwtToken(user *users.User, w http.ResponseWriter) (JwtClaim, string) {
 	return jwtClaim, tokenString
 }
 
-func getJwtToken(r *http.Request) (JwtClaim, error) {
-	c, err := r.Cookie(cookieName)
-	if err != nil {
-		if err == http.ErrNoCookie {
-			return JwtClaim{}, err
-		}
-		return JwtClaim{}, err
-	}
-
+func parseToken(token string) (JwtClaim, error) {
 	var claims JwtClaim
-	tkn, err := jwt.ParseWithClaims(c.Value, &claims, func(token *jwt.Token) (interface{}, error) {
+	tkn, err := jwt.ParseWithClaims(token, &claims, func(token *jwt.Token) (interface{}, error) {
 		return jwtKey, nil
 	})
 
@@ -74,5 +66,16 @@ func getJwtToken(r *http.Request) (JwtClaim, error) {
 	if !tkn.Valid {
 		return claims, errors.New("token is not valid")
 	}
-	return claims, err
+	return claims, nil
+}
+
+func getJwtToken(r *http.Request) (JwtClaim, error) {
+	c, err := r.Cookie(cookieName)
+	if err != nil {
+		if err == http.ErrNoCookie {
+			return JwtClaim{}, err
+		}
+		return JwtClaim{}, err
+	}
+	return parseToken(c.Value)
 }
diff --git a/handlers/notifications.go b/handlers/notifications.go
index b809c7e2..8832487d 100644
--- a/handlers/notifications.go
+++ b/handlers/notifications.go
@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"github.com/gorilla/mux"
+	"github.com/statping/statping/types/errors"
 	"github.com/statping/statping/types/failures"
 	"github.com/statping/statping/types/notifications"
 	"github.com/statping/statping/types/services"
@@ -11,11 +12,14 @@ import (
 
 func apiNotifiersHandler(w http.ResponseWriter, r *http.Request) {
 	var notifs []notifications.Notification
-	notifiers := services.AllNotifiers()
-	for _, n := range notifiers {
+	for _, n := range services.AllNotifiers() {
 		notif := n.Select()
-		notifer, _ := notifications.Find(notif.Method)
-		notif.UpdateFields(notifer)
+		no, err := notifications.Find(notif.Method)
+		if err != nil {
+			log.Error(err)
+			sendErrorJson(err, w, r)
+		}
+		notif.UpdateFields(no)
 		notifs = append(notifs, *notif)
 	}
 	sort.Sort(notifications.NotificationOrder(notifs))
@@ -24,10 +28,9 @@ func apiNotifiersHandler(w http.ResponseWriter, r *http.Request) {
 
 func apiNotifierGetHandler(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
-	notif := services.FindNotifier(vars["notifier"])
-	notifer, err := notifications.Find(notif.Method)
-	if err != nil {
-		sendErrorJson(err, w, r)
+	notifer := services.FindNotifier(vars["notifier"])
+	if notifer == nil {
+		sendErrorJson(errors.New("could not find notifier"), w, r)
 		return
 	}
 	returnJson(notifer, w, r)
@@ -48,13 +51,17 @@ func apiNotifierUpdateHandler(w http.ResponseWriter, r *http.Request) {
 
 	log.Infof("Updating %s Notifier", notifer.Title)
 
-	err = notifer.Update()
-	if err != nil {
+	if err := notifer.Update(); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
 
 	notif := services.ReturnNotifier(notifer.Method)
+	if err := notif.Valid(notifer.Values()); err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+
 	if _, err := notif.OnSave(); err != nil {
 		sendErrorJson(err, w, r)
 		return
@@ -70,9 +77,9 @@ type testNotificationReq struct {
 
 func testNotificationHandler(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
-	n, err := notifications.Find(vars["notifier"])
-	if err != nil {
-		sendErrorJson(err, w, r)
+	n := services.FindNotifier(vars["notifier"])
+	if n == nil {
+		sendErrorJson(errors.New("unknown notifier"), w, r)
 		return
 	}
 
@@ -85,6 +92,7 @@ func testNotificationHandler(w http.ResponseWriter, r *http.Request) {
 	notif := services.ReturnNotifier(n.Method)
 
 	var out string
+	var err error
 	if req.Method == "success" {
 		out, err = notif.OnSuccess(services.Example(true))
 	} else {
diff --git a/handlers/notifiers_test.go b/handlers/notifiers_test.go
index e8eec518..352b5ab5 100644
--- a/handlers/notifiers_test.go
+++ b/handlers/notifiers_test.go
@@ -3,7 +3,9 @@ package handlers
 import (
 	"github.com/statping/statping/notifiers"
 	"github.com/statping/statping/types/services"
+	"github.com/statping/statping/utils"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"testing"
 )
 
@@ -11,7 +13,9 @@ func TestAttachment(t *testing.T) {
 	notifiers.InitNotifiers()
 }
 
-func TestUnAuthenticatedNotifierRoutes(t *testing.T) {
+func TestAuthenticatedNotifierRoutes(t *testing.T) {
+	slackWebhookUrl := utils.Params.GetString("SLACK_URL")
+
 	tests := []HTTPTest{
 		{
 			Name:           "No Authentication - View All Notifiers",
@@ -20,6 +24,13 @@ func TestUnAuthenticatedNotifierRoutes(t *testing.T) {
 			ExpectedStatus: 401,
 			BeforeTest:     UnsetTestENV,
 		},
+		{
+			Name:           "View All Notifiers",
+			URL:            "/api/notifiers",
+			Method:         "GET",
+			ExpectedStatus: 200,
+			BeforeTest:     SetTestENV,
+		},
 		{
 			Name:           "No Authentication - View Notifier",
 			URL:            "/api/notifier/slack",
@@ -28,12 +39,94 @@ func TestUnAuthenticatedNotifierRoutes(t *testing.T) {
 			BeforeTest:     UnsetTestENV,
 		},
 		{
-			Name:           "No Authentication - Update Notifier",
+			Name:           "View Notifier",
 			URL:            "/api/notifier/slack",
-			Method:         "POST",
+			Method:         "GET",
+			ExpectedStatus: 200,
+			BeforeTest: func(t *testing.T) error {
+				notif := services.FindNotifier("slack")
+				require.NotNil(t, notif)
+				assert.Equal(t, "slack", notif.Method)
+				return SetTestENV(t)
+			},
+		},
+		{
+			Name:   "No Authentication - Update Notifier",
+			URL:    "/api/notifier/slack",
+			Method: "POST",
+			Body: `{
+					"method": "slack",
+					"host": "` + slackWebhookUrl + `",
+					"enabled": true,
+					"limits": 55
+				}`,
 			ExpectedStatus: 401,
 			BeforeTest:     UnsetTestENV,
 		},
+		{
+			Name:   "Update Notifier",
+			URL:    "/api/notifier/slack",
+			Method: "POST",
+			Body: `{
+					"method": "slack",
+					"host": "` + slackWebhookUrl + `",
+					"enabled": true,
+					"limits": 55
+				}`,
+			ExpectedStatus: 200,
+			BeforeTest: func(t *testing.T) error {
+				notif := services.FindNotifier("slack")
+				require.NotNil(t, notif)
+				assert.Equal(t, "slack", notif.Method)
+				assert.False(t, notif.Enabled.Bool)
+				return SetTestENV(t)
+			},
+			AfterTest: func(t *testing.T) error {
+				notif := services.FindNotifier("slack")
+				require.NotNil(t, notif)
+				assert.Equal(t, "slack", notif.Method)
+				assert.True(t, notif.Enabled.Bool)
+				return UnsetTestENV(t)
+			},
+		},
+		{
+			Name:   "Test Notifier (OnSuccess)",
+			URL:    "/api/notifier/slack/test",
+			Method: "POST",
+			Body: `{
+				"method": "success",
+				"notifier": {
+					"enabled": false,
+					"limits": 60,
+					"method": "slack",
+					"host": "` + slackWebhookUrl + `",
+					"success_data": "{\n  \"blocks\": [{\n    \"type\": \"section\",\n    \"text\": {\n      \"type\": \"mrkdwn\",\n      \"text\": \"The service {{.Service.Name}} is back online.\"\n    }\n  }, {\n    \"type\": \"actions\",\n    \"elements\": [{\n      \"type\": \"button\",\n      \"text\": {\n        \"type\": \"plain_text\",\n        \"text\": \"View Service\",\n        \"emoji\": true\n      },\n      \"style\": \"primary\",\n      \"url\": \"{{.Core.Domain}}/service/{{.Service.Id}}\"\n    }, {\n      \"type\": \"button\",\n      \"text\": {\n        \"type\": \"plain_text\",\n        \"text\": \"Go to Statping\",\n        \"emoji\": true\n      },\n      \"url\": \"{{.Core.Domain}}\"\n    }]\n  }]\n}",
+					"failure_data": "{\n  \"blocks\": [{\n    \"type\": \"section\",\n    \"text\": {\n      \"type\": \"mrkdwn\",\n      \"text\": \":warning: The service {{.Service.Name}} is currently offline! :warning:\"\n    }\n  }, {\n    \"type\": \"divider\"\n  }, {\n    \"type\": \"section\",\n    \"fields\": [{\n      \"type\": \"mrkdwn\",\n      \"text\": \"*Service:*\\n{{.Service.Name}}\"\n    }, {\n      \"type\": \"mrkdwn\",\n      \"text\": \"*URL:*\\n{{.Service.Domain}}\"\n    }, {\n      \"type\": \"mrkdwn\",\n      \"text\": \"*Status Code:*\\n{{.Service.LastStatusCode}}\"\n    }, {\n      \"type\": \"mrkdwn\",\n      \"text\": \"*When:*\\n{{.Failure.CreatedAt}}\"\n    }, {\n      \"type\": \"mrkdwn\",\n      \"text\": \"*Downtime:*\\n{{.Service.Downtime.Human}}\"\n    }, {\n      \"type\": \"plain_text\",\n      \"text\": \"*Error:*\\n{{.Failure.Issue}}\"\n    }]\n  }, {\n    \"type\": \"divider\"\n  }, {\n    \"type\": \"actions\",\n    \"elements\": [{\n      \"type\": \"button\",\n      \"text\": {\n        \"type\": \"plain_text\",\n        \"text\": \"View Offline Service\",\n        \"emoji\": true\n      },\n      \"style\": \"danger\",\n      \"url\": \"{{.Core.Domain}}/service/{{.Service.Id}}\"\n    }, {\n      \"type\": \"button\",\n      \"text\": {\n        \"type\": \"plain_text\",\n        \"text\": \"Go to Statping\",\n        \"emoji\": true\n      },\n      \"url\": \"{{.Core.Domain}}\"\n    }]\n  }]\n}"
+				}
+			}`,
+			ExpectedStatus:   200,
+			ExpectedContains: []string{`"success":true`},
+			BeforeTest:       SetTestENV,
+		},
+		{
+			Name:   "Test Notifier (OnFailure)",
+			URL:    "/api/notifier/slack/test",
+			Method: "POST",
+			Body: `{
+				"method": "failure",
+				"notifier": {
+					"enabled": false,
+					"limits": 60,
+					"method": "slack",
+					"host": "` + slackWebhookUrl + `",
+					"success_data": "{\n  \"blocks\": [{\n    \"type\": \"section\",\n    \"text\": {\n      \"type\": \"mrkdwn\",\n      \"text\": \"The service {{.Service.Name}} is back online.\"\n    }\n  }, {\n    \"type\": \"actions\",\n    \"elements\": [{\n      \"type\": \"button\",\n      \"text\": {\n        \"type\": \"plain_text\",\n        \"text\": \"View Service\",\n        \"emoji\": true\n      },\n      \"style\": \"primary\",\n      \"url\": \"{{.Core.Domain}}/service/{{.Service.Id}}\"\n    }, {\n      \"type\": \"button\",\n      \"text\": {\n        \"type\": \"plain_text\",\n        \"text\": \"Go to Statping\",\n        \"emoji\": true\n      },\n      \"url\": \"{{.Core.Domain}}\"\n    }]\n  }]\n}",
+					"failure_data": "{\n  \"blocks\": [{\n    \"type\": \"section\",\n    \"text\": {\n      \"type\": \"mrkdwn\",\n      \"text\": \":warning: The service {{.Service.Name}} is currently offline! :warning:\"\n    }\n  }, {\n    \"type\": \"divider\"\n  }, {\n    \"type\": \"section\",\n    \"fields\": [{\n      \"type\": \"mrkdwn\",\n      \"text\": \"*Service:*\\n{{.Service.Name}}\"\n    }, {\n      \"type\": \"mrkdwn\",\n      \"text\": \"*URL:*\\n{{.Service.Domain}}\"\n    }, {\n      \"type\": \"mrkdwn\",\n      \"text\": \"*Status Code:*\\n{{.Service.LastStatusCode}}\"\n    }, {\n      \"type\": \"mrkdwn\",\n      \"text\": \"*When:*\\n{{.Failure.CreatedAt}}\"\n    }, {\n      \"type\": \"mrkdwn\",\n      \"text\": \"*Downtime:*\\n{{.Service.Downtime.Human}}\"\n    }, {\n      \"type\": \"plain_text\",\n      \"text\": \"*Error:*\\n{{.Failure.Issue}}\"\n    }]\n  }, {\n    \"type\": \"divider\"\n  }, {\n    \"type\": \"actions\",\n    \"elements\": [{\n      \"type\": \"button\",\n      \"text\": {\n        \"type\": \"plain_text\",\n        \"text\": \"View Offline Service\",\n        \"emoji\": true\n      },\n      \"style\": \"danger\",\n      \"url\": \"{{.Core.Domain}}/service/{{.Service.Id}}\"\n    }, {\n      \"type\": \"button\",\n      \"text\": {\n        \"type\": \"plain_text\",\n        \"text\": \"Go to Statping\",\n        \"emoji\": true\n      },\n      \"url\": \"{{.Core.Domain}}\"\n    }]\n  }]\n}"
+				}
+			}`,
+			ExpectedStatus:   200,
+			ExpectedContains: []string{`"success":true`},
+			BeforeTest:       SetTestENV,
+		},
 	}
 
 	for _, v := range tests {
@@ -68,7 +161,7 @@ func TestApiNotifiersRoutes(t *testing.T) {
 			Method: "POST",
 			Body: `{
 					"method": "slack",
-					"host": "https://slack.api/example/12345",
+					"host": "https://hooks.slack.com/services/TTJ1B49DP/XBNU09O9M/9uI2123SUnYBuGcxLopZomz9H",
 					"enabled": true,
 					"limits": 55
 				}`,
@@ -80,7 +173,7 @@ func TestApiNotifiersRoutes(t *testing.T) {
 			URL:              "/api/notifier/slack",
 			Method:           "GET",
 			ExpectedStatus:   200,
-			ExpectedContains: []string{`"method":"slack"`},
+			ExpectedContains: []string{`"method":"slack"`, `"host":"https://hooks.slack.com/services/TTJ1B49DP/XBNU09O9M/9uI2123SUnYBuGcxLopZomz9H"`},
 			BeforeTest:       SetTestENV,
 			SecureRoute:      true,
 		},
diff --git a/handlers/oauth_custom.go b/handlers/oauth_custom.go
index fb595617..09e0e03f 100644
--- a/handlers/oauth_custom.go
+++ b/handlers/oauth_custom.go
@@ -11,9 +11,7 @@ import (
 func customOAuth(r *http.Request) (*oAuth, error) {
 	auth := core.App.OAuth
 	code := r.URL.Query().Get("code")
-
 	scopes := strings.Split(auth.CustomScopes, ",")
-
 	config := &oauth2.Config{
 		ClientID:     auth.CustomClientID,
 		ClientSecret: auth.CustomClientSecret,
diff --git a/handlers/oauth_test.go b/handlers/oauth_test.go
new file mode 100644
index 00000000..be053f7c
--- /dev/null
+++ b/handlers/oauth_test.go
@@ -0,0 +1,45 @@
+package handlers
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestOAuthRoutes(t *testing.T) {
+	tests := []HTTPTest{
+		{
+			Name: "OAuth Save",
+			URL:  "/api/oauth",
+			Body: `{
+						"gh_client_id": "githubid",
+						"gh_client_secret": "githubsecret",
+						"google_client_id": "googleid",
+						"google_client_secret": "googlesecret",
+						"oauth_domains": "gmail.com,yahoo.com,socialeck.com",
+						"oauth_providers": "local,slack,google,github",
+						"slack_client_id": "example.iddd",
+						"slack_client_secret": "exampleeesecret",
+						"slack_team": "dev"
+					}`,
+			Method:         "POST",
+			ExpectedStatus: 200,
+			BeforeTest:     SetTestENV,
+		},
+		{
+			Name:             "OAuth Values",
+			URL:              "/api/oauth",
+			Method:           "GET",
+			ExpectedStatus:   200,
+			ExpectedContains: []string{`"slack_client_id":"example.iddd"`},
+			AfterTest:        UnsetTestENV,
+		},
+	}
+
+	for _, v := range tests {
+		t.Run(v.Name, func(t *testing.T) {
+			res, t, err := RunHTTPTest(v, t)
+			assert.Nil(t, err)
+			t.Log(res)
+		})
+	}
+}
diff --git a/handlers/routes.go b/handlers/routes.go
index 0ff7f3ea..ed233d0e 100644
--- a/handlers/routes.go
+++ b/handlers/routes.go
@@ -5,9 +5,11 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/statping/statping/source"
+	"github.com/statping/statping/types/core"
 	"github.com/statping/statping/utils"
 	"net/http"
 	"net/http/pprof"
+	"time"
 
 	_ "github.com/statping/statping/types/metrics"
 )
@@ -37,7 +39,7 @@ func Router() *mux.Router {
 	}
 
 	bPath := utils.Params.GetString("BASE_PATH")
-	sentryHandler := sentryhttp.New(sentryhttp.Options{})
+	sentryHandler := sentryhttp.New(sentryhttp.Options{Timeout: 5 * time.Second})
 
 	if bPath != "" {
 		basePath = "/" + bPath + "/"
@@ -68,24 +70,22 @@ func Router() *mux.Router {
 	if source.UsingAssets(dir) {
 		indexHandler := http.FileServer(http.Dir(dir + "/assets/"))
 
-		r.PathPrefix("/css/").Handler(http.StripPrefix(basePath, Gzip(staticAssets("css"))))
-		r.PathPrefix("/js/").Handler(http.StripPrefix(basePath, Gzip(staticAssets("js"))))
-		r.PathPrefix("/scss/").Handler(http.StripPrefix(basePath, Gzip(staticAssets("scss"))))
-		r.PathPrefix("/favicon/").Handler(http.StripPrefix(basePath, Gzip(staticAssets("favicon"))))
+		r.PathPrefix("/css/").Handler(http.StripPrefix(basePath, staticAssets("css")))
+		r.PathPrefix("/favicon/").Handler(http.StripPrefix(basePath, staticAssets("favicon")))
 		r.PathPrefix("/robots.txt").Handler(http.StripPrefix(basePath, indexHandler))
 		r.PathPrefix("/banner.png").Handler(http.StripPrefix(basePath, indexHandler))
 	} else {
 		tmplFileSrv := http.FileServer(source.TmplBox.HTTPBox())
 		tmplBoxHandler := http.StripPrefix(basePath, tmplFileSrv)
 
-		r.PathPrefix("/css/").Handler(http.StripPrefix(basePath, Gzip(tmplFileSrv)))
-		r.PathPrefix("/scss/").Handler(http.StripPrefix(basePath, Gzip(tmplFileSrv)))
-		r.PathPrefix("/js/").Handler(http.StripPrefix(basePath, Gzip(tmplFileSrv)))
-		r.PathPrefix("/favicon/").Handler(http.StripPrefix(basePath, Gzip(tmplFileSrv)))
+		r.PathPrefix("/css/").Handler(http.StripPrefix(basePath, tmplFileSrv))
+		r.PathPrefix("/favicon/").Handler(http.StripPrefix(basePath, tmplFileSrv))
 		r.PathPrefix("/robots.txt").Handler(tmplBoxHandler)
 		r.PathPrefix("/banner.png").Handler(tmplBoxHandler)
 	}
 
+	r.PathPrefix("/js/").Handler(http.StripPrefix(basePath, http.FileServer(source.TmplBox.HTTPBox())))
+
 	api := r.NewRoute().Subrouter()
 	api.Use(apiMiddleware)
 	api.Use(prometheusMiddleware)
@@ -101,6 +101,10 @@ func Router() *mux.Router {
 	api.Handle("/api/core", authenticated(apiCoreHandler, false)).Methods("POST")
 	api.Handle("/api/logs", authenticated(logsHandler, false)).Methods("GET")
 	api.Handle("/api/logs/last", authenticated(logsLineHandler, false)).Methods("GET")
+	api.Handle("/api/settings/import", authenticated(settingsImportHandler, false)).Methods("POST")
+	api.Handle("/api/settings/export", authenticated(settingsExportHandler, false)).Methods("GET")
+	api.Handle("/api/settings/configs", authenticated(configsViewHandler, false)).Methods("GET")
+	api.Handle("/api/settings/configs", authenticated(configsSaveHandler, false)).Methods("POST")
 
 	// API OAUTH Routes
 	api.Handle("/api/oauth", scoped(apiOAuthHandler)).Methods("GET")
@@ -127,10 +131,12 @@ func Router() *mux.Router {
 	api.Handle("/api/services/{id}", scoped(apiServiceHandler)).Methods("GET")
 	api.Handle("/api/reorder/services", authenticated(reorderServiceHandler, false)).Methods("POST")
 	api.Handle("/api/services/{id}", authenticated(apiServiceUpdateHandler, false)).Methods("POST")
+	api.Handle("/api/services/{id}", authenticated(apiServicePatchHandler, false)).Methods("PATCH")
 	api.Handle("/api/services/{id}", authenticated(apiServiceDeleteHandler, false)).Methods("DELETE")
 	api.Handle("/api/services/{id}/failures", scoped(apiServiceFailuresHandler)).Methods("GET")
 	api.Handle("/api/services/{id}/failures", authenticated(servicesDeleteFailuresHandler, false)).Methods("DELETE")
 	api.Handle("/api/services/{id}/hits", scoped(apiServiceHitsHandler)).Methods("GET")
+	api.Handle("/api/services/{id}/hits", authenticated(apiServiceHitsDeleteHandler, false)).Methods("DELETE")
 
 	// API SERVICE CHART DATA Routes
 	api.Handle("/api/services/{id}/hits_data", cached("30s", "application/json", apiServiceDataHandler)).Methods("GET")
@@ -152,6 +158,7 @@ func Router() *mux.Router {
 	// API USER Routes
 	api.Handle("/api/users", authenticated(apiAllUsersHandler, false)).Methods("GET")
 	api.Handle("/api/users", authenticated(apiCreateUsersHandler, false)).Methods("POST")
+	api.Handle("/api/users/token", http.HandlerFunc(apiCheckUserTokenHandler)).Methods("POST")
 	api.Handle("/api/users/{id}", authenticated(apiUserHandler, false)).Methods("GET")
 	api.Handle("/api/users/{id}", authenticated(apiUserUpdateHandler, false)).Methods("POST")
 	api.Handle("/api/users/{id}", authenticated(apiUserDeleteHandler, false)).Methods("DELETE")
@@ -179,16 +186,20 @@ func Router() *mux.Router {
 	// API Generic Routes
 	r.Handle("/metrics", readOnly(promhttp.Handler(), false))
 	r.Handle("/health", http.HandlerFunc(healthCheckHandler))
-	r.Handle("/.well-known/", http.StripPrefix("/.well-known/", http.FileServer(http.Dir(dir+"/.well-known"))))
-	r.NotFoundHandler = http.HandlerFunc(error404Handler)
+	r.NotFoundHandler = http.HandlerFunc(baseHandler)
 	return r
 }
 
 func resetRouter() {
+	log.Infoln("Restarting HTTP Router")
 	router = Router()
 	httpServer.Handler = router
 }
 
 func resetCookies() {
-	jwtKey = []byte(utils.NewSHA256Hash())
+	if core.App == nil {
+		jwtKey = []byte(utils.NewSHA256Hash())
+		return
+	}
+	jwtKey = []byte(utils.Sha256Hash(core.App.ApiSecret))
 }
diff --git a/handlers/server.go b/handlers/server.go
index 7e3fd167..9eb320b5 100644
--- a/handlers/server.go
+++ b/handlers/server.go
@@ -3,8 +3,11 @@ package handlers
 import (
 	"crypto/tls"
 	"fmt"
+	"github.com/foomo/simplecert"
+	"github.com/foomo/tlsconfig"
 	"github.com/statping/statping/utils"
 	"net/http"
+	"strings"
 )
 
 func startServer(host string) {
@@ -21,6 +24,69 @@ func startServer(host string) {
 	}
 }
 
+func letsEncryptCert() (*tls.Config, error) {
+	if !utils.FolderExists(utils.Directory + "/certs") {
+		if err := utils.CreateDirectory(utils.Directory + "/certs"); err != nil {
+			return nil, err
+		}
+	}
+
+	cfg := simplecert.Default
+	cfg.Domains = strings.Split(utils.Params.GetString("LETSENCRYPT_HOST"), ",")
+	cfg.CacheDir = utils.Directory + "/certs"
+	cfg.SSLEmail = utils.Params.GetString("LETSENCRYPT_EMAIL")
+	cfg.Local = utils.Params.GetBool("LETSENCRYPT_LOCAL")
+	cfg.WillRenewCertificate = func() {
+		log.Infoln("LetsEncrypt renewing SSL Certificate for: ", utils.Params.GetString("LETSENCRYPT_HOST"))
+	}
+	cfg.DidRenewCertificate = func() {
+		log.Infoln("LetsEncrypt renewed SSL Certificate for: ", utils.Params.GetString("LETSENCRYPT_HOST"))
+		StopHTTPServer(nil)
+		if err := RunHTTPServer(); err != nil {
+			log.Errorln(err)
+		}
+	}
+	cfg.FailedToRenewCertificate = func(err error) {
+		log.Errorln(err)
+	}
+	certReloader, err := simplecert.Init(cfg, func() {
+		StopHTTPServer(nil)
+	})
+	if err != nil {
+		log.Fatal("simplecert init failed: ", err)
+		return nil, err
+	}
+
+	tlsconf := tlsconfig.NewServerTLSConfig(tlsconfig.TLSModeServerStrict)
+	tlsconf.GetCertificate = certReloader.GetCertificateFunc()
+
+	return tlsconf, nil
+}
+
+func startLetsEncryptServer(ip string) {
+	log.Infoln("Starting LetEncrypt redirect server on port 80")
+	go http.ListenAndServe(":80", http.HandlerFunc(simplecert.Redirect))
+
+	cfg, err := letsEncryptCert()
+	if err != nil {
+		httpError <- err
+		return
+	}
+
+	srv := &http.Server{
+		Addr:         fmt.Sprintf("%v:%v", ip, 443),
+		Handler:      router,
+		TLSConfig:    cfg,
+		WriteTimeout: timeout,
+		ReadTimeout:  timeout,
+		IdleTimeout:  timeout,
+	}
+
+	if err := srv.ListenAndServeTLS("", ""); err != nil {
+		httpError <- err
+	}
+}
+
 func startSSLServer(ip string) {
 	cfg := &tls.Config{
 		MinVersion:               tls.VersionTLS12,
@@ -28,9 +94,9 @@ func startSSLServer(ip string) {
 		PreferServerCipherSuites: true,
 		CipherSuites: []uint16{
 			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
 			tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-			tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
-			tls.TLS_RSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
 		},
 	}
 	srv := &http.Server{
@@ -42,7 +108,11 @@ func startSSLServer(ip string) {
 		ReadTimeout:  timeout,
 		IdleTimeout:  timeout,
 	}
-	if err := srv.ListenAndServeTLS(utils.Directory+"/server.crt", utils.Directory+"/server.key"); err != nil {
+
+	certFile := utils.Directory + "/server.crt"
+	keyFile := utils.Directory + "/server.key"
+
+	if err := srv.ListenAndServeTLS(certFile, keyFile); err != nil {
 		httpError <- err
 	}
 }
diff --git a/handlers/services.go b/handlers/services.go
index be1a7b12..135ddccf 100644
--- a/handlers/services.go
+++ b/handlers/services.go
@@ -74,6 +74,46 @@ func apiCreateServiceHandler(w http.ResponseWriter, r *http.Request) {
 	sendJsonAction(service, "create", w, r)
 }
 
+type servicePatchReq struct {
+	Online  bool   `json:"online"`
+	Issue   string `json:"issue,omitempty"`
+	Latency int64  `json:"latency,omitempty"`
+}
+
+func apiServicePatchHandler(w http.ResponseWriter, r *http.Request) {
+	service, err := findService(r)
+	if err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+	var req servicePatchReq
+	if err := DecodeJSON(r, &req); err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+
+	service.Online = req.Online
+	service.Latency = req.Latency
+
+	issueDefault := "Service was triggered to be offline"
+	if req.Issue != "" {
+		issueDefault = req.Issue
+	}
+
+	if !req.Online {
+		services.RecordFailure(service, issueDefault, "trigger")
+	} else {
+		services.RecordSuccess(service)
+	}
+
+	if err := service.Update(); err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+
+	sendJsonAction(service, "update", w, r)
+}
+
 func apiServiceUpdateHandler(w http.ResponseWriter, r *http.Request) {
 	service, err := findService(r)
 	if err != nil {
@@ -84,9 +124,7 @@ func apiServiceUpdateHandler(w http.ResponseWriter, r *http.Request) {
 		sendErrorJson(err, w, r)
 		return
 	}
-
-	err = service.Update()
-	if err != nil {
+	if err := service.Update(); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
@@ -199,6 +237,19 @@ func apiServiceTimeDataHandler(w http.ResponseWriter, r *http.Request) {
 	returnJson(uptimeData, w, r)
 }
 
+func apiServiceHitsDeleteHandler(w http.ResponseWriter, r *http.Request) {
+	service, err := findService(r)
+	if err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+	if err := service.AllHits().DeleteAll(); err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+	sendJsonAction(service, "delete", w, r)
+}
+
 func apiServiceDeleteHandler(w http.ResponseWriter, r *http.Request) {
 	service, err := findService(r)
 	if err != nil {
@@ -231,8 +282,7 @@ func servicesDeleteFailuresHandler(w http.ResponseWriter, r *http.Request) {
 		sendErrorJson(err, w, r)
 		return
 	}
-	err = service.DeleteFailures()
-	if err != nil {
+	if err := service.AllFailures().DeleteAll(); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
diff --git a/handlers/services_test.go b/handlers/services_test.go
index 4bef36a4..981c8b85 100644
--- a/handlers/services_test.go
+++ b/handlers/services_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/statping/statping/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"net/http/httptest"
 	"testing"
 	"time"
 )
@@ -60,11 +61,11 @@ func TestApiServiceRoutes(t *testing.T) {
 			Method:           "GET",
 			ExpectedContains: []string{`"name":"Google"`},
 			ExpectedStatus:   200,
-			ResponseLen:      6,
+			ResponseLen:      7,
 			BeforeTest:       SetTestENV,
 			FuncTest: func(t *testing.T) error {
 				count := len(services.Services())
-				if count != 6 {
+				if count != 7 {
 					return errors.Errorf("incorrect services count: %d", count)
 				}
 				return nil
@@ -76,11 +77,11 @@ func TestApiServiceRoutes(t *testing.T) {
 			Method:           "GET",
 			ExpectedContains: []string{`"name":"Google"`},
 			ExpectedStatus:   200,
-			ResponseLen:      5,
+			ResponseLen:      6,
 			BeforeTest:       UnsetTestENV,
 			FuncTest: func(t *testing.T) error {
 				count := len(services.Services())
-				if count != 6 {
+				if count != 7 {
 					return errors.Errorf("incorrect services count: %d", count)
 				}
 				return nil
@@ -214,7 +215,7 @@ func TestApiServiceRoutes(t *testing.T) {
 			URL:            "/api/services/1/uptime_data" + startEndQuery,
 			Method:         "GET",
 			ExpectedStatus: 200,
-			ResponseFunc: func(t *testing.T, resp []byte) error {
+			ResponseFunc: func(req *httptest.ResponseRecorder, t *testing.T, resp []byte) error {
 				var uptime *services.UptimeSeries
 				if err := json.Unmarshal(resp, &uptime); err != nil {
 					return err
@@ -260,10 +261,10 @@ func TestApiServiceRoutes(t *testing.T) {
 					"order_id": 0
 				}`,
 			ExpectedStatus:   200,
-			ExpectedContains: []string{Success, `"type":"service","method":"create"`, `"public":false`, `"group_id":1`},
+			ExpectedContains: []string{Success, MethodCreate, `"type":"service",`, `"public":false`, `"group_id":1`},
 			FuncTest: func(t *testing.T) error {
 				count := len(services.Services())
-				if count != 7 {
+				if count != 8 {
 					return errors.Errorf("incorrect services count: %d", count)
 				}
 				return nil
@@ -325,7 +326,27 @@ func TestApiServiceRoutes(t *testing.T) {
 			ExpectedContains: []string{Success, MethodDelete},
 			FuncTest: func(t *testing.T) error {
 				count := len(services.Services())
-				if count != 6 {
+				if count != 7 {
+					return errors.Errorf("incorrect services count: %d", count)
+				}
+				return nil
+			},
+			SecureRoute: true,
+		},
+		{
+			Name:           "Statping Patch Static Service",
+			URL:            "/api/services/7",
+			Method:         "PATCH",
+			ExpectedStatus: 200,
+			Body: `{
+						"online": false,
+						"latency": 30500,
+						"issue": "This is a failure string you can create"
+					},`,
+			ExpectedContains: []string{Success, MethodUpdate},
+			FuncTest: func(t *testing.T) error {
+				count := len(services.Services())
+				if count != 7 {
 					return errors.Errorf("incorrect services count: %d", count)
 				}
 				return nil
diff --git a/handlers/setup.go b/handlers/setup.go
index 565020ed..4c663eb2 100644
--- a/handlers/setup.go
+++ b/handlers/setup.go
@@ -11,7 +11,6 @@ import (
 	"net/http"
 	"net/url"
 	"strconv"
-	"time"
 )
 
 func processSetupHandler(w http.ResponseWriter, r *http.Request) {
@@ -60,7 +59,7 @@ func processSetupHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		if err := configs.CreateAdminUser(confgs); err != nil {
+		if err := configs.CreateAdminUser(); err != nil {
 			sendErrorJson(err, w, r)
 			return
 		}
@@ -123,7 +122,7 @@ func processSetupHandler(w http.ResponseWriter, r *http.Request) {
 
 	CacheStorage.Delete("/")
 	resetCookies()
-	time.Sleep(2 * time.Second)
+
 	out := struct {
 		Message string            `json:"message"`
 		Config  *configs.DbConfig `json:"config"`
diff --git a/handlers/users.go b/handlers/users.go
index cf9862a7..94d58bd9 100644
--- a/handlers/users.go
+++ b/handlers/users.go
@@ -80,6 +80,23 @@ func apiAllUsersHandler(w http.ResponseWriter, r *http.Request) {
 	returnJson(allUsers, w, r)
 }
 
+func apiCheckUserTokenHandler(w http.ResponseWriter, r *http.Request) {
+	r.ParseForm()
+	token := r.PostForm.Get("token")
+	if token == "" {
+		sendErrorJson(errors.New("missing token parameter"), w, r)
+		return
+	}
+
+	claim, err := parseToken(token)
+	if err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+
+	returnJson(claim, w, r)
+}
+
 func apiCreateUsersHandler(w http.ResponseWriter, r *http.Request) {
 	var user *users.User
 	err := DecodeJSON(r, &user)
diff --git a/install.sh b/install.sh
index cb065b54..cbbdab4c 100755
--- a/install.sh
+++ b/install.sh
@@ -136,6 +136,8 @@ getArch() {
       ARCH="arm"
     elif [ ${MACHINE_TYPE} == 'arm64' ]; then
       ARCH="arm64"
+    elif [ ${MACHINE_TYPE} == 'aarch64' ]; then
+      ARCH="arm64"
     else
       ARCH="386"
     fi
diff --git a/notifiers/amazon_sns.go b/notifiers/amazon_sns.go
new file mode 100644
index 00000000..f1405a48
--- /dev/null
+++ b/notifiers/amazon_sns.go
@@ -0,0 +1,150 @@
+package notifiers
+
+import (
+	"fmt"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/sns"
+	"github.com/statping/statping/types/null"
+	"time"
+
+	"github.com/statping/statping/types/failures"
+	"github.com/statping/statping/types/notifications"
+	"github.com/statping/statping/types/notifier"
+	"github.com/statping/statping/types/services"
+)
+
+var _ notifier.Notifier = (*amazonSNS)(nil)
+
+type amazonSNS struct {
+	*notifications.Notification
+}
+
+func (g *amazonSNS) Select() *notifications.Notification {
+	return g.Notification
+}
+
+func (g *amazonSNS) Valid(values notifications.Values) error {
+	return nil
+}
+
+var AmazonSNS = &amazonSNS{&notifications.Notification{
+	Method:      "amazon_sns",
+	Title:       "Amazon SNS",
+	Description: "Use amazonSNS to receive push notifications. Add your amazonSNS URL and App Token to receive notifications.",
+	Author:      "Hunter Long",
+	AuthorUrl:   "https://github.com/hunterlong",
+	Icon:        "amazon",
+	Delay:       5 * time.Second,
+	Limits:      60,
+	SuccessData: null.NewNullString(`{{.Service.Name}} is back online and was down for {{.Service.Downtime.Human}}`),
+	FailureData: null.NewNullString(`{{.Service.Name}} is offline and has been down for {{.Service.Downtime.Human}}`),
+	DataType:    "html",
+	Form: []notifications.NotificationForm{{
+		Type:        "text",
+		Title:       "AWS Access Token",
+		DbField:     "api_key",
+		Placeholder: "AKPMED5XUXSEU3O5AB6M",
+		Required:    true,
+	}, {
+		Type:        "text",
+		Title:       "AWS Secret Key",
+		DbField:     "api_secret",
+		Placeholder: "39eAZODxEosHRgzLx173ttX9sCtJVOE8rzElRE9B",
+		Required:    true,
+	}, {
+		Type:        "text",
+		Title:       "Region",
+		SmallText:   "Amazon Region for SNS",
+		DbField:     "var1",
+		Placeholder: "us-west-2",
+		Required:    true,
+	}, {
+		Type:        "text",
+		Title:       "SNS Topic ARN",
+		SmallText:   "The ARN of the Topic",
+		DbField:     "Host",
+		Placeholder: "arn:aws:sns:us-west-2:123456789012:YourTopic",
+		Required:    true,
+	}}},
+}
+
+func valToAttr(val interface{}) *sns.MessageAttributeValue {
+	dataType := "String"
+	switch val.(type) {
+	case string, bool:
+		dataType = "String"
+	case int, int64, uint, uint64, uint32:
+		dataType = "Number"
+	}
+	return &sns.MessageAttributeValue{
+		DataType:    aws.String(dataType),
+		StringValue: aws.String(fmt.Sprintf("%v", val)),
+	}
+}
+
+func messageAttributesSNS(s services.Service, f failures.Failure) map[string]*sns.MessageAttributeValue {
+	attr := make(map[string]*sns.MessageAttributeValue)
+	attr["service_id"] = valToAttr(s.Id)
+	attr["online"] = valToAttr(s.Online)
+	attr["downtime_milliseconds"] = valToAttr(s.Downtime().Milliseconds())
+	if f.Id != 0 {
+		attr["failure_issue"] = valToAttr(f.Issue)
+		attr["failure_reason"] = valToAttr(f.Reason)
+		attr["failure_status_code"] = valToAttr(f.ErrorCode)
+		attr["failure_ping"] = valToAttr(f.PingTime)
+	}
+	return attr
+}
+
+// Send will send a HTTP Post to the amazonSNS API. It accepts type: string
+func (g *amazonSNS) sendMessage(msg string, s services.Service, f failures.Failure) (string, error) {
+	creds := credentials.NewStaticCredentials(g.ApiKey.String, g.ApiSecret.String, "")
+	c := aws.NewConfig()
+	c.Credentials = creds
+	c.Region = aws.String(g.Var1.String)
+	sess, err := session.NewSession(c)
+	if err != nil {
+		return "", err
+	}
+
+	client := sns.New(sess)
+	input := &sns.PublishInput{
+		Message:           aws.String(msg),
+		TopicArn:          aws.String(g.Host.String),
+		MessageAttributes: messageAttributesSNS(s, f),
+	}
+
+	result, err := client.Publish(input)
+	if err != nil {
+		return "", err
+	}
+
+	return result.String(), nil
+}
+
+// OnFailure will trigger failing service
+func (g *amazonSNS) OnFailure(s services.Service, f failures.Failure) (string, error) {
+	msg := ReplaceVars(g.FailureData.String, s, f)
+	return g.sendMessage(msg, s, f)
+}
+
+// OnSuccess will trigger successful service
+func (g *amazonSNS) OnSuccess(s services.Service) (string, error) {
+	msg := ReplaceVars(g.SuccessData.String, s, failures.Failure{})
+	return g.sendMessage(msg, s, failures.Failure{})
+}
+
+// OnTest will test the amazonSNS notifier
+func (g *amazonSNS) OnTest() (string, error) {
+	s := services.Example(true)
+	f := failures.Example()
+	msg := ReplaceVars(`This is a test SNS notification from Statping. Service: {{.Service.Name}} - Downtime: {{.Service.Downtime.Human}}`, s, f)
+	return g.sendMessage(msg, s, f)
+}
+
+// OnSave will trigger when this notifier is saved
+func (g *amazonSNS) OnSave() (string, error) {
+	return "", nil
+}
diff --git a/notifiers/amazon_sns_test.go b/notifiers/amazon_sns_test.go
new file mode 100644
index 00000000..c9988c3e
--- /dev/null
+++ b/notifiers/amazon_sns_test.go
@@ -0,0 +1,76 @@
+package notifiers
+
+import (
+	"testing"
+	"time"
+
+	"github.com/statping/statping/database"
+	"github.com/statping/statping/types/core"
+	"github.com/statping/statping/types/failures"
+	"github.com/statping/statping/types/notifications"
+	"github.com/statping/statping/types/null"
+	"github.com/statping/statping/types/services"
+	"github.com/statping/statping/utils"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAmazonSNSNotifier(t *testing.T) {
+	err := utils.InitLogs()
+	require.Nil(t, err)
+	snsToken := utils.Params.GetString("SNS_TOKEN")
+	snsSecret := utils.Params.GetString("SNS_SECRET")
+	snsRegion := utils.Params.GetString("SNS_REGION")
+	snsTopic := utils.Params.GetString("SNS_TOPIC")
+
+	db, err := database.OpenTester()
+	require.Nil(t, err)
+	db.AutoMigrate(&notifications.Notification{})
+	notifications.SetDB(db)
+	core.Example()
+
+	if snsToken == "" || snsSecret == "" || snsRegion == "" || snsTopic == "" {
+		t.Log("SNS notifier testing skipped, missing SNS_TOKEN, SNS_SECRET, SNS_REGION, SNS_TOPIC environment variables")
+		t.SkipNow()
+	}
+
+	t.Run("Load SNS", func(t *testing.T) {
+		AmazonSNS.ApiKey = null.NewNullString(snsToken)
+		AmazonSNS.ApiSecret = null.NewNullString(snsSecret)
+		AmazonSNS.Var1 = null.NewNullString(snsRegion)
+		AmazonSNS.Host = null.NewNullString(snsTopic)
+		AmazonSNS.Delay = 15 * time.Second
+		AmazonSNS.Enabled = null.NewNullBool(true)
+
+		Add(AmazonSNS)
+
+		assert.Equal(t, "Hunter Long", AmazonSNS.Author)
+		assert.Equal(t, snsToken, AmazonSNS.ApiKey.String)
+		assert.Equal(t, snsSecret, AmazonSNS.ApiSecret.String)
+	})
+
+	t.Run("SNS Notifier Tester", func(t *testing.T) {
+		assert.True(t, AmazonSNS.CanSend())
+	})
+
+	t.Run("SNS Notifier Tester OnSave", func(t *testing.T) {
+		_, err := AmazonSNS.OnSave()
+		assert.Nil(t, err)
+	})
+
+	t.Run("SNS OnFailure", func(t *testing.T) {
+		_, err := AmazonSNS.OnFailure(services.Example(false), failures.Example())
+		assert.Nil(t, err)
+	})
+
+	t.Run("SNS OnSuccess", func(t *testing.T) {
+		_, err := AmazonSNS.OnSuccess(services.Example(true))
+		assert.Nil(t, err)
+	})
+
+	t.Run("SNS Test", func(t *testing.T) {
+		_, err := AmazonSNS.OnTest()
+		assert.Nil(t, err)
+	})
+
+}
diff --git a/notifiers/command.go b/notifiers/command.go
index bc44c285..6f482b74 100644
--- a/notifiers/command.go
+++ b/notifiers/command.go
@@ -5,6 +5,7 @@ import (
 	"github.com/statping/statping/types/failures"
 	"github.com/statping/statping/types/notifications"
 	"github.com/statping/statping/types/notifier"
+	"github.com/statping/statping/types/null"
 	"github.com/statping/statping/types/services"
 	"github.com/statping/statping/utils"
 	"strings"
@@ -21,6 +22,10 @@ func (c *commandLine) Select() *notifications.Notification {
 	return c.Notification
 }
 
+func (c *commandLine) Valid(values notifications.Values) error {
+	return nil
+}
+
 var Command = &commandLine{&notifications.Notification{
 	Method:      "command",
 	Title:       "Command",
@@ -29,8 +34,8 @@ var Command = &commandLine{&notifications.Notification{
 	AuthorUrl:   "https://github.com/hunterlong",
 	Delay:       time.Duration(1 * time.Second),
 	Icon:        "fas fa-terminal",
-	SuccessData: "/usr/bin/curl -L http://localhost:8080",
-	FailureData: "/usr/bin/curl -L http://localhost:8080",
+	SuccessData: null.NewNullString("/usr/bin/curl -L http://localhost:8080"),
+	FailureData: null.NewNullString("/usr/bin/curl -L http://localhost:8080"),
 	DataType:    "text",
 	Limits:      60,
 }}
@@ -51,21 +56,21 @@ func runCommand(cmd string) (string, string, error) {
 
 // OnSuccess for commandLine will trigger successful service
 func (c *commandLine) OnSuccess(s services.Service) (string, error) {
-	tmpl := ReplaceVars(c.SuccessData, s, failures.Failure{})
+	tmpl := ReplaceVars(c.SuccessData.String, s, failures.Failure{})
 	out, _, err := runCommand(tmpl)
 	return out, err
 }
 
 // OnFailure for commandLine will trigger failing service
 func (c *commandLine) OnFailure(s services.Service, f failures.Failure) (string, error) {
-	tmpl := ReplaceVars(c.FailureData, s, f)
+	tmpl := ReplaceVars(c.FailureData.String, s, f)
 	out, _, err := runCommand(tmpl)
 	return out, err
 }
 
 // OnTest for commandLine triggers when this notifier has been saved
 func (c *commandLine) OnTest() (string, error) {
-	tmpl := ReplaceVars(c.Var1, services.Example(true), failures.Example())
+	tmpl := ReplaceVars(c.Var1.String, services.Example(true), failures.Example())
 	in, out, err := runCommand(tmpl)
 	utils.Log.Infoln(in)
 	utils.Log.Infoln(out)
diff --git a/notifiers/command_test.go b/notifiers/command_test.go
index b424fb65..0da6687c 100644
--- a/notifiers/command_test.go
+++ b/notifiers/command_test.go
@@ -15,6 +15,7 @@ import (
 )
 
 func TestCommandNotifier(t *testing.T) {
+	t.Parallel()
 	t.SkipNow()
 	err := utils.InitLogs()
 	require.Nil(t, err)
@@ -25,9 +26,9 @@ func TestCommandNotifier(t *testing.T) {
 	core.Example()
 
 	t.Run("Load Command", func(t *testing.T) {
-		Command.Host = "/bin/echo"
-		Command.Var1 = "service {{.Service.Domain}} is online"
-		Command.Var2 = "service {{.Service.Domain}} is offline"
+		Command.Host = null.NewNullString("/bin/echo")
+		Command.Var1 = null.NewNullString("service {{.Service.Domain}} is online")
+		Command.Var2 = null.NewNullString("service {{.Service.Domain}} is offline")
 		Command.Delay = time.Duration(100 * time.Millisecond)
 		Command.Limits = 99
 		Command.Enabled = null.NewNullBool(true)
diff --git a/notifiers/discord.go b/notifiers/discord.go
index 416ab57d..da1e8d18 100644
--- a/notifiers/discord.go
+++ b/notifiers/discord.go
@@ -7,6 +7,7 @@ import (
 	"github.com/statping/statping/types/failures"
 	"github.com/statping/statping/types/notifications"
 	"github.com/statping/statping/types/notifier"
+	"github.com/statping/statping/types/null"
 	"github.com/statping/statping/types/services"
 	"github.com/statping/statping/utils"
 	"strings"
@@ -21,28 +22,27 @@ type discord struct {
 
 var Discorder = &discord{&notifications.Notification{
 	Method:      "discord",
-	Title:       "discord",
+	Title:       "Discord",
 	Description: "Send notifications to your discord channel using discord webhooks. Insert your discord channel Webhook URL to receive notifications. Based on the <a href=\"https://discordapp.com/developers/docs/resources/Webhook\">discord webhooker API</a>.",
 	Author:      "Hunter Long",
 	AuthorUrl:   "https://github.com/hunterlong",
 	Delay:       time.Duration(5 * time.Second),
-	Host:        "https://discordapp.com/api/webhooks/****/*****",
 	Icon:        "fab fa-discord",
-	SuccessData: `{"content": "Your service '{{.Service.Name}}' is currently online!"}`,
-	FailureData: `{"content": "Your service '{{.Service.Name}}' is currently failing! Reason: {{.Failure.Issue}}"}`,
+	SuccessData: null.NewNullString(`{"content": "Your service '{{.Service.Name}}' is currently back online and was down for {{.Service.Downtime.Human}}."}`),
+	FailureData: null.NewNullString(`{"content": "Your service '{{.Service.Name}}' is has been failing for {{.Service.Downtime.Human}}! Reason: {{.Failure.Issue}}"}`),
 	DataType:    "json",
 	Limits:      60,
 	Form: []notifications.NotificationForm{{
 		Type:        "text",
 		Title:       "discord webhooker URL",
-		Placeholder: "Insert your Webhook URL here",
+		Placeholder: "https://discordapp.com/api/webhooks/****/*****",
 		DbField:     "host",
 	}}},
 }
 
 // Send will send a HTTP Post to the discord API. It accepts type: []byte
 func (d *discord) sendRequest(msg string) (string, error) {
-	out, _, err := utils.HttpRequest(Discorder.GetValue("host"), "POST", "application/json", nil, strings.NewReader(msg), time.Duration(10*time.Second), true, nil)
+	out, _, err := utils.HttpRequest(d.Host.String, "POST", "application/json", nil, strings.NewReader(msg), time.Duration(10*time.Second), true, nil)
 	return string(out), err
 }
 
@@ -50,29 +50,35 @@ func (d *discord) Select() *notifications.Notification {
 	return d.Notification
 }
 
+func (d *discord) Valid(values notifications.Values) error {
+	return nil
+}
+
 // OnFailure will trigger failing service
 func (d *discord) OnFailure(s services.Service, f failures.Failure) (string, error) {
-	out, err := d.sendRequest(ReplaceVars(d.FailureData, s, f))
+	out, err := d.sendRequest(ReplaceVars(d.FailureData.String, s, f))
 	return out, err
 }
 
 // OnSuccess will trigger successful service
 func (d *discord) OnSuccess(s services.Service) (string, error) {
-	out, err := d.sendRequest(ReplaceVars(d.SuccessData, s, failures.Failure{}))
+	out, err := d.sendRequest(ReplaceVars(d.SuccessData.String, s, failures.Failure{}))
 	return out, err
 }
 
 // OnSave triggers when this notifier has been saved
 func (d *discord) OnTest() (string, error) {
-	outError := errors.New("Incorrect discord URL, please confirm URL is correct")
+	outError := errors.New("incorrect discord URL, please confirm URL is correct")
 	message := `{"content": "Testing the discord notifier"}`
-	contents, _, err := utils.HttpRequest(Discorder.Host, "POST", "application/json", nil, bytes.NewBuffer([]byte(message)), time.Duration(10*time.Second), true, nil)
+	contents, _, err := utils.HttpRequest(Discorder.Host.String, "POST", "application/json", nil, bytes.NewBuffer([]byte(message)), time.Duration(10*time.Second), true, nil)
 	if string(contents) == "" {
 		return "", nil
 	}
 	var dtt discordTestJson
-	err = json.Unmarshal(contents, &dtt)
 	if err != nil {
+		return "", err
+	}
+	if err = json.Unmarshal(contents, &dtt); err != nil {
 		return string(contents), outError
 	}
 	if dtt.Code == 0 {
diff --git a/notifiers/discord_test.go b/notifiers/discord_test.go
index 7d33b3b1..a4171416 100644
--- a/notifiers/discord_test.go
+++ b/notifiers/discord_test.go
@@ -19,6 +19,7 @@ var (
 )
 
 func TestDiscordNotifier(t *testing.T) {
+	t.Parallel()
 	err := utils.InitLogs()
 	require.Nil(t, err)
 	DISCORD_URL = utils.Params.GetString("DISCORD_URL")
@@ -35,14 +36,14 @@ func TestDiscordNotifier(t *testing.T) {
 	}
 
 	t.Run("Load discord", func(t *testing.T) {
-		Discorder.Host = DISCORD_URL
+		Discorder.Host = null.NewNullString(DISCORD_URL)
 		Discorder.Delay = time.Duration(100 * time.Millisecond)
 		Discorder.Enabled = null.NewNullBool(true)
 
 		Add(Discorder)
 
 		assert.Equal(t, "Hunter Long", Discorder.Author)
-		assert.Equal(t, DISCORD_URL, Discorder.Host)
+		assert.Equal(t, DISCORD_URL, Discorder.Host.String)
 	})
 
 	t.Run("discord Notifier Tester", func(t *testing.T) {
diff --git a/notifiers/email.go b/notifiers/email.go
index d3ec0461..2980c705 100644
--- a/notifiers/email.go
+++ b/notifiers/email.go
@@ -1,17 +1,16 @@
 package notifiers
 
 import (
-	"bytes"
 	"crypto/tls"
 	"fmt"
 	"github.com/go-mail/mail"
+	"github.com/statping/emails"
 	"github.com/statping/statping/types/core"
 	"github.com/statping/statping/types/failures"
 	"github.com/statping/statping/types/notifications"
 	"github.com/statping/statping/types/notifier"
 	"github.com/statping/statping/types/services"
 	"github.com/statping/statping/utils"
-	"html/template"
 )
 
 var _ notifier.Notifier = (*emailer)(nil)
@@ -28,6 +27,10 @@ func (e *emailer) Select() *notifications.Notification {
 	return e.Notification
 }
 
+func (e *emailer) Valid(values notifications.Values) error {
+	return nil
+}
+
 var email = &emailer{&notifications.Notification{
 	Method:      "email",
 	Title:       "SMTP Mail",
@@ -88,12 +91,12 @@ type emailOutgoing struct {
 // OnFailure will trigger failing service
 func (e *emailer) OnFailure(s services.Service, f failures.Failure) (string, error) {
 	subject := fmt.Sprintf("Service %s is Offline", s.Name)
-	tmpl := renderEmail(s, f)
+	tmpl := renderEmail(s, f, emails.Failure)
 	email := &emailOutgoing{
-		To:       e.Var2,
+		To:       e.Var2.String,
 		Subject:  subject,
 		Template: tmpl,
-		From:     e.Var1,
+		From:     e.Var1.String,
 	}
 	return tmpl, e.dialSend(email)
 }
@@ -101,38 +104,29 @@ func (e *emailer) OnFailure(s services.Service, f failures.Failure) (string, err
 // OnSuccess will trigger successful service
 func (e *emailer) OnSuccess(s services.Service) (string, error) {
 	subject := fmt.Sprintf("Service %s is Back Online", s.Name)
-	tmpl := renderEmail(s, failures.Failure{})
+	tmpl := renderEmail(s, failures.Failure{}, emails.Success)
 	email := &emailOutgoing{
-		To:       e.Var2,
+		To:       e.Var2.String,
 		Subject:  subject,
 		Template: tmpl,
-		From:     e.Var1,
+		From:     e.Var1.String,
 	}
 	return tmpl, e.dialSend(email)
 }
 
-func renderEmail(s services.Service, f failures.Failure) string {
-	wr := bytes.NewBuffer(nil)
-	tmpl := template.New("email")
-	tmpl, err := tmpl.Parse(emailBase)
-	if err != nil {
-		log.Errorln(err)
-		return emailBase
-	}
-
+func renderEmail(s services.Service, f failures.Failure, emailData string) string {
 	data := replacer{
 		Core:    *core.App,
 		Service: s,
 		Failure: f,
 		Custom:  nil,
 	}
-
-	if err = tmpl.ExecuteTemplate(wr, "email", data); err != nil {
+	output, err := emails.Parse(emailData, data)
+	if err != nil {
 		log.Errorln(err)
-		return emailBase
+		return emailData
 	}
-
-	return wr.String()
+	return output
 }
 
 // OnTest triggers when this notifier has been saved
@@ -140,10 +134,10 @@ func (e *emailer) OnTest() (string, error) {
 	service := services.Example(true)
 	subject := fmt.Sprintf("Service %v is Back Online", service.Name)
 	email := &emailOutgoing{
-		To:       e.Var2,
+		To:       e.Var2.String,
 		Subject:  subject,
-		Template: renderEmail(service, failures.Example()),
-		From:     e.Var1,
+		Template: renderEmail(service, failures.Example(), emailFailure),
+		From:     e.Var1.String,
 	}
 	return subject, e.dialSend(email)
 }
@@ -154,10 +148,10 @@ func (e *emailer) OnSave() (string, error) {
 }
 
 func (e *emailer) dialSend(email *emailOutgoing) error {
-	mailer = mail.NewDialer(e.Host, e.Port, e.Username, e.Password)
+	mailer = mail.NewDialer(e.Host.String, int(e.Port.Int64), e.Username.String, e.Password.String)
 	m := mail.NewMessage()
 	// if email setting TLS is Disabled
-	if e.ApiKey == "true" {
+	if e.ApiKey.String == "true" {
 		mailer.SSL = false
 	} else {
 		mailer.TLSConfig = &tls.Config{InsecureSkipVerify: true}
diff --git a/notifiers/email_rendered.go b/notifiers/email_rendered.go
new file mode 100755
index 00000000..4d2da9e8
--- /dev/null
+++ b/notifiers/email_rendered.go
@@ -0,0 +1,52 @@
+// DO NOT EDIT ** This file was generated with go generate on 2020-08-21 21:37:06.638898 +0000 UTC ** DO NOT EDIT //
+package notifiers
+
+const emailSuccess = `<!doctype html><html xmlns=http://www.w3.org/1999/xhtml xmlns:v=urn:schemas-microsoft-com:vml xmlns:o=urn:schemas-microsoft-com:office:office><title>Statping Service Notification</title><meta http-equiv=x-ua-compatible content="IE=edge"><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><style type=text/css>
+          #outlook a { padding:0; }
+          body { margin:0;padding:0;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%; }
+          table, td { border-collapse:collapse;mso-table-lspace:0pt;mso-table-rspace:0pt; }
+          img { border:0;height:auto;line-height:100%; outline:none;text-decoration:none;-ms-interpolation-mode:bicubic; }
+          p { display:block;margin:13px 0; }
+        </style><link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700" rel=stylesheet type=text/css><style type=text/css>
+          @import url(https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700);
+        </style><style type=text/css>
+      @media only screen and (min-width:480px) {
+        .mj-column-per-100 { width:100% !important; max-width: 100%; }
+      }
+    </style><style type=text/css>
+        
+        
+
+    @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile { width: 100% !important; }
+      td.mj-full-width-mobile { width: auto !important; }
+    }
+  
+        </style><body style=background-color:#E7E7E7;><div style=background-color:#E7E7E7;><div style="background:#12ab0c url(https://assets.statping.com/greenbackground.png) top center / auto repeat;margin:0px auto;max-width:600px;"><div style=line-height:0;font-size:0;><table align=center background=https://assets.statping.com/greenbackground.png border=0 cellpadding=0 cellspacing=0 role=presentation style="background:#12ab0c url(https://assets.statping.com/greenbackground.png) top center / auto repeat;width:100%;"><tbody><tr><td style=direction:ltr;font-size:0px;padding:0px;text-align:center;><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation style=vertical-align:top; width=100%><tr><td align=center style="font-size:0px;padding:10px 25px;word-break:break-word;"><table border=0 cellpadding=0 cellspacing=0 role=presentation style=border-collapse:collapse;border-spacing:0px;><tbody><tr><td style=width:45px;><a href=https://statping.com target=_blank><img alt=Sphero height=auto src=https://assets.statping.com/iconlight.png style=border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px; width=45></a></table></table></div></table></div></div><div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:600px;"><table align=center border=0 cellpadding=0 cellspacing=0 role=presentation style=background:#ffffff;background-color:#ffffff;width:100%;><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;"><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation style=vertical-align:top; width=100%><tr><td align=left style=font-size:0px;padding:15px;word-break:break-word;><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:22px;line-height:30px;text-align:left;color:#000000;">{{.Service.Name}} is currently offline, you might want to check it.</div><tr><td style="font-size:0px;padding:20px 0;padding-top:10px;padding-right:0px;padding-bottom:10px;padding-left:0px;word-break:break-word;"><div style="margin:0px auto;max-width:600px;"><table align=center border=0 cellpadding=0 cellspacing=0 role=presentation style=width:100%;><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;padding-bottom:10px;padding-left:0px;padding-right:0px;padding-top:10px;text-align:center;"><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation style=vertical-align:top; width=100%><tr><td align=center style="font-size:0px;padding:10px 25px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:20px;line-height:1;text-align:center;color:#626262;">Offline for {{.Service.Downtime.Human}}</div><tr><td align=center vertical-align=middle style="font-size:0px;padding:10px 25px;word-break:break-word;"><table border=0 cellpadding=0 cellspacing=0 role=presentation style=border-collapse:separate;line-height:100%;><tr><td align=center bgcolor=#4caf50 role=presentation style="border:none;border-radius:4px;cursor:auto;mso-padding-alt:10px 25px;background:#4caf50;" valign=middle><a href={{.Core.Domain}}/service/{{.Service.Id}} style="display:inline-block;background:#4caf50;color:#ffffff;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:4px;" target=_blank>View Dashboard</a></table></table></div></table></div><tr><td style=font-size:0px;padding:0px;word-break:break-word;><div style="background:#fafafa;background-color:#fafafa;margin:0px auto;max-width:600px;"><table align=center border=0 cellpadding=0 cellspacing=0 role=presentation style=background:#fafafa;background-color:#fafafa;width:100%;><tbody><tr><td style=direction:ltr;font-size:0px;padding:0px;text-align:center;><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation style=vertical-align:top; width=100%><tr><td align=left style="font-size:0px;padding:10px 25px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:20px;line-height:1;text-align:left;color:#626262;">Service Domain</div><tr><td align=left style="font-size:0px;padding:10px 25px;padding-top:0px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:14px;line-height:1;text-align:left;color:#626262;">{{.Service.Domain}}</div></table></div></table></div><tr><td style=font-size:0px;padding:0px;word-break:break-word;><div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:600px;"><table align=center border=0 cellpadding=0 cellspacing=0 role=presentation style=background:#ffffff;background-color:#ffffff;width:100%;><tbody><tr><td style=direction:ltr;font-size:0px;padding:0px;text-align:center;><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation style=vertical-align:top; width=100%><tr><td align=left style="font-size:0px;padding:10px 25px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:20px;line-height:1;text-align:left;color:#626262;">Current Issue</div><tr><td align=left style="font-size:0px;padding:10px 25px;padding-top:0px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:14px;line-height:1;text-align:left;color:#626262;">{{.Failure.Issue}}</div></table></div></table></div><tr><td style=font-size:0px;word-break:break-word;><div style=height:30px;>&nbsp;</div><tr><td style=font-size:0px;padding:0;word-break:break-word;><div style="background:#12ab0c url(https://assets.statping.com/greenbackground.png) top center / auto repeat;margin:0px auto;max-width:600px;"><div style=line-height:0;font-size:0;><table align=center background=https://assets.statping.com/greenbackground.png border=0 cellpadding=0 cellspacing=0 role=presentation style="background:#12ab0c url(https://assets.statping.com/greenbackground.png) top center / auto repeat;width:100%;"><tbody><tr><td style=direction:ltr;font-size:0px;padding:0;text-align:center;><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation style=vertical-align:top; width=100%><tr><td align=center style="font-size:0px;padding:10px 25px;word-break:break-word;"><table border=0 cellpadding=0 cellspacing=0 role=presentation style=border-collapse:collapse;border-spacing:0px;><tbody><tr><td style=width:250px;><a href=https://statping.com target=_blank><img height=auto src=https://assets.statping.com/statpingcom.png style=border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px; width=250></a></table></table></div></table></div></div><tr><td style="font-size:0px;padding:20px 0;padding-top:10px;padding-bottom:0;word-break:break-word;"><div style="margin:0px auto;max-width:600px;"><table align=center border=0 cellpadding=0 cellspacing=0 role=presentation style=width:100%;><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;padding-bottom:0;padding-top:10px;text-align:center;"><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation style=vertical-align:top; width=100%><tr><td align=center style="font-size:0px;padding:10px 25px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:11px;line-height:16px;text-align:center;color:#445566;">You are receiving this email because one of your services has changed on your Statping instance. You can modify this email on the Email Notifier page in Settings.</div><tr><td align=center style="font-size:0px;padding:10px 25px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:11px;line-height:16px;text-align:center;color:#445566;">&copy; Statping</div></table></div></table></div><tr><td style="font-size:0px;padding:20px 0;padding-top:0;padding-bottom:0;word-break:break-word;"><div style="margin:0px auto;max-width:600px;"><table align=center border=0 cellpadding=0 cellspacing=0 role=presentation style=width:100%;><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;padding-bottom:0;padding-top:0;text-align:center;"><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0;line-height:0;text-align:left;display:inline-block;width:100%;direction:ltr;><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation width=100%><tbody><tr><td style=vertical-align:top;padding-right:0;><table border=0 cellpadding=0 cellspacing=0 role=presentation width=100%><tr><td align=center style="font-size:0px;padding:10px 25px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:11px;font-weight:bold;line-height:16px;text-align:center;color:#445566;"><a class=footer-link href=https://statping.com>Statping.com</a>&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+<a class=footer-link href=https://github.com/statping/statping>Github</a>&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+<a class=footer-link href=https://statping.com/privacy>Privacy</a>&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</div></table></table></div></div></table></div></table></div></table></div></div>`
+
+const emailFailure = `<!doctype html><html xmlns=http://www.w3.org/1999/xhtml xmlns:v=urn:schemas-microsoft-com:vml xmlns:o=urn:schemas-microsoft-com:office:office><title>Statping Service Notification</title><meta http-equiv=x-ua-compatible content="IE=edge"><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><style type=text/css>
+          #outlook a { padding:0; }
+          body { margin:0;padding:0;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%; }
+          table, td { border-collapse:collapse;mso-table-lspace:0pt;mso-table-rspace:0pt; }
+          img { border:0;height:auto;line-height:100%; outline:none;text-decoration:none;-ms-interpolation-mode:bicubic; }
+          p { display:block;margin:13px 0; }
+        </style><link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700" rel=stylesheet type=text/css><style type=text/css>
+          @import url(https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700);
+        </style><style type=text/css>
+      @media only screen and (min-width:480px) {
+        .mj-column-per-100 { width:100% !important; max-width: 100%; }
+      }
+    </style><style type=text/css>
+        
+        
+
+    @media only screen and (max-width:480px) {
+      table.mj-full-width-mobile { width: 100% !important; }
+      td.mj-full-width-mobile { width: auto !important; }
+    }
+  
+        </style><body style=background-color:#E7E7E7;><div style=background-color:#E7E7E7;><div style="background:#a30911 url(https://assets.statping.com/offlinebanner.png) top center / auto repeat;margin:0px auto;max-width:600px;"><div style=line-height:0;font-size:0;><table align=center background=https://assets.statping.com/offlinebanner.png border=0 cellpadding=0 cellspacing=0 role=presentation style="background:#a30911 url(https://assets.statping.com/offlinebanner.png) top center / auto repeat;width:100%;"><tbody><tr><td style=direction:ltr;font-size:0px;padding:0px;text-align:center;><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation style=vertical-align:top; width=100%><tr><td align=center style="font-size:0px;padding:10px 25px;word-break:break-word;"><table border=0 cellpadding=0 cellspacing=0 role=presentation style=border-collapse:collapse;border-spacing:0px;><tbody><tr><td style=width:45px;><a href=https://statping.com target=_blank><img alt=Sphero height=auto src=https://assets.statping.com/iconlight.png style=border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px; width=45></a></table></table></div></table></div></div><div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:600px;"><table align=center border=0 cellpadding=0 cellspacing=0 role=presentation style=background:#ffffff;background-color:#ffffff;width:100%;><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;"><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation style=vertical-align:top; width=100%><tr><td align=left style=font-size:0px;padding:15px;word-break:break-word;><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:22px;line-height:30px;text-align:left;color:#000000;">{{.Service.Name}} is currently offline, you might want to check it.</div><tr><td style="font-size:0px;padding:20px 0;padding-top:10px;padding-right:0px;padding-bottom:10px;padding-left:0px;word-break:break-word;"><div style="margin:0px auto;max-width:600px;"><table align=center border=0 cellpadding=0 cellspacing=0 role=presentation style=width:100%;><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;padding-bottom:10px;padding-left:0px;padding-right:0px;padding-top:10px;text-align:center;"><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation style=vertical-align:top; width=100%><tr><td align=center style="font-size:0px;padding:10px 25px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:20px;line-height:1;text-align:center;color:#626262;">Offline for {{.Service.Downtime.Human}}</div><tr><td align=center vertical-align=middle style="font-size:0px;padding:10px 25px;word-break:break-word;"><table border=0 cellpadding=0 cellspacing=0 role=presentation style=border-collapse:separate;line-height:100%;><tr><td align=center bgcolor=#cb121c role=presentation style="border:none;border-radius:4px;cursor:auto;mso-padding-alt:10px 25px;background:#cb121c;" valign=middle><a href={{.Core.Domain}}/service/{{.Service.Id}} style="display:inline-block;background:#cb121c;color:#ffffff;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:4px;" target=_blank>View Dashboard</a></table></table></div></table></div><tr><td style=font-size:0px;padding:0px;word-break:break-word;><div style="background:#fafafa;background-color:#fafafa;margin:0px auto;max-width:600px;"><table align=center border=0 cellpadding=0 cellspacing=0 role=presentation style=background:#fafafa;background-color:#fafafa;width:100%;><tbody><tr><td style=direction:ltr;font-size:0px;padding:0px;text-align:center;><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation style=vertical-align:top; width=100%><tr><td align=left style="font-size:0px;padding:10px 25px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:20px;line-height:1;text-align:left;color:#626262;">Service Domain</div><tr><td align=left style="font-size:0px;padding:10px 25px;padding-top:0px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:14px;line-height:1;text-align:left;color:#626262;">{{.Service.Domain}}</div></table></div></table></div><tr><td style=font-size:0px;padding:0px;word-break:break-word;><div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:600px;"><table align=center border=0 cellpadding=0 cellspacing=0 role=presentation style=background:#ffffff;background-color:#ffffff;width:100%;><tbody><tr><td style=direction:ltr;font-size:0px;padding:0px;text-align:center;><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation style=vertical-align:top; width=100%><tr><td align=left style="font-size:0px;padding:10px 25px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:20px;line-height:1;text-align:left;color:#626262;">Current Issue</div><tr><td align=left style="font-size:0px;padding:10px 25px;padding-top:0px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:14px;line-height:1;text-align:left;color:#626262;">{{.Failure.Issue}}</div></table></div></table></div><tr><td style=font-size:0px;word-break:break-word;><div style=height:30px;>&nbsp;</div><tr><td style=font-size:0px;padding:0;word-break:break-word;><div style="background:#a30911 url(https://assets.statping.com/offlinebanner.png) top center / auto repeat;margin:0px auto;max-width:600px;"><div style=line-height:0;font-size:0;><table align=center background=https://assets.statping.com/offlinebanner.png border=0 cellpadding=0 cellspacing=0 role=presentation style="background:#a30911 url(https://assets.statping.com/offlinebanner.png) top center / auto repeat;width:100%;"><tbody><tr><td style=direction:ltr;font-size:0px;padding:0;text-align:center;><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation style=vertical-align:top; width=100%><tr><td align=center style="font-size:0px;padding:10px 25px;word-break:break-word;"><table border=0 cellpadding=0 cellspacing=0 role=presentation style=border-collapse:collapse;border-spacing:0px;><tbody><tr><td style=width:250px;><a href=https://statping.com target=_blank><img height=auto src=https://assets.statping.com/statpingcom.png style=border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px; width=250></a></table></table></div></table></div></div><tr><td style="font-size:0px;padding:20px 0;padding-top:10px;padding-bottom:0;word-break:break-word;"><div style="margin:0px auto;max-width:600px;"><table align=center border=0 cellpadding=0 cellspacing=0 role=presentation style=width:100%;><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;padding-bottom:0;padding-top:10px;text-align:center;"><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation style=vertical-align:top; width=100%><tr><td align=center style="font-size:0px;padding:10px 25px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:11px;line-height:16px;text-align:center;color:#445566;">You are receiving this email because one of your services has changed on your Statping instance. You can modify this email on the Email Notifier page in Settings.</div><tr><td align=center style="font-size:0px;padding:10px 25px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:11px;line-height:16px;text-align:center;color:#445566;">&copy; Statping</div></table></div></table></div><tr><td style="font-size:0px;padding:20px 0;padding-top:0;padding-bottom:0;word-break:break-word;"><div style="margin:0px auto;max-width:600px;"><table align=center border=0 cellpadding=0 cellspacing=0 role=presentation style=width:100%;><tbody><tr><td style="direction:ltr;font-size:0px;padding:20px 0;padding-bottom:0;padding-top:0;text-align:center;"><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0;line-height:0;text-align:left;display:inline-block;width:100%;direction:ltr;><div class="mj-column-per-100 mj-outlook-group-fix" style=font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;><table border=0 cellpadding=0 cellspacing=0 role=presentation width=100%><tbody><tr><td style=vertical-align:top;padding-right:0;><table border=0 cellpadding=0 cellspacing=0 role=presentation width=100%><tr><td align=center style="font-size:0px;padding:10px 25px;word-break:break-word;"><div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:11px;font-weight:bold;line-height:16px;text-align:center;color:#445566;"><a class=footer-link href=https://statping.com>Statping.com</a>&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+<a class=footer-link href=https://github.com/statping/statping>Github</a>&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+<a class=footer-link href=https://statping.com/privacy>Privacy</a>&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</div></table></table></div></div></table></div></table></div></table></div></div>`
diff --git a/notifiers/email_template.go b/notifiers/email_template.go
deleted file mode 100644
index af21e415..00000000
--- a/notifiers/email_template.go
+++ /dev/null
@@ -1,628 +0,0 @@
-package notifiers
-
-const emailBase = `
-{{$banner := "https://assets.statping.com/greenbackground.png"}}
-{{$color := "#4caf50"}}
-{{if not .Service.Online}}
-{{$banner = "https://assets.statping.com/offlinebanner.png"}}
-{{$color = "#c30c0c"}}
-{{end}}
-
-<!doctype html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
-
-<head>
-  <title> Statping Service Notification </title>
-  <!--[if !mso]><!-- -->
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <!--<![endif]-->
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <style type="text/css">
-    #outlook a {
-      padding: 0;
-    }
-
-    body {
-      margin: 0;
-      padding: 0;
-      -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-    }
-
-    table,
-    td {
-      border-collapse: collapse;
-      mso-table-lspace: 0pt;
-      mso-table-rspace: 0pt;
-    }
-
-    img {
-      border: 0;
-      height: auto;
-      line-height: 100%;
-      outline: none;
-      text-decoration: none;
-      -ms-interpolation-mode: bicubic;
-    }
-
-    p {
-      display: block;
-      margin: 13px 0;
-    }
-  </style>
-  <!--[if mso]>
-        <xml>
-        <o:OfficeDocumentSettings>
-          <o:AllowPNG/>
-          <o:PixelsPerInch>96</o:PixelsPerInch>
-        </o:OfficeDocumentSettings>
-        </xml>
-        <![endif]-->
-  <!--[if lte mso 11]>
-        <style type="text/css">
-          .mj-outlook-group-fix { width:100% !important; }
-        </style>
-        <![endif]-->
-  <!--[if !mso]><!-->
-  <link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700" rel="stylesheet" type="text/css">
-  <style type="text/css">
-    @import url(https://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700);
-  </style>
-  <!--<![endif]-->
-  <style type="text/css">
-    @media only screen and (min-width:480px) {
-      .mj-column-per-100 {
-        width: 100% !important;
-        max-width: 100%;
-      }
-    }
-  </style>
-  <style type="text/css">
-    @media only screen and (max-width:480px) {
-      table.mj-full-width-mobile {
-        width: 100% !important;
-      }
-      td.mj-full-width-mobile {
-        width: auto !important;
-      }
-    }
-  </style>
-</head>
-
-<body style="background-color:#E7E7E7;">
-  <div style="background-color:#E7E7E7;">
-    <!-- Top Bar -->
-    <!--[if mso | IE]>
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      
-        <v:rect  style="width:600px;" xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false">
-        <v:fill  origin="0.5, 0" position="0.5, 0" src="{{$banner}}" color="#FF3FB4" type="tile" />
-        <v:textbox style="mso-fit-shape-to-text:true" inset="0,0,0,0">
-      <![endif]-->
-    <div style="background:#FF3FB4 url({{$banner}}) top center / auto repeat;margin:0px auto;max-width:600px;">
-      <div style="line-height:0;font-size:0;">
-        <table align="center" background="{{$banner}}" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#FF3FB4 url({{$banner}}) top center / auto repeat;width:100%;">
-          <tbody>
-            <tr>
-              <td style="direction:ltr;font-size:0px;padding:0px;text-align:center;">
-                <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                
-        <tr>
-      
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-                <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
-                    <tr>
-                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
-                          <tbody>
-                            <tr>
-                              <td style="width:45px;"> <a href="https://statping.com" target="_blank">
-          
-      <img
-         alt="Statping" height="auto" src="https://assets.statping.com/iconlight.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="45"
-      />
-    
-        </a> </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                      </td>
-                    </tr>
-                  </table>
-                </div>
-                <!--[if mso | IE]>
-            </td>
-          
-        </tr>
-      
-                  </table>
-                <![endif]-->
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
-    <!--[if mso | IE]>
-        </v:textbox>
-      </v:rect>
-    
-          </td>
-        </tr>
-      </table>
-      
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-    <div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:600px;">
-      <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#ffffff;background-color:#ffffff;width:100%;">
-        <tbody>
-          <tr>
-            <td style="direction:ltr;font-size:0px;padding:20px 0;text-align:center;">
-              <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                
-        <tr>
-      
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-              <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
-                  <tr>
-                    <td align="left" style="font-size:0px;padding:15px;word-break:break-word;">
-                      <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:22px;line-height:30px;text-align:left;color:#000000;">
-
-{{if .Service.Online}}
-	{{.Service.Name}} is back online.
-{{else}}
-	{{.Service.Name}} is currently offline, you might want to check it.
-{{end}}
-
-</div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td style="font-size:0px;padding:20px 0;padding-top:10px;padding-right:0px;padding-bottom:10px;padding-left:0px;word-break:break-word;">
-                      <!--[if mso | IE]>
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-                      <div style="margin:0px auto;max-width:600px;">
-                        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-                          <tbody>
-                            <tr>
-                              <td style="direction:ltr;font-size:0px;padding:20px 0;padding-bottom:10px;padding-left:0px;padding-right:0px;padding-top:10px;text-align:center;">
-                                <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                
-        <tr>
-      
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-                                <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
-                                    <tr>
-                                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:20px;line-height:1;text-align:center;color:#626262;">
-{{if .Service.Online}}
-Online for {{.Service.Uptime.Human}}
-{{else}}
-Offline for {{.Service.Downtime.Human}}
-{{end}}
-</div>
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td align="center" vertical-align="middle" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                        <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
-                                          <tr>
-                                            <td align="center" bgcolor="{{$color}}" role="presentation" style="border:none;border-radius:4px;cursor:auto;mso-padding-alt:10px 25px;background:{{$color}};" valign="middle"> 
-<a href="{{.Core.Domain}}/service/{{.Service.Id}}" style="display:inline-block;background:{{$color}};color:#ffffff;font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:13px;font-weight:normal;line-height:120%;margin:0;text-decoration:none;text-transform:none;padding:10px 25px;mso-padding-alt:0px;border-radius:4px;"
-                                                target="_blank">
-              View Dashboard
-            </a> </td>
-                                          </tr>
-                                        </table>
-                                      </td>
-                                    </tr>
-                                  </table>
-                                </div>
-                                <!--[if mso | IE]>
-            </td>
-          
-        </tr>
-      
-                  </table>
-                <![endif]-->
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                      </div>
-                      <!--[if mso | IE]>
-          </td>
-        </tr>
-      </table>
-      <![endif]-->
-                    </td>
-                  </tr>
-                  <!-- Bottom Graphic -->
-                  <tr>
-                    <td style="font-size:0px;padding:0px;word-break:break-word;">
-                      <!--[if mso | IE]>
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-                      <div style="background:#fafafa;background-color:#fafafa;margin:0px auto;max-width:600px;">
-                        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#fafafa;background-color:#fafafa;width:100%;">
-                          <tbody>
-                            <tr>
-                              <td style="direction:ltr;font-size:0px;padding:0px;text-align:center;">
-                                <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                
-        <tr>
-      
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-                                <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
-                                    <tr>
-                                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:20px;line-height:1;text-align:left;color:#626262;">Service Domain</div>
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td align="left" style="font-size:0px;padding:10px 25px;padding-top:0px;word-break:break-word;">
-                                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:14px;line-height:1;text-align:left;color:#626262;">{{.Service.Domain}}</div>
-                                      </td>
-                                    </tr>
-                                  </table>
-                                </div>
-                                <!--[if mso | IE]>
-            </td>
-          
-        </tr>
-      
-                  </table>
-                <![endif]-->
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                      </div>
-                      <!--[if mso | IE]>
-          </td>
-        </tr>
-      </table>
-      <![endif]-->
-                    </td>
-                  </tr>
-                  <tr>
-                    <td style="font-size:0px;padding:0px;word-break:break-word;">
-                      <!--[if mso | IE]>
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-                      <div style="background:#ffffff;background-color:#ffffff;margin:0px auto;max-width:600px;">
-                        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#ffffff;background-color:#ffffff;width:100%;">
-                          <tbody>
-                            <tr>
-                              <td style="direction:ltr;font-size:0px;padding:0px;text-align:center;">
-                                <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                
-        <tr>
-      
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-{{if .Failure}}
-                                <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
-                                    <tr>
-                                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:20px;line-height:1;text-align:left;color:#626262;">Current Issue</div>
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td align="left" style="font-size:0px;padding:10px 25px;padding-top:0px;word-break:break-word;">
-                                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:14px;line-height:1;text-align:left;color:#626262;">{{.Failure.Issue}}</div>
-                                      </td>
-                                    </tr>
-                                  </table>
-                                </div>
-{{end}}
-                                <!--[if mso | IE]>
-            </td>
-          
-        </tr>
-      
-                  </table>
-                <![endif]-->
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                      </div>
-                      <!--[if mso | IE]>
-          </td>
-        </tr>
-      </table>
-      <![endif]-->
-                    </td>
-                  </tr>
-                  <tr>
-                    <td style="font-size:0px;word-break:break-word;">
-                      <!--[if mso | IE]>
-    
-        <table role="presentation" border="0" cellpadding="0" cellspacing="0"><tr><td height="30" style="vertical-align:top;height:30px;">
-      
-    <![endif]-->
-                      <div style="height:30px;"> &nbsp; </div>
-                      <!--[if mso | IE]>
-    
-        </td></tr></table>
-      
-    <![endif]-->
-                    </td>
-                  </tr>
-                  <tr>
-                    <td style="font-size:0px;padding:0;word-break:break-word;">
-                      <!--[if mso | IE]>
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      
-        <v:rect  style="width:600px;" xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false">
-        <v:fill  origin="0.5, 0" position="0.5, 0" src="{{$banner}}" color="#F15822" type="tile" />
-        <v:textbox style="mso-fit-shape-to-text:true" inset="0,0,0,0">
-      <![endif]-->
-                      <div style="background:#F15822 url({{$banner}}) top center / auto repeat;margin:0px auto;max-width:600px;">
-                        <div style="line-height:0;font-size:0;">
-                          <table align="center" background="{{$banner}}" border="0" cellpadding="0" cellspacing="0" role="presentation" style="background:#F15822 url({{$banner}}) top center / auto repeat;width:100%;">
-                            <tbody>
-                              <tr>
-                                <td style="direction:ltr;font-size:0px;padding:0;text-align:center;">
-                                  <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                
-        <tr>
-      
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-                                  <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                                    <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
-                                      <tr>
-                                        <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:collapse;border-spacing:0px;">
-                                            <tbody>
-                                              <tr>
-                                                <td style="width:250px;"> <a href="https://www.sphero.com" target="_blank">
-          
-      <img
-         height="auto" src="https://assets.statping.com/statpingcom.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="250"
-      />
-    
-        </a> </td>
-                                              </tr>
-                                            </tbody>
-                                          </table>
-                                        </td>
-                                      </tr>
-                                    </table>
-                                  </div>
-                                  <!--[if mso | IE]>
-            </td>
-          
-        </tr>
-      
-                  </table>
-                <![endif]-->
-                                </td>
-                              </tr>
-                            </tbody>
-                          </table>
-                        </div>
-                      </div>
-                      <!--[if mso | IE]>
-        </v:textbox>
-      </v:rect>
-    
-          </td>
-        </tr>
-      </table>
-      <![endif]-->
-                    </td>
-                  </tr>
-                  <tr>
-                    <td style="font-size:0px;padding:20px 0;padding-top:10px;padding-bottom:0;word-break:break-word;">
-                      <!--[if mso | IE]>
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-                      <div style="margin:0px auto;max-width:600px;">
-                        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-                          <tbody>
-                            <tr>
-                              <td style="direction:ltr;font-size:0px;padding:20px 0;padding-bottom:0;padding-top:10px;text-align:center;">
-                                <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                
-        <tr>
-      
-            <td
-               class="" style="vertical-align:top;width:600px;"
-            >
-          <![endif]-->
-                                <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                                  <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
-                                    <tr>
-                                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:11px;line-height:16px;text-align:center;color:#445566;">You are receiving this email because one of your services has changed on your Statping instance. You can modify this email on the Email Notifier page in Settings.</div>
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                        <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:11px;line-height:16px;text-align:center;color:#445566;">&copy; Statping</div>
-                                      </td>
-                                    </tr>
-                                  </table>
-                                </div>
-                                <!--[if mso | IE]>
-            </td>
-          
-        </tr>
-      
-                  </table>
-                <![endif]-->
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                      </div>
-                      <!--[if mso | IE]>
-          </td>
-        </tr>
-      </table>
-      <![endif]-->
-                    </td>
-                  </tr>
-                  <tr>
-                    <td style="font-size:0px;padding:20px 0;padding-top:0;padding-bottom:0;word-break:break-word;">
-                      <!--[if mso | IE]>
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-                      <div style="margin:0px auto;max-width:600px;">
-                        <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-                          <tbody>
-                            <tr>
-                              <td style="direction:ltr;font-size:0px;padding:20px 0;padding-bottom:0;padding-top:0;text-align:center;">
-                                <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                
-        <tr>
-      
-            <td
-               class="" style="width:600px;"
-            >
-          <![endif]-->
-                                <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0;line-height:0;text-align:left;display:inline-block;width:100%;direction:ltr;">
-                                  <!--[if mso | IE]>
-        <table
-           border="0" cellpadding="0" cellspacing="0" role="presentation"
-        >
-          <tr>
-        
-              <td
-                 style="vertical-align:top;width:600px;"
-              >
-              <![endif]-->
-                                  <div class="mj-column-per-100 mj-outlook-group-fix" style="font-size:0px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                                    <table border="0" cellpadding="0" cellspacing="0" role="presentation" width="100%">
-                                      <tbody>
-                                        <tr>
-                                          <td style="vertical-align:top;padding-right:0;">
-                                            <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="" width="100%">
-                                              <tr>
-                                                <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                                  <div style="font-family:Ubuntu, Helvetica, Arial, sans-serif;font-size:11px;font-weight:bold;line-height:16px;text-align:center;color:#445566;"><a class="footer-link" href="https://statping.com">Statping.com</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0; <a class="footer-link" href="https://github.com/statping/statping">Github</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;
-                                                    <a class="footer-link" href="https://statping.com/privacy">Privacy</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0; <a class="footer-link" href="https://www.google.com">Unsubscribe</a></div>
-                                                </td>
-                                              </tr>
-                                            </table>
-                                          </td>
-                                        </tr>
-                                      </tbody>
-                                    </table>
-                                  </div>
-                                  <!--[if mso | IE]>
-              </td>
-              
-          </tr>
-          </table>
-        <![endif]-->
-                                </div>
-                                <!--[if mso | IE]>
-            </td>
-          
-        </tr>
-      
-                  </table>
-                <![endif]-->
-                              </td>
-                            </tr>
-                          </tbody>
-                        </table>
-                      </div>
-                      <!--[if mso | IE]>
-          </td>
-        </tr>
-      </table>
-      <![endif]-->
-                    </td>
-                  </tr>
-                </table>
-              </div>
-              <!--[if mso | IE]>
-            </td>
-          
-        </tr>
-      
-                  </table>
-                <![endif]-->
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <!--[if mso | IE]>
-          </td>
-        </tr>
-      </table>
-      <![endif]-->
-  </div>
-</body>
-
-</html>
-`
diff --git a/notifiers/email_test.go b/notifiers/email_test.go
index cbcec63e..d873335a 100644
--- a/notifiers/email_test.go
+++ b/notifiers/email_test.go
@@ -24,6 +24,7 @@ var (
 )
 
 func TestEmailNotifier(t *testing.T) {
+	t.Parallel()
 	err := utils.InitLogs()
 	require.Nil(t, err)
 
@@ -46,18 +47,18 @@ func TestEmailNotifier(t *testing.T) {
 	}
 
 	t.Run("New email", func(t *testing.T) {
-		email.Host = EMAIL_HOST
-		email.Username = EMAIL_USER
-		email.Password = EMAIL_PASS
-		email.Var1 = EMAIL_OUTGOING
-		email.Var2 = EMAIL_SEND_TO
-		email.Port = int(EMAIL_PORT)
+		email.Host = null.NewNullString(EMAIL_HOST)
+		email.Username = null.NewNullString(EMAIL_USER)
+		email.Password = null.NewNullString(EMAIL_PASS)
+		email.Var1 = null.NewNullString(EMAIL_OUTGOING)
+		email.Var2 = null.NewNullString(EMAIL_SEND_TO)
+		email.Port = null.NewNullInt64(EMAIL_PORT)
 		email.Delay = time.Duration(100 * time.Millisecond)
 		email.Enabled = null.NewNullBool(true)
 
 		Add(email)
 		assert.Equal(t, "Hunter Long", email.Author)
-		assert.Equal(t, EMAIL_HOST, email.Host)
+		assert.Equal(t, EMAIL_HOST, email.Host.String)
 	})
 
 	t.Run("email Within Limits", func(t *testing.T) {
diff --git a/notifiers/generate.go b/notifiers/generate.go
new file mode 100644
index 00000000..1b12772c
--- /dev/null
+++ b/notifiers/generate.go
@@ -0,0 +1,270 @@
+// +build ignore
+
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"github.com/statping/statping/utils"
+	"github.com/tdewolff/minify/v2"
+	"github.com/tdewolff/minify/v2/html"
+	"os"
+	"time"
+)
+
+var (
+	mjmlApplication string
+	mjmlPrivate     string
+)
+
+func main() {
+	utils.InitEnvs()
+
+	mjmlApplication = os.Getenv("MJML_APP")
+	mjmlPrivate = os.Getenv("MJML_PRIVATE")
+
+	if mjmlApplication == "" || mjmlPrivate == "" {
+		fmt.Println("skipping email MJML template render, missing MJML_APP and MJML_PRIVATE")
+		return
+	}
+
+	fmt.Println("Generating success/failure email templates from MJML to a HTML golang constant")
+
+	success := convertMJML(emailSuccessMJML)
+	fail := convertMJML(emailFailureMJML)
+
+	htmlOut := `// DO NOT EDIT ** This file was generated with go generate on ` + utils.Now().String() + ` ** DO NOT EDIT //
+package notifiers
+
+const emailSuccess = ` + minimize(success) + `
+
+const emailFailure = ` + minimize(fail) + `
+
+`
+
+	utils.SaveFile("email_rendered.go", []byte(htmlOut))
+
+	fmt.Println("Email MJML to HTML const saved: notifiers/email_rendered.go")
+}
+
+type mjmlInput struct {
+	Mjml string `json:"mjml"`
+}
+
+func minimize(val string) string {
+	m := minify.New()
+	m.Add("text/html", &html.Minifier{
+		KeepDefaultAttrVals: true,
+	})
+	s, err := m.String("text/html", val)
+	if err != nil {
+		panic(err)
+	}
+
+	return fmt.Sprintf("`%s`", s)
+}
+
+func convertMJML(mjml string) string {
+	input, _ := json.Marshal(mjmlInput{mjml})
+	auth := fmt.Sprintf("%s:%s", mjmlApplication, mjmlPrivate)
+	resp, _, err := utils.HttpRequest("https://"+auth+"@api.mjml.io/v1/render", "POST", "application/json", nil, bytes.NewBuffer(input), 15*time.Minute, false, nil)
+	if err != nil {
+		panic(err)
+	}
+	var respData mjmlApi
+	if err := json.Unmarshal(resp, &respData); err != nil {
+		panic(err)
+	}
+	return respData.Html
+}
+
+type mjmlApi struct {
+	Html    string `json:"html"`
+	Mjml    string `json:"mjml"`
+	Version string `json:"mjml_version"`
+}
+
+const emailFailureMJML = `<mjml>
+  <mj-head>
+    <mj-title>Statping Service Notification</mj-title>
+  </mj-head>
+  <mj-body background-color="#E7E7E7">
+    <mj-raw>
+      <!-- Top Bar -->
+    </mj-raw>
+    <mj-section background-color="#a30911" background-url="https://assets.statping.com/offlinebanner.png" padding="0px">
+      <mj-column>
+        <mj-image width="45px" href="https://statping.com" src="https://assets.statping.com/iconlight.png" align="center" alt="Sphero"></mj-image>
+      </mj-column>
+    </mj-section>
+  
+    <mj-section background-color="#ffffff">
+      <mj-column width="100%">
+        <mj-text font-family="Ubuntu, Helvetica, Arial, sans-serif" font-size="22px" padding="15px" line-height="30px">
+         {{.Service.Name}} is currently offline, you might want to check it.
+        </mj-text>
+        
+        
+            <mj-section padding-left="0px" padding-right="0px" padding-top="10px" padding-bottom="10px">
+        <mj-column>
+          <mj-text font-color="#d50d0d" align="center" font-size="20px" color="#626262">Offline for {{.Service.Downtime.Human}}</mj-text>
+          
+          <mj-button border-radius="4px" background-color="#cb121c" href="{{.Core.Domain}}/service/{{.Service.Id}}">View Dashboard</mj-button>
+          
+    </mj-column>
+  </mj-section>
+        
+       
+    <mj-raw>
+      <!-- Bottom Graphic -->
+    </mj-raw>
+    
+        
+        
+   
+  <mj-section padding="0px" background-color="#fafafa">
+        <mj-column>
+          <mj-text font-size="20px" color="#626262">Service Domain</mj-text>
+          <mj-text padding-top="0px" font-size="14px" color="#626262">{{.Service.Domain}}</mj-text>
+    </mj-column>
+  </mj-section>
+    
+    <mj-section padding="0px"  background-color="#ffffff">
+        <mj-column>
+          <mj-text font-size="20px" color="#626262">Current Issue</mj-text>
+          <mj-text padding-top="0px" font-size="14px" color="#626262">{{.Failure.Issue}}</mj-text>
+    </mj-column>
+  </mj-section>
+    
+   
+ <mj-spacer height="30px" />
+        
+    <mj-section padding="0" background-url="https://assets.statping.com/offlinebanner.png" background-color="#a30911">
+      <mj-column>
+        <mj-image width="250px" href="https://statping.com" src="https://assets.statping.com/statpingcom.png" align="center"></mj-image>
+      </mj-column>
+    </mj-section>
+        
+         <mj-section padding-bottom="0" padding-top="10px">
+        <mj-column>
+        <mj-text color="#445566" font-size="11px" align="center" line-height="16px">
+            You are receiving this email because one of your services has changed on your Statping instance. You can modify this email on the Email Notifier page in Settings.
+          </mj-text>
+          <mj-text color="#445566" font-size="11px" align="center" line-height="16px">
+            &copy; Statping
+          </mj-text>
+        </mj-column>
+      </mj-section>
+        
+         <mj-section padding-top="0" padding-bottom="0">
+        <mj-group>
+          <mj-column width="100%" padding-right="0">
+            <mj-text color="#445566" font-size="11px" align="center" line-height="16px" font-weight="bold">
+              <a class="footer-link" href="https://statping.com">Statping.com</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0; 
+              
+              <a class="footer-link" href="https://github.com/statping/statping">Github</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;
+              
+              <a class="footer-link" href="https://statping.com/privacy">Privacy</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;
+            </mj-text>
+          </mj-column>
+        </mj-group>
+
+      </mj-section>
+      </mj-column>
+    </mj-section>
+        
+  </mj-body>
+</mjml>`
+
+const emailSuccessMJML = `<mjml>
+  <mj-head>
+    <mj-title>Statping Service Notification</mj-title>
+  </mj-head>
+  <mj-body background-color="#E7E7E7">
+    <mj-raw>
+      <!-- Top Bar -->
+    </mj-raw>
+    <mj-section background-color="#12ab0c" background-url="https://assets.statping.com/greenbackground.png" padding="0px">
+      <mj-column>
+        <mj-image width="45px" href="https://statping.com" src="https://assets.statping.com/iconlight.png" align="center" alt="Sphero"></mj-image>
+      </mj-column>
+    </mj-section>
+  
+    <mj-section background-color="#ffffff">
+      <mj-column width="100%">
+        <mj-text font-family="Ubuntu, Helvetica, Arial, sans-serif" font-size="22px" padding="15px" line-height="30px">
+         {{.Service.Name}} is currently offline, you might want to check it.
+        </mj-text>
+        
+        
+            <mj-section padding-left="0px" padding-right="0px" padding-top="10px" padding-bottom="10px">
+        <mj-column>
+          <mj-text font-color="#d50d0d" align="center" font-size="20px" color="#626262">Offline for {{.Service.Downtime.Human}}</mj-text>
+          
+          <mj-button border-radius="4px" background-color="#4caf50" href="{{.Core.Domain}}/service/{{.Service.Id}}">View Dashboard</mj-button>
+          
+    </mj-column>
+  </mj-section>
+        
+       
+    <mj-raw>
+      <!-- Bottom Graphic -->
+    </mj-raw>
+    
+        
+        
+   
+  <mj-section padding="0px" background-color="#fafafa">
+        <mj-column>
+          <mj-text font-size="20px" color="#626262">Service Domain</mj-text>
+          <mj-text padding-top="0px" font-size="14px" color="#626262">{{.Service.Domain}}</mj-text>
+    </mj-column>
+  </mj-section>
+    
+    <mj-section padding="0px"  background-color="#ffffff">
+        <mj-column>
+          <mj-text font-size="20px" color="#626262">Current Issue</mj-text>
+          <mj-text padding-top="0px" font-size="14px" color="#626262">{{.Failure.Issue}}</mj-text>
+    </mj-column>
+  </mj-section>
+    
+   
+ <mj-spacer height="30px" />
+        
+    <mj-section padding="0" background-url="https://assets.statping.com/greenbackground.png" background-color="#12ab0c">
+      <mj-column>
+        <mj-image width="250px" href="https://statping.com" src="https://assets.statping.com/statpingcom.png" align="center"></mj-image>
+      </mj-column>
+    </mj-section>
+        
+         <mj-section padding-bottom="0" padding-top="10px">
+        <mj-column>
+        <mj-text color="#445566" font-size="11px" align="center" line-height="16px">
+            You are receiving this email because one of your services has changed on your Statping instance. You can modify this email on the Email Notifier page in Settings.
+          </mj-text>
+          <mj-text color="#445566" font-size="11px" align="center" line-height="16px">
+            &copy; Statping
+          </mj-text>
+        </mj-column>
+      </mj-section>
+        
+         <mj-section padding-top="0" padding-bottom="0">
+        <mj-group>
+          <mj-column width="100%" padding-right="0">
+            <mj-text color="#445566" font-size="11px" align="center" line-height="16px" font-weight="bold">
+              <a class="footer-link" href="https://statping.com">Statping.com</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0; 
+              
+              <a class="footer-link" href="https://github.com/statping/statping">Github</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;
+              
+              <a class="footer-link" href="https://statping.com/privacy">Privacy</a>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;
+            </mj-text>
+          </mj-column>
+        </mj-group>
+
+      </mj-section>
+      </mj-column>
+    </mj-section>
+        
+  </mj-body>
+</mjml>`
diff --git a/notifiers/gotify.go b/notifiers/gotify.go
new file mode 100644
index 00000000..19c2fa5f
--- /dev/null
+++ b/notifiers/gotify.go
@@ -0,0 +1,97 @@
+package notifiers
+
+import (
+	"github.com/statping/statping/types/null"
+	"strings"
+	"time"
+
+	"github.com/statping/statping/types/failures"
+	"github.com/statping/statping/types/notifications"
+	"github.com/statping/statping/types/notifier"
+	"github.com/statping/statping/types/services"
+	"github.com/statping/statping/utils"
+)
+
+var _ notifier.Notifier = (*gotify)(nil)
+
+type gotify struct {
+	*notifications.Notification
+}
+
+func (g *gotify) Select() *notifications.Notification {
+	return g.Notification
+}
+
+func (g *gotify) Valid(values notifications.Values) error {
+	return nil
+}
+
+var Gotify = &gotify{&notifications.Notification{
+	Method:      "gotify",
+	Title:       "Gotify",
+	Description: "Use Gotify to receive push notifications. Add your Gotify URL and App Token to receive notifications.",
+	Author:      "Hugo van Rijswijk",
+	AuthorUrl:   "https://github.com/hugo-vrijswijk",
+	Icon:        "broadcast-tower",
+	Delay:       time.Duration(5 * time.Second),
+	Limits:      60,
+	SuccessData: null.NewNullString(`{"title": "{{.Service.Name}}", "message": "Your service '{{.Service.Name}}' is currently online!", "priority": 2}`),
+	FailureData: null.NewNullString(`{"title": "{{.Service.Name}}", "message": "Your service '{{.Service.Name}}' is currently failing! Reason: {{.Failure.Issue}}", "priority": 5}`),
+	DataType:    "json",
+	Form: []notifications.NotificationForm{{
+		Type:        "text",
+		Title:       "Gotify URL",
+		SmallText:   "Gotify server URL, including http(s):// and port if needed",
+		DbField:     "Host",
+		Placeholder: "https://gotify.domain.com",
+		Required:    true,
+	}, {
+		Type:        "text",
+		Title:       "App Token",
+		SmallText:   "The Application Token generated by Gotify",
+		DbField:     "api_key",
+		Placeholder: "TB5gatYYyR.FCD2",
+		Required:    true,
+	}}},
+}
+
+// Send will send a HTTP Post to the Gotify API. It accepts type: string
+func (g *gotify) sendMessage(msg string) (string, error) {
+	var url string
+	if strings.HasSuffix(g.Host.String, "/") {
+		url = g.Host.String + "message"
+	} else {
+		url = g.Host.String + "/message"
+	}
+
+	headers := []string{"X-Gotify-Key=" + g.ApiKey.String}
+
+	content, _, err := utils.HttpRequest(url, "POST", "application/json", headers, strings.NewReader(msg), time.Duration(10*time.Second), true, nil)
+
+	return string(content), err
+}
+
+// OnFailure will trigger failing service
+func (g *gotify) OnFailure(s services.Service, f failures.Failure) (string, error) {
+	out, err := g.sendMessage(ReplaceVars(g.FailureData.String, s, f))
+	return out, err
+}
+
+// OnSuccess will trigger successful service
+func (g *gotify) OnSuccess(s services.Service) (string, error) {
+	out, err := g.sendMessage(ReplaceVars(g.SuccessData.String, s, failures.Failure{}))
+	return out, err
+}
+
+// OnTest will test the Gotify notifier
+func (g *gotify) OnTest() (string, error) {
+	msg := `{"title:" "Test" "message": "Testing the Gotify Notifier", "priority": 0}`
+	content, err := g.sendMessage(msg)
+
+	return content, err
+}
+
+// OnSave will trigger when this notifier is saved
+func (g *gotify) OnSave() (string, error) {
+	return "", nil
+}
diff --git a/notifiers/gotify_test.go b/notifiers/gotify_test.go
new file mode 100644
index 00000000..e93ff516
--- /dev/null
+++ b/notifiers/gotify_test.go
@@ -0,0 +1,81 @@
+package notifiers
+
+import (
+	"testing"
+	"time"
+
+	"github.com/statping/statping/database"
+	"github.com/statping/statping/types/core"
+	"github.com/statping/statping/types/failures"
+	"github.com/statping/statping/types/notifications"
+	"github.com/statping/statping/types/null"
+	"github.com/statping/statping/types/services"
+	"github.com/statping/statping/utils"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+var (
+	GOTIFY_URL   string
+	GOTIFY_TOKEN string
+)
+
+func TestGotifyNotifier(t *testing.T) {
+	err := utils.InitLogs()
+	require.Nil(t, err)
+
+	t.Parallel()
+	GOTIFY_URL = utils.Params.GetString("GOTIFY_URL")
+	GOTIFY_TOKEN = utils.Params.GetString("GOTIFY_TOKEN")
+
+	db, err := database.OpenTester()
+	require.Nil(t, err)
+	db.AutoMigrate(&notifications.Notification{})
+	notifications.SetDB(db)
+	core.Example()
+
+	if GOTIFY_URL == "" {
+		t.Log("gotify notifier testing skipped, missing GOTIFY_URL environment variable")
+		t.SkipNow()
+	}
+	if GOTIFY_TOKEN == "" {
+		t.Log("gotify notifier testing skipped, missing GOTIFY_TOKEN environment variable")
+		t.SkipNow()
+	}
+
+	t.Run("Load gotify", func(t *testing.T) {
+		Gotify.Host = null.NewNullString(GOTIFY_URL)
+		Gotify.Delay = time.Duration(100 * time.Millisecond)
+		Gotify.Enabled = null.NewNullBool(true)
+
+		Add(Gotify)
+
+		assert.Equal(t, "Hugo van Rijswijk", Gotify.Author)
+		assert.Equal(t, GOTIFY_URL, Gotify.Host.String)
+	})
+
+	t.Run("gotify Notifier Tester", func(t *testing.T) {
+		assert.True(t, Gotify.CanSend())
+	})
+
+	t.Run("gotify Notifier Tester OnSave", func(t *testing.T) {
+		_, err := Gotify.OnSave()
+		assert.Nil(t, err)
+	})
+
+	t.Run("gotify OnFailure", func(t *testing.T) {
+		_, err := Gotify.OnFailure(services.Example(false), failures.Example())
+		assert.Nil(t, err)
+	})
+
+	t.Run("gotify OnSuccess", func(t *testing.T) {
+		_, err := Gotify.OnSuccess(services.Example(true))
+		assert.Nil(t, err)
+	})
+
+	t.Run("gotify Test", func(t *testing.T) {
+		_, err := Gotify.OnTest()
+		assert.Nil(t, err)
+	})
+
+}
diff --git a/notifiers/line_notify.go b/notifiers/line_notify.go
index 37d0908d..b0dbf304 100644
--- a/notifiers/line_notify.go
+++ b/notifiers/line_notify.go
@@ -26,6 +26,10 @@ func (l *lineNotifier) Select() *notifications.Notification {
 	return l.Notification
 }
 
+func (l *lineNotifier) Valid(values notifications.Values) error {
+	return nil
+}
+
 var LineNotify = &lineNotifier{&notifications.Notification{
 	Method:      lineNotifyMethod,
 	Title:       "LINE Notify",
@@ -46,7 +50,7 @@ var LineNotify = &lineNotifier{&notifications.Notification{
 func (l *lineNotifier) sendMessage(message string) (string, error) {
 	v := url.Values{}
 	v.Set("message", message)
-	headers := []string{fmt.Sprintf("Authorization=Bearer %v", l.ApiSecret)}
+	headers := []string{fmt.Sprintf("Authorization=Bearer %v", l.ApiSecret.String)}
 	content, _, err := utils.HttpRequest("https://notify-api.line.me/api/notify", "POST", "application/x-www-form-urlencoded", headers, strings.NewReader(v.Encode()), time.Duration(10*time.Second), true, nil)
 	return string(content), err
 }
diff --git a/notifiers/mobile.go b/notifiers/mobile.go
index d3664642..1096df11 100644
--- a/notifiers/mobile.go
+++ b/notifiers/mobile.go
@@ -22,6 +22,10 @@ func (m *mobilePush) Select() *notifications.Notification {
 	return m.Notification
 }
 
+func (m *mobilePush) Valid(values notifications.Values) error {
+	return nil
+}
+
 var Mobile = &mobilePush{&notifications.Notification{
 	Method: "mobile",
 	Title:  "Mobile",
@@ -38,13 +42,8 @@ var Mobile = &mobilePush{&notifications.Notification{
 		Placeholder: "A list of your Mobile device push notification ID's.",
 		DbField:     "var1",
 		IsHidden:    true,
-	}, {
-		Type:        "number",
-		Title:       "Array of device numbers",
-		Placeholder: "1 for iphone 2 for android",
-		DbField:     "var2",
-		IsHidden:    true,
-	}}},
+	},
+	}},
 }
 
 func dataJson(s services.Service, f failures.Failure) map[string]interface{} {
@@ -69,7 +68,7 @@ func dataJson(s services.Service, f failures.Failure) map[string]interface{} {
 func (m *mobilePush) OnFailure(s services.Service, f failures.Failure) (string, error) {
 	data := dataJson(s, f)
 	msg := &pushArray{
-		Message: fmt.Sprintf("Your service '%v' is currently failing! Reason: %v", s.Name, f.Issue),
+		Message: fmt.Sprintf("%s is currently failing! Reason: %v", s.Name, f.Issue),
 		Title:   "Service Offline",
 		Data:    data,
 	}
@@ -80,7 +79,7 @@ func (m *mobilePush) OnFailure(s services.Service, f failures.Failure) (string,
 func (m *mobilePush) OnSuccess(s services.Service) (string, error) {
 	data := dataJson(s, failures.Failure{})
 	msg := &pushArray{
-		Message:  "Service is Online!",
+		Message:  fmt.Sprintf("%s is back online and was down for %s", s.Name, s.Downtime().Human()),
 		Title:    "Service Online",
 		Data:     data,
 		Platform: 2,
@@ -93,7 +92,7 @@ func (m *mobilePush) OnTest() (string, error) {
 	msg := &pushArray{
 		Message:  "Testing the Mobile Notifier",
 		Title:    "Testing Notifications",
-		Tokens:   []string{m.Var1},
+		Tokens:   []string{m.Var1.String},
 		Platform: 2,
 	}
 	body, err := pushRequest(msg)
@@ -115,8 +114,8 @@ func (m *mobilePush) OnTest() (string, error) {
 
 // Send will send message to Statping push notifications endpoint
 func (m *mobilePush) Send(pushMessage *pushArray) error {
-	pushMessage.Tokens = []string{m.Var1}
-	pushMessage.Platform = utils.ToInt(m.Var2)
+	pushMessage.Tokens = []string{m.Var1.String}
+	pushMessage.Platform = 2
 	_, err := pushRequest(pushMessage)
 	if err != nil {
 		return err
@@ -134,8 +133,7 @@ func pushRequest(msg *pushArray) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	url := "https://push.statping.com/api/push"
-	body, _, err = utils.HttpRequest(url, "POST", "application/json", nil, bytes.NewBuffer(body), time.Duration(20*time.Second), false, nil)
+	body, _, err = utils.HttpRequest("https://push.statping.com/api/push", "POST", "application/json", nil, bytes.NewBuffer(body), time.Duration(20*time.Second), false, nil)
 	return body, err
 }
 
diff --git a/notifiers/mobile_test.go b/notifiers/mobile_test.go
index 5268e1e9..b53ee849 100644
--- a/notifiers/mobile_test.go
+++ b/notifiers/mobile_test.go
@@ -19,12 +19,18 @@ var (
 )
 
 func TestMobileNotifier(t *testing.T) {
-	t.SkipNow()
 	err := utils.InitLogs()
 	require.Nil(t, err)
 
+	t.Parallel()
+
 	mobileToken = utils.Params.GetString("MOBILE_TOKEN")
-	Mobile.Var1 = mobileToken
+	if mobileToken == "" {
+		t.Log("Mobile notifier testing skipped, missing MOBILE_ID environment variable")
+		t.SkipNow()
+	}
+
+	Mobile.Var1 = null.NewNullString(mobileToken)
 
 	db, err := database.OpenTester()
 	require.Nil(t, err)
@@ -32,14 +38,8 @@ func TestMobileNotifier(t *testing.T) {
 	notifications.SetDB(db)
 	core.Example()
 
-	Mobile.Var1 = mobileToken
-	if mobileToken == "" {
-		t.Log("Mobile notifier testing skipped, missing MOBILE_ID environment variable")
-		t.SkipNow()
-	}
-
 	t.Run("Load Mobile", func(t *testing.T) {
-		Mobile.Var1 = mobileToken
+		Mobile.Var1 = null.NewNullString(mobileToken)
 		Mobile.Delay = time.Duration(100 * time.Millisecond)
 		Mobile.Limits = 10
 		Mobile.Enabled = null.NewNullBool(true)
@@ -47,7 +47,7 @@ func TestMobileNotifier(t *testing.T) {
 		Add(Mobile)
 
 		assert.Equal(t, "Hunter Long", Mobile.Author)
-		assert.Equal(t, mobileToken, Mobile.Var1)
+		assert.Equal(t, mobileToken, Mobile.Var1.String)
 	})
 
 	t.Run("Mobile Notifier Tester", func(t *testing.T) {
diff --git a/notifiers/notifiers.go b/notifiers/notifiers.go
index d1a74a26..ec23bd1e 100644
--- a/notifiers/notifiers.go
+++ b/notifiers/notifiers.go
@@ -10,6 +10,8 @@ import (
 	"time"
 )
 
+//go:generate go run generate.go
+
 var log = utils.Log.WithField("type", "notifier")
 
 type replacer struct {
@@ -32,7 +34,11 @@ func InitNotifiers() {
 		Mobile,
 		Pushover,
 		statpingMailer,
+		Gotify,
+		AmazonSNS,
 	)
+
+	services.UpdateNotifiers()
 }
 
 func ReplaceTemplate(tmpl string, data replacer) string {
@@ -52,10 +58,11 @@ func ReplaceTemplate(tmpl string, data replacer) string {
 
 func Add(notifs ...services.ServiceNotifier) {
 	for _, n := range notifs {
-		services.AddNotifier(n)
-		if err := n.Select().Create(); err != nil {
+		notif := n.Select()
+		if err := notif.Create(); err != nil {
 			log.Error(err)
 		}
+		services.AddNotifier(n)
 	}
 }
 
diff --git a/notifiers/notifiers_test.go b/notifiers/notifiers_test.go
index e1f25d82..0e25a991 100644
--- a/notifiers/notifiers_test.go
+++ b/notifiers/notifiers_test.go
@@ -1,13 +1,14 @@
 package notifiers
 
 import (
-	"github.com/magiconair/properties/assert"
 	"github.com/statping/statping/types/failures"
 	"github.com/statping/statping/types/services"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
 func TestReplaceTemplate(t *testing.T) {
+	t.Parallel()
 	temp := `{"id":{{.Service.Id}},"name":"{{.Service.Name}}"}`
 	replaced := ReplaceTemplate(temp, replacer{Service: services.Example(true)})
 	assert.Equal(t, `{"id":6283,"name":"Statping Example"}`, replaced)
@@ -16,3 +17,39 @@ func TestReplaceTemplate(t *testing.T) {
 	replaced = ReplaceTemplate(temp, replacer{Service: services.Example(false), Failure: failures.Example()})
 	assert.Equal(t, `{"id":6283,"name":"Statping Example","failure":"Response did not response a 200 status code"}`, replaced)
 }
+
+func TestPushover_Select(t *testing.T) {
+	tests := []struct {
+		Value    string
+		Expected string
+	}{
+		{
+			"lowest",
+			"-2",
+		},
+		{
+			"low",
+			"-1",
+		},
+		{
+			"normal",
+			"0",
+		},
+		{
+			"high",
+			"1",
+		},
+		{
+			"emergency",
+			"2",
+		},
+		{
+			"",
+			"0",
+		},
+	}
+
+	for _, v := range tests {
+		assert.Equal(t, v.Expected, priority(v.Value))
+	}
+}
diff --git a/notifiers/pushover.go b/notifiers/pushover.go
index 623eb0fd..f0eb2222 100644
--- a/notifiers/pushover.go
+++ b/notifiers/pushover.go
@@ -5,6 +5,7 @@ import (
 	"github.com/statping/statping/types/failures"
 	"github.com/statping/statping/types/notifications"
 	"github.com/statping/statping/types/notifier"
+	"github.com/statping/statping/types/null"
 	"github.com/statping/statping/types/services"
 	"github.com/statping/statping/utils"
 	"net/url"
@@ -26,6 +27,10 @@ func (t *pushover) Select() *notifications.Notification {
 	return t.Notification
 }
 
+func (t *pushover) Valid(values notifications.Values) error {
+	return nil
+}
+
 var Pushover = &pushover{&notifications.Notification{
 	Method:      "pushover",
 	Title:       "Pushover",
@@ -35,8 +40,8 @@ var Pushover = &pushover{&notifications.Notification{
 	Icon:        "fa dot-circle",
 	Delay:       time.Duration(10 * time.Second),
 	Limits:      60,
-	SuccessData: `Your service '{{.Service.Name}}' is currently online!`,
-	FailureData: `Your service '{{.Service.Name}}' is currently offline!`,
+	SuccessData: null.NewNullString(`Your service '{{.Service.Name}}' is currently online!`),
+	FailureData: null.NewNullString(`Your service '{{.Service.Name}}' is currently offline!`),
 	DataType:    "text",
 	Form: []notifications.NotificationForm{{
 		Type:        "text",
@@ -88,12 +93,12 @@ func priority(val string) string {
 // Send will send a HTTP Post to the Pushover API. It accepts type: string
 func (t *pushover) sendMessage(message string) (string, error) {
 	v := url.Values{}
-	v.Set("token", t.ApiSecret)
-	v.Set("user", t.ApiKey)
+	v.Set("token", t.ApiSecret.String)
+	v.Set("user", t.ApiKey.String)
 	v.Set("message", message)
-	v.Set("priority", priority(t.Var1))
-	if t.Var2 != "" {
-		v.Set("sound", t.Var2)
+	v.Set("priority", priority(t.Var1.String))
+	if t.Var2.String != "" {
+		v.Set("sound", t.Var2.String)
 	}
 	rb := strings.NewReader(v.Encode())
 
@@ -106,14 +111,14 @@ func (t *pushover) sendMessage(message string) (string, error) {
 
 // OnFailure will trigger failing service
 func (t *pushover) OnFailure(s services.Service, f failures.Failure) (string, error) {
-	message := ReplaceVars(t.FailureData, s, f)
+	message := ReplaceVars(t.FailureData.String, s, f)
 	out, err := t.sendMessage(message)
 	return out, err
 }
 
 // OnSuccess will trigger successful service
 func (t *pushover) OnSuccess(s services.Service) (string, error) {
-	message := ReplaceVars(t.SuccessData, s, failures.Failure{})
+	message := ReplaceVars(t.SuccessData.String, s, failures.Failure{})
 	out, err := t.sendMessage(message)
 	return out, err
 }
diff --git a/notifiers/pushover_test.go b/notifiers/pushover_test.go
index aea799c0..658b94d3 100644
--- a/notifiers/pushover_test.go
+++ b/notifiers/pushover_test.go
@@ -22,6 +22,7 @@ func TestPushoverNotifier(t *testing.T) {
 	err := utils.InitLogs()
 	require.Nil(t, err)
 
+	t.Parallel()
 	PUSHOVER_TOKEN = utils.Params.GetString("PUSHOVER_TOKEN")
 	PUSHOVER_API = utils.Params.GetString("PUSHOVER_API")
 
@@ -37,17 +38,17 @@ func TestPushoverNotifier(t *testing.T) {
 	}
 
 	t.Run("Load Pushover", func(t *testing.T) {
-		Pushover.ApiKey = PUSHOVER_TOKEN
-		Pushover.ApiSecret = PUSHOVER_API
-		Pushover.Var1 = "Normal"
-		Pushover.Var2 = "vibrate"
+		Pushover.ApiKey = null.NewNullString(PUSHOVER_TOKEN)
+		Pushover.ApiSecret = null.NewNullString(PUSHOVER_API)
+		Pushover.Var1 = null.NewNullString("Normal")
+		Pushover.Var2 = null.NewNullString("vibrate")
 		Pushover.Enabled = null.NewNullBool(true)
 
 		Add(Pushover)
 
 		assert.Nil(t, err)
 		assert.Equal(t, "Hunter Long", Pushover.Author)
-		assert.Equal(t, PUSHOVER_TOKEN, Pushover.ApiKey)
+		assert.Equal(t, PUSHOVER_TOKEN, Pushover.ApiKey.String)
 	})
 
 	t.Run("Pushover Within Limits", func(t *testing.T) {
diff --git a/notifiers/slack.go b/notifiers/slack.go
index 8b1bfdd7..b95973cf 100644
--- a/notifiers/slack.go
+++ b/notifiers/slack.go
@@ -6,6 +6,7 @@ import (
 	"github.com/statping/statping/types/failures"
 	"github.com/statping/statping/types/notifications"
 	"github.com/statping/statping/types/notifier"
+	"github.com/statping/statping/types/null"
 	"github.com/statping/statping/types/services"
 	"github.com/statping/statping/utils"
 	"strings"
@@ -28,22 +29,21 @@ func (s *slack) Select() *notifications.Notification {
 
 var slacker = &slack{&notifications.Notification{
 	Method:      slackMethod,
-	Title:       "slack",
+	Title:       "Slack",
 	Description: "Send notifications to your slack channel when a service is offline. Insert your Incoming webhook URL for your channel to receive notifications. Based on the <a href=\"https://api.slack.com/incoming-webhooks\">Slack API</a>.",
 	Author:      "Hunter Long",
 	AuthorUrl:   "https://github.com/hunterlong",
 	Delay:       time.Duration(10 * time.Second),
-	Host:        "https://webhooksurl.slack.com/***",
 	Icon:        "fab fa-slack",
-	SuccessData: `{ "blocks": [ { "type": "section", "text": { "type": "mrkdwn", "text": "The service {{.Service.Name}} is back online." } }, { "type": "actions", "elements": [ { "type": "button", "text": { "type": "plain_text", "text": "View Service", "emoji": true }, "style": "primary", "url": "{{.Core.Domain}}/service/{{.Service.Id}}" }, { "type": "button", "text": { "type": "plain_text", "text": "Go to Statping", "emoji": true }, "url": "{{.Core.Domain}}" } ] } ] }`,
-	FailureData: `{ "blocks": [ { "type": "section", "text": { "type": "mrkdwn", "text": ":warning: The service {{.Service.Name}} is currently offline! :warning:" } }, { "type": "divider" }, { "type": "section", "fields": [ { "type": "mrkdwn", "text": "*Service:*\n{{.Service.Name}}" }, { "type": "mrkdwn", "text": "*URL:*\n{{.Service.Domain}}" }, { "type": "mrkdwn", "text": "*Status Code:*\n{{.Service.LastStatusCode}}" }, { "type": "mrkdwn", "text": "*When:*\n{{.Failure.CreatedAt}}" }, { "type": "mrkdwn", "text": "*Downtime:*\n{{.Service.DowntimeAgo}}" }, { "type": "plain_text", "text": "*Error:*\n{{.Failure.Issue}}" } ] }, { "type": "divider" }, { "type": "actions", "elements": [ { "type": "button", "text": { "type": "plain_text", "text": "View Offline Service", "emoji": true }, "style": "danger", "url": "{{.Core.Domain}}/service/{{.Service.Id}}" }, { "type": "button", "text": { "type": "plain_text", "text": "Go to Statping", "emoji": true }, "url": "{{.Core.Domain}}" } ] } ] }`,
+	SuccessData: null.NewNullString(`{ "blocks": [ { "type": "section", "text": { "type": "mrkdwn", "text": "The service {{.Service.Name}} is back online." } }, { "type": "actions", "elements": [ { "type": "button", "text": { "type": "plain_text", "text": "View Service", "emoji": true }, "style": "primary", "url": "{{.Core.Domain}}/service/{{.Service.Id}}" }, { "type": "button", "text": { "type": "plain_text", "text": "Go to Statping", "emoji": true }, "url": "{{.Core.Domain}}" } ] } ] }`),
+	FailureData: null.NewNullString(`{ "blocks": [ { "type": "section", "text": { "type": "mrkdwn", "text": ":warning: The service {{.Service.Name}} is currently offline! :warning:" } }, { "type": "divider" }, { "type": "section", "fields": [ { "type": "mrkdwn", "text": "*Service:*\n{{.Service.Name}}" }, { "type": "mrkdwn", "text": "*URL:*\n{{.Service.Domain}}" }, { "type": "mrkdwn", "text": "*Status Code:*\n{{.Service.LastStatusCode}}" }, { "type": "mrkdwn", "text": "*When:*\n{{.Failure.CreatedAt}}" }, { "type": "mrkdwn", "text": "*Downtime:*\n{{.Service.Downtime.Human}}" }, { "type": "plain_text", "text": "*Error:*\n{{.Failure.Issue}}" } ] }, { "type": "divider" }, { "type": "actions", "elements": [ { "type": "button", "text": { "type": "plain_text", "text": "View Offline Service", "emoji": true }, "style": "danger", "url": "{{.Core.Domain}}/service/{{.Service.Id}}" }, { "type": "button", "text": { "type": "plain_text", "text": "Go to Statping", "emoji": true }, "url": "{{.Core.Domain}}" } ] } ] }`),
 	DataType:    "json",
 	RequestInfo: "Slack allows you to customize your own messages with many complex components. Checkout the <a target=\"_blank\" href=\"https://api.slack.com/reference/surfaces/formatting\">Slack Message API</a> to learn how you can create your own.",
 	Limits:      60,
 	Form: []notifications.NotificationForm{{
 		Type:        "text",
 		Title:       "Incoming Webhook Url",
-		Placeholder: "Insert your Slack Webhook URL here.",
+		Placeholder: "https://hooks.slack.com/services/ETJ1B87WE/H76D6G8S30/H4d97R4EcZ40SpfyqPlAHr",
 		SmallText:   "Incoming Webhook URL from <a href=\"https://api.slack.com/apps\" target=\"_blank\">Slack Apps</a>",
 		DbField:     "Host",
 		Required:    true,
@@ -52,7 +52,7 @@ var slacker = &slack{&notifications.Notification{
 
 // Send will send a HTTP Post to the slack webhooker API. It accepts type: string
 func (s *slack) sendSlack(msg string) (string, error) {
-	resp, _, err := utils.HttpRequest(s.Host, "POST", "application/json", nil, strings.NewReader(msg), time.Duration(10*time.Second), true, nil)
+	resp, _, err := utils.HttpRequest(s.Host.String, "POST", "application/json", nil, strings.NewReader(msg), time.Duration(10*time.Second), true, nil)
 	if err != nil {
 		return "", err
 	}
@@ -61,8 +61,8 @@ func (s *slack) sendSlack(msg string) (string, error) {
 
 func (s *slack) OnTest() (string, error) {
 	example := services.Example(true)
-	testMsg := ReplaceVars(s.SuccessData, example, failures.Failure{})
-	contents, resp, err := utils.HttpRequest(s.Host, "POST", "application/json", nil, bytes.NewBuffer([]byte(testMsg)), time.Duration(10*time.Second), true, nil)
+	testMsg := ReplaceVars(s.SuccessData.String, example, failures.Failure{})
+	contents, resp, err := utils.HttpRequest(s.Host.String, "POST", "application/json", nil, bytes.NewBuffer([]byte(testMsg)), time.Duration(10*time.Second), true, nil)
 	if err != nil {
 		return "", err
 	}
@@ -75,14 +75,14 @@ func (s *slack) OnTest() (string, error) {
 
 // OnFailure will trigger failing service
 func (s *slack) OnFailure(srv services.Service, f failures.Failure) (string, error) {
-	msg := ReplaceVars(s.FailureData, srv, f)
+	msg := ReplaceVars(s.FailureData.String, srv, f)
 	out, err := s.sendSlack(msg)
 	return out, err
 }
 
 // OnSuccess will trigger successful service
 func (s *slack) OnSuccess(srv services.Service) (string, error) {
-	msg := ReplaceVars(s.SuccessData, srv, failures.Failure{})
+	msg := ReplaceVars(s.SuccessData.String, srv, failures.Failure{})
 	out, err := s.sendSlack(msg)
 	return out, err
 }
@@ -91,3 +91,7 @@ func (s *slack) OnSuccess(srv services.Service) (string, error) {
 func (s *slack) OnSave() (string, error) {
 	return "", nil
 }
+
+func (s *slack) Valid(values notifications.Values) error {
+	return nil
+}
diff --git a/notifiers/slack_test.go b/notifiers/slack_test.go
index cc05def5..4ed28bce 100644
--- a/notifiers/slack_test.go
+++ b/notifiers/slack_test.go
@@ -21,6 +21,8 @@ var (
 func TestSlackNotifier(t *testing.T) {
 	err := utils.InitLogs()
 	require.Nil(t, err)
+
+	t.Parallel()
 	db, err := database.OpenTester()
 	require.Nil(t, err)
 	db.AutoMigrate(&notifications.Notification{})
@@ -28,21 +30,21 @@ func TestSlackNotifier(t *testing.T) {
 	core.Example()
 
 	SLACK_URL = utils.Params.GetString("SLACK_URL")
-	slacker.Host = SLACK_URL
-	slacker.Enabled = null.NewNullBool(true)
-
 	if SLACK_URL == "" {
 		t.Log("slack notifier testing skipped, missing SLACK_URL environment variable")
 		t.SkipNow()
 	}
 
+	slacker.Host = null.NewNullString(SLACK_URL)
+	slacker.Enabled = null.NewNullBool(true)
+
 	t.Run("Load slack", func(t *testing.T) {
-		slacker.Host = SLACK_URL
-		slacker.Delay = time.Duration(100 * time.Millisecond)
+		slacker.Host = null.NewNullString(SLACK_URL)
+		slacker.Delay = 100 * time.Millisecond
 		slacker.Limits = 3
 		Add(slacker)
 		assert.Equal(t, "Hunter Long", slacker.Author)
-		assert.Equal(t, SLACK_URL, slacker.Host)
+		assert.Equal(t, SLACK_URL, slacker.Host.String)
 	})
 
 	t.Run("slack Within Limits", func(t *testing.T) {
diff --git a/notifiers/statping_emailer.go b/notifiers/statping_emailer.go
index a6b5165d..3fc82afc 100644
--- a/notifiers/statping_emailer.go
+++ b/notifiers/statping_emailer.go
@@ -27,6 +27,10 @@ func (s *statpingEmailer) Select() *notifications.Notification {
 	return s.Notification
 }
 
+func (s *statpingEmailer) Valid(values notifications.Values) error {
+	return nil
+}
+
 var statpingMailer = &statpingEmailer{&notifications.Notification{
 	Method:      statpingEmailerName,
 	Title:       "Email",
@@ -69,7 +73,7 @@ type statpingMail struct {
 // OnFailure will trigger failing service
 func (s *statpingEmailer) OnFailure(srv services.Service, f failures.Failure) (string, error) {
 	ee := statpingMail{
-		Email:   s.Host,
+		Email:   s.Host.String,
 		Core:    *core.App,
 		Service: srv,
 		Failure: f,
@@ -80,7 +84,7 @@ func (s *statpingEmailer) OnFailure(srv services.Service, f failures.Failure) (s
 // OnSuccess will trigger successful service
 func (s *statpingEmailer) OnSuccess(srv services.Service) (string, error) {
 	ee := statpingMail{
-		Email:   s.Host,
+		Email:   s.Host.String,
 		Core:    *core.App,
 		Service: srv,
 		Failure: failures.Failure{},
@@ -91,7 +95,7 @@ func (s *statpingEmailer) OnSuccess(srv services.Service) (string, error) {
 // OnSave will trigger when this notifier is saved
 func (s *statpingEmailer) OnSave() (string, error) {
 	ee := statpingMail{
-		Email:   s.Host,
+		Email:   s.Host.String,
 		Core:    *core.App,
 		Service: services.Service{},
 		Failure: failures.Failure{},
diff --git a/notifiers/statping_emailer_test.go b/notifiers/statping_emailer_test.go
index 76ebf05f..8cf71227 100644
--- a/notifiers/statping_emailer_test.go
+++ b/notifiers/statping_emailer_test.go
@@ -21,6 +21,8 @@ var (
 func TestStatpingEmailerNotifier(t *testing.T) {
 	err := utils.InitLogs()
 	require.Nil(t, err)
+
+	t.Parallel()
 	db, err := database.OpenTester()
 	require.Nil(t, err)
 	db.AutoMigrate(&notifications.Notification{})
@@ -28,7 +30,7 @@ func TestStatpingEmailerNotifier(t *testing.T) {
 	core.Example()
 
 	testEmail = utils.Params.GetString("TEST_EMAIL")
-	statpingMailer.Host = testEmail
+	statpingMailer.Host = null.NewNullString(testEmail)
 	statpingMailer.Enabled = null.NewNullBool(true)
 
 	if testEmail == "" {
@@ -37,12 +39,12 @@ func TestStatpingEmailerNotifier(t *testing.T) {
 	}
 
 	t.Run("Load statping emailer", func(t *testing.T) {
-		statpingMailer.Host = testEmail
+		statpingMailer.Host = null.NewNullString(testEmail)
 		statpingMailer.Delay = time.Duration(100 * time.Millisecond)
 		statpingMailer.Limits = 3
 		Add(statpingMailer)
 		assert.Equal(t, "Hunter Long", statpingMailer.Author)
-		assert.Equal(t, testEmail, statpingMailer.Host)
+		assert.Equal(t, testEmail, statpingMailer.Host.String)
 	})
 
 	t.Run("statping emailer Within Limits", func(t *testing.T) {
diff --git a/notifiers/telegram.go b/notifiers/telegram.go
index 8af363b5..72867fbe 100644
--- a/notifiers/telegram.go
+++ b/notifiers/telegram.go
@@ -7,6 +7,7 @@ import (
 	"github.com/statping/statping/types/failures"
 	"github.com/statping/statping/types/notifications"
 	"github.com/statping/statping/types/notifier"
+	"github.com/statping/statping/types/null"
 	"github.com/statping/statping/types/services"
 	"github.com/statping/statping/utils"
 	"net/url"
@@ -24,6 +25,10 @@ func (t *telegram) Select() *notifications.Notification {
 	return t.Notification
 }
 
+func (t *telegram) Valid(values notifications.Values) error {
+	return nil
+}
+
 var Telegram = &telegram{&notifications.Notification{
 	Method:      "telegram",
 	Title:       "Telegram",
@@ -32,8 +37,8 @@ var Telegram = &telegram{&notifications.Notification{
 	AuthorUrl:   "https://github.com/hunterlong",
 	Icon:        "fab fa-telegram-plane",
 	Delay:       time.Duration(5 * time.Second),
-	SuccessData: "Your service '{{.Service.Name}}' is currently online!",
-	FailureData: "Your service '{{.Service.Name}}' is currently offline!",
+	SuccessData: null.NewNullString("Your service '{{.Service.Name}}' is currently online!"),
+	FailureData: null.NewNullString("Your service '{{.Service.Name}}' is currently offline!"),
 	DataType:    "text",
 	Limits:      60,
 	Form: []notifications.NotificationForm{{
@@ -55,10 +60,10 @@ var Telegram = &telegram{&notifications.Notification{
 
 // Send will send a HTTP Post to the Telegram API. It accepts type: string
 func (t *telegram) sendMessage(message string) (string, error) {
-	apiEndpoint := fmt.Sprintf("https://api.telegram.org/bot%v/sendMessage", t.ApiSecret)
+	apiEndpoint := fmt.Sprintf("https://api.telegram.org/bot%v/sendMessage", t.ApiSecret.String)
 
 	v := url.Values{}
-	v.Set("chat_id", t.Var1)
+	v.Set("chat_id", t.Var1.String)
 	v.Set("text", message)
 
 	contents, _, err := utils.HttpRequest(apiEndpoint, "POST", "application/x-www-form-urlencoded", nil, strings.NewReader(v.Encode()), time.Duration(10*time.Second), true, nil)
@@ -74,16 +79,14 @@ func (t *telegram) sendMessage(message string) (string, error) {
 
 // OnFailure will trigger failing service
 func (t *telegram) OnFailure(s services.Service, f failures.Failure) (string, error) {
-	msg := ReplaceVars(t.FailureData, s, f)
-	out, err := t.sendMessage(msg)
-	return out, err
+	msg := ReplaceVars(t.FailureData.String, s, f)
+	return t.sendMessage(msg)
 }
 
 // OnSuccess will trigger successful service
 func (t *telegram) OnSuccess(s services.Service) (string, error) {
-	msg := ReplaceVars(t.SuccessData, s, failures.Failure{})
-	out, err := t.sendMessage(msg)
-	return out, err
+	msg := ReplaceVars(t.SuccessData.String, s, failures.Failure{})
+	return t.sendMessage(msg)
 }
 
 // OnTest will test the Twilio SMS messaging
diff --git a/notifiers/telegram_test.go b/notifiers/telegram_test.go
index b7895975..cc06857f 100644
--- a/notifiers/telegram_test.go
+++ b/notifiers/telegram_test.go
@@ -23,10 +23,17 @@ func TestTelegramNotifier(t *testing.T) {
 	err := utils.InitLogs()
 	require.Nil(t, err)
 
+	t.Parallel()
+
 	telegramToken = utils.Params.GetString("TELEGRAM_TOKEN")
 	telegramChannel = utils.Params.GetString("TELEGRAM_CHANNEL")
-	Telegram.ApiSecret = telegramToken
-	Telegram.Var1 = telegramChannel
+	if telegramToken == "" || telegramChannel == "" {
+		t.Log("Telegram notifier testing skipped, missing TELEGRAM_TOKEN and TELEGRAM_CHANNEL environment variable")
+		t.SkipNow()
+	}
+
+	Telegram.ApiSecret = null.NewNullString(telegramToken)
+	Telegram.Var1 = null.NewNullString(telegramChannel)
 
 	db, err := database.OpenTester()
 	require.Nil(t, err)
@@ -34,22 +41,17 @@ func TestTelegramNotifier(t *testing.T) {
 	notifications.SetDB(db)
 	core.Example()
 
-	if telegramToken == "" || telegramChannel == "" {
-		t.Log("Telegram notifier testing skipped, missing TELEGRAM_TOKEN and TELEGRAM_CHANNEL environment variable")
-		t.SkipNow()
-	}
-
 	t.Run("Load Telegram", func(t *testing.T) {
-		Telegram.ApiSecret = telegramToken
-		Telegram.Var1 = telegramChannel
+		Telegram.ApiSecret = null.NewNullString(telegramToken)
+		Telegram.Var1 = null.NewNullString(telegramChannel)
 		Telegram.Delay = time.Duration(1 * time.Second)
 		Telegram.Enabled = null.NewNullBool(true)
 
 		Add(Telegram)
 
 		assert.Equal(t, "Hunter Long", Telegram.Author)
-		assert.Equal(t, telegramToken, Telegram.ApiSecret)
-		assert.Equal(t, telegramChannel, Telegram.Var1)
+		assert.Equal(t, telegramToken, Telegram.ApiSecret.String)
+		assert.Equal(t, telegramChannel, Telegram.Var1.String)
 	})
 
 	t.Run("Telegram Within Limits", func(t *testing.T) {
diff --git a/notifiers/twilio.go b/notifiers/twilio.go
index ec46d21a..0ea1c902 100644
--- a/notifiers/twilio.go
+++ b/notifiers/twilio.go
@@ -8,6 +8,7 @@ import (
 	"github.com/statping/statping/types/failures"
 	"github.com/statping/statping/types/notifications"
 	"github.com/statping/statping/types/notifier"
+	"github.com/statping/statping/types/null"
 	"github.com/statping/statping/types/services"
 	"github.com/statping/statping/utils"
 	"net/url"
@@ -25,6 +26,10 @@ func (t *twilio) Select() *notifications.Notification {
 	return t.Notification
 }
 
+func (t *twilio) Valid(values notifications.Values) error {
+	return nil
+}
+
 var Twilio = &twilio{&notifications.Notification{
 	Method:      "twilio",
 	Title:       "Twilio",
@@ -33,8 +38,8 @@ var Twilio = &twilio{&notifications.Notification{
 	AuthorUrl:   "https://github.com/hunterlong",
 	Icon:        "far fa-comment-alt",
 	Delay:       time.Duration(10 * time.Second),
-	SuccessData: "Your service '{{.Service.Name}}' is currently online!",
-	FailureData: "Your service '{{.Service.Name}}' is currently offline!",
+	SuccessData: null.NewNullString("Your service '{{.Service.Name}}' is currently online!"),
+	FailureData: null.NewNullString("Your service '{{.Service.Name}}' is currently offline!"),
 	DataType:    "text",
 	Limits:      15,
 	Form: []notifications.NotificationForm{{
@@ -66,15 +71,15 @@ var Twilio = &twilio{&notifications.Notification{
 
 // Send will send a HTTP Post to the Twilio SMS API. It accepts type: string
 func (t *twilio) sendMessage(message string) (string, error) {
-	twilioUrl := fmt.Sprintf("https://api.twilio.com/2010-04-01/Accounts/%s/Messages.json", t.ApiKey)
+	twilioUrl := fmt.Sprintf("https://api.twilio.com/2010-04-01/Accounts/%s/Messages.json", t.ApiKey.String)
 
 	v := url.Values{}
-	v.Set("To", "+"+t.Var1)
-	v.Set("From", "+"+t.Var2)
+	v.Set("To", "+"+t.Var1.String)
+	v.Set("From", "+"+t.Var2.String)
 	v.Set("Body", message)
 	rb := strings.NewReader(v.Encode())
 
-	authHeader := base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s", t.ApiKey, t.ApiSecret)))
+	authHeader := base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s", t.ApiKey.String, t.ApiSecret.String)))
 
 	contents, _, err := utils.HttpRequest(twilioUrl, "POST", "application/x-www-form-urlencoded", []string{"Authorization=Basic " + authHeader}, rb, 10*time.Second, true, nil)
 	success, _ := twilioSuccess(contents)
@@ -91,13 +96,13 @@ func (t *twilio) sendMessage(message string) (string, error) {
 
 // OnFailure will trigger failing service
 func (t *twilio) OnFailure(s services.Service, f failures.Failure) (string, error) {
-	msg := ReplaceVars(t.FailureData, s, f)
+	msg := ReplaceVars(t.FailureData.String, s, f)
 	return t.sendMessage(msg)
 }
 
 // OnSuccess will trigger successful service
 func (t *twilio) OnSuccess(s services.Service) (string, error) {
-	msg := ReplaceVars(t.SuccessData, s, failures.Failure{})
+	msg := ReplaceVars(t.SuccessData.String, s, failures.Failure{})
 	return t.sendMessage(msg)
 }
 
diff --git a/notifiers/twilio_test.go b/notifiers/twilio_test.go
index f7195811..5510b6cd 100644
--- a/notifiers/twilio_test.go
+++ b/notifiers/twilio_test.go
@@ -23,8 +23,7 @@ func TestTwilioNotifier(t *testing.T) {
 	err := utils.InitLogs()
 	require.Nil(t, err)
 
-	TWILIO_SID = utils.Params.GetString("TWILIO_SID")
-	TWILIO_SECRET = utils.Params.GetString("TWILIO_SECRET")
+	t.Parallel()
 
 	db, err := database.OpenTester()
 	require.Nil(t, err)
@@ -32,16 +31,19 @@ func TestTwilioNotifier(t *testing.T) {
 	notifications.SetDB(db)
 	core.Example()
 
+	TWILIO_SID = utils.Params.GetString("TWILIO_SID")
+	TWILIO_SECRET = utils.Params.GetString("TWILIO_SECRET")
+
 	if TWILIO_SID == "" || TWILIO_SECRET == "" {
 		t.Log("twilio notifier testing skipped, missing TWILIO_SID and TWILIO_SECRET environment variable")
 		t.SkipNow()
 	}
 
 	t.Run("Load Twilio", func(t *testing.T) {
-		Twilio.ApiKey = TWILIO_SID
-		Twilio.ApiSecret = TWILIO_SECRET
-		Twilio.Var1 = "15005550006"
-		Twilio.Var2 = "15005550006"
+		Twilio.ApiKey = null.NewNullString(TWILIO_SID)
+		Twilio.ApiSecret = null.NewNullString(TWILIO_SECRET)
+		Twilio.Var1 = null.NewNullString("15005550006")
+		Twilio.Var2 = null.NewNullString("15005550006")
 		Twilio.Delay = 100 * time.Millisecond
 		Twilio.Enabled = null.NewNullBool(true)
 
@@ -49,7 +51,7 @@ func TestTwilioNotifier(t *testing.T) {
 
 		assert.Nil(t, err)
 		assert.Equal(t, "Hunter Long", Twilio.Author)
-		assert.Equal(t, TWILIO_SID, Twilio.ApiKey)
+		assert.Equal(t, TWILIO_SID, Twilio.ApiKey.String)
 	})
 
 	t.Run("Twilio Within Limits", func(t *testing.T) {
diff --git a/notifiers/webhook.go b/notifiers/webhook.go
index 8f3d520c..3831718a 100644
--- a/notifiers/webhook.go
+++ b/notifiers/webhook.go
@@ -6,6 +6,7 @@ import (
 	"github.com/statping/statping/types/failures"
 	"github.com/statping/statping/types/notifications"
 	"github.com/statping/statping/types/notifier"
+	"github.com/statping/statping/types/null"
 	"github.com/statping/statping/types/services"
 	"github.com/statping/statping/utils"
 	"io/ioutil"
@@ -32,8 +33,8 @@ var Webhook = &webhooker{&notifications.Notification{
 	AuthorUrl:   "https://github.com/hunterlong",
 	Icon:        "fas fa-code-branch",
 	Delay:       time.Duration(3 * time.Second),
-	SuccessData: `{"id": "{{.Service.Id}}", "online": true}`,
-	FailureData: `{"id": "{{.Service.Id}}", "online": false}`,
+	SuccessData: null.NewNullString(`{"id": "{{.Service.Id}}", "online": true}`),
+	FailureData: null.NewNullString(`{"id": "{{.Service.Id}}", "online": false}`),
 	DataType:    "json",
 	Limits:      180,
 	Form: []notifications.NotificationForm{{
@@ -79,30 +80,37 @@ func (w *webhooker) Select() *notifications.Notification {
 	return w.Notification
 }
 
+func (w *webhooker) Valid(values notifications.Values) error {
+	return nil
+}
+
 func (w *webhooker) sendHttpWebhook(body string) (*http.Response, error) {
-	utils.Log.Infoln(fmt.Sprintf("sending body: '%v' to %v as a %v request", body, w.Host, w.Var1))
+	utils.Log.Infoln(fmt.Sprintf("sending body: '%v' to %v as a %v request", body, w.Host.String, w.Var1.String))
 	client := new(http.Client)
-	client.Timeout = time.Duration(10 * time.Second)
-	buf := bytes.NewBuffer(nil)
-	if w.Var2 != "" {
-		buf = bytes.NewBuffer([]byte(body))
-	}
-	req, err := http.NewRequest(w.Var1, w.Host, buf)
+	client.Timeout = 10 * time.Second
+	req, err := http.NewRequest(w.Var1.String, w.Host.String, bytes.NewBufferString(body))
 	if err != nil {
 		return nil, err
 	}
-	if w.ApiSecret != "" {
-		splitArray := strings.Split(w.ApiSecret, ",")
-		for _, a := range splitArray {
-			split := strings.Split(a, "=")
-			req.Header.Add(split[0], split[1])
+	if w.ApiSecret.String != "" {
+		keyVal := strings.SplitN(w.ApiSecret.String, "=", 2)
+		if len(keyVal) == 2 {
+			if keyVal[0] != "" && keyVal[1] != "" {
+				if strings.ToLower(keyVal[0]) == "host" {
+					req.Host = strings.TrimSpace(keyVal[1])
+				} else {
+					req.Header.Set(keyVal[0], keyVal[1])
+				}
+			}
 		}
 	}
-	if w.ApiKey != "" {
-		req.Header.Add("Content-Type", w.ApiKey)
+	if w.ApiKey.String != "" {
+		req.Header.Add("Content-Type", w.ApiKey.String)
+	} else {
+		req.Header.Add("Content-Type", "application/json")
 	}
 	req.Header.Set("User-Agent", "Statping")
-	req.Header.Set("Statping-Version", utils.Version)
+	req.Header.Set("Statping-Version", utils.Params.GetString("VERSION"))
 	resp, err := client.Do(req)
 	if err != nil {
 		return nil, err
@@ -114,7 +122,7 @@ func (w *webhooker) sendHttpWebhook(body string) (*http.Response, error) {
 func (w *webhooker) OnTest() (string, error) {
 	f := failures.Example()
 	s := services.Example(false)
-	body := ReplaceVars(w.SuccessData, s, f)
+	body := ReplaceVars(w.SuccessData.String, s, f)
 	resp, err := w.sendHttpWebhook(body)
 	if err != nil {
 		return "", err
@@ -128,7 +136,7 @@ func (w *webhooker) OnTest() (string, error) {
 
 // OnFailure will trigger failing service
 func (w *webhooker) OnFailure(s services.Service, f failures.Failure) (string, error) {
-	msg := ReplaceVars(w.FailureData, s, f)
+	msg := ReplaceVars(w.FailureData.String, s, f)
 	resp, err := w.sendHttpWebhook(msg)
 	if err != nil {
 		return "", err
@@ -140,7 +148,7 @@ func (w *webhooker) OnFailure(s services.Service, f failures.Failure) (string, e
 
 // OnSuccess will trigger successful service
 func (w *webhooker) OnSuccess(s services.Service) (string, error) {
-	msg := ReplaceVars(w.SuccessData, s, failures.Failure{})
+	msg := ReplaceVars(w.SuccessData.String, s, failures.Failure{})
 	resp, err := w.sendHttpWebhook(msg)
 	if err != nil {
 		return "", err
diff --git a/notifiers/webhook_test.go b/notifiers/webhook_test.go
index bb70d8bc..73d2103e 100644
--- a/notifiers/webhook_test.go
+++ b/notifiers/webhook_test.go
@@ -21,9 +21,12 @@ var (
 )
 
 func TestWebhookNotifier(t *testing.T) {
-	t.SkipNow()
 	err := utils.InitLogs()
 	require.Nil(t, err)
+
+	t.Parallel()
+	t.SkipNow()
+
 	db, err := database.OpenTester()
 	require.Nil(t, err)
 	db.AutoMigrate(&notifications.Notification{})
@@ -31,10 +34,10 @@ func TestWebhookNotifier(t *testing.T) {
 	core.Example()
 
 	t.Run("Load webhooker", func(t *testing.T) {
-		Webhook.Host = webhookTestUrl
-		Webhook.Var1 = "POST"
-		Webhook.Var2 = webhookMessage
-		Webhook.ApiKey = "application/json"
+		Webhook.Host = null.NewNullString(webhookTestUrl)
+		Webhook.Var1 = null.NewNullString("POST")
+		Webhook.Var2 = null.NewNullString(webhookMessage)
+		Webhook.ApiKey = null.NewNullString("application/json")
 		Webhook.Enabled = null.NewNullBool(true)
 
 		Add(Webhook)
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 150860d4..5d2c34a3 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -13,15 +13,31 @@ type: app
 confinement: strict
 grade: stable
 
-parts:
-  statping:
-    plugin: dump
-    source: ./build/statping-linux.tar.gz
+architectures:
+  - build-on: amd64
+  - build-on: armhf
+  - build-on: arm64
+  - build-on: i386
 
 apps:
   statping:
     command: statping
     plugs:
       - home
+      - network
       - network-bind
-      - network
\ No newline at end of file
+
+parts:
+  statping:
+    source: .
+    plugin: nil
+    override-build: |
+      apt-get update
+      apt-get install -y curl
+      curl -o- -L https://statping.com/install.sh | bash
+      mv /usr/local/bin/statping ./
+    build-packages:
+      - git
+      - gcc
+      - make
+      - sed
diff --git a/source/generate_help.go b/source/generate_help.go
new file mode 100644
index 00000000..6bccd7cf
--- /dev/null
+++ b/source/generate_help.go
@@ -0,0 +1,183 @@
+// +build ignore
+
+package main
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"github.com/gomarkdown/markdown"
+	"github.com/gomarkdown/markdown/html"
+	"html/template"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"strings"
+	"time"
+)
+
+const wikiUrl = "https://github.com/statping/statping.wiki"
+
+var vue = `<template>
+<div class="col-12">
+<div class="row mb-4">
+	{{ range .Categories }}
+	<div class="col">
+	<h4 class="h4 mb-2">{{ .String }}</h4>
+		{{ range .Pages }}
+			<a @click.prevent='tab="{{.String}}"' class="d-block mb-1 text-link" href="#">{{.String}}</a>
+		{{end}}
+	</div>
+	{{end}}
+</div>
+
+<div class="col-12" v-if='tab === "Home"'>
+	<div v-pre>
+		{{html .Home.Data}}
+	</div>
+</div>
+{{ range .Pages }}
+	<div class="col-12" v-if='tab === "{{.String}}"'>
+		<h1 class="h1 mt-5 mb-5 text-muted">{{ .String }}</h1>
+		<span class="spacer"></span>
+		<div v-pre>
+				{{html .Data}}
+		</div>
+	</div>
+{{end}}
+
+<div class="col-12 shadow-md mt-5">
+	<div class="text-dim" v-pre>
+		{{html .Footer.Data}}
+	</div>
+</div>
+
+<div class="text-center small text-dim" v-pre>
+Automatically generated from Statping's Wiki on {{.CreatedAt}}
+</div>
+
+</div>
+</template>
+
+<script>
+export default {
+  name: 'Help',
+	data () {
+		  return {
+			  tab: "Home",
+		  }
+	  }
+}
+</script>
+
+<style scoped>
+IMG {
+	max-width: 80%;
+	alignment: center;
+	display: block;
+}
+</style>
+`
+
+var temp *template.Template
+
+type Category struct {
+	String string
+	Pages  []*Page
+}
+
+type Page struct {
+	String string
+	Data   string
+}
+
+type Render struct {
+	Categories []*Category
+	Pages      []*Page
+	Home       *Page
+	Footer     *Page
+	CreatedAt  time.Time
+}
+
+func main() {
+	fmt.Println("RUNNING: ./source/generate_help.go")
+	fmt.Println("\n\nGenerating Help.vue from Statping's Wiki")
+	fmt.Println("Cloning ", wikiUrl)
+	cmd := exec.Command("git", "clone", wikiUrl)
+	cmd.Start()
+	cmd.Wait()
+
+	fmt.Println("Generating Help view from Wiki")
+
+	d, _ := ioutil.ReadFile("statping.wiki/_Sidebar.md")
+
+	var cats []*Category
+	var pages []*Page
+	scanner := bufio.NewScanner(strings.NewReader(string(d)))
+	var thisCategory *Category
+	for scanner.Scan() {
+		txt := scanner.Text()
+		if txt == "" {
+			continue
+		}
+		if txt[0:1] == "#" {
+			newCate := &Category{
+				String: txt[2:len(txt)],
+			}
+			if txt[2:len(txt)] == "Contact" || txt[2:len(txt)] == "Badges" {
+				continue
+			}
+			thisCategory = newCate
+			cats = append(cats, newCate)
+		}
+		if txt[0:2] == "[[" {
+			file := "statping.wiki/" + txt[2:len(txt)-2] + ".md"
+			file = strings.ReplaceAll(file, " ", "-")
+			page := &Page{
+				String: txt[2 : len(txt)-2],
+				Data:   open(file),
+			}
+			pages = append(pages, page)
+			thisCategory.Pages = append(thisCategory.Pages, page)
+		}
+	}
+
+	home := &Page{
+		String: "Home",
+		Data:   open("statping.wiki/Home.md"),
+	}
+
+	footer := &Page{
+		String: "Footer",
+		Data:   open("statping.wiki/_Footer.md"),
+	}
+
+	w := bytes.NewBufferString("")
+	temp = template.New("wiki")
+	temp.Funcs(template.FuncMap{
+		"html": func(val string) template.HTML {
+			return template.HTML(val)
+		},
+		"fake": func(val string) template.HTML {
+			return template.HTML(`{{` + val + `}}`)
+		},
+	})
+	temp, _ = temp.Parse(vue)
+	temp.ExecuteTemplate(w, "wiki", Render{Categories: cats, Pages: pages, Home: home, Footer: footer, CreatedAt: time.Now().UTC()})
+
+	fmt.Println("Saving wiki page to: ./frontend/src/pages/Home.vue")
+	ioutil.WriteFile("../frontend/src/pages/Help.vue", w.Bytes(), os.FileMode(0755))
+
+	fmt.Println("Deleting statping wiki repo")
+	os.RemoveAll("statping.wiki")
+}
+
+func open(filename string) string {
+	htmlFlags := html.CommonFlags | html.HrefTargetBlank
+	opts := html.RendererOptions{Flags: htmlFlags}
+	renderer := html.NewRenderer(opts)
+
+	d, _ := ioutil.ReadFile(filename)
+	output := markdown.ToHTML(d, nil, renderer)
+	return string(output)
+}
diff --git a/source/generate_languages.go b/source/generate_languages.go
new file mode 100644
index 00000000..f344410c
--- /dev/null
+++ b/source/generate_languages.go
@@ -0,0 +1,227 @@
+// +build ignore
+
+package main
+
+import (
+	"encoding/csv"
+	"fmt"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/translate"
+	"io"
+	"io/ioutil"
+	"os"
+	"strings"
+)
+
+var (
+	tr        *translate.Translate
+	awsKey    string
+	awsSecret string
+)
+
+type Text struct {
+	Key string
+	En  string
+	Fr  string
+	De  string
+	Ru  string
+	Sp  string
+	Jp  string
+	Cn  string
+	Ko  string
+	It  string
+}
+
+func main() {
+	fmt.Println("RUNNING: ./source/generate_languages.go")
+	awsKey = os.Getenv("AWS_ACCESS_KEY_ID")
+	awsSecret = os.Getenv("AWS_SECRET_ACCESS_KEY")
+	if awsKey == "" || awsSecret == "" {
+		fmt.Println("AWS_ACCESS_KEY_ID or AWS_SECRET_ACCESS_KEY not set")
+		os.Exit(0)
+		return
+	}
+
+	InitAWS()
+
+	file, _ := os.Open("../frontend/src/languages/data.csv")
+
+	defer file.Close()
+	c := csv.NewReader(file)
+
+	var translations []*Text
+	line := 0
+	for {
+		// Read each record from csv
+		record, err := c.Read()
+		if err == io.EOF {
+			break
+		}
+		if line == 0 {
+			line++
+			continue
+		}
+		if err != nil {
+			fmt.Println(err)
+			continue
+		}
+		key := record[0]
+		english := record[1]
+
+		translated := TranslateAll(key, english)
+
+		translations = append(translations, translated)
+
+		fmt.Printf("%s | English: %s | French: %s | German: %s | Russian: %s\n", translated.Key, translated.En, translated.Fr, translated.De, translated.Ru)
+		line++
+	}
+
+	//CreateGo(translations)
+
+	CreateJS("english", translations)
+	CreateJS("russian", translations)
+	CreateJS("french", translations)
+	CreateJS("german", translations)
+	CreateJS("spanish", translations)
+	CreateJS("japanese", translations)
+	CreateJS("chinese", translations)
+	CreateJS("italian", translations)
+	CreateJS("korean", translations)
+}
+
+func Translate(val, language string) string {
+	input := &translate.TextInput{
+		SourceLanguageCode: aws.String("en"),
+		TargetLanguageCode: aws.String(language),
+		Text:               aws.String(val),
+	}
+	req, out := tr.TextRequest(input)
+	if err := req.Send(); err != nil {
+		panic(req.Error)
+	}
+	return *out.TranslatedText
+}
+
+func TranslateAll(key, en string) *Text {
+	return &Text{
+		Key: key,
+		En:  en,
+		Fr:  Translate(en, "fr"),
+		De:  Translate(en, "de"),
+		Ru:  Translate(en, "ru"),
+		Sp:  Translate(en, "es"),
+		Jp:  Translate(en, "ja"),
+		Cn:  Translate(en, "zh"),
+		Ko:  Translate(en, "ko"),
+		It:  Translate(en, "it"),
+	}
+}
+
+func (t *Text) String(lang string) string {
+	switch lang {
+	case "english":
+		return fmt.Sprintf(`    %s: "%s"`, t.Key, t.En)
+	case "russian":
+		return fmt.Sprintf(`    %s: "%s"`, t.Key, t.Ru)
+	case "spanish":
+		return fmt.Sprintf(`    %s: "%s"`, t.Key, t.Sp)
+	case "german":
+		return fmt.Sprintf(`    %s: "%s"`, t.Key, t.De)
+	case "french":
+		return fmt.Sprintf(`    %s: "%s"`, t.Key, t.Fr)
+	case "japanese":
+		return fmt.Sprintf(`    %s: "%s"`, t.Key, t.Jp)
+	case "chinese":
+		return fmt.Sprintf(`    %s: "%s"`, t.Key, t.Cn)
+	case "korean":
+		return fmt.Sprintf(`    %s: "%s"`, t.Key, t.Ko)
+	case "italian":
+		return fmt.Sprintf(`    %s: "%s"`, t.Key, t.It)
+	default:
+		return fmt.Sprintf(`    %s: "%s"`, t.Key, t.En)
+	}
+}
+
+func GoLang(trs []*Text) string {
+	var allvars []string
+	languages := []string{"english", "russian"}
+	for _, language := range languages {
+		allvars = append(allvars, language+" := make(map[string]string)")
+		for _, t := range trs {
+			allvars = append(allvars, GoLine(language, t))
+		}
+		allvars = append(allvars, "\nLanguage[\""+language+"\"] = "+language)
+	}
+	return strings.Join(allvars, "\n")
+}
+
+func GoLine(lang string, t *Text) string {
+	switch lang {
+	case "english":
+		return fmt.Sprintf(`		%s["%s"] = "%s"`, lang, t.Key, t.En)
+	case "russian":
+		return fmt.Sprintf(`		%s["%s"] = "%s"`, lang, t.Key, t.Ru)
+	case "spanish":
+		return fmt.Sprintf(`		%s["%s"] = "%s"`, lang, t.Key, t.Sp)
+	case "german":
+		return fmt.Sprintf(`		%s["%s"] = "%s"`, lang, t.Key, t.De)
+	case "french":
+		return fmt.Sprintf(`		%s["%s"] = "%s"`, lang, t.Key, t.Fr)
+	case "japanese":
+		return fmt.Sprintf(`		%s["%s"] = "%s"`, lang, t.Key, t.Jp)
+	case "chinese":
+		return fmt.Sprintf(`		%s["%s"] = "%s"`, lang, t.Key, t.Cn)
+	case "korean":
+		return fmt.Sprintf(`		%s["%s"] = "%s"`, lang, t.Key, t.Ko)
+	case "italian":
+		return fmt.Sprintf(`		%s["%s"] = "%s"`, lang, t.Key, t.It)
+	default:
+		return fmt.Sprintf(`		%s["%s"] = "%s"`, lang, t.Key, t.En)
+	}
+}
+
+func CreateGo(trs []*Text) {
+
+	data := `package utils
+
+var Language map[string]map[string]string
+
+func init() {
+	Language = make(map[string]map[string]string)
+	` + GoLang(trs) + `
+}
+`
+
+	ioutil.WriteFile("../utils/languages.go", []byte(data), os.ModePerm)
+}
+
+func CreateJS(name string, trs []*Text) {
+
+	data := "const " + name + " = {\n"
+
+	var allvars []string
+	for _, v := range trs {
+		allvars = append(allvars, v.String(name))
+	}
+
+	data += strings.Join(allvars, ",\n")
+
+	data += "\n}\n\nexport default " + name
+
+	ioutil.WriteFile("../frontend/src/languages/"+name+".js", []byte(data), os.ModePerm)
+
+}
+
+func InitAWS() {
+	creds := credentials.NewStaticCredentials(awsKey, awsSecret, "")
+	sess, err := session.NewSession(&aws.Config{
+		Region:      aws.String("us-west-2"),
+		Credentials: creds,
+	})
+	if err != nil {
+		panic(err)
+	}
+	tr = translate.New(sess)
+}
diff --git a/source/generate_version.go b/source/generate_version.go
new file mode 100644
index 00000000..3c0df432
--- /dev/null
+++ b/source/generate_version.go
@@ -0,0 +1,41 @@
+// +build ignore
+
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"regexp"
+	"strings"
+)
+
+const replace = `this\.version = "[0-9]\.[0-9]{2}\.[0-9]{2}";`
+const replaceCommit = `this\.commit = \"[a-z0-9]{40}\"\;`
+
+func main() {
+	fmt.Println("RUNNING: ./source/generate_version.go")
+	version, _ := ioutil.ReadFile("../version.txt")
+	apiJsFile, _ := ioutil.ReadFile("../frontend/src/API.js")
+
+	w := bytes.NewBuffer(nil)
+	cmd := exec.Command("git", "rev-parse", "HEAD")
+	cmd.Stdout = w
+	cmd.Run()
+	gitCommit := strings.TrimSpace(w.String())
+
+	fmt.Println("git commit: ", gitCommit)
+
+	replaceWith := `this.version = "` + strings.TrimSpace(string(version)) + `";`
+	replaceCommitWith := `this.commit = "` + gitCommit + `";`
+
+	vRex := regexp.MustCompile(replace)
+	newApiFile := vRex.ReplaceAllString(string(apiJsFile), replaceWith)
+	cRex := regexp.MustCompile(replaceCommit)
+	newApiFile = cRex.ReplaceAllString(newApiFile, replaceCommitWith)
+
+	fmt.Printf("Setting version %s to frontend/src/API.js\n", string(version))
+	ioutil.WriteFile("../frontend/src/API.js", []byte(newApiFile), os.FileMode(0755))
+}
diff --git a/source/generate_wiki.go b/source/generate_wiki.go
deleted file mode 100644
index c753cc98..00000000
--- a/source/generate_wiki.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// +build ignore
-
-package main
-
-import (
-	"github.com/statping/statping/utils"
-	"io/ioutil"
-	"log"
-	"os"
-	"strings"
-	"text/template"
-	"time"
-)
-
-const (
-	wikiUrl = "http://assets.statping.com/wiki/"
-)
-
-func replaceDash(s string) string {
-	return strings.Replace(s, "-", " ", -1)
-}
-
-func main() {
-	var compiled string
-
-	utils.InitLogs()
-	utils.Command("git clone https://github.com/statping/statping.wiki.git")
-
-	pages := []string{"Types-of-Monitoring", "Features", "Start-Statping", "Linux", "Mac", "Windows", "AWS-EC2", "Docker", "Mobile-App", "Heroku", "API", "Makefile",
-		"Notifiers", "Notifier-Events", "Notifier-Example", "Prometheus-Exporter", "SSL", "Config-with-.env-File", "Static-Export", "Statping-Plugins", "Statuper", "Build-and-Test", "Contributing", "PGP-Signature", "Testing", "Deployment"}
-	newPages := map[string]string{}
-
-	for k, v := range pages {
-		compiled += "<a class=\"scrollclick\" href=\"#\" data-id=\"page_" + utils.ToString(k) + "\">" + replaceDash(v) + "</a><br>"
-	}
-
-	for k, v := range pages {
-		sc, _ := ioutil.ReadFile("statping.wiki/" + v + ".md")
-		newPages[v] = string(sc)
-		compiled += "\n\n<div class=\"mt-5\" id=\"page_" + utils.ToString(k) + "\"><h1>" + replaceDash(v) + "</h1></div>\n" + string(sc)
-	}
-
-	utils.DeleteDirectory("./statping.wiki")
-	utils.DeleteDirectory("./logs")
-
-	f, err := os.Create("../frontend/src/pages/Help.vue")
-	die(err)
-	defer f.Close()
-
-	packageTemplate.Execute(f, struct {
-		Timestamp time.Time
-		URL       string
-		Compiled  string
-		Pages     map[string]string
-	}{
-		Timestamp: utils.Now(),
-		URL:       "ok",
-		Compiled:  compiled,
-		Pages:     newPages,
-	})
-}
-
-func die(err error) {
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-var packageTemplate = template.Must(template.New("").Parse(`<template>
-    <div class="col-12 bg-white p-4" v-html={{printf "%q" .Compiled}}></div>
-</template>
-
-<script>
-export default {
-  name: 'Help',
-}
-</script>`))
diff --git a/source/source.go b/source/source.go
index c35a739c..ce9078af 100644
--- a/source/source.go
+++ b/source/source.go
@@ -1,6 +1,8 @@
 package source
 
-//go:generate go run generate_wiki.go
+//go:generate go run generate_help.go
+//go:generate go run generate_version.go
+//go:generate go run generate_languages.go
 
 import (
 	"fmt"
@@ -14,18 +16,36 @@ import (
 )
 
 var (
-	log         = utils.Log.WithField("type", "source")
-	TmplBox     *rice.Box // HTML and other small files from the 'source/tmpl' directory, this will be loaded into '/assets'
-	DefaultScss = []string{"scss/main.scss", "scss/base.scss", "scss/mobile.scss"}
+	log           = utils.Log.WithField("type", "source")
+	TmplBox       *rice.Box // HTML and other small files from the 'source/dist' directory, this will be loaded into '/assets'
+	RequiredFiles = []string{
+		"css/style.css",
+		"css/style.css.gz",
+		"css/index.css",
+		"scss/index.scss",
+		"scss/base.scss",
+		"scss/forms.scss",
+		"scss/layout.scss",
+		"scss/mixin.scss",
+		"scss/mobile.scss",
+		"scss/variables.scss",
+		"banner.png",
+		"favicon.ico",
+		"robots.txt",
+	}
 )
 
-// Assets will load the Rice boxes containing the CSS, SCSS, JS, and HTML files.
+// Assets will load the Rice boxes containing the CSS, SCSS, favicon, and HTML files.
 func Assets() error {
 	if utils.Params.GetBool("DISABLE_HTTP") {
 		return nil
 	}
 	var err error
 	TmplBox, err = rice.FindBox("dist")
+	if err != nil {
+		return err
+	}
+
 	return err
 }
 
@@ -34,11 +54,11 @@ func scssRendered(name string) string {
 	path := spl[:len(spl)-2]
 	file := spl[len(spl)-1]
 	splFile := strings.Split(file, ".")
-	return fmt.Sprintf("%s/css/%s.css", strings.Join(path, "/"), splFile[len(splFile)-2])
+	return filepath.Join(strings.Join(path, "/"), "css", splFile[len(splFile)-2]+".css")
 }
 
 // CompileSASS will attempt to compile the SASS files into CSS
-func CompileSASS(files ...string) error {
+func CompileSASS() error {
 	sassBin := utils.Params.GetString("SASS")
 	if sassBin == "" {
 		bin, err := exec.LookPath("sass")
@@ -49,23 +69,20 @@ func CompileSASS(files ...string) error {
 		sassBin = bin
 	}
 
-	for _, file := range files {
-		scssFile := fmt.Sprintf("%v/assets/%v", utils.Params.GetString("STATPING_DIR"), file)
+	scssFile := filepath.Join(utils.Params.GetString("STATPING_DIR"), "assets", "scss", "index.scss")
+	log.Infoln(fmt.Sprintf("Compiling SASS %v into %v", scssFile, scssRendered(scssFile)))
 
-		log.Infoln(fmt.Sprintf("Compiling SASS %v into %v", scssFile, scssRendered(scssFile)))
-
-		stdout, stderr, err := utils.Command(sassBin, scssFile, scssRendered(scssFile))
-
-		if err != nil {
-			log.Errorln(fmt.Sprintf("Failed to compile assets with SASS %v", err))
-			log.Errorln(fmt.Sprintf("%s %s %s", sassBin, scssFile, scssRendered(scssFile)))
-			return errors.Wrapf(err, "failed to compile assets, %s %s %s", err, stdout, stderr)
-		}
-
-		if stdout != "" || stderr != "" {
-			log.Infoln(fmt.Sprintf("out: %v | error: %v", stdout, stderr))
-		}
+	stdout, stderr, err := utils.Command(sassBin, scssFile, scssRendered(scssFile))
+	if err != nil {
+		log.Errorln(fmt.Sprintf("Failed to compile assets with SASS %v", err))
+		log.Errorln(fmt.Sprintf("%s %s %s", sassBin, scssFile, scssRendered(scssFile)))
+		return errors.Wrapf(err, "failed to compile assets, %s %s %s", err, stdout, stderr)
 	}
+
+	if stdout != "" || stderr != "" {
+		log.Infoln(fmt.Sprintf("out: %v | error: %v", stdout, stderr))
+	}
+
 	log.Infoln("SASS Compiling is complete!")
 	return nil
 }
@@ -75,17 +92,14 @@ func UsingAssets(folder string) bool {
 	if _, err := os.Stat(folder + "/assets"); err == nil {
 		return true
 	} else {
-		useAssets := utils.Params.GetBool("USE_ASSETS")
-
-		if useAssets {
+		if utils.Params.GetBool("USE_ASSETS") {
 			log.Infoln("Environment variable USE_ASSETS was found.")
 			if err := CreateAllAssets(folder); err != nil {
 				log.Warnln(err)
 			}
-			err := CompileSASS(DefaultScss...)
-			if err != nil {
+			if err := CompileSASS(); err != nil {
 				//CopyToPublic(CssBox, folder+"/css", "base.css")
-				log.Warnln("Default 'base.css' was insert because SASS did not work.")
+				log.Warn(errors.Wrap(err, "Default 'base.css' was insert because SASS did not work."))
 				return true
 			}
 			return true
@@ -96,7 +110,7 @@ func UsingAssets(folder string) bool {
 
 // SaveAsset will save an asset to the '/assets/' folder.
 func SaveAsset(data []byte, path string) error {
-	path = fmt.Sprintf("%s/assets/%s", utils.Directory, path)
+	path = filepath.Join(utils.Directory, "assets", path)
 	err := utils.SaveFile(path, data)
 	if err != nil {
 		log.Errorln(fmt.Sprintf("Failed to save %v, %v", path, err))
@@ -107,26 +121,23 @@ func SaveAsset(data []byte, path string) error {
 
 // OpenAsset returns a file's contents as a string
 func OpenAsset(path string) string {
-	path = fmt.Sprintf("%s/assets/%s", utils.Directory, path)
+	path = filepath.Join(utils.Directory, "assets", path)
 	data, err := utils.OpenFile(path)
 	if err != nil {
-		log.Errorln(fmt.Sprintf("Failed to open %v, %v", path, err))
+		log.Errorln(fmt.Sprintf("Failed to open %s, %v", path, err))
 		return ""
 	}
 	return data
 }
 
-// CreateAllAssets will dump HTML, CSS, SCSS, and JS assets into the '/assets' directory
+// CreateAllAssets will dump HTML, CSS, SCSS, and favicon assets into the '/assets' directory
 func CreateAllAssets(folder string) error {
-	log.Infoln(fmt.Sprintf("Dump Statping assets into %v/assets", folder))
+	log.Infoln(fmt.Sprintf("Dump Statping assets into %s/assets", folder))
 	fp := filepath.Join
 
 	if err := MakePublicFolder(fp(folder, "/assets")); err != nil {
 		return err
 	}
-	if err := MakePublicFolder(fp(folder, "assets", "js")); err != nil {
-		return err
-	}
 	if err := MakePublicFolder(fp(folder, "assets", "css")); err != nil {
 		return err
 	}
@@ -136,20 +147,28 @@ func CreateAllAssets(folder string) error {
 	if err := MakePublicFolder(fp(folder, "assets", "scss")); err != nil {
 		return err
 	}
-	log.Infoln("Inserting scss, css, and javascript files into assets folder")
+	log.Infoln("Inserting scss, css, and favicon files into assets folder")
 
 	if err := CopyAllToPublic(TmplBox); err != nil {
 		log.Errorln(err)
 		return errors.Wrap(err, "copying all to public")
 	}
 
-	CopyToPublic(TmplBox, "", "robots.txt")
-	CopyToPublic(TmplBox, "", "banner.png")
-	CopyToPublic(TmplBox, "", "favicon.ico")
+	if err := CopyToPublic(TmplBox, "", "robots.txt"); err != nil {
+		return err
+	}
+	if err := CopyToPublic(TmplBox, "", "banner.png"); err != nil {
+		return err
+	}
+	if err := CopyToPublic(TmplBox, "", "favicon.ico"); err != nil {
+		return err
+	}
 	log.Infoln("Compiling CSS from SCSS style...")
-	err := CompileSASS(DefaultScss...)
+	if err := CompileSASS(); err != nil {
+		return err
+	}
 	log.Infoln("Statping assets have been inserted")
-	return err
+	return nil
 }
 
 // DeleteAllAssets will delete the '/assets' folder
@@ -165,30 +184,30 @@ func DeleteAllAssets(folder string) error {
 
 // CopyAllToPublic will copy all the files in a rice box into a local folder
 func CopyAllToPublic(box *rice.Box) error {
-
 	exclude := map[string]bool{
 		"base.gohtml": true,
 		"index.html":  true,
 	}
 
-	err := box.Walk("/", func(path string, info os.FileInfo, err error) error {
+	return box.Walk("/", func(path string, info os.FileInfo, err error) error {
 		if info.Name() == "" {
 			return nil
 		}
 		if exclude[info.Name()] {
 			return nil
 		}
+		if strings.Contains(path, "js") {
+			return nil
+		}
 		if info.IsDir() {
 			return nil
 		}
-		utils.Log.Infoln(path)
 		file, err := box.Bytes(path)
 		if err != nil {
 			return err
 		}
 		return SaveAsset(file, path)
 	})
-	return err
 }
 
 // CopyToPublic will create a file from a rice Box to the '/assets' directory
@@ -213,11 +232,11 @@ func CopyToPublic(box *rice.Box, path, file string) error {
 
 // MakePublicFolder will create a new folder
 func MakePublicFolder(folder string) error {
-	log.Infoln(fmt.Sprintf("Creating folder '%v'", folder))
+	log.Infoln(fmt.Sprintf("Creating folder '%s'", folder))
 	if !utils.FolderExists(folder) {
 		err := utils.CreateDirectory(folder)
 		if err != nil {
-			log.Errorln(fmt.Sprintf("Failed to created %v directory, %v", folder, err))
+			log.Errorln(fmt.Sprintf("Failed to created %s directory, %v", folder, err))
 			return err
 		}
 	}
diff --git a/source/source_test.go b/source/source_test.go
index a0c848f8..95712f22 100644
--- a/source/source_test.go
+++ b/source/source_test.go
@@ -19,62 +19,85 @@ func init() {
 	dir = utils.Params.GetString("STATPING_DIR")
 }
 
+func assertFiles(t *testing.T, exist bool) {
+	for _, f := range RequiredFiles {
+		if exist {
+			assert.FileExists(t, dir+"/assets/"+f)
+		} else {
+			assert.NoFileExists(t, dir+"/assets/"+f)
+		}
+	}
+}
+
 func TestCore_UsingAssets(t *testing.T) {
 	assert.False(t, UsingAssets(dir))
+	assertFiles(t, false)
 }
 
 func TestCreateAssets(t *testing.T) {
-	CreateAllAssets(dir)
+	assert.Nil(t, CreateAllAssets(dir))
 	assert.True(t, UsingAssets(dir))
-	CompileSASS(DefaultScss...)
-	assert.FileExists(t, dir+"/assets/css/main.css")
-	assert.FileExists(t, dir+"/assets/css/style.css")
-	assert.FileExists(t, dir+"/assets/css/vendor.css")
-	assert.FileExists(t, dir+"/assets/scss/base.scss")
-	assert.FileExists(t, dir+"/assets/scss/mobile.scss")
-	assert.FileExists(t, dir+"/assets/scss/variables.scss")
+	assert.Nil(t, CompileSASS())
+	assertFiles(t, true)
 }
 
-//func TestCopyAllToPublic(t *testing.T) {
-//	err := CopyAllToPublic(TmplBox)
-//	require.Nil(t, err)
-//}
+func TestCopyAllToPublic(t *testing.T) {
+	err := CopyAllToPublic(TmplBox)
+	require.Nil(t, err)
+	assertFiles(t, true)
+}
 
 func TestCompileSASS(t *testing.T) {
-	CompileSASS(DefaultScss...)
+	err := CompileSASS()
+	require.Nil(t, err)
 	assert.True(t, UsingAssets(dir))
+	assertFiles(t, true)
 }
 
 func TestSaveAndCompileAsset(t *testing.T) {
-	scssData := "$bodycolor: #333; BODY { color: $bodycolor; }"
+	vars := OpenAsset("scss/variables.scss")
+	vars += "$testingcolor: #b1b2b3;"
 
-	err := SaveAsset([]byte(scssData), "scss/theme.scss")
+	err := SaveAsset([]byte(vars), "scss/variables.scss")
 	require.Nil(t, err)
-	assert.FileExists(t, dir+"/assets/scss/theme.scss")
+	assert.FileExists(t, dir+"/assets/scss/variables.scss")
 
-	asset := OpenAsset("scss/theme.scss")
+	scssData := OpenAsset("scss/base.scss")
+	scssData += "BODY { color: $testingcolor; }"
+	err = SaveAsset([]byte(scssData), "scss/base.scss")
+	require.Nil(t, err)
+	assert.FileExists(t, dir+"/assets/scss/base.scss")
+
+	asset := OpenAsset("scss/variables.scss")
+	assert.NotEmpty(t, asset)
+	assert.Equal(t, vars, asset)
+
+	asset = OpenAsset("scss/base.scss")
 	assert.NotEmpty(t, asset)
 	assert.Equal(t, scssData, asset)
 
-	err = CompileSASS("scss/theme.scss")
+	err = CompileSASS()
 	require.Nil(t, err)
-	assert.FileExists(t, dir+"/assets/css/theme.css")
+	assertFiles(t, true)
 
-	themeCSS, err := utils.OpenFile(dir + "/assets/css/theme.css")
+	themeCSS, err := utils.OpenFile(dir + "/assets/css/index.css")
 	require.Nil(t, err)
 
-	assert.Contains(t, themeCSS, `color: #333;`)
+	assert.Contains(t, themeCSS, `color: #b1b2b3;`)
 }
 
 func TestOpenAsset(t *testing.T) {
-	asset := OpenAsset("scss/theme.scss")
-	assert.NotEmpty(t, asset)
+	for _, f := range RequiredFiles {
+		assert.FileExists(t, dir+"/assets/"+f)
+		assert.NotEmpty(t, OpenAsset(f))
+	}
 }
 
 func TestDeleteAssets(t *testing.T) {
 	assert.True(t, UsingAssets(dir))
 	assert.Nil(t, DeleteAllAssets(dir))
 	assert.False(t, UsingAssets(dir))
+	assertFiles(t, false)
 }
 
 func ExampleSaveAsset() {
diff --git a/source/tmpl/banner.png b/source/tmpl/banner.png
deleted file mode 100644
index 0378161b..00000000
Binary files a/source/tmpl/banner.png and /dev/null differ
diff --git a/source/tmpl/favicon.ico b/source/tmpl/favicon.ico
deleted file mode 100644
index e8999029..00000000
Binary files a/source/tmpl/favicon.ico and /dev/null differ
diff --git a/source/wiki.go b/source/wiki.go
index 478b1191..dcc949d4 100644
--- a/source/wiki.go
+++ b/source/wiki.go
@@ -6,4 +6,4 @@
 package source
 
 // CompiledWiki contains all of the Statping Wiki pages from the Github Wiki repo.
-var CompiledWiki = []byte("<a class=\"scrollclick\" href=\"#\" data-id=\"page_0\">Types of Monitoring</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_1\">Features</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_2\">Start Statping</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_3\">Linux</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_4\">Mac</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_5\">Windows</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_6\">AWS EC2</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_7\">Docker</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_8\">Mobile App</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_9\">Heroku</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_10\">API</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_11\">Makefile</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_12\">Notifiers</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_13\">Notifier Events</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_14\">Notifier Example</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_15\">Prometheus Exporter</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_16\">SSL</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_17\">Config with .env File</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_18\">Static Export</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_19\">Statping Plugins</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_20\">Statuper</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_21\">Build and Test</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_22\">Contributing</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_23\">PGP Signature</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_24\">Testing</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_25\">Deployment</a><br>\n\n<div class=\"mt-5\" id=\"page_0\"><h1>Types of Monitoring</h1></div>\nYou can monitor your application by using a simple HTTP GET to the endpoint to return back a response and status code. Normally you want a 200 status code on an HTTP request. You might want to require a 404 or 500 error as a response code though. With each service you can include a Timeout in seconds to work with your long running services.\n\n# HTTP Endpoints with Custom POST\nFor more advanced monitoring you can add a data as a HTTP POST request. This is useful for automatically submitting JSON, or making sure your signup form is working correctly.\n\n<p align=\"center\">\n<img width=\"100%\" src=\"https://img.cjx.io/statup-httpservice.png\">\n</p>\n\nWith a HTTP service, you can POST a JSON string to your endpoint to retrieve any type of response back. You can then use Regex in the Expected Response field to parse a custom response that exactly matches your status requirements. \n\n# TCP/UDP Services\nFor other services that don't use HTTP, you can monitor any type of service by using the PORT of the service. If you're Ethereum Blockchain server is running on 8545, you can use TCP to monitor your server. With a TCP service, you can monitor your Docker containers, or remove service running on a custom port. You don't need to include `http` in the endpoint field, just IP or Hostname.\n\n<p align=\"center\">\n<img width=\"100%\" src=\"https://img.cjx.io/statup-tcpservice.png\">\n</p>\n\n# ICMP Service\nYou can send a [ICMP](https://en.wikipedia.org/wiki/Internet_Control_Message_Protocol) (ping) to an endpoint rather than HTTP/TCP/UDP request for a quick response.\n\n\n<div class=\"mt-5\" id=\"page_1\"><h1>Features</h1></div>\nStatping is a great Status Page that can be deployed with 0 effort.\n\n# 3 Different Databases\nYou can use MySQL, Postgres, or SQLite as a database for your Statping status page. The server will automatically upgrade your database tables depending on which database you have.\n\n# Easy to Startup\nStatping is an extremely easy to setup website monitoring tool without fussing with dependencies or packages. Simply download and install the precompile binary for your operating system. Statping works on Windows, Mac, Linux, Docker, and even the Raspberry Pi.\n\n# Plugins\nStatping is an awesome Status Page generator that allows you to create your own plugins with Golang Plugins! You don't need to request a PR or even tell us about your plugin. Plugin's are compiled and then send as a binary to the Statping `/plugins` folder. Test your plugins using the `statup test plugin` command, checkout the [Plugin Wiki](https://github.com/statping/statping/wiki/Statping-Plugins) to see detailed information about creating plugins.\n\n# No Maintenance\nMany other website monitoring applications will collect data until the server fails because of hard drive is 100% full. Statping will automatically delete records to make sure your server will stay UP for years. The EC2 AMI Image is a great way to host your status page without worrying about it crashing one day. Statping will automatically upgrade its software when you reboot your computer.\n\n# Email & Slack Notifications\nReceive email notifications if your website or application goes offline. Statping includes SMTP connections so you can use AWS SES, or any other SMTP emailing service. Go in the Email Settings in Settings to configure these options.\n\n# Prometheus Exporter\nIf you want a deeper view of your applications status, you can use Grafana and Prometheus to graph all types of data about your services. Read more about the [Prometheus Exporter](https://github.com/statping/statping/wiki/Prometheus-Exporter)\n\n<div class=\"mt-5\" id=\"page_2\"><h1>Start Statping</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_3\"><h1>Linux</h1></div>\n# Installing on Linux\nInstalling Statping on Linux can be done by downloading the latest tar.gz file, unzipping, and running the executable. You can also install using [Snapcraft](https://snapcraft.io/) for Ubuntu systems.\n\n```shell\ncurl -o- -L https://statping.com/install.sh | bash\n```\n\n## Install using Snapcraft\n\n[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-white.svg)](https://snapcraft.io/statping)\n\nIf you are using [snap](https://snapcraft.io/statping), you can simply run this command to install Statping.\n```shell\nsudo snap install statping\n```\n\n# Compiling SCSS for Custom Theme\nStatping requires `sass` to be installed to the local machine to compile SCSS into CSS if you want to use the Custom Theme features. \n\n- Apt: `apt install ruby-sass -y`\n- Node: `npm install sass -g`\n- Ruby: `gem install sass`\n\n## Systemd Service\nSetting up a systemd service is a great way to make sure your Statping server will automatically reboot when needed. You can use the file below for your service. You should have Statping already installed by this step.\n###### /etc/systemd/system/statping.service\n```\n[Unit]\nDescription=Statping Server\nAfter=network.target\nAfter=systemd-user-sessions.service\nAfter=network-online.target\n\n[Service]\nType=simple\nRestart=always\nExecStart=/usr/local/bin/statping\nWorkingDirectory=/usr/local/bin\n\n[Install]\nWantedBy=multi-user.target\n```\nThen you can enable and start your systemd service with:\n```\nsystemctl daemon-reload\n\nsystemctl enable statping.service\n\nsystemctl start statping\n```\nYou're Statping server will now automatically restart when your server restarts.\n\n## Raspberry Pi\nYou can even run Statping on your Raspberry Pi by installing the precompiled binary from [Latest Releases](https://github.com/statping/statping/releases/latest). For the Raspberry Pi 3 you'll want to download the `statping-linux-arm7.tar.gz` file. Be sure to change `VERSION` to the latest version in Releases, and include the 'v'.\n\n```\nVERSION=$(curl -s \"https://github.com/statping/statping/releases/latest\" | grep -o 'tag/[v.0-9]*' | awk -F/ '{print $2}')\nwget https://github.com/statping/statping/releases/download/$VERSION/statping-linux-arm7.tar.gz\ntar -xvzf statping-linux-arm7.tar.gz\nchmod +x statping\nmv statping /usr/local/bin/statping\n\nstatping version\n``` \n\n## Alpine Linux\nThe Docker image is using the Statping Alpine binary since it's so incredibly small. You can run it on your own alpine image by downloading `statping-linux-alpine.tar.gz` from [Latest Releases](https://github.com/statping/statping/releases/latest).\n\n<div class=\"mt-5\" id=\"page_4\"><h1>Mac</h1></div>\n# Installing on Mac\nStatping includes an easy to use [Homebrew Formula](https://github.com/hunterlong/homebrew-statping) to quick get your Status Page up and running locally. Statping on brew is automatically generated for each new release to master. Install with the commands below,\n###### Using Homebrew\n```bash\nbrew tap statping/statping\nbrew install statping\n```\n###### Using the Terminal\n```shell\ncurl -o- -L https://statping.com/install.sh | bash\n```\n\n<p align=\"center\">\n<img width=\"80%\" src=\"https://img.cjx.io/statupbrewinstall.gif\">\n</p>\n\nOnce you've installed it, checkout which version you have by running `statping version`.\n\n# Compiling SCSS for Custom Theme\nStatping requires `sass` to be installed to the local machine to compile SCSS into CSS if you want to use the Custom Theme features. \n\n- Node: `npm install sass -g`\n- Ruby: `gem install sass`\n\n\n<div class=\"mt-5\" id=\"page_5\"><h1>Windows</h1></div>\n# Installing on Windows\nCurrently, Statping only works on Windows 64-bit computers. Just download the exe file from [Latest Releases](https://github.com/statping/statping/releases/latest) and run it in your command prompt. It will create a HTTP server on port 8080, so you can visit `http://localhost:8080` to see your Statping Status Page.\n\n# Compiling SCSS for Custom Theme\nStatping requires `sass` to be installed to the local machine to compile SCSS into CSS if you want to use the Custom Theme features. \n\n- Node: `npm install sass -g`\n- Ruby: `gem install sass`\n\n# Running Statping as a Service\nTo ensure Statping is always running, it can be installed to run as a service on a Windows machine. The easiest way to do that is by using NSSM, the [Non-Sucking Service Manager](https://nssm.cc/download). Download and unzip the compressed file to a location on your machine running Statping to get started:\n1. Open an administrative command prompt.\n2. Change to the folder that contains the 64 bit version of NSSM.\n3. Type \"nssm install Statping\" and press enter.\n4. For the properties, use the following as an example:\n    Path: C:\\Program Files\\Statping\\statping.exe\n    Startup directory: C:\\Program Files\\Statping\n5. Click \"Install\".\n6. Launch the windows services manager.\n7. Run Statping.\n\n## Known Issues with Windows\nUnfortunately, Statping only works on Windows 64-bit processors. If you have more than 4gb of ram, there's a good chance you already have a 64-bit processor. Download the [Latest Releases](https://github.com/statping/statping/releases/latest) of Statping, extract the ZIP file, then double click on the `statping.exe` file. You can use a SQLite database for a quick setup, or connect to a local/remote Postgres or MySQL database server.\n\n<div class=\"mt-5\" id=\"page_6\"><h1>AWS EC2</h1></div>\nRunning Statping on the smallest EC2 server is very quick using the AWS AMI Image. The AWS AMI Image will automatically start a Statping Docker container that will automatically update to the latest version. Once the EC2 is booted, you can go to the Public DNS domain to view the Statping installation page. The Statping root folder is located at: `/statping` on the server.\n\n# AMI Image\nChoose the correct AMI Image ID based on your AWS region.\n- us-east-1 `ami-09ccd23d9c7afba61` (Virginia)\n- us-east-2 `ami-0c6c9b714a501cdb3` (Ohio)\n- us-west-1 `ami-02159cc1fc701a77e` (California)\n- us-west-2 `ami-007c6990949f5ccee` (Oregon)\n- eu-central-1 `ami-06e252d6d8b0c2f1f` (Frankfurt)\n\n# Upgrading Staping\nYou can upgrade the Statping executable by running the commands below on your EC2 instance.\n```\nVERSION=$(curl -s \"https://github.com/statping/statping/releases/latest\" | grep -o 'tag/[v.0-9]*' | awk -F/ '{print $2}')\nwget https://github.com/statping/statping/releases/download/$VERSION/statping-linux-x64.tar.gz\ntar -xvzf statping-linux-x64.tar.gz\nchmod +x statping\nmv statping /usr/local/bin/statping\n```\nYou can test the version number by running `statping version`.\n\n# Instructions\n\n### 1. Create an EC2 instance from AMI Image\nGo to the main EC2 dashboard and click 'Launch Instance'. Then type `Statping` inside the search field for 'Community AMI'. Once you've found it in your region, click Select!\n\n<img src=\"https://img.cjx.io/statpingaws-ami.png\">\n\n### 2. Get the Public DNS for EC2 Instance\nCopy the 'Public DNS' URL and paste it into your browser.\n\n<img src=\"https://img.cjx.io/statping-aws-ec2.png\">\n\n### 3. Setup Statping\nUse SQLite if you don't want to connect to a remote MySQL or Postgres database.\n\n<img src=\"https://img.cjx.io/statping-setup.png\">\n\n# EC2 Server Features\nRunning your Statping server on a small EC2 instance is perfect for most users. Below you'll find some commands to get up and running in seconds.\n- Super cheap on the t2.nano (~$4.60 monthly)\n- Small usage, 8gb of hard drive\n- Automatic SSL certificate if you require it\n- Automatic reboot when the server needs it\n- Automatic database cleanup, so you'll never be at 100% full.\n- Automatic docker containers/images removal\n\n## Create Security Groups\nUsing the AWS CLI you can copy and paste the commands below to auto create everything for you. The server opens port 80 and 443.\n```bash\naws ec2 create-security-group --group-name StatpingPublicHTTP --description \"Statping HTTP Server on port 80 and 443\"\n# will response back a Group ID. Copy ID and use it for --group-id below.\n```\n```bash\nGROUPS=sg-7e8b830f\naws ec2 authorize-security-group-ingress --group-id $GROUPS --protocol tcp --port 80 --cidr 0.0.0.0/0\naws ec2 authorize-security-group-ingress --group-id $GROUPS --protocol tcp --port 443 --cidr 0.0.0.0/0\n```\n## Create EC2 without SSL\nOnce your server has started, go to the EC2 Public DNS endpoint. You should be redirected to /setup to continue your installation process! The database information is already inputed for you.\n```bash\nGROUPS=sg-7e8b830f\nKEY=MYKEYHERE\nAMI_IMAGE=ami-7be8a103\n\naws ec2 run-instances \\\n    --image-id $AMI_IMAGE \\\n    --count 1 --instance-type t2.nano \\\n    --key-name $KEY \\\n    --security-group-ids $GROUPS\n```\n## Create EC2 with Automatic SSL Certification\nStart a Statping server with an SSL cert that will automatically regenerate when it's near expiration time. You'll need to point your domain's A record (IP address) or CNAME (public DNS endpoint) to use this feature.\n\n```bash\nwget https://raw.githubusercontent.com/hunterlong/statping/master/dev/ec2-ssl.sh\n```\n\n```bash\n# edit the contents inside of ec2-ssl.sh then continue\nLETSENCRYPT_HOST=\"status.MYDOMAIN.com\"\nLETSENCRYPT_EMAIL=\"noreply@MYEMAIL.com\"\n```\nEdit ec2-ssl.sh and insert your domain you want to use, then run command below. Use the Security Group ID that you used above for --security-group-ids\n```\nGROUPS=sg-7e8b830f\nAMI_IMAGE=ami-7be8a103\nKEY=MYKEYHERE\n\naws ec2 run-instances \\\n    --user-data file://ec2-ssl.sh \\\n    --image-id $AMI_IMAGE \\\n    --count 1 --instance-type t2.nano \\\n    --key-name $KEY \\\n    --security-group-ids $GROUPS\n```\n\n### EC2 Server Specs\n- t2.nano ($4.60 monthly)\n- 8gb SSD Memory\n- 0.5gb RAM\n- Docker with Docker Compose installed\n- Running Statping, NGINX, and Postgres\n- boot scripts to automatically clean unused containers.\n\n\n\n<div class=\"mt-5\" id=\"page_7\"><h1>Docker</h1></div>\nStatping is easily ran on Docker with the light weight Alpine linux image. View on [Docker Hub](https://hub.docker.com/r/hunterlong/statping).\n\n[![](https://images.microbadger.com/badges/image/hunterlong/statping.svg)](https://microbadger.com/images/hunterlong/statping) [![Docker Pulls](https://img.shields.io/docker/pulls/hunterlong/statping.svg)](https://hub.docker.com/r/hunterlong/statping/builds/)\n\n# Latest Docker Image\nThe `latest` Docker image uses Alpine Linux to keep it ultra small.\n```bash\ndocker run -d \\\n  -p 8080:8080 \\\n  --restart always \\\n  hunterlong/statping\n```\n\n# Mounting Volume\nYou can mount a volume to the `/app` Statping directory. This folder will contain `logs`, `config.yml`, and static assets if you want to edit the SCSS/CSS. \n```bash\ndocker run -d \\\n  -p 8080:8080 \\\n  -v /mydir/statping:/app \\\n  --restart always \\\n  hunterlong/statping\n```\n\n# Attach a SSL Certificate\nWhen you mount `server.crt` and `server.key` to the `/app` directory, Statping will run a HTTPS server on port 443. Checkout the [SSL Wiki](https://github.com/statping/statping/wiki/SSL) documentation to see more information about this.\n```bash\ndocker run -d \\\n  -p 443:443 \\\n  -v /mydir/domain.crt:/app/server.crt \\\n  -v /mydir/domain.key:/app/server.key \\\n  -v /mydir:/app \\\n  --restart always \\\n  hunterlong/statping\n```\n\n# Development Docker Image\nIf you want to run Statping that was build from the source, use the `dev` Docker image.\n```bash\ndocker run -d -p 8080:8080 hunterlong/statping:dev\n```\n\n# Cypress Testing Docker Image\nThis Docker image will pull the latest version of Statping and test the web interface with [Cypress](https://www.cypress.io/).\n```bash\ndocker run -it -p 8080:8080 hunterlong/statping:cypress\n```\n\n#### Or use Docker Compose\nThis Docker Compose file inlcudes NGINX, Postgres, and Statping.\n\n### Docker Compose with NGINX and Postgres\nOnce you initiate the `docker-compose.yml` file below go to http://localhost and you'll be forwarded to the /setup page. \nDatabase Authentication\n- database: `postgres`\n- port: `5432`\n- username: `statup`\n- password: `password123`\n- database: `statup`\n\n```yaml\nversion: '2.3'\n\nservices:\n\n  nginx:\n    container_name: nginx\n    image: jwilder/nginx-proxy\n    ports:\n      - 0.0.0.0:80:80\n      - 0.0.0.0:443:443\n    networks:\n      - internet\n    restart: always\n    volumes:\n      - /var/run/docker.sock:/tmp/docker.sock:ro\n      - ./statup/nginx/certs:/etc/nginx/certs:ro\n      - ./statup/nginx/vhost:/etc/nginx/vhost.d\n      - ./statup/nginx/html:/usr/share/nginx/html:ro\n      - ./statup/nginx/dhparam:/etc/nginx/dhparam\n    environment:\n      DEFAULT_HOST: localhost\n\n  statup:\n    container_name: statup\n    image: hunterlong/statping:latest\n    restart: always\n    networks:\n      - internet\n      - database\n    depends_on:\n      - postgres\n    volumes:\n      - ./statup/app:/app\n    environment:\n      VIRTUAL_HOST: localhost\n      VIRTUAL_PORT: 8080\n      DB_CONN: postgres\n      DB_HOST: postgres\n      DB_USER: statup\n      DB_PASS: password123\n      DB_DATABASE: statup\n      NAME: EC2 Example\n      DESCRIPTION: This is a Statping Docker Compose instance\n\n  postgres:\n    container_name: postgres\n    image: postgres:10\n    restart: always\n    networks:\n      - database\n    volumes:\n      - ./statup/postgres:/var/lib/postgresql/data\n    environment:\n      POSTGRES_PASSWORD: password123\n      POSTGRES_USER: statup\n      POSTGRES_DB: statup\n\nnetworks:\n  internet:\n    driver: bridge\n  database:\n    driver: bridge\n```\nOr a simple wget...\n```bash\nwget https://raw.githubusercontent.com/hunterlong/statping/master/servers/docker-compose.yml\ndocker-compose up -d\n```\n\n### Docker Compose with Automatic SSL\nYou can automatically start a Statping server with automatic SSL encryption using this docker-compose file. First point your domain's DNS to the Statping server, and then run this docker-compose command with DOMAIN and EMAIL. Email is for letsencrypt services.\n```bash\nwget https://raw.githubusercontent.com/hunterlong/statping/master/servers/docker-compose-ssl.yml\n\nLETSENCRYPT_HOST=mydomain.com \\\n    LETSENCRYPT_EMAIL=info@mydomain.com \\\n    docker-compose -f docker-compose-ssl.yml up -d\n```\n\n#### Full docker-compose with Automatic SSL\n\n```yaml\nversion: '2.3'\n\nservices:\n\n  nginx:\n    container_name: nginx\n    image: jwilder/nginx-proxy\n    ports:\n      - 0.0.0.0:80:80\n      - 0.0.0.0:443:443\n    labels:\n      - \"com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy\"\n    networks:\n      - internet\n    restart: always\n    volumes:\n      - /var/run/docker.sock:/tmp/docker.sock:ro\n      - ./statup/nginx/certs:/etc/nginx/certs:ro\n      - ./statup/nginx/vhost:/etc/nginx/vhost.d\n      - ./statup/nginx/html:/usr/share/nginx/html:ro\n      - ./statup/nginx/dhparam:/etc/nginx/dhparam\n    environment:\n      DEFAULT_HOST: ${LETSENCRYPT_HOST}\n\n  letsencrypt:\n    container_name: letsencrypt\n    image: jrcs/letsencrypt-nginx-proxy-companion\n    networks:\n      - internet\n    restart: always\n    volumes:\n      - /var/run/docker.sock:/var/run/docker.sock:ro\n      - ./statup/nginx/certs:/etc/nginx/certs\n      - ./statup/nginx/vhost:/etc/nginx/vhost.d\n      - ./statup/nginx/html:/usr/share/nginx/html\n      - ./statup/nginx/dhparam:/etc/nginx/dhparam\n\n  statup:\n    container_name: statup\n    image: hunterlong/statping:latest\n    restart: always\n    networks:\n      - internet\n      - database\n    depends_on:\n      - postgres\n    volumes:\n      - ./statup/app:/app\n    environment:\n      VIRTUAL_HOST: ${LETSENCRYPT_HOST}\n      VIRTUAL_PORT: 8080\n      LETSENCRYPT_HOST: ${LETSENCRYPT_HOST}\n      LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL}\n      DB_CONN: postgres\n      DB_HOST: postgres\n      DB_USER: statup\n      DB_PASS: password123\n      DB_DATABASE: statup\n      NAME: SSL Example\n      DESCRIPTION: This Status Status Page should be running ${LETSENCRYPT_HOST} with SSL.\n\n  postgres:\n    container_name: postgres\n    image: postgres:10\n    restart: always\n    networks:\n      - database\n    volumes:\n      - ./statup/postgres:/var/lib/postgresql/data\n    environment:\n      POSTGRES_PASSWORD: password123\n      POSTGRES_USER: statup\n      POSTGRES_DB: statup\n\nnetworks:\n  internet:\n    driver: bridge\n  database:\n    driver: bridge\n```\n\n<div class=\"mt-5\" id=\"page_8\"><h1>Mobile App</h1></div>\nStatping has a free mobile app so you can monitor your websites and applications without the need of a computer. \n\n![iTunes App Store](https://img.shields.io/itunes/v/1445513219.svg)\n\n<p align=\"center\">\n<a href=\"https://play.google.com/store/apps/details?id=com.statping\"><img src=\"https://img.cjx.io/google-play.svg\"></a>\n<a href=\"https://itunes.apple.com/us/app/apple-store/id1445513219\"><img src=\"https://img.cjx.io/app-store-badge.svg\"></a>\n</p>\n\n<p align=\"center\">\n<img src=\"https://img.cjx.io/statping_iphone_bk.png\">\n</p>\n\n\n<div class=\"mt-5\" id=\"page_9\"><h1>Heroku</h1></div>\nYou can now instantly deploy your Statping instance on a free Heroku container. Simply click the deploy button below and get up in running within seconds. This Heroku deployment is based on the Statping Docker image so you will have all the great features including SASS and all the notifiers without any setup. \n\n[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/statping/statping/tree/master)\n\nView the live Heroku Statping instance at: [https://statping.herokuapp.com](https://statping.herokuapp.com)\n\n# Database Configuration\nYou will need to deploy a Postgres database to your instance and insert some configuration variables. View the image below to see what environment variable you need to configure. If you insert `DB_CONN`, Statping will attempt to automatically connect to the database without the need for the `config.yml` file. \n\n![](https://img.cjx.io/herokustatping.png)\n\n\n<div class=\"mt-5\" id=\"page_10\"><h1>API</h1></div>\nStatping includes a RESTFUL API so you can view, update, and edit your services with easy to use routes. You can currently view, update and delete services, view, create, update users, and get detailed information about the Statping instance. To make life easy, try out a Postman or Swagger JSON file and use it on your Statping Server.\n\n<p align=\"center\">\n<a href=\"https://documenter.getpostman.com/view/1898229/RzfiJUd6\">Postman</a> | <a href=\"https://github.com/statping/statping/blob/master/source/tmpl/postman.json\">Postman JSON Export</a> | <a href=\"https://github.com/statping/statping/blob/master/dev/swagger.json\">Swagger Export</a>\n</p>\n\n## Authentication\nAuthentication uses the Statping API Secret to accept remote requests. You can find the API Secret in the Settings page of your Statping server. To send requests to your Statping API, include a Authorization Header when you send the request. The API will accept any one of the headers below.\n\n- HTTP Header: `Authorization: API SECRET HERE`\n- HTTP Header: `Authorization: Bearer API SECRET HERE`\n\n## Main Route `/api`\nThe main API route will show you all services and failures along with them.\n\n## Services\nThe services API endpoint will show you detailed information about services and will allow you to edit/delete services with POST/DELETE http methods.\n\n### Viewing All Services\n- Endpoint: `/api/services`\n- Method: `GET`\n- Response: Array of [Services](https://github.com/statping/statping/wiki/API#service-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\n### Viewing Service\n- Endpoint: `/api/services/{id}`\n- Method: `GET`\n- Response: [Service](https://github.com/statping/statping/wiki/API#service-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\n### Updating Service\n- Endpoint: `/api/services/{id}`\n- Method: `POST`\n- Response: [Service](https://github.com/statping/statping/wiki/API#service-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\nPOST Data:\n```json\n{\n    \"name\": \"Updated Service\",\n    \"domain\": \"https://google.com\",\n    \"expected\": \"\",\n    \"expected_status\": 200,\n    \"check_interval\": 15,\n    \"type\": \"http\",\n    \"method\": \"GET\",\n    \"post_data\": \"\",\n    \"port\": 0,\n    \"timeout\": 10,\n    \"order_id\": 0\n}\n```\n\n### Create New Service\n- Endpoint: `/api/services`\n- Method: `POST`\n- Response: [Service](https://github.com/statping/statping/wiki/API#service-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\nPOST Data:\n```json\n{\n    \"name\": \"Create New Service\",\n    \"domain\": \"https://www.coogger.com\",\n    \"expected\": \"\",\n    \"expected_status\": 200,\n    \"check_interval\": 15,\n    \"type\": \"http\",\n    \"method\": \"GET\",\n    \"post_data\": \"\",\n    \"port\": 0,\n    \"timeout\": 10,\n    \"order_id\": 0\n}\n```\n\n### Deleting Service\n- Endpoint: `/api/services/{id}`\n- Method: `DELETE`\n- Response: [Object Response](https://github.com/statping/statping/wiki/API#object-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\nResponse:\n```json\n{\n    \"status\": \"success\",\n    \"id\": 4,\n    \"type\": \"service\",\n    \"method\": \"delete\"\n}\n```\n\n## Users\nThe users API endpoint will show you users that are registered inside your Statping instance.\n\n### View All Users\n- Endpoint: `/api/users`\n- Method: `GET`\n- Response: Array of [Users](https://github.com/statping/statping/wiki/API#user-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\n### Viewing User\n- Endpoint: `/api/users/{id}`\n- Method: `GET`\n- Response: [User](https://github.com/statping/statping/wiki/API#user-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\n### Creating New User\n- Endpoint: `/api/users`\n- Method: `POST`\n- Response: [User](https://github.com/statping/statping/wiki/API#user-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\nPOST Data:\n```json\n{\n    \"username\": \"newadmin\",\n    \"email\": \"info@email.com\",\n    \"password\": \"password123\",\n    \"admin\": true\n}\n```\n\n### Updating User\n- Endpoint: `/api/users/{id}`\n- Method: `POST`\n- Response: [User](https://github.com/statping/statping/wiki/API#user-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\nPOST Data:\n```json\n{\n    \"username\": \"updatedadmin\",\n    \"email\": \"info@email.com\",\n    \"password\": \"password123\",\n    \"admin\": true\n}\n```\n\n### Deleting User\n- Endpoint: `/api/services/{id}`\n- Method: `DELETE`\n- Response: [Object Response](https://github.com/statping/statping/wiki/API#object-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\nResponse:\n```json\n{\n    \"status\": \"success\",\n    \"id\": 3,\n    \"type\": \"user\",\n    \"method\": \"delete\"\n}\n```\n\n# Service Response\n```json\n{\n    \"id\": 8,\n    \"name\": \"Test Service 0\",\n    \"domain\": \"https://status.coinapp.io\",\n    \"expected\": \"\",\n    \"expected_status\": 200,\n    \"check_interval\": 1,\n    \"type\": \"http\",\n    \"method\": \"GET\",\n    \"post_data\": \"\",\n    \"port\": 0,\n    \"timeout\": 30,\n    \"order_id\": 0,\n    \"created_at\": \"2018-09-12T09:07:03.045832088-07:00\",\n    \"updated_at\": \"2018-09-12T09:07:03.046114305-07:00\",\n    \"online\": false,\n    \"latency\": 0.031411064,\n    \"24_hours_online\": 0,\n    \"avg_response\": \"\",\n    \"status_code\": 502,\n    \"last_online\": \"0001-01-01T00:00:00Z\",\n    \"dns_lookup_time\": 0.001727175,\n    \"failures\": [\n        {\n            \"id\": 5187,\n            \"issue\": \"HTTP Status Code 502 did not match 200\",\n            \"created_at\": \"2018-09-12T10:41:46.292277471-07:00\"\n        },\n        {\n            \"id\": 5188,\n            \"issue\": \"HTTP Status Code 502 did not match 200\",\n            \"created_at\": \"2018-09-12T10:41:47.337659862-07:00\"\n        }\n    ]\n}\n```\n\n# User Response\n```json\n{\n    \"id\": 1,\n    \"username\": \"admin\",\n    \"api_key\": \"02f324450a631980121e8fd6ea7dfe4a7c685a2f\",\n    \"admin\": true,\n    \"created_at\": \"2018-09-12T09:06:53.906398511-07:00\",\n    \"updated_at\": \"2018-09-12T09:06:54.972440207-07:00\"\n}\n```\n\n# Object Response\n```json\n{\n    \"type\": \"service\",\n    \"id\": 19,\n    \"method\": \"delete\",\n    \"status\": \"success\"\n}\n```\n\n# Main API Response\n```json\n{\n    \"name\": \"Awesome Status\",\n    \"description\": \"An awesome status page by Statping\",\n    \"footer\": \"This is my custom footer\",\n    \"domain\": \"https://demo.statping.com\",\n    \"version\": \"v0.56\",\n    \"migration_id\": 1536768413,\n    \"created_at\": \"2018-09-12T09:06:53.905374829-07:00\",\n    \"updated_at\": \"2018-09-12T09:07:01.654201225-07:00\",\n    \"database\": \"sqlite\",\n    \"started_on\": \"2018-09-12T10:43:07.760729349-07:00\",\n    \"services\": [\n        {\n            \"id\": 1,\n            \"name\": \"Google\",\n            \"domain\": \"https://google.com\",\n            \"expected\": \"\",\n            \"expected_status\": 200,\n            \"check_interval\": 10,\n            \"type\": \"http\",\n            \"method\": \"GET\",\n            \"post_data\": \"\",\n            \"port\": 0,\n            \"timeout\": 10,\n            \"order_id\": 0,\n            \"created_at\": \"2018-09-12T09:06:54.97549122-07:00\",\n            \"updated_at\": \"2018-09-12T09:06:54.975624103-07:00\",\n            \"online\": true,\n            \"latency\": 0.09080986,\n            \"24_hours_online\": 0,\n            \"avg_response\": \"\",\n            \"status_code\": 200,\n            \"last_online\": \"2018-09-12T10:44:07.931990439-07:00\",\n            \"dns_lookup_time\": 0.005543935\n        }\n    ]\n}\n```\n\n\n<div class=\"mt-5\" id=\"page_11\"><h1>Makefile</h1></div>\nHere's a simple list of Makefile commands you can run using `make`. The [Makefile](https://github.com/statping/statping/blob/master/Makefile) may change often, so i'll try to keep this Wiki up-to-date.\n\n- Ubuntu `apt-get install build-essential`\n- MacOSX `sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer`\n- Windows [Install Guide for GNU make utility](http://gnuwin32.sourceforge.net/packages/make.htm)\n- CentOS/RedHat `yum groupinstall \"Development Tools\"`\n\n### Commands\n```bash\nmake build                         # build the binary\nmake install\nmake run\nmake test\nmake coverage\nmake docs\n# Building Statping\nmake build-all\nmake build-alpine\nmake docker\nmake docker-run\nmake docker-dev\nmake docker-run-dev\nmake databases\nmake dev-deps\nmake clean\nmake compress\nmake cypress-install\nmake cypress-test\n```\n\n<div class=\"mt-5\" id=\"page_12\"><h1>Notifiers</h1></div>\n<p align=\"center\">\n<img width=\"80%\" src=\"https://s3-us-west-2.amazonaws.com/gitimgs/statupnotifiers.png\">\n</p>\n\nStatping includes multiple Notifiers to alert you when your services are offline. You can also create your own notifier and send a Push Request to this repo! Creating a custom notifier is pretty easy as long as you follow the requirements. A notifier will automatically be installed into the users Statping database, and form values will save without any hassles. 💃\n\n<p align=\"center\">\n<a href=\"https://github.com/statping/statping/wiki/Notifier-Example\">Example Code</a> | <a href=\"https://github.com/statping/statping/wiki/Notifier-Events\">Events</a> | <a href=\"https://github.com/statping/statping/tree/master/notifiers\">View Notifiers</a><br>\n<a href=\"https://godoc.org/github.com/statping/statping/core/notifier\"><img src=\"https://godoc.org/github.com/golang/gddo?status.svg\"></a>\n</p>\n\n## Notifier Requirements\n- Must have a unique `METHOD` name\n- Struct must have `*notifier.Notification` pointer in it. \n- Must create and add your notifier variable in `init()`\n- Should have a form for user to input their variables/keys. `Form: []notifier.NotificationForm`\n\n## Notifier Interface (required)\nStatping has the `Notifier` interface which you'll need to include in your notifier. Statping includes many other events/triggers for your notifier, checkout <a href=\"https://github.com/statping/statping/wiki/Notifier-Events\">Notifier Events</a> to see all of them.\n```go\n// Notifier interface is required to create a new Notifier\ntype Notifier interface {\n\tOnSave() error          // OnSave is triggered when the notifier is saved\n\tSend(interface{}) error // OnSave is triggered when the notifier is saved\n\tSelect() *Notification  // Select returns the *Notification for a notifier\n}\n```\n\n### Basic Interface (required)\nInclude `OnSuccess` and `OnFailure` to receive events when a service is online or offline.\n```go\n// BasicEvents includes the most minimal events, failing and successful service triggers\ntype BasicEvents interface {\n\t// OnSuccess is triggered when a service is successful\n\tOnSuccess(*services.Service)\n\t// OnFailure is triggered when a service is failing\n\tOnFailure(*services.Service, *types.Failure)\n}\n```\n\n### Test Interface\nThe OnTest method will give the front end user the ability to test your notifier without saving, the OnTest method for your notifier run the functionality to test the user's submitted parameters and respond an error if notifier is not correctly setup.\n```go\n// Tester interface will include a function to Test users settings before saving\ntype Tester interface {\n\tOnTest() error\n}\n```\nIf your notifier includes this interface, the Test button will appear.\n\n## Notifier Struct\n```go\nvar example = &Example{&notifier.Notification{\n\tMethod: \"example\",                               // unique method name\n\tHost:   \"http://exmaplehost.com\",                // default 'host' field\n\tForm: []notifier.NotificationForm{{\n\t\tType:        \"text\",                     // text, password, number, or email\n\t\tTitle:       \"Host\",                     // The title of value in form\n\t\tPlaceholder: \"Insert your Host here.\",   // Optional placeholder in input\n\t\tDbField:     \"host\",                     // An accepted DbField value (read below)\n\t}},\n}\n```\n\n## Notifier Form\nInclude a form with your notifier so other users can save API keys, username, passwords, and other values. \n```go\n// NotificationForm contains the HTML fields for each variable/input you want the notifier to accept.\ntype NotificationForm struct {\n\tType        string `json:\"type\"`        // the html input type (text, password, email)\n\tTitle       string `json:\"title\"`       // include a title for ease of use\n\tPlaceholder string `json:\"placeholder\"` // add a placeholder for the input\n\tDbField     string `json:\"field\"`       // true variable key for input\n\tSmallText   string `json:\"small_text\"`  // insert small text under a html input\n\tRequired    bool   `json:\"required\"`    // require this input on the html form\n\tIsHidden    bool   `json:\"hidden\"`      // hide this form element from end user\n\tIsList      bool   `json:\"list\"`        // make this form element a comma separated list\n\tIsSwitch    bool   `json:\"switch\"`      // make the notifier a boolean true/false switch\n}\n```\n\n### Example Notifier Form\nThis is the Slack Notifier `Form` fields.\n```go\nForm: []notifier.NotificationForm{{\n\t\tType:        \"text\",\n\t\tTitle:       \"Incoming webhooker Url\",\n\t\tPlaceholder: \"Insert your slack webhook URL here.\",\n\t\tSmallText:   \"Incoming webhooker URL from <a href=\\\"https://api.slack.com/apps\\\" target=\\\"_blank\\\">slack Apps</a>\",\n\t\tDbField:     \"Host\",\n\t\tRequired:    true,\n\t}}\n}\n```\n\n### Accepted DbField Values\nThe `notifier.NotificationForm` has a field called `DbField` which is the column to save the value into the database. Below are the acceptable DbField string names to include in your form. \n- `host` used for a URL or API endpoint\n- `username` used for a username\n- `password` used for a password\n- `port` used for a integer port number\n- `api_key` used for some kind of API key\n- `api_secret` used for some API secret\n- `var1` used for any type of string\n- `var2` used for any type of string (extra)\n\n### Form Elements\nYou can completely custom your notifications to include a detailed form. \n- `Type` is a HTML input type for your field\n- `Title` give your input element a title\n- `Placeholder` optional field if you want a placeholder in input\n- `DbField` required field to save variable into database (read above)\n- `Placeholder` optional field for inserting small hint under the input\n\n# Adding Notifiers\nTo add a notifier to the Statping application, simply append your Notifier in the `AttachNotifiers()` function inside of [core/core.go](https://github.com/statping/statping/blob/master/core/core.go).\n\n```go\n// AttachNotifiers will attach all the notifier's into the system\nfunc AttachNotifiers() error {\n\treturn notifier.AddNotifiers(\n\t\tnotifiers.Command,\n\t\tnotifiers.Discorder,\n\t\tnotifiers.Emailer,\n\t\tnotifiers.LineNotify,\n\t\tnotifiers.Mobile,\n\t\tnotifiers.Slacker,\n\t\tnotifiers.Telegram,\n\t\tnotifiers.Twilio,\n\t\tnotifiers.Webhook,\n\t)\n}\n```\n###### [AttachNotifiers](https://github.com/statping/statping/blob/master/core/core.go#L183)\n\n<div class=\"mt-5\" id=\"page_13\"><h1>Notifier Events</h1></div>\nEvents are handled by added interfaces for the elements you want to monitor.\n\n## Required Notifier Interface\n```go\n// Notifier interface is required to create a new Notifier\ntype Notifier interface {\n\t// Run will trigger inside of the notifier when enabled\n\tRun() error\n\t// OnSave is triggered when the notifier is saved\n\tOnSave() error\n\t// Test will run a function inside the notifier to Test if it works\n\tTest() error\n\t// Select returns the *Notification for a notifier\n\tSelect() *Notification\n}\n```\n\n## Basic Success/Failure Interface\n```go\n// BasicEvents includes the most minimal events, failing and successful service triggers\ntype BasicEvents interface {\n\t// OnSuccess is triggered when a service is successful\n\tOnSuccess(*services.Service)\n\t// OnFailure is triggered when a service is failing\n\tOnFailure(*services.Service, *types.Failure)\n}\n```\n\n\n## Service Events\n```go\n// ServiceEvents are events for Services\ntype ServiceEvents interface {\n\tOnNewService(*services.Service)\n\tOnUpdatedService(*services.Service)\n\tOnDeletedService(*services.Service)\n}\n```\n\n## User Events\n```go\n// UserEvents are events for Users\ntype UserEvents interface {\n\tOnNewUser(*types.User)\n\tOnUpdatedUser(*types.User)\n\tOnDeletedUser(*types.User)\n}\n```\n\n## Core Events\n```go\n// CoreEvents are events for the main Core app\ntype CoreEvents interface {\n\tOnUpdatedCore(*types.Core)\n}\n```\n\n## Notifier Events\n```go\n// NotifierEvents are events for other Notifiers\ntype NotifierEvents interface {\n\tOnNewNotifier(*Notification)\n\tOnUpdatedNotifier(*Notification)\n}\n```\n\n<div class=\"mt-5\" id=\"page_14\"><h1>Notifier Example</h1></div>\nBelow is a full example of a Statping notifier which will give you a good example of how to create your own. Insert your new notifier inside the `/notifiers` folder once your ready!\n\n```go\npackage notifiers\n\nimport (\n\t\"errors\"\n\t\"fmt\"\n\t\"github.com/statping/statping/types\"\n        \"github.com/statping/statping/core/notifier\"\n\t\"time\"\n)\n\ntype Example struct {\n\t*notifier.Notification\n}\n\nvar example = &Example{&notifier.Notification{\n\tMethod:      METHOD,\n\tTitle:       \"Example\",\n\tDescription: \"Example Notifier\",\n\tAuthor:      \"Hunter Long\",\n\tAuthorUrl:   \"https://github.com/hunterlong\",\n\tDelay:       time.Duration(5 * time.Second),\n\tForm: []notifier.NotificationForm{{\n\t\tType:        \"text\",\n\t\tTitle:       \"Host\",\n\t\tPlaceholder: \"Insert your Host here.\",\n\t\tDbField:     \"host\",\n\t\tSmallText:   \"this is where you would put the host\",\n\t}, {\n\t\tType:        \"text\",\n\t\tTitle:       \"Username\",\n\t\tPlaceholder: \"Insert your Username here.\",\n\t\tDbField:     \"username\",\n\t}, {\n\t\tType:        \"password\",\n\t\tTitle:       \"Password\",\n\t\tPlaceholder: \"Insert your Password here.\",\n\t\tDbField:     \"password\",\n\t}, {\n\t\tType:        \"number\",\n\t\tTitle:       \"Port\",\n\t\tPlaceholder: \"Insert your Port here.\",\n\t\tDbField:     \"port\",\n\t}, {\n\t\tType:        \"text\",\n\t\tTitle:       \"API Key\",\n\t\tPlaceholder: \"Insert your API Key here\",\n\t\tDbField:     \"api_key\",\n\t}, {\n\t\tType:        \"text\",\n\t\tTitle:       \"API Secret\",\n\t\tPlaceholder: \"Insert your API Secret here\",\n\t\tDbField:     \"api_secret\",\n\t}, {\n\t\tType:        \"text\",\n\t\tTitle:       \"Var 1\",\n\t\tPlaceholder: \"Insert your Var1 here\",\n\t\tDbField:     \"var1\",\n\t}, {\n\t\tType:        \"text\",\n\t\tTitle:       \"Var2\",\n\t\tPlaceholder: \"Var2 goes here\",\n\t\tDbField:     \"var2\",\n\t}},\n}}\n\n// REQUIRED init() will install/load the notifier\nfunc init() {\n\tnotifier.AddNotifier(example)\n}\n\n// REQUIRED - Send is where you would put the action's of your notifier\nfunc (n *Example) Send(msg interface{}) error {\n\tmessage := msg.(string)\n\tfmt.Printf(\"i received this string: %v\\n\", message)\n\treturn nil\n}\n\n// REQUIRED\nfunc (n *Example) Select() *notifier.Notification {\n\treturn n.Notification\n}\n\n// REQUIRED\nfunc (n *Example) OnSave() error {\n\tmsg := fmt.Sprintf(\"received on save trigger\")\n\tn.AddQueue(msg)\n\treturn nil\n}\n\n// REQUIRED\nfunc (n *Example) Test() error {\n\tmsg := fmt.Sprintf(\"received a test trigger\\n\")\n\tn.AddQueue(msg)\n\treturn nil\n}\n\n// REQUIRED - BASIC EVENT\nfunc (n *Example) OnSuccess(s *services.Service) {\n\tmsg := fmt.Sprintf(\"received a count trigger for service: %v\\n\", s.Name)\n\tn.AddQueue(msg)\n}\n\n// REQUIRED - BASIC EVENT\nfunc (n *Example) OnFailure(s *services.Service, f *types.Failure) {\n\tmsg := fmt.Sprintf(\"received a failure trigger for service: %v\\n\", s.Name)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnNewService(s *services.Service) {\n\tmsg := fmt.Sprintf(\"received a new service trigger for service: %v\\n\", s.Name)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnUpdatedService(s *services.Service) {\n\tmsg := fmt.Sprintf(\"received a update service trigger for service: %v\\n\", s.Name)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnDeletedService(s *services.Service) {\n\tmsg := fmt.Sprintf(\"received a delete service trigger for service: %v\\n\", s.Name)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnNewUser(s *types.User) {\n\tmsg := fmt.Sprintf(\"received a new user trigger for user: %v\\n\", s.Username)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnUpdatedUser(s *types.User) {\n\tmsg := fmt.Sprintf(\"received a updated user trigger for user: %v\\n\", s.Username)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnDeletedUser(s *types.User) {\n\tmsg := fmt.Sprintf(\"received a deleted user trigger for user: %v\\n\", s.Username)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnUpdatedCore(s *types.Core) {\n\tmsg := fmt.Sprintf(\"received a updated core trigger for core: %v\\n\", s.Name)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnNewNotifier(s *Notification) {\n\tmsg := fmt.Sprintf(\"received a new notifier trigger for notifier: %v\\n\", s.Method)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnUpdatedNotifier(s *Notification) {\n\tmsg := fmt.Sprintf(\"received a update notifier trigger for notifier: %v\\n\", s.Method)\n\tn.AddQueue(msg)\n}\n```\n\n\n<div class=\"mt-5\" id=\"page_15\"><h1>Prometheus Exporter</h1></div>\nStatping includes a prometheus exporter so you can have even more monitoring power with your services. The prometheus exporter can be seen on `/metrics`, simply create another exporter in your prometheus config. Use your Statping API Secret for the Authorization Bearer header, the `/metrics` URL is dedicated for Prometheus and requires the correct API Secret has `Authorization` header.\n\n# Grafana Dashboard\nStatping has a [Grafana Dashboard](https://grafana.com/dashboards/6950) that you can quickly implement if you've added your Statping service to Prometheus. Import Dashboard ID: `6950` into your Grafana dashboard and watch the metrics come in!\n\n<p align=\"center\"><img width=\"80%\" src=\"https://img.cjx.io/statupgrafana.png\"></p>\n\n## Basic Prometheus Exporter\nIf you have Statping and the Prometheus server in the same Docker network, you can use the yaml config below.\n```yaml\nscrape_configs:\n  - job_name: 'statping'\n    scrape_interval: 30s\n    bearer_token: 'SECRET API KEY HERE'\n    static_configs:\n      - targets: ['statping:8080']\n```\n\n## Remote URL Prometheus Exporter\nThis exporter yaml below has `scheme: https`, which you can remove if you arn't using HTTPS.\n```yaml\nscrape_configs:\n  - job_name: 'statping'\n    scheme: https\n    scrape_interval: 30s\n    bearer_token: 'SECRET API KEY HERE'\n    static_configs:\n      - targets: ['status.mydomain.com']\n```\n\n### `/metrics` Output\n```\nstatping_total_failures 206\nstatping_total_services 4\nstatping_service_failures{id=\"1\" name=\"Google\"} 0\nstatping_service_latency{id=\"1\" name=\"Google\"} 12\nstatping_service_online{id=\"1\" name=\"Google\"} 1\nstatping_service_status_code{id=\"1\" name=\"Google\"} 200\nstatping_service_response_length{id=\"1\" name=\"Google\"} 10777\nstatping_service_failures{id=\"2\" name=\"Statping.com\"} 0\nstatping_service_latency{id=\"2\" name=\"Statping.com\"} 3\nstatping_service_online{id=\"2\" name=\"Statping.com\"} 1\nstatping_service_status_code{id=\"2\" name=\"Statping.com\"} 200\nstatping_service_response_length{id=\"2\" name=\"Statping.com\"} 2\n```\n\n<div class=\"mt-5\" id=\"page_16\"><h1>SSL</h1></div>\nYou can run Statping with a valid certificate by including 2 files in the root directory. Although, I personally recommend using NGINX or Apache to serve the SSL and then have the webserver direct traffic to the Statping instance. This guide will show you how to implement SSL onto your Statping server with multiple options.\n\n## SSL Certificate with Statping\nTo run the Statping HTTP server in SSL mode, you must include 2 files in the root directory of your Statping application. The 2 files you must include are:\n- `server.crt` SSL Certificate File\n- `server.key` SSL Certificate Key File\n\nThe filenames and extensions must match the exact naming above. If these 2 files are found, Statping will automatically start the HTTP server in SSL mode using your certificates. You can also generate your own SSL certificates, but you will receive a \"ERR_CERT_AUTHORITY_INVALID\" error. To generate your own, follow the commands below:\n\n```shell\nopenssl req -new -sha256 -key server.key -out server.csr\nopenssl x509 -req -sha256 -in server.csr -signkey server.key -out server.crt -days 3650\n```\nThis will generate a self signed certificate that you can use for your Statup instance. I recommend using a web server to do SSL termination for your server though.\n\n## Choose a Web Server or Environment\n\n**Choose the environment running the Statping instance.**\n- [Docker](#docker)\n- [NGINX](#nginx)\n- [Apache](#apache)\n\n## Docker\nDocker might be the easiest way to get up and running with a SSL certificate. Below is a `docker-compose.yml` file that will run NGINX, LetEncrypt, and Statping.\n\n1. Point your domain or subdomain to the IP address of the Docker server. This would be done on CloudFlare, Route53, or some other DNS provider.\n\n2. Replace the `docker-compose.yml` contents:\n- `MY.DOMAIN.COM` with the domain you want to use\n- `MY@EMAIL.COM` with your email address\n\n3. Run the docker container by running command `docker-compose up -d`. Give a little bit of time for LetEncrypt to automatically generate your SSL certificate.\n\n###### `docker-compose.yml`\n```yaml\nversion: '2.3'\nservices:\n  nginx:\n    container_name: nginx\n    image: jwilder/nginx-proxy\n    ports:\n      - 0.0.0.0:80:80\n      - 0.0.0.0:443:443\n    labels:\n      - \"com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy\"\n    networks:\n      - internet\n    restart: always\n    volumes:\n      - /var/run/docker.sock:/tmp/docker.sock:ro\n      - ./statping/nginx/certs:/etc/nginx/certs:ro\n      - ./statping/nginx/vhost:/etc/nginx/vhost.d\n      - ./statping/nginx/html:/usr/share/nginx/html:ro\n      - ./statping/nginx/dhparam:/etc/nginx/dhparam\n    environment:\n      DEFAULT_HOST: MY.DOMAIN.COM\n\n  letsencrypt:\n    container_name: letsencrypt\n    image: jrcs/letsencrypt-nginx-proxy-companion\n    networks:\n      - internet\n    restart: always\n    volumes:\n      - /var/run/docker.sock:/var/run/docker.sock:ro\n      - ./statping/nginx/certs:/etc/nginx/certs\n      - ./statping/nginx/vhost:/etc/nginx/vhost.d\n      - ./statping/nginx/html:/usr/share/nginx/html\n      - ./statping/nginx/dhparam:/etc/nginx/dhparam\n\n  statping:\n    container_name: statping\n    image: hunterlong/statping:latest\n    restart: always\n    networks:\n      - internet\n    depends_on:\n      - nginx\n    volumes:\n      - ./statping/app:/app\n    environment:\n      VIRTUAL_HOST: MY.DOMAIN.COM\n      VIRTUAL_PORT: 8080\n      LETSENCRYPT_HOST: MY.DOMAIN.COM\n      LETSENCRYPT_EMAIL: MY@EMAIL.COM\n\nnetworks:\n  internet:\n    driver: bridge\n```\n\n## NGINX\nIf you already have a NGINX web server running, you just have to add a proxy pass and your SSL certs to the nginx config or as a vhost. By default Statping runs on port 8080, you can change this port by starting server with `statping -ip 127.0.0.1 -port 9595`.\n\n- Replace `/my/absolute/directory/for/cert/server.crt` with SSL certificate file.\n- Replace `/my/absolute/directory/for/key/server.key` with SSL key file.\n- Run `service nginx restart` and try out https on your domain.\n\n##### Tutorials\n- [NGINX Guide](https://docs.nginx.com/nginx/admin-guide/security-controls/terminating-ssl-http/)\n- [How To Set Up Nginx Load Balancing with SSL Termination](https://www.digitalocean.com/community/tutorials/how-to-set-up-nginx-load-balancing-with-ssl-termination)\n\n###### `/etc/nginx/nginx.conf`\n```\n#user  nobody;\nworker_processes  1;\nevents {\n    worker_connections  1024;\n}\nhttp {\n    include            mime.types;\n    default_type       application/octet-stream;\n    send_timeout       1800;\n    sendfile           on;\n    keepalive_timeout  6500;\n    server {\n        listen       80;\n        server_name  localhost;\n        location / {\n          proxy_pass          http://localhost:8080;\n          proxy_set_header    Host             $host;\n          proxy_set_header    X-Real-IP        $remote_addr;\n          proxy_set_header    X-Forwarded-For  $proxy_add_x_forwarded_for;\n          proxy_set_header    X-Client-Verify  SUCCESS;\n          proxy_set_header    X-Client-DN      $ssl_client_s_dn;\n          proxy_set_header    X-SSL-Subject    $ssl_client_s_dn;\n          proxy_set_header    X-SSL-Issuer     $ssl_client_i_dn;\n          proxy_read_timeout 1800;\n          proxy_connect_timeout 1800;\n        }\n    }\n    # HTTPS server\n    \n    server {\n        listen       443;\n        server_name  localhost;\n    \n        ssl                  on;\n        ssl_certificate      /my/absolute/directory/for/cert/server.crt;\n        ssl_certificate_key  /my/absolute/directory/for/key/server.key;\n        ssl_session_timeout  5m;\n    \n        ssl_protocols  SSLv2 SSLv3 TLSv1;\n        ssl_ciphers  ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;\n        ssl_prefer_server_ciphers   on;\n    \n        location / {\n          proxy_pass          http://localhost:8080;\n          proxy_set_header    Host             $host;\n          proxy_set_header    X-Real-IP        $remote_addr;\n          proxy_set_header    X-Forwarded-For  $proxy_add_x_forwarded_for;\n          proxy_set_header    X-Client-Verify  SUCCESS;\n          proxy_set_header    X-Client-DN      $ssl_client_s_dn;\n          proxy_set_header    X-SSL-Subject    $ssl_client_s_dn;\n          proxy_set_header    X-SSL-Issuer     $ssl_client_i_dn;\n          proxy_read_timeout 1800;\n          proxy_connect_timeout 1800;\n        }\n    }\n}\n```\n\n## Apache\n\n<div class=\"mt-5\" id=\"page_17\"><h1>Config with .env File</h1></div>\nIt may be useful to load your environment using a `.env` file in the root directory of your Statping server. The .env file will be automatically loaded on startup and will overwrite all values you have in config.yml.\n\nIf you have the `DB_CONN` environment variable set Statping will bypass all values in config.yml and will require you to have the other DB_* variables in place. You can pass in these environment variables without requiring a .env file.\n\n## `.env` File\n```bash\nDB_CONN=postgres\nDB_HOST=0.0.0.0\nDB_PORT=5432\nDB_USER=root\nDB_PASS=password123\nDB_DATABASE=root\n\nNAME=Demo\nDESCRIPTION=This is an awesome page\nDOMAIN=https://domain.com\nADMIN_USER=admin\nADMIN_PASSWORD=admin\nADMIN_EMAIL=info@admin.com\nUSE_CDN=true\nPOSTGRES_SSLMODE=false # enable ssl_mode for postgres (To enable use require)\nDISABLE_LOGS=false # disable logs from appearing and writing to disk\n\nIS_DOCKER=false\nIS_AWS=false\nSASS=/usr/local/bin/sass\nCMD_FILE=/bin/bash\n```\nThis .env file will include additional variables in the future, subscribe to this repo to keep up-to-date with changes and updates. \n\n<div class=\"mt-5\" id=\"page_18\"><h1>Static Export</h1></div>\nIf you want to use Statping as a CLI application without running a server, you can export your status page to a static HTML.\nThis export tool is very useful for people who want to export their HTML and upload/commit it to Github Pages or an FTP server.\n```dash\nstatup export\n```\n###### Creates `index.html` in the current directory with CDN asset URL's. 💃 \n\n<div class=\"mt-5\" id=\"page_19\"><h1>Statping Plugins</h1></div>\nSince Statping is built in Go Language we can use the [Go Plugin](https://golang.org/pkg/plugin/) feature to create dynamic plugins that run on load. Statping has an event anytime anything happens, you can create your own plugins and do any type of function. To implement your own ideas into Statping, use the plugin using the [statup/plugin](https://github.com/statping/statping/blob/master/plugin/main.go) package.\n```\ngo get github.com/statping/statping/plugin\n```\n\n## Example Plugin\nStart off with the [Example Statping Plugin](https://github.com/statping/statping_plugin) that includes all the interfaces and some custom options for you to expand on. You can include any type of function in your own plugin!\n\n<p align=\"center\">\n<img width=\"95%\" src=\"https://img.cjx.io/statuppluginrun.gif\">\n</p>\n\n## Building Plugins\nPlugins don't need a push request and they can be private! You'll need to compile your plugin to the Golang `.so` binary format. Once you've built your plugin, insert it into the `plugins` folder in your Statping directory and reboot the application. Clone the [Example Statping Plugin](https://github.com/statping/statping_plugin) repo and try to build it yourself!\n\n#### Build Requirements\n- You must have `main.go`\n- You must create the Plugin variable on `init()`\n\n```bash\ngit clone https://github.com/statping/statping_plugin\ncd statup-plugin\ngo build -buildmode=plugin -o example.so\n```\n###### Insert `example.so` into the `plugins` directory and reload Statping\n\n## Testing Statping Plugins\nStatping includes a couple tools to help you on your Plugin journey, you can use `statup test plugins` command to test all plugins in your `/plugins` folder. This test will attempt to parse your plugin details, and then it will send events for your plugin to be fired.\n```\nstatup test plugins\n```\n<p align=\"center\">\n<img width=\"85%\" src=\"https://img.cjx.io/statupplugintester.gif\">\n</p>\n\nYour plugin should be able to parse and receive events before distributing it. The test tools creates a temporary database (SQLite) that your plugin can interact with. Statping uses [upper.io/db.v3](https://upper.io/db.v3) for database interactions. The database is passed to your plugin `OnLoad(db sqlbuilder.Database)`, so you can use the `db` variable passed here.\n\n## Statping Plugin Interface\nPlease remember Golang plugin's are very new and Statping plugin package may change and 'could' brake your plugin. Checkout the [statup/plugin package](https://github.com/statping/statping/blob/master/plugin/main.go) to see the most current interfaces.\n```go\ntype PluginActions interface {\n\tGetInfo() Info\n\tGetForm() string\n\tSetInfo(map[string]interface{}) Info\n\tRoutes() []Routing\n\tOnSave(map[string]interface{})\n\tOnFailure(map[string]interface{})\n\tOnSuccess(map[string]interface{})\n\tOnSettingsSaved(map[string]interface{})\n\tOnNewUser(map[string]interface{})\n\tOnNewService(map[string]interface{})\n\tOnUpdatedService(map[string]interface{})\n\tOnDeletedService(map[string]interface{})\n\tOnInstall(map[string]interface{})\n\tOnUninstall(map[string]interface{})\n\tOnBeforeRequest(map[string]interface{})\n\tOnAfterRequest(map[string]interface{})\n\tOnShutdown()\n\tOnLoad(sqlbuilder.Database)\n}\n```\n\n## Event Parameters\nAll event interfaces for the Statping Plugin will return a `map[string]interface{}` type, this is because the plugin package will most likely update and change in the future, but using this type will allow your plugin to continue even after updates.\n\n## Example of an Event\nKnowing what happens during an event is important for your plugin. For example, lets have an event that echo something when a service has a Failure status being issued. Checkout some example below to see how this golang plugin action works. \n\n```go\nfunc (p pkg) OnSuccess(data map[string]interface{}) {\n    fmt.Println(\"Statping Example Plugin received a successful service hit! \")\n    fmt.Println(\"Name:    \", data[\"Name\"])\n    fmt.Println(\"Domain:  \", data[\"Domain\"])\n    fmt.Println(\"Method:  \", data[\"Method\"])\n    fmt.Println(\"Latency: \", data[\"Latency\"])\n}\n```\n###### OnSuccess is fired every time a service has check it be online\n\n```go\nfunc OnFailure(service map[string]interface{}) {\n    fmt.Println(\"oh no! an event is failing right now! do something!\")\n    fmt.Println(service)\n}\n```\n###### OnFailure is fired every time a service is failing\n\n```go\nfunc (p pkg) OnLoad(db sqlbuilder.Database) {\n    fmt.Println(\"=============================================================\")\n    fmt.Printf(\"  Statping Example Plugin Loaded using %v database\\n\", db.Name())\n    fmt.Println(\"=============================================================\")\n}\n```\n###### OnLoad is fired after plugin is loaded into the environment\n\n\n## Interacting with Database\nThe Example Statping Plugin includes a variable `Database` that will allow you to interact with the Statping database. Checkout [database.go](https://github.com/statping/statping_plugin/blob/master/database.go) to see a full example of Create, Read, Update and then Deleting a custom Communication entry into the database.\n```go\n// Insert a new communication into database\n// once inserted, return the Communication\nfunc (c *Communication) Create() *Communication {\n\tuuid, err := CommunicationTable().Insert(c)\n\tif err != nil {\n\t\tpanic(err)\n\t}\n\tc.Id = uuid.(int64)\n\treturn c\n}\n```\n\n## Custom HTTP Routes\nPlugin's can include their own HTTP route to accept GET/POST requests. Route are loaded after Statping loads all of it's Routes. Checkout [routes.go](https://github.com/statping/statping_plugin/blob/master/routes.go) on the example plugin to see a full example of how to use it.\n```go\n// You must have a Routes() method in your plugin\nfunc (p *pkg) Routes() []plugin.Routing {\n\treturn []plugin.Routing{{\n\t\tURL:     \"hello\",\n\t\tMethod:  \"GET\",\n\t\tHandler: CustomInfoHandler,\n\t}}\n}\n\n// This is the HTTP handler for the '/hello' URL created above\nfunc CustomInfoHandler(w http.ResponseWriter, r *http.Request) {\n\tw.WriteHeader(http.StatusOK)\n\tfmt.Fprintln(w, \"Oh Wow!!! This is cool...\")\n}\n```\n\n\n## Plugin To-Do List\n- [ ] Ability to includes assets like jpg, json, etc\n\n<div class=\"mt-5\" id=\"page_20\"><h1>Statuper</h1></div>\nStatping includes a simple to use installation shell script that will help you install locally, Docker, and even onto a AWS EC2 instance.\n\n<p align=\"center\">\n<img width=\"90%\" src=\"https://img.cjx.io/statuper1.png\">\n</p>\n\n## Installation\n```bash\ncurl -O https://assets.statup.io/statuper && chmod +x statuper\n```\n\n## Usage\n- `statuper`\n\n<div class=\"mt-5\" id=\"page_21\"><h1>Build and Test</h1></div>\nBuilding from the Go Language source code is pretty easy if you already have Go installed. Clone this repo and `cd` into it. \n\n### Git n' Go Get\n```bash\ngit clone https://github.com/statping/statping.git\ncd statup\ngo get -v\n```\n\n### Install go.rice\nStatping uses go.rice to compile HTML, JS, and CSS files into it's single binary output.\n```\ngo get github.com/GeertJohan/go.rice\ngo get github.com/GeertJohan/go.rice/rice\n```\n\n### Build Statping Binary\nStatping uses go.rice to compile HTML, JS, and CSS files into it's single binary output.\n```\nrice embed-go\ngo build -o statup .\n./statup version\n```\n\n### Test Coverage\nYou can also test Statio on your localhost, but it does require a MySQL, and Postgres server to be accessible since testing does create/drop tables for multiple databases. \n```\ngo test -v\n```\n\n<div class=\"mt-5\" id=\"page_22\"><h1>Contributing</h1></div>\nHave a feature you want to implement into Statping!? Awesome! Follow this guide to see how you can test, compile and build Statping for production use. I recommend you use `make` with this process, it will save you time and it will auto include many customized parameters to get everything working correctly.\n\n# Dependencies\nStatping has a couple of required dependencies when testing and compiling the binary. The [Makefile](https://github.com/statping/statping/blob/master/Makefile) will make these tasks a lot easier. Take a look at the Makefile to see what commands are ran. Run the command below to get setup right away.\n```bash\nmake dev-deps\n```\nList of requirements for compiling assets, building binary, and testing.\n- [Go Language](https://golang.org/) (currently `1.10.3`)\n- [Docker](https://docs.docker.com/)\n- [SASS](https://sass-lang.com/install)\n- [Cypress](https://www.cypress.io/) (only used for UI testing, `make cypress-install`)\n\n# Compiling Assets\nThis Golang project uses [rice](https://github.com/GeertJohan/go.rice) to compile static assets into a single file. The file `source/rice-box.go` is never committed to the Github repo, it is automatically created on build. Statping also requires `sass` to be installed on your local OS. To compile all the static assets run the command below:\n\n```bash\nmake compile\n```\nAfter this is complete, you'll notice the `source/rice-box.go` file has been generated. You can now continue to build, and test.\n\n# Testing\nStatping includes multiple ways to Test the application, you can run the `make` command, or the normal `go test` command. To see the full experience of your updates, you can even run Cypress tests which is in the `.dev/test` folder.\n\nStatping will run all tests in `cmd` folder on MySQL, Postgres, and SQLite databases. You can run `make databases` to automatically create MySQL and Postgres with Docker.\n\n###### Go Unit Testing:\n```bash\nmake test\n```\n\n###### Cypress UI Testing:\n```bash\nmake cypress-test\n```\n\n###### Test Everything:\n```bash\nmake test-all\n```\n\n# Build\nStatping will build on all operating systems except Windows 32-bit. I personally use [xgo](https://github.com/karalabe/xgo) to cross-compile on multiple systems using Docker. Follow the commands below to build on your local system.\n\n###### Build for local operating system:\n```bash\nmake build\n```\n\n# Compile for Production\nOnce you've tested and built locally, you can compile Statping for all available operating systems using the command below. This command will require you to have Docker.\n\n```bash\nmake build-all\n```\n\n# What Now\nEverything tested, compiled and worked out!? Awesome! 💃 You can now commit your changes, and submit a Pull Request with the features/bugs you added or removed.\n\n\n\n\n\n<div class=\"mt-5\" id=\"page_23\"><h1>PGP Signature</h1></div>\nYou can check if the Statping binary you downloaded is authentic by running a few commands.\n\n### Steps to Authenticate\n1. Download the Statping `tar.gz` file from [Latest Releases](https://github.com/statping/statping/releases/latest) and extract the `statping` binary and the `statup.asc` file.\n2. Run command: `gpg --verify statping.asc`\n3. You should see `Good signature from \"Hunter Long <info@statping.com>\" [ultimate]`.\n\n# Statping Public Key\n- [https://statping.com/statping.gpg](https://statping.com/statping.gpg)\n\nYou can also download the key with the command below:\n```\nwget https://statping.com/statping.gpg\n```\n\n###### `statping.gpg`\n```\n-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBFwGUYIBEADNsDY4aUOx8EoZuTRFPtjuadJzFRyKtHhw/tLlAnoFACanZPIT\nNZoRYvRR5v6lMDXdxsteDbJEOhZ1WDiKIr4OyMahPsyyH6ULzSBKgePUswa0sDef\nUnXYzPFQCzqQyQQFbp9AYfDP7dW6dTL9I6qU2NqlJvjxJiiZTAq87SmsLqHiASnI\n+ottnQuu6vJQBJz2PFIuaS1c3js/+HBbth9GK5B9YN1BIIyZoFmWKVU9HnJf+aM3\nUs6OLjjwYwWzQH38ZV84IjVXyiP9PQVhlCXeHK7XdhPZvnSP1m5Wszj/jowwY6Mz\nLgLotfL540X7yOJ7hJTFYLFBOtJdJr/3Ov8SH4HXdPFPVG+UqxsmtmPqUQ9iAxAE\njRFfkAxBvH5Szf2WZdaLnlrrOcOKJIIjZgHqalquBTAhlh5ul0lUVSSPxetwIBlW\n60L41k94NJFGDt8xOJ+122mLcywmQ1CzhDfeIKlxl6JDiVHjoRqlQQrqIoNZMV85\nrzGfrmbuwv1MXGBJoiNy3330ujOBmhQ9dQVwKpxhBKdjnAgIGM9szbUYxIkGgM1O\nU4b1WF3AF/9JOpKJ0LewslpM3BFFYnemGsHXAv3TBPqKidNdwMAiBOtNykGoXF6i\n0D6jOW/IB1da0gUA+kr5JdAOwIG7JXKhur2MO7Ncid59DL2N8RePRWj+jwARAQAB\ntB9IdW50ZXIgTG9uZyA8aW5mb0BzdGF0cGluZy5jb20+iQJOBBMBCAA4FiEEt21h\n+qbbdZRm6D2ZZLnGquLVUngFAlwGUYICGwMFCwkIBwIGFQoJCAsCBBYCAwECHgEC\nF4AACgkQZLnGquLVUnizwA//c7vmwTMq/8LYlbo37WM2kDE9AKIrz6VSMq4RhGbC\nLikH0X0epa+if79n9BZrVU/Af3aKTn7vu2J4XrvzcdCXtcsR0YmCWML2Y6OSFmhX\nw3o6woiFcp+SUWdcM/kithRun+j9sKV4akdgkdBQUdh/RMVln+radz1c6G59iTdh\nS+Ip3ObO7Gn5VnrLwxix+W9Jhg8YhDgDGEDt8e1yvjuMRY+WhjHFlwEMoE0kvQL8\nQvQH2dGD3dExWAuIL7+0xC0ZGU0PR8vRrq1ukdIsWlDY+42vvhcyPZKFFDTM/QLF\nFcCNiPSGhiK/NQq67xnRMFdh0fnqbydWj2atMpacIrheEkOt8db2/UMyDOwlIxgy\nKOG8x+yNKiG9LyvW4axRLctN608/+TbvtFo5TVOFJYxJQp4b5uz7LgJAJw7PBvfC\nbqx64BH8WGzgyGcAl9unQEtpDuxXoKvP2kbsS7hjvhK0gJgW9llpV4sRJJGApTBc\nWtbcS9DBGs3k1aZdA72bxnayD32syVz7czl4+tkRsbQZ4VgJh1yrHIDsdWQXFnYu\nEQJfCgX5HvvC13MpDUth0NWCFtWQirY3EFbIgSuhB/D5iXA+Dt1Dq5c1u7wQlUVi\nLQCU++oMGrlU3gZrnov5lnBGCEjn0O9bKQm8zmLdEcENFxUZvfPjOIY64YprZxD9\nBv65Ag0EXAZRggEQAMmjHmnvH8SvNJhku/oI96dFKen3bg9xdaFUD1vAuNglCalH\nwgXcCZd0RdobYNG46cXTzTQadtHS4hi/UBJ+oy5ZUpIRglW12eTYtqM2G11VbcQi\nj6rLITP9NIP+G1xBICSYK4UwmH55BolMEQ/1ZX0a9rESM9stDNglheCCudbMGR/1\nZYnufdEsh0yPwyC/1upZeu8LPWK62pt9mE/gccx77QTeDi5OJcRf1fPbUTCm3vSS\nwPPV2AGANodIhostjDymt5vh0tGwc7oUZZLnVdErfuctv7yMgZdiCpYu0jFy1NYf\nJgOpZasrcK7/1ozGzsfAo/sSU4kIkMwuWGgqfx5kGRK2CgU4T0i7oI6DMpOX9ZS8\ns3+oCWu83X0ofvm5R2CbjiUj2gR6JOhBQbJpCeTkLe+SFcUpnyrr7lG8B8QZHm5N\nnBi05V/s63RE3g/6WpR/fWuh+uswe01uqlSx9deW7jT49BL/MdSxwjfwLBLz/hLM\n0ld385XAd9bqMjUtp0XhZX2YORx3f/aKY7PYA62baGibb5RdPRw6viEAWU20eb+8\nX9Pa7hGmwUeal5lka4SD/TGl7wdY+g4oYP+jtKinH/ZftWA5wHTe3jWT5bdWrT2d\ne+0qA0SBkmKIDLpktvtTa19w2nfwBIwJ6fN36ZjYpOn/stxR7aRtnhSqvzxbABEB\nAAGJAjYEGAEIACAWIQS3bWH6ptt1lGboPZlkucaq4tVSeAUCXAZRggIbDAAKCRBk\nucaq4tVSeGWmD/9Pg1x6s98zdZCQa2apmUnuoQAQA9Gf2RBBuglCDGsY67wbvdHZ\n9wdFRs2QEhl2O3oFmidxthBOBRl9z62nXliLwNn1Lcy/yDfaB8wH6gMm4jn2N/z9\nvQXnyIzg8m4PItZ1p5mnY3qH5lpGF8r9Gb7tzK10rqulM2XTDojZOevlEGI6LGw8\nFjccXtNquqGZwxzytmKF3T7UBmpmt2qock8N5iJn987m6WeYmbFNc0ii0guHfdtO\nzQcItz2ngCdyvfgQPwCAoAv72ysSGhz5KZgAXRrEdcqj6Jw3ivoEUKq1aUrYncXQ\n3zC3ED6AjWOGRzjvTZzj22IVacUZ0gqx0x/oldXLOhMB9u6nFXHKj1n9nc0XHMNi\nLp9EuvQgcNLjFZGE9sxh25u9V+OhItfT/aarYEu/Xq0IkUUcdz4GehXth1/Cq1wH\nlSUie4nCs7I7OWhqMNClqP7ywElDXsQ66MCgvf01Dh64YUVjJNnyyK0QiYlCx/JQ\nZ85hNLtVXZfYqC5BRZlVFp8I8Rs2Qos9YEgn2M22+Rj+RIeD74LZFB7Q4myRvTMB\n/P466dFI83KYhwvjBYOP3jPTrV7Ky8poEGifQp2mM294CFIPS7z0z7a8+yMzcsRP\nOluFxewsEO0QNDrfFb+0gnjYlnGqOFcZjUMXbDdY5oLSPtXohynuTK1qyQ==\n=Xn0G\n-----END PGP PUBLIC KEY BLOCK-----\n```\n\n<div class=\"mt-5\" id=\"page_24\"><h1>Testing</h1></div>\nIf you want to test your updates with the current golang testing units, you can follow the guide below to run a full test process. Each test for Statping will run in MySQL, Postgres, and SQlite to make sure all database types work correctly.\n\n## Create Docker Databases\nThe easiest way to run the tests on all 3 databases is by starting temporary databases servers with Docker. Docker is available for Linux, Mac and Windows. You can download/install it by going to the [Docker Installation](https://docs.docker.com/install/) site.\n\n```go\ndocker run -it -d \\\n   -p 3306:3306 \\\n   -env MYSQL_ROOT_PASSWORD=password123 \\\n   -env MYSQL_DATABASE=root mysql\n```\n\n```go\ndocker run -it -d \\\n   -p 5432:5432 \\\n   -env POSTGRES_PASSWORD=password123 \\\n   -env POSTGRES_USER=root \\\n   -env POSTGRES_DB=root postgres\n```\n\nOnce you have MySQL and Postgres running, you can begin the testing. SQLite database will automatically create a `statup.db` file and will delete after testing.\n\n## Run Tests\nInsert the database environment variables to auto connect the the databases and run the normal test command: `go test -v`. You'll see a verbose output of each test. If all tests pass, make a push request! 💃\n```go\nDB_DATABASE=root \\\n   DB_USER=root \\\n   DB_PASS=password123 \\\n   DB_HOST=localhost \\\n   go test -v\n```\n\n<div class=\"mt-5\" id=\"page_25\"><h1>Deployment</h1></div>\nStatping is a pretty cool server for monitoring your services. The way we deploy might be a little cooler though. Statping is using the most bleeding edge technology to release updates and distribute binary files automatically.\n\n1. Source code commits get pushed to Github\n2. [Rice](https://github.com/GeertJohan/go.rice) will compile all the static assets into 1 file (rice-box.go in source)\n3. SASS will generate  a compiled version of the CSS. \n4. Statping Help page is generated by cloning the Wiki repo using `go generate`.\n5. Travis-CI tests the Golang application.\n6. Travis-CI tests the Statping API using [Postman](https://github.com/statping/statping/blob/master/source/tmpl/postman.json).\n7. If all tests are successful, Travis-CI will compile the binaries using [xgo](https://github.com/karalabe/xgo).\n8. Binaries are code signed using the official [PGP key](https://github.com/statping/statping/wiki/PGP-Signature) and compressed.\n9. [Docker](https://cloud.docker.com/repository/docker/hunterlong/statping/builds) receives a trigger to build for the `latest` tag.\n10. Travis-CI uploads the [latest release](https://github.com/statping/statping/releases) as a tagged version on Github.\n11. Travis-CI updates the [homebrew-statping](https://github.com/hunterlong/homebrew-statping) repo with the latest version.\n\nAnd that's it! Statping is ready to be shipped and installed.\n\n")
+var CompiledWiki = []byte("<a class=\"scrollclick\" href=\"#\" data-id=\"page_0\">Types of Monitoring</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_1\">Features</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_2\">Start Statping</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_3\">Linux</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_4\">Mac</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_5\">Windows</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_6\">AWS EC2</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_7\">Docker</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_8\">Mobile App</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_9\">Heroku</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_10\">API</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_11\">Makefile</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_12\">Notifiers</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_13\">Notifier Events</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_14\">Notifier Example</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_15\">Prometheus Exporter</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_16\">SSL</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_17\">Config with .env File</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_18\">Static Export</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_19\">Statping Plugins</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_20\">Statuper</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_21\">Build and Test</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_22\">Contributing</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_23\">PGP Signature</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_24\">Testing</a><br><a class=\"scrollclick\" href=\"#\" data-id=\"page_25\">Deployment</a><br>\n\n<div class=\"mt-5\" id=\"page_0\"><h1>Types of Monitoring</h1></div>\nYou can monitor your application by using a simple HTTP GET to the endpoint to return back a response and status code. Normally you want a 200 status code on an HTTP request. You might want to require a 404 or 500 error as a response code though. With each service you can include a Timeout in seconds to work with your long running services.\n\n# HTTP Endpoints with Custom POST\nFor more advanced monitoring you can add a data as a HTTP POST request. This is useful for automatically submitting JSON, or making sure your signup form is working correctly.\n\n<p align=\"center\">\n<img width=\"100%\" src=\"https://img.cjx.io/statup-httpservice.png\">\n</p>\n\nWith a HTTP service, you can POST a JSON string to your endpoint to retrieve any type of response back. You can then use Regex in the Expected Response field to parse a custom response that exactly matches your status requirements. \n\n# TCP/UDP Services\nFor other services that don't use HTTP, you can monitor any type of service by using the PORT of the service. If you're Ethereum Blockchain server is running on 8545, you can use TCP to monitor your server. With a TCP service, you can monitor your Docker containers, or remove service running on a custom port. You don't need to include `http` in the endpoint field, just IP or Hostname.\n\n<p align=\"center\">\n<img width=\"100%\" src=\"https://img.cjx.io/statup-tcpservice.png\">\n</p>\n\n# ICMP Service\nYou can send a [ICMP](https://en.wikipedia.org/wiki/Internet_Control_Message_Protocol) (ping) to an endpoint rather than HTTP/TCP/UDP request for a quick response.\n\n\n<div class=\"mt-5\" id=\"page_1\"><h1>Features</h1></div>\nStatping is a great Status Page that can be deployed with 0 effort.\n\n# 3 Different Databases\nYou can use MySQL, Postgres, or SQLite as a database for your Statping status page. The server will automatically upgrade your database tables depending on which database you have.\n\n# Easy to Startup\nStatping is an extremely easy to setup website monitoring tool without fussing with dependencies or packages. Simply download and install the precompile binary for your operating system. Statping works on Windows, Mac, Linux, Docker, and even the Raspberry Pi.\n\n# Plugins\nStatping is an awesome Status Page generator that allows you to create your own plugins with Golang Plugins! You don't need to request a PR or even tell us about your plugin. Plugin's are compiled and then send as a binary to the Statping `/plugins` folder. Test your plugins using the `statup test plugin` command, checkout the [Plugin Wiki](https://github.com/statping/statping/wiki/Statping-Plugins) to see detailed information about creating plugins.\n\n# No Maintenance\nMany other website monitoring applications will collect data until the server fails because of hard drive is 100% full. Statping will automatically delete records to make sure your server will stay UP for years. The EC2 AMI Image is a great way to host your status page without worrying about it crashing one day. Statping will automatically upgrade its software when you reboot your computer.\n\n# Email & Slack Notifications\nReceive email notifications if your website or application goes offline. Statping includes SMTP connections so you can use AWS SES, or any other SMTP emailing service. Go in the Email Settings in Settings to configure these options.\n\n# Prometheus Exporter\nIf you want a deeper view of your applications status, you can use Grafana and Prometheus to graph all types of data about your services. Read more about the [Prometheus Exporter](https://github.com/statping/statping/wiki/Prometheus-Exporter)\n\n<div class=\"mt-5\" id=\"page_2\"><h1>Start Statping</h1></div>\n\n\n<div class=\"mt-5\" id=\"page_3\"><h1>Linux</h1></div>\n# Installing on Linux\nInstalling Statping on Linux can be done by downloading the latest tar.gz file, unzipping, and running the executable. You can also install using [Snapcraft](https://snapcraft.io/) for Ubuntu systems.\n\n```shell\ncurl -o- -L https://statping.com/install.sh | bash\n```\n\n## Install using Snapcraft\n\n[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-white.svg)](https://snapcraft.io/statping)\n\nIf you are using [snap](https://snapcraft.io/statping), you can simply run this command to install Statping.\n```shell\nsudo snap install statping\n```\n\n# Compiling SCSS for Custom Theme\nStatping requires `sass` to be installed to the local machine to compile SCSS into CSS if you want to use the Custom Theme features. \n\n- Apt: `apt install ruby-sass -y`\n- Node: `npm install sass -g`\n- Ruby: `gem install sass`\n\n## Systemd Service\nSetting up a systemd service is a great way to make sure your Statping server will automatically reboot when needed. You can use the file below for your service. You should have Statping already installed by this step.\n###### /etc/systemd/system/statping.service\n```\n[Unit]\nDescription=Statping Server\nAfter=network.target\nAfter=systemd-user-sessions.service\nAfter=network-online.target\n\n[Service]\nType=simple\nRestart=always\nExecStart=/usr/local/bin/statping\nWorkingDirectory=/usr/local/bin\n\n[Install]\nWantedBy=multi-user.target\n```\nThen you can enable and start your systemd service with:\n```\nsystemctl daemon-reload\n\nsystemctl enable statping.service\n\nsystemctl start statping\n```\nYou're Statping server will now automatically restart when your server restarts.\n\n## Raspberry Pi\nYou can even run Statping on your Raspberry Pi by installing the precompiled binary from [Latest Releases](https://github.com/statping/statping/releases/latest). For the Raspberry Pi 3 you'll want to download the `statping-linux-arm7.tar.gz` file. Be sure to change `VERSION` to the latest version in Releases, and include the 'v'.\n\n```\nVERSION=$(curl -s \"https://github.com/statping/statping/releases/latest\" | grep -o 'tag/[v.0-9]*' | awk -F/ '{print $2}')\nwget https://github.com/statping/statping/releases/download/$VERSION/statping-linux-arm7.tar.gz\ntar -xvzf statping-linux-arm7.tar.gz\nchmod +x statping\nmv statping /usr/local/bin/statping\n\nstatping version\n``` \n\n## Alpine Linux\nThe Docker image is using the Statping Alpine binary since it's so incredibly small. You can run it on your own alpine image by downloading `statping-linux-alpine.tar.gz` from [Latest Releases](https://github.com/statping/statping/releases/latest).\n\n<div class=\"mt-5\" id=\"page_4\"><h1>Mac</h1></div>\n# Installing on Mac\nStatping includes an easy to use [Homebrew Formula](https://github.com/hunterlong/homebrew-statping) to quick get your Status Page up and running locally. Statping on brew is automatically generated for each new release to master. Install with the commands below,\n###### Using Homebrew\n```bash\nbrew tap statping/statping\nbrew install statping\n```\n###### Using the Terminal\n```shell\ncurl -o- -L https://statping.com/install.sh | bash\n```\n\n<p align=\"center\">\n<img width=\"80%\" src=\"https://img.cjx.io/statupbrewinstall.gif\">\n</p>\n\nOnce you've installed it, checkout which version you have by running `statping version`.\n\n# Compiling SCSS for Custom Theme\nStatping requires `sass` to be installed to the local machine to compile SCSS into CSS if you want to use the Custom Theme features. \n\n- Node: `npm install sass -g`\n- Ruby: `gem install sass`\n\n\n<div class=\"mt-5\" id=\"page_5\"><h1>Windows</h1></div>\n# Installing on Windows\nCurrently, Statping only works on Windows 64-bit computers. Just download the exe file from [Latest Releases](https://github.com/statping/statping/releases/latest) and run it in your command prompt. It will create a HTTP server on port 8080, so you can visit `http://localhost:8080` to see your Statping Status Page.\n\n# Compiling SCSS for Custom Theme\nStatping requires `sass` to be installed to the local machine to compile SCSS into CSS if you want to use the Custom Theme features. \n\n- Node: `npm install sass -g`\n- Ruby: `gem install sass`\n\n# Running Statping as a Service\nTo ensure Statping is always running, it can be installed to run as a service on a Windows machine. The easiest way to do that is by using NSSM, the [Non-Sucking Service Manager](https://nssm.cc/download). Download and unzip the compressed file to a location on your machine running Statping to get started:\n1. Open an administrative command prompt.\n2. Change to the folder that contains the 64 bit version of NSSM.\n3. Type \"nssm install Statping\" and press enter.\n4. For the properties, use the following as an example:\n    Path: C:\\Program Files\\Statping\\statping.exe\n    Startup directory: C:\\Program Files\\Statping\n5. Click \"Install\".\n6. Launch the windows services manager.\n7. Run Statping.\n\n## Known Issues with Windows\nUnfortunately, Statping only works on Windows 64-bit processors. If you have more than 4gb of ram, there's a good chance you already have a 64-bit processor. Download the [Latest Releases](https://github.com/statping/statping/releases/latest) of Statping, extract the ZIP file, then double click on the `statping.exe` file. You can use a SQLite database for a quick setup, or connect to a local/remote Postgres or MySQL database server.\n\n<div class=\"mt-5\" id=\"page_6\"><h1>AWS EC2</h1></div>\nRunning Statping on the smallest EC2 server is very quick using the AWS AMI Image. The AWS AMI Image will automatically start a Statping Docker container that will automatically update to the latest version. Once the EC2 is booted, you can go to the Public DNS domain to view the Statping installation page. The Statping root folder is located at: `/statping` on the server.\n\n# AMI Image\nChoose the correct AMI Image ID based on your AWS region.\n- us-east-1 `ami-09ccd23d9c7afba61` (Virginia)\n- us-east-2 `ami-0c6c9b714a501cdb3` (Ohio)\n- us-west-1 `ami-02159cc1fc701a77e` (California)\n- us-west-2 `ami-007c6990949f5ccee` (Oregon)\n- eu-central-1 `ami-06e252d6d8b0c2f1f` (Frankfurt)\n\n# Upgrading Staping\nYou can upgrade the Statping executable by running the commands below on your EC2 instance.\n```\nVERSION=$(curl -s \"https://github.com/statping/statping/releases/latest\" | grep -o 'tag/[v.0-9]*' | awk -F/ '{print $2}')\nwget https://github.com/statping/statping/releases/download/$VERSION/statping-linux-x64.tar.gz\ntar -xvzf statping-linux-x64.tar.gz\nchmod +x statping\nmv statping /usr/local/bin/statping\n```\nYou can test the version number by running `statping version`.\n\n# Instructions\n\n### 1. Create an EC2 instance from AMI Image\nGo to the main EC2 dashboard and click 'Launch Instance'. Then type `Statping` inside the search field for 'Community AMI'. Once you've found it in your region, click Select!\n\n<img src=\"https://img.cjx.io/statpingaws-ami.png\">\n\n### 2. Get the Public DNS for EC2 Instance\nCopy the 'Public DNS' URL and paste it into your browser.\n\n<img src=\"https://img.cjx.io/statping-aws-ec2.png\">\n\n### 3. Setup Statping\nUse SQLite if you don't want to connect to a remote MySQL or Postgres database.\n\n<img src=\"https://img.cjx.io/statping-setup.png\">\n\n# EC2 Server Features\nRunning your Statping server on a small EC2 instance is perfect for most users. Below you'll find some commands to get up and running in seconds.\n- Super cheap on the t2.nano (~$4.60 monthly)\n- Small usage, 8gb of hard drive\n- Automatic SSL certificate if you require it\n- Automatic reboot when the server needs it\n- Automatic database cleanup, so you'll never be at 100% full.\n- Automatic docker containers/images removal\n\n## Create Security Groups\nUsing the AWS CLI you can copy and paste the commands below to auto create everything for you. The server opens port 80 and 443.\n```bash\naws ec2 create-security-group --group-name StatpingPublicHTTP --description \"Statping HTTP Server on port 80 and 443\"\n# will response back a Group ID. Copy ID and use it for --group-id below.\n```\n```bash\nGROUPS=sg-7e8b830f\naws ec2 authorize-security-group-ingress --group-id $GROUPS --protocol tcp --port 80 --cidr 0.0.0.0/0\naws ec2 authorize-security-group-ingress --group-id $GROUPS --protocol tcp --port 443 --cidr 0.0.0.0/0\n```\n## Create EC2 without SSL\nOnce your server has started, go to the EC2 Public DNS endpoint. You should be redirected to /setup to continue your installation process! The database information is already inputed for you.\n```bash\nGROUPS=sg-7e8b830f\nKEY=MYKEYHERE\nAMI_IMAGE=ami-7be8a103\n\naws ec2 run-instances \\\n    --image-id $AMI_IMAGE \\\n    --count 1 --instance-type t2.nano \\\n    --key-name $KEY \\\n    --security-group-ids $GROUPS\n```\n## Create EC2 with Automatic SSL Certification\nStart a Statping server with an SSL cert that will automatically regenerate when it's near expiration time. You'll need to point your domain's A record (IP address) or CNAME (public DNS endpoint) to use this feature.\n\n```bash\nwget https://raw.githubusercontent.com/hunterlong/statping/master/dev/ec2-ssl.sh\n```\n\n```bash\n# edit the contents inside of ec2-ssl.sh then continue\nLETSENCRYPT_HOST=\"status.MYDOMAIN.com\"\nLETSENCRYPT_EMAIL=\"noreply@MYEMAIL.com\"\n```\nEdit ec2-ssl.sh and insert your domain you want to use, then run command below. Use the Security Group ID that you used above for --security-group-ids\n```\nGROUPS=sg-7e8b830f\nAMI_IMAGE=ami-7be8a103\nKEY=MYKEYHERE\n\naws ec2 run-instances \\\n    --user-data file://ec2-ssl.sh \\\n    --image-id $AMI_IMAGE \\\n    --count 1 --instance-type t2.nano \\\n    --key-name $KEY \\\n    --security-group-ids $GROUPS\n```\n\n### EC2 Server Specs\n- t2.nano ($4.60 monthly)\n- 8gb SSD Memory\n- 0.5gb RAM\n- Docker with Docker Compose installed\n- Running Statping, NGINX, and Postgres\n- boot scripts to automatically clean unused containers.\n\n\n\n<div class=\"mt-5\" id=\"page_7\"><h1>Docker</h1></div>\nStatping is easily ran on Docker with the light weight Alpine linux image. View on [Docker Hub](https://hub.docker.com/r/hunterlong/statping).\n\n[![](https://images.microbadger.com/badges/image/hunterlong/statping.svg)](https://microbadger.com/images/hunterlong/statping) [![Docker Pulls](https://img.shields.io/docker/pulls/hunterlong/statping.svg)](https://hub.docker.com/r/hunterlong/statping/builds/)\n\n# Latest Docker Image\nThe `latest` Docker image uses Alpine Linux to keep it ultra small.\n```bash\ndocker run -d \\\n  -p 8080:8080 \\\n  --restart always \\\n  hunterlong/statping\n```\n\n# Mounting Volume\nYou can mount a volume to the `/app` Statping directory. This folder will contain `logs`, `config.yml`, and static assets if you want to edit the SCSS/CSS. \n```bash\ndocker run -d \\\n  -p 8080:8080 \\\n  -v /mydir/statping:/app \\\n  --restart always \\\n  hunterlong/statping\n```\n\n# Attach a SSL Certificate\nWhen you mount `server.crt` and `server.key` to the `/app` directory, Statping will run a HTTPS server on port 443. Checkout the [SSL Wiki](https://github.com/statping/statping/wiki/SSL) documentation to see more information about this.\n```bash\ndocker run -d \\\n  -p 443:443 \\\n  -v /mydir/domain.crt:/app/server.crt \\\n  -v /mydir/domain.key:/app/server.key \\\n  -v /mydir:/app \\\n  --restart always \\\n  hunterlong/statping\n```\n\n# Development Docker Image\nIf you want to run Statping that was build from the source, use the `dev` Docker image.\n```bash\ndocker run -d -p 8080:8080 hunterlong/statping:dev\n```\n\n# Cypress Testing Docker Image\nThis Docker image will pull the latest version of Statping and test the web interface with [Cypress](https://www.cypress.io/).\n```bash\ndocker run -it -p 8080:8080 hunterlong/statping:cypress\n```\n\n#### Or use Docker Compose\nThis Docker Compose file inlcudes NGINX, Postgres, and Statping.\n\n### Docker Compose with NGINX and Postgres\nOnce you initiate the `docker-compose.yml` file below go to http://localhost and you'll be forwarded to the /setup page. \nDatabase Authentication\n- database: `postgres`\n- port: `5432`\n- username: `statup`\n- password: `password123`\n- database: `statup`\n\n```yaml\nversion: '2.3'\n\nservices:\n\n  nginx:\n    container_name: nginx\n    image: jwilder/nginx-proxy\n    ports:\n      - 0.0.0.0:80:80\n      - 0.0.0.0:443:443\n    networks:\n      - internet\n    restart: always\n    volumes:\n      - /var/run/docker.sock:/tmp/docker.sock:ro\n      - ./statup/nginx/certs:/etc/nginx/certs:ro\n      - ./statup/nginx/vhost:/etc/nginx/vhost.d\n      - ./statup/nginx/html:/usr/share/nginx/html:ro\n      - ./statup/nginx/dhparam:/etc/nginx/dhparam\n    environment:\n      DEFAULT_HOST: localhost\n\n  statup:\n    container_name: statup\n    image: hunterlong/statping:latest\n    restart: always\n    networks:\n      - internet\n      - database\n    depends_on:\n      - postgres\n    volumes:\n      - ./statup/app:/app\n    environment:\n      VIRTUAL_HOST: localhost\n      VIRTUAL_PORT: 8080\n      DB_CONN: postgres\n      DB_HOST: postgres\n      DB_USER: statup\n      DB_PASS: password123\n      DB_DATABASE: statup\n      NAME: EC2 Example\n      DESCRIPTION: This is a Statping Docker Compose instance\n\n  postgres:\n    container_name: postgres\n    image: postgres:10\n    restart: always\n    networks:\n      - database\n    volumes:\n      - ./statup/postgres:/var/lib/postgresql/data\n    environment:\n      POSTGRES_PASSWORD: password123\n      POSTGRES_USER: statup\n      POSTGRES_DB: statup\n\nnetworks:\n  internet:\n    driver: bridge\n  database:\n    driver: bridge\n```\nOr a simple wget...\n```bash\nwget https://raw.githubusercontent.com/hunterlong/statping/master/servers/docker-compose.yml\ndocker-compose up -d\n```\n\n### Docker Compose with Automatic SSL\nYou can automatically start a Statping server with automatic SSL encryption using this docker-compose file. First point your domain's DNS to the Statping server, and then run this docker-compose command with DOMAIN and EMAIL. Email is for letsencrypt services.\n```bash\nwget https://raw.githubusercontent.com/hunterlong/statping/master/servers/docker-compose-ssl.yml\n\nLETSENCRYPT_HOST=mydomain.com \\\n    LETSENCRYPT_EMAIL=info@mydomain.com \\\n    docker-compose -f docker-compose-ssl.yml up -d\n```\n\n#### Full docker-compose with Automatic SSL\n\n```yaml\nversion: '2.3'\n\nservices:\n\n  nginx:\n    container_name: nginx\n    image: jwilder/nginx-proxy\n    ports:\n      - 0.0.0.0:80:80\n      - 0.0.0.0:443:443\n    labels:\n      - \"com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy\"\n    networks:\n      - internet\n    restart: always\n    volumes:\n      - /var/run/docker.sock:/tmp/docker.sock:ro\n      - ./statup/nginx/certs:/etc/nginx/certs:ro\n      - ./statup/nginx/vhost:/etc/nginx/vhost.d\n      - ./statup/nginx/html:/usr/share/nginx/html:ro\n      - ./statup/nginx/dhparam:/etc/nginx/dhparam\n    environment:\n      DEFAULT_HOST: ${LETSENCRYPT_HOST}\n\n  letsencrypt:\n    container_name: letsencrypt\n    image: jrcs/letsencrypt-nginx-proxy-companion\n    networks:\n      - internet\n    restart: always\n    volumes:\n      - /var/run/docker.sock:/var/run/docker.sock:ro\n      - ./statup/nginx/certs:/etc/nginx/certs\n      - ./statup/nginx/vhost:/etc/nginx/vhost.d\n      - ./statup/nginx/html:/usr/share/nginx/html\n      - ./statup/nginx/dhparam:/etc/nginx/dhparam\n\n  statup:\n    container_name: statup\n    image: hunterlong/statping:latest\n    restart: always\n    networks:\n      - internet\n      - database\n    depends_on:\n      - postgres\n    volumes:\n      - ./statup/app:/app\n    environment:\n      VIRTUAL_HOST: ${LETSENCRYPT_HOST}\n      VIRTUAL_PORT: 8080\n      LETSENCRYPT_HOST: ${LETSENCRYPT_HOST}\n      LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL}\n      DB_CONN: postgres\n      DB_HOST: postgres\n      DB_USER: statup\n      DB_PASS: password123\n      DB_DATABASE: statup\n      NAME: SSL Example\n      DESCRIPTION: This Status Status Page should be running ${LETSENCRYPT_HOST} with SSL.\n\n  postgres:\n    container_name: postgres\n    image: postgres:10\n    restart: always\n    networks:\n      - database\n    volumes:\n      - ./statup/postgres:/var/lib/postgresql/data\n    environment:\n      POSTGRES_PASSWORD: password123\n      POSTGRES_USER: statup\n      POSTGRES_DB: statup\n\nnetworks:\n  internet:\n    driver: bridge\n  database:\n    driver: bridge\n```\n\n<div class=\"mt-5\" id=\"page_8\"><h1>Mobile App</h1></div>\nStatping has a free mobile app so you can monitor your websites and applications without the need of a computer. \n\n![iTunes App Store](https://img.shields.io/itunes/v/1445513219.svg)\n\n<p align=\"center\">\n<a href=\"https://play.google.com/store/apps/details?id=com.statping\"><img src=\"https://img.cjx.io/google-play.svg\"></a>\n<a href=\"https://itunes.apple.com/us/app/apple-store/id1445513219\"><img src=\"https://img.cjx.io/app-store-badge.svg\"></a>\n</p>\n\n<p align=\"center\">\n<img src=\"https://img.cjx.io/statping_iphone_bk.png\">\n</p>\n\n\n<div class=\"mt-5\" id=\"page_9\"><h1>Heroku</h1></div>\nYou can now instantly deploy your Statping instance on a free Heroku container. Simply click the deploy button below and get up in running within seconds. This Heroku deployment is based on the Statping Docker image so you will have all the great features including SASS and all the notifiers without any setup. \n\n[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/statping/statping/tree/master)\n\nView the live Heroku Statping instance at: [https://statping.herokuapp.com](https://statping.herokuapp.com)\n\n# Database Configuration\nYou will need to deploy a Postgres database to your instance and insert some configuration variables. View the image below to see what environment variable you need to configure. If you insert `DB_CONN`, Statping will attempt to automatically connect to the database without the need for the `config.yml` file. \n\n![](https://img.cjx.io/herokustatping.png)\n\n\n<div class=\"mt-5\" id=\"page_10\"><h1>API</h1></div>\nStatping includes a RESTFUL API so you can view, update, and edit your services with easy to use routes. You can currently view, update and delete services, view, create, update users, and get detailed information about the Statping instance. To make life easy, try out a Postman or Swagger JSON file and use it on your Statping Server.\n\n<p align=\"center\">\n<a href=\"https://documenter.getpostman.com/view/1898229/RzfiJUd6\">Postman</a> | <a href=\"https://github.com/statping/statping/blob/master/dev/postman.json\">Postman JSON Export</a> | <a href=\"https://github.com/statping/statping/blob/master/dev/swagger.json\">Swagger Export</a>\n</p>\n\n## Authentication\nAuthentication uses the Statping API Secret to accept remote requests. You can find the API Secret in the Settings page of your Statping server. To send requests to your Statping API, include a Authorization Header when you send the request. The API will accept any one of the headers below.\n\n- HTTP Header: `Authorization: API SECRET HERE`\n- HTTP Header: `Authorization: Bearer API SECRET HERE`\n\n## Main Route `/api`\nThe main API route will show you all services and failures along with them.\n\n## Services\nThe services API endpoint will show you detailed information about services and will allow you to edit/delete services with POST/DELETE http methods.\n\n### Viewing All Services\n- Endpoint: `/api/services`\n- Method: `GET`\n- Response: Array of [Services](https://github.com/statping/statping/wiki/API#service-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\n### Viewing Service\n- Endpoint: `/api/services/{id}`\n- Method: `GET`\n- Response: [Service](https://github.com/statping/statping/wiki/API#service-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\n### Updating Service\n- Endpoint: `/api/services/{id}`\n- Method: `POST`\n- Response: [Service](https://github.com/statping/statping/wiki/API#service-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\nPOST Data:\n```json\n{\n    \"name\": \"Updated Service\",\n    \"domain\": \"https://google.com\",\n    \"expected\": \"\",\n    \"expected_status\": 200,\n    \"check_interval\": 15,\n    \"type\": \"http\",\n    \"method\": \"GET\",\n    \"post_data\": \"\",\n    \"port\": 0,\n    \"timeout\": 10,\n    \"order_id\": 0\n}\n```\n\n### Create New Service\n- Endpoint: `/api/services`\n- Method: `POST`\n- Response: [Service](https://github.com/statping/statping/wiki/API#service-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\nPOST Data:\n```json\n{\n    \"name\": \"Create New Service\",\n    \"domain\": \"https://www.coogger.com\",\n    \"expected\": \"\",\n    \"expected_status\": 200,\n    \"check_interval\": 15,\n    \"type\": \"http\",\n    \"method\": \"GET\",\n    \"post_data\": \"\",\n    \"port\": 0,\n    \"timeout\": 10,\n    \"order_id\": 0\n}\n```\n\n### Deleting Service\n- Endpoint: `/api/services/{id}`\n- Method: `DELETE`\n- Response: [Object Response](https://github.com/statping/statping/wiki/API#object-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\nResponse:\n```json\n{\n    \"status\": \"success\",\n    \"id\": 4,\n    \"type\": \"service\",\n    \"method\": \"delete\"\n}\n```\n\n## Users\nThe users API endpoint will show you users that are registered inside your Statping instance.\n\n### View All Users\n- Endpoint: `/api/users`\n- Method: `GET`\n- Response: Array of [Users](https://github.com/statping/statping/wiki/API#user-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\n### Viewing User\n- Endpoint: `/api/users/{id}`\n- Method: `GET`\n- Response: [User](https://github.com/statping/statping/wiki/API#user-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\n### Creating New User\n- Endpoint: `/api/users`\n- Method: `POST`\n- Response: [User](https://github.com/statping/statping/wiki/API#user-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\nPOST Data:\n```json\n{\n    \"username\": \"newadmin\",\n    \"email\": \"info@email.com\",\n    \"password\": \"password123\",\n    \"admin\": true\n}\n```\n\n### Updating User\n- Endpoint: `/api/users/{id}`\n- Method: `POST`\n- Response: [User](https://github.com/statping/statping/wiki/API#user-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\nPOST Data:\n```json\n{\n    \"username\": \"updatedadmin\",\n    \"email\": \"info@email.com\",\n    \"password\": \"password123\",\n    \"admin\": true\n}\n```\n\n### Deleting User\n- Endpoint: `/api/services/{id}`\n- Method: `DELETE`\n- Response: [Object Response](https://github.com/statping/statping/wiki/API#object-response)\n- Response Type: `application/json`\n- Request Type: `application/json`\n\nResponse:\n```json\n{\n    \"status\": \"success\",\n    \"id\": 3,\n    \"type\": \"user\",\n    \"method\": \"delete\"\n}\n```\n\n# Service Response\n```json\n{\n    \"id\": 8,\n    \"name\": \"Test Service 0\",\n    \"domain\": \"https://status.coinapp.io\",\n    \"expected\": \"\",\n    \"expected_status\": 200,\n    \"check_interval\": 1,\n    \"type\": \"http\",\n    \"method\": \"GET\",\n    \"post_data\": \"\",\n    \"port\": 0,\n    \"timeout\": 30,\n    \"order_id\": 0,\n    \"created_at\": \"2018-09-12T09:07:03.045832088-07:00\",\n    \"updated_at\": \"2018-09-12T09:07:03.046114305-07:00\",\n    \"online\": false,\n    \"latency\": 0.031411064,\n    \"24_hours_online\": 0,\n    \"avg_response\": \"\",\n    \"status_code\": 502,\n    \"last_online\": \"0001-01-01T00:00:00Z\",\n    \"dns_lookup_time\": 0.001727175,\n    \"failures\": [\n        {\n            \"id\": 5187,\n            \"issue\": \"HTTP Status Code 502 did not match 200\",\n            \"created_at\": \"2018-09-12T10:41:46.292277471-07:00\"\n        },\n        {\n            \"id\": 5188,\n            \"issue\": \"HTTP Status Code 502 did not match 200\",\n            \"created_at\": \"2018-09-12T10:41:47.337659862-07:00\"\n        }\n    ]\n}\n```\n\n# User Response\n```json\n{\n    \"id\": 1,\n    \"username\": \"admin\",\n    \"api_key\": \"02f324450a631980121e8fd6ea7dfe4a7c685a2f\",\n    \"admin\": true,\n    \"created_at\": \"2018-09-12T09:06:53.906398511-07:00\",\n    \"updated_at\": \"2018-09-12T09:06:54.972440207-07:00\"\n}\n```\n\n# Object Response\n```json\n{\n    \"type\": \"service\",\n    \"id\": 19,\n    \"method\": \"delete\",\n    \"status\": \"success\"\n}\n```\n\n# Main API Response\n```json\n{\n    \"name\": \"Awesome Status\",\n    \"description\": \"An awesome status page by Statping\",\n    \"footer\": \"This is my custom footer\",\n    \"domain\": \"https://demo.statping.com\",\n    \"version\": \"v0.56\",\n    \"migration_id\": 1536768413,\n    \"created_at\": \"2018-09-12T09:06:53.905374829-07:00\",\n    \"updated_at\": \"2018-09-12T09:07:01.654201225-07:00\",\n    \"database\": \"sqlite\",\n    \"started_on\": \"2018-09-12T10:43:07.760729349-07:00\",\n    \"services\": [\n        {\n            \"id\": 1,\n            \"name\": \"Google\",\n            \"domain\": \"https://google.com\",\n            \"expected\": \"\",\n            \"expected_status\": 200,\n            \"check_interval\": 10,\n            \"type\": \"http\",\n            \"method\": \"GET\",\n            \"post_data\": \"\",\n            \"port\": 0,\n            \"timeout\": 10,\n            \"order_id\": 0,\n            \"created_at\": \"2018-09-12T09:06:54.97549122-07:00\",\n            \"updated_at\": \"2018-09-12T09:06:54.975624103-07:00\",\n            \"online\": true,\n            \"latency\": 0.09080986,\n            \"24_hours_online\": 0,\n            \"avg_response\": \"\",\n            \"status_code\": 200,\n            \"last_online\": \"2018-09-12T10:44:07.931990439-07:00\",\n            \"dns_lookup_time\": 0.005543935\n        }\n    ]\n}\n```\n\n\n<div class=\"mt-5\" id=\"page_11\"><h1>Makefile</h1></div>\nHere's a simple list of Makefile commands you can run using `make`. The [Makefile](https://github.com/statping/statping/blob/master/Makefile) may change often, so i'll try to keep this Wiki up-to-date.\n\n- Ubuntu `apt-get install build-essential`\n- MacOSX `sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer`\n- Windows [Install Guide for GNU make utility](http://gnuwin32.sourceforge.net/packages/make.htm)\n- CentOS/RedHat `yum groupinstall \"Development Tools\"`\n\n### Commands\n```bash\nmake build                         # build the binary\nmake install\nmake run\nmake test\nmake coverage\nmake docs\n# Building Statping\nmake build-all\nmake build-alpine\nmake docker\nmake docker-run\nmake docker-dev\nmake docker-run-dev\nmake databases\nmake dev-deps\nmake clean\nmake compress\nmake cypress-install\nmake cypress-test\n```\n\n<div class=\"mt-5\" id=\"page_12\"><h1>Notifiers</h1></div>\n<p align=\"center\">\n<img width=\"80%\" src=\"https://s3-us-west-2.amazonaws.com/gitimgs/statupnotifiers.png\">\n</p>\n\nStatping includes multiple Notifiers to alert you when your services are offline. You can also create your own notifier and send a Push Request to this repo! Creating a custom notifier is pretty easy as long as you follow the requirements. A notifier will automatically be installed into the users Statping database, and form values will save without any hassles. 💃\n\n<p align=\"center\">\n<a href=\"https://github.com/statping/statping/wiki/Notifier-Example\">Example Code</a> | <a href=\"https://github.com/statping/statping/wiki/Notifier-Events\">Events</a> | <a href=\"https://github.com/statping/statping/tree/master/notifiers\">View Notifiers</a><br>\n<a href=\"https://godoc.org/github.com/statping/statping/core/notifier\"><img src=\"https://godoc.org/github.com/golang/gddo?status.svg\"></a>\n</p>\n\n## Notifier Requirements\n- Must have a unique `METHOD` name\n- Struct must have `*notifier.Notification` pointer in it. \n- Must create and add your notifier variable in `init()`\n- Should have a form for user to input their variables/keys. `Form: []notifier.NotificationForm`\n\n## Notifier Interface (required)\nStatping has the `Notifier` interface which you'll need to include in your notifier. Statping includes many other events/triggers for your notifier, checkout <a href=\"https://github.com/statping/statping/wiki/Notifier-Events\">Notifier Events</a> to see all of them.\n```go\n// Notifier interface is required to create a new Notifier\ntype Notifier interface {\n\tOnSave() error          // OnSave is triggered when the notifier is saved\n\tSend(interface{}) error // OnSave is triggered when the notifier is saved\n\tSelect() *Notification  // Select returns the *Notification for a notifier\n}\n```\n\n### Basic Interface (required)\nInclude `OnSuccess` and `OnFailure` to receive events when a service is online or offline.\n```go\n// BasicEvents includes the most minimal events, failing and successful service triggers\ntype BasicEvents interface {\n\t// OnSuccess is triggered when a service is successful\n\tOnSuccess(*services.Service)\n\t// OnFailure is triggered when a service is failing\n\tOnFailure(*services.Service, *types.Failure)\n}\n```\n\n### Test Interface\nThe OnTest method will give the front end user the ability to test your notifier without saving, the OnTest method for your notifier run the functionality to test the user's submitted parameters and respond an error if notifier is not correctly setup.\n```go\n// Tester interface will include a function to Test users settings before saving\ntype Tester interface {\n\tOnTest() error\n}\n```\nIf your notifier includes this interface, the Test button will appear.\n\n## Notifier Struct\n```go\nvar example = &Example{&notifier.Notification{\n\tMethod: \"example\",                               // unique method name\n\tHost:   \"http://exmaplehost.com\",                // default 'host' field\n\tForm: []notifier.NotificationForm{{\n\t\tType:        \"text\",                     // text, password, number, or email\n\t\tTitle:       \"Host\",                     // The title of value in form\n\t\tPlaceholder: \"Insert your Host here.\",   // Optional placeholder in input\n\t\tDbField:     \"host\",                     // An accepted DbField value (read below)\n\t}},\n}\n```\n\n## Notifier Form\nInclude a form with your notifier so other users can save API keys, username, passwords, and other values. \n```go\n// NotificationForm contains the HTML fields for each variable/input you want the notifier to accept.\ntype NotificationForm struct {\n\tType        string `json:\"type\"`        // the html input type (text, password, email)\n\tTitle       string `json:\"title\"`       // include a title for ease of use\n\tPlaceholder string `json:\"placeholder\"` // add a placeholder for the input\n\tDbField     string `json:\"field\"`       // true variable key for input\n\tSmallText   string `json:\"small_text\"`  // insert small text under a html input\n\tRequired    bool   `json:\"required\"`    // require this input on the html form\n\tIsHidden    bool   `json:\"hidden\"`      // hide this form element from end user\n\tIsList      bool   `json:\"list\"`        // make this form element a comma separated list\n\tIsSwitch    bool   `json:\"switch\"`      // make the notifier a boolean true/false switch\n}\n```\n\n### Example Notifier Form\nThis is the Slack Notifier `Form` fields.\n```go\nForm: []notifier.NotificationForm{{\n\t\tType:        \"text\",\n\t\tTitle:       \"Incoming webhooker Url\",\n\t\tPlaceholder: \"Insert your slack webhook URL here.\",\n\t\tSmallText:   \"Incoming webhooker URL from <a href=\\\"https://api.slack.com/apps\\\" target=\\\"_blank\\\">slack Apps</a>\",\n\t\tDbField:     \"Host\",\n\t\tRequired:    true,\n\t}}\n}\n```\n\n### Accepted DbField Values\nThe `notifier.NotificationForm` has a field called `DbField` which is the column to save the value into the database. Below are the acceptable DbField string names to include in your form. \n- `host` used for a URL or API endpoint\n- `username` used for a username\n- `password` used for a password\n- `port` used for a integer port number\n- `api_key` used for some kind of API key\n- `api_secret` used for some API secret\n- `var1` used for any type of string\n- `var2` used for any type of string (extra)\n\n### Form Elements\nYou can completely custom your notifications to include a detailed form. \n- `Type` is a HTML input type for your field\n- `Title` give your input element a title\n- `Placeholder` optional field if you want a placeholder in input\n- `DbField` required field to save variable into database (read above)\n- `Placeholder` optional field for inserting small hint under the input\n\n# Adding Notifiers\nTo add a notifier to the Statping application, simply append your Notifier in the `AttachNotifiers()` function inside of [core/core.go](https://github.com/statping/statping/blob/master/core/core.go).\n\n```go\n// AttachNotifiers will attach all the notifier's into the system\nfunc AttachNotifiers() error {\n\treturn notifier.AddNotifiers(\n\t\tnotifiers.Command,\n\t\tnotifiers.Discorder,\n\t\tnotifiers.Emailer,\n\t\tnotifiers.LineNotify,\n\t\tnotifiers.Mobile,\n\t\tnotifiers.Slacker,\n\t\tnotifiers.Telegram,\n\t\tnotifiers.Twilio,\n\t\tnotifiers.Webhook,\n\t)\n}\n```\n###### [AttachNotifiers](https://github.com/statping/statping/blob/master/core/core.go#L183)\n\n<div class=\"mt-5\" id=\"page_13\"><h1>Notifier Events</h1></div>\nEvents are handled by added interfaces for the elements you want to monitor.\n\n## Required Notifier Interface\n```go\n// Notifier interface is required to create a new Notifier\ntype Notifier interface {\n\t// Run will trigger inside of the notifier when enabled\n\tRun() error\n\t// OnSave is triggered when the notifier is saved\n\tOnSave() error\n\t// Test will run a function inside the notifier to Test if it works\n\tTest() error\n\t// Select returns the *Notification for a notifier\n\tSelect() *Notification\n}\n```\n\n## Basic Success/Failure Interface\n```go\n// BasicEvents includes the most minimal events, failing and successful service triggers\ntype BasicEvents interface {\n\t// OnSuccess is triggered when a service is successful\n\tOnSuccess(*services.Service)\n\t// OnFailure is triggered when a service is failing\n\tOnFailure(*services.Service, *types.Failure)\n}\n```\n\n\n## Service Events\n```go\n// ServiceEvents are events for Services\ntype ServiceEvents interface {\n\tOnNewService(*services.Service)\n\tOnUpdatedService(*services.Service)\n\tOnDeletedService(*services.Service)\n}\n```\n\n## User Events\n```go\n// UserEvents are events for Users\ntype UserEvents interface {\n\tOnNewUser(*types.User)\n\tOnUpdatedUser(*types.User)\n\tOnDeletedUser(*types.User)\n}\n```\n\n## Core Events\n```go\n// CoreEvents are events for the main Core app\ntype CoreEvents interface {\n\tOnUpdatedCore(*types.Core)\n}\n```\n\n## Notifier Events\n```go\n// NotifierEvents are events for other Notifiers\ntype NotifierEvents interface {\n\tOnNewNotifier(*Notification)\n\tOnUpdatedNotifier(*Notification)\n}\n```\n\n<div class=\"mt-5\" id=\"page_14\"><h1>Notifier Example</h1></div>\nBelow is a full example of a Statping notifier which will give you a good example of how to create your own. Insert your new notifier inside the `/notifiers` folder once your ready!\n\n```go\npackage notifiers\n\nimport (\n\t\"errors\"\n\t\"fmt\"\n\t\"github.com/statping/statping/types\"\n        \"github.com/statping/statping/core/notifier\"\n\t\"time\"\n)\n\ntype Example struct {\n\t*notifier.Notification\n}\n\nvar example = &Example{&notifier.Notification{\n\tMethod:      METHOD,\n\tTitle:       \"Example\",\n\tDescription: \"Example Notifier\",\n\tAuthor:      \"Hunter Long\",\n\tAuthorUrl:   \"https://github.com/hunterlong\",\n\tDelay:       time.Duration(5 * time.Second),\n\tForm: []notifier.NotificationForm{{\n\t\tType:        \"text\",\n\t\tTitle:       \"Host\",\n\t\tPlaceholder: \"Insert your Host here.\",\n\t\tDbField:     \"host\",\n\t\tSmallText:   \"this is where you would put the host\",\n\t}, {\n\t\tType:        \"text\",\n\t\tTitle:       \"Username\",\n\t\tPlaceholder: \"Insert your Username here.\",\n\t\tDbField:     \"username\",\n\t}, {\n\t\tType:        \"password\",\n\t\tTitle:       \"Password\",\n\t\tPlaceholder: \"Insert your Password here.\",\n\t\tDbField:     \"password\",\n\t}, {\n\t\tType:        \"number\",\n\t\tTitle:       \"Port\",\n\t\tPlaceholder: \"Insert your Port here.\",\n\t\tDbField:     \"port\",\n\t}, {\n\t\tType:        \"text\",\n\t\tTitle:       \"API Key\",\n\t\tPlaceholder: \"Insert your API Key here\",\n\t\tDbField:     \"api_key\",\n\t}, {\n\t\tType:        \"text\",\n\t\tTitle:       \"API Secret\",\n\t\tPlaceholder: \"Insert your API Secret here\",\n\t\tDbField:     \"api_secret\",\n\t}, {\n\t\tType:        \"text\",\n\t\tTitle:       \"Var 1\",\n\t\tPlaceholder: \"Insert your Var1 here\",\n\t\tDbField:     \"var1\",\n\t}, {\n\t\tType:        \"text\",\n\t\tTitle:       \"Var2\",\n\t\tPlaceholder: \"Var2 goes here\",\n\t\tDbField:     \"var2\",\n\t}},\n}}\n\n// REQUIRED init() will install/load the notifier\nfunc init() {\n\tnotifier.AddNotifier(example)\n}\n\n// REQUIRED - Send is where you would put the action's of your notifier\nfunc (n *Example) Send(msg interface{}) error {\n\tmessage := msg.(string)\n\tfmt.Printf(\"i received this string: %v\\n\", message)\n\treturn nil\n}\n\n// REQUIRED\nfunc (n *Example) Select() *notifier.Notification {\n\treturn n.Notification\n}\n\n// REQUIRED\nfunc (n *Example) OnSave() error {\n\tmsg := fmt.Sprintf(\"received on save trigger\")\n\tn.AddQueue(msg)\n\treturn nil\n}\n\n// REQUIRED\nfunc (n *Example) Test() error {\n\tmsg := fmt.Sprintf(\"received a test trigger\\n\")\n\tn.AddQueue(msg)\n\treturn nil\n}\n\n// REQUIRED - BASIC EVENT\nfunc (n *Example) OnSuccess(s *services.Service) {\n\tmsg := fmt.Sprintf(\"received a count trigger for service: %v\\n\", s.Name)\n\tn.AddQueue(msg)\n}\n\n// REQUIRED - BASIC EVENT\nfunc (n *Example) OnFailure(s *services.Service, f *types.Failure) {\n\tmsg := fmt.Sprintf(\"received a failure trigger for service: %v\\n\", s.Name)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnNewService(s *services.Service) {\n\tmsg := fmt.Sprintf(\"received a new service trigger for service: %v\\n\", s.Name)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnUpdatedService(s *services.Service) {\n\tmsg := fmt.Sprintf(\"received a update service trigger for service: %v\\n\", s.Name)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnDeletedService(s *services.Service) {\n\tmsg := fmt.Sprintf(\"received a delete service trigger for service: %v\\n\", s.Name)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnNewUser(s *types.User) {\n\tmsg := fmt.Sprintf(\"received a new user trigger for user: %v\\n\", s.Username)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnUpdatedUser(s *types.User) {\n\tmsg := fmt.Sprintf(\"received a updated user trigger for user: %v\\n\", s.Username)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnDeletedUser(s *types.User) {\n\tmsg := fmt.Sprintf(\"received a deleted user trigger for user: %v\\n\", s.Username)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnUpdatedCore(s *types.Core) {\n\tmsg := fmt.Sprintf(\"received a updated core trigger for core: %v\\n\", s.Name)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnNewNotifier(s *Notification) {\n\tmsg := fmt.Sprintf(\"received a new notifier trigger for notifier: %v\\n\", s.Method)\n\tn.AddQueue(msg)\n}\n\n// OPTIONAL\nfunc (n *Example) OnUpdatedNotifier(s *Notification) {\n\tmsg := fmt.Sprintf(\"received a update notifier trigger for notifier: %v\\n\", s.Method)\n\tn.AddQueue(msg)\n}\n```\n\n\n<div class=\"mt-5\" id=\"page_15\"><h1>Prometheus Exporter</h1></div>\nStatping includes a prometheus exporter so you can have even more monitoring power with your services. The prometheus exporter can be seen on `/metrics`, simply create another exporter in your prometheus config. Use your Statping API Secret for the Authorization Bearer header, the `/metrics` URL is dedicated for Prometheus and requires the correct API Secret has `Authorization` header.\n\n# Grafana Dashboard\nStatping has a [Grafana Dashboard](https://grafana.com/dashboards/6950) that you can quickly implement if you've added your Statping service to Prometheus. Import Dashboard ID: `6950` into your Grafana dashboard and watch the metrics come in!\n\n<p align=\"center\"><img width=\"80%\" src=\"https://img.cjx.io/statupgrafana.png\"></p>\n\n## Basic Prometheus Exporter\nIf you have Statping and the Prometheus server in the same Docker network, you can use the yaml config below.\n```yaml\nscrape_configs:\n  - job_name: 'statping'\n    scrape_interval: 30s\n    bearer_token: 'SECRET API KEY HERE'\n    static_configs:\n      - targets: ['statping:8080']\n```\n\n## Remote URL Prometheus Exporter\nThis exporter yaml below has `scheme: https`, which you can remove if you arn't using HTTPS.\n```yaml\nscrape_configs:\n  - job_name: 'statping'\n    scheme: https\n    scrape_interval: 30s\n    bearer_token: 'SECRET API KEY HERE'\n    static_configs:\n      - targets: ['status.mydomain.com']\n```\n\n### `/metrics` Output\n```\nstatping_total_failures 206\nstatping_total_services 4\nstatping_service_failures{id=\"1\" name=\"Google\"} 0\nstatping_service_latency{id=\"1\" name=\"Google\"} 12\nstatping_service_online{id=\"1\" name=\"Google\"} 1\nstatping_service_status_code{id=\"1\" name=\"Google\"} 200\nstatping_service_response_length{id=\"1\" name=\"Google\"} 10777\nstatping_service_failures{id=\"2\" name=\"Statping.com\"} 0\nstatping_service_latency{id=\"2\" name=\"Statping.com\"} 3\nstatping_service_online{id=\"2\" name=\"Statping.com\"} 1\nstatping_service_status_code{id=\"2\" name=\"Statping.com\"} 200\nstatping_service_response_length{id=\"2\" name=\"Statping.com\"} 2\n```\n\n<div class=\"mt-5\" id=\"page_16\"><h1>SSL</h1></div>\nYou can run Statping with a valid certificate by including 2 files in the root directory. Although, I personally recommend using NGINX or Apache to serve the SSL and then have the webserver direct traffic to the Statping instance. This guide will show you how to implement SSL onto your Statping server with multiple options.\n\n## SSL Certificate with Statping\nTo run the Statping HTTP server in SSL mode, you must include 2 files in the root directory of your Statping application. The 2 files you must include are:\n- `server.crt` SSL Certificate File\n- `server.key` SSL Certificate Key File\n\nThe filenames and extensions must match the exact naming above. If these 2 files are found, Statping will automatically start the HTTP server in SSL mode using your certificates. You can also generate your own SSL certificates, but you will receive a \"ERR_CERT_AUTHORITY_INVALID\" error. To generate your own, follow the commands below:\n\n```shell\nopenssl req -new -sha256 -key server.key -out server.csr\nopenssl x509 -req -sha256 -in server.csr -signkey server.key -out server.crt -days 3650\n```\nThis will generate a self signed certificate that you can use for your Statup instance. I recommend using a web server to do SSL termination for your server though.\n\n## Choose a Web Server or Environment\n\n**Choose the environment running the Statping instance.**\n- [Docker](#docker)\n- [NGINX](#nginx)\n- [Apache](#apache)\n\n## Docker\nDocker might be the easiest way to get up and running with a SSL certificate. Below is a `docker-compose.yml` file that will run NGINX, LetEncrypt, and Statping.\n\n1. Point your domain or subdomain to the IP address of the Docker server. This would be done on CloudFlare, Route53, or some other DNS provider.\n\n2. Replace the `docker-compose.yml` contents:\n- `MY.DOMAIN.COM` with the domain you want to use\n- `MY@EMAIL.COM` with your email address\n\n3. Run the docker container by running command `docker-compose up -d`. Give a little bit of time for LetEncrypt to automatically generate your SSL certificate.\n\n###### `docker-compose.yml`\n```yaml\nversion: '2.3'\nservices:\n  nginx:\n    container_name: nginx\n    image: jwilder/nginx-proxy\n    ports:\n      - 0.0.0.0:80:80\n      - 0.0.0.0:443:443\n    labels:\n      - \"com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy\"\n    networks:\n      - internet\n    restart: always\n    volumes:\n      - /var/run/docker.sock:/tmp/docker.sock:ro\n      - ./statping/nginx/certs:/etc/nginx/certs:ro\n      - ./statping/nginx/vhost:/etc/nginx/vhost.d\n      - ./statping/nginx/html:/usr/share/nginx/html:ro\n      - ./statping/nginx/dhparam:/etc/nginx/dhparam\n    environment:\n      DEFAULT_HOST: MY.DOMAIN.COM\n\n  letsencrypt:\n    container_name: letsencrypt\n    image: jrcs/letsencrypt-nginx-proxy-companion\n    networks:\n      - internet\n    restart: always\n    volumes:\n      - /var/run/docker.sock:/var/run/docker.sock:ro\n      - ./statping/nginx/certs:/etc/nginx/certs\n      - ./statping/nginx/vhost:/etc/nginx/vhost.d\n      - ./statping/nginx/html:/usr/share/nginx/html\n      - ./statping/nginx/dhparam:/etc/nginx/dhparam\n\n  statping:\n    container_name: statping\n    image: hunterlong/statping:latest\n    restart: always\n    networks:\n      - internet\n    depends_on:\n      - nginx\n    volumes:\n      - ./statping/app:/app\n    environment:\n      VIRTUAL_HOST: MY.DOMAIN.COM\n      VIRTUAL_PORT: 8080\n      LETSENCRYPT_HOST: MY.DOMAIN.COM\n      LETSENCRYPT_EMAIL: MY@EMAIL.COM\n\nnetworks:\n  internet:\n    driver: bridge\n```\n\n## NGINX\nIf you already have a NGINX web server running, you just have to add a proxy pass and your SSL certs to the nginx config or as a vhost. By default Statping runs on port 8080, you can change this port by starting server with `statping -ip 127.0.0.1 -port 9595`.\n\n- Replace `/my/absolute/directory/for/cert/server.crt` with SSL certificate file.\n- Replace `/my/absolute/directory/for/key/server.key` with SSL key file.\n- Run `service nginx restart` and try out https on your domain.\n\n##### Tutorials\n- [NGINX Guide](https://docs.nginx.com/nginx/admin-guide/security-controls/terminating-ssl-http/)\n- [How To Set Up Nginx Load Balancing with SSL Termination](https://www.digitalocean.com/community/tutorials/how-to-set-up-nginx-load-balancing-with-ssl-termination)\n\n###### `/etc/nginx/nginx.conf`\n```\n#user  nobody;\nworker_processes  1;\nevents {\n    worker_connections  1024;\n}\nhttp {\n    include            mime.types;\n    default_type       application/octet-stream;\n    send_timeout       1800;\n    sendfile           on;\n    keepalive_timeout  6500;\n    server {\n        listen       80;\n        server_name  localhost;\n        location / {\n          proxy_pass          http://localhost:8080;\n          proxy_set_header    Host             $host;\n          proxy_set_header    X-Real-IP        $remote_addr;\n          proxy_set_header    X-Forwarded-For  $proxy_add_x_forwarded_for;\n          proxy_set_header    X-Client-Verify  SUCCESS;\n          proxy_set_header    X-Client-DN      $ssl_client_s_dn;\n          proxy_set_header    X-SSL-Subject    $ssl_client_s_dn;\n          proxy_set_header    X-SSL-Issuer     $ssl_client_i_dn;\n          proxy_read_timeout 1800;\n          proxy_connect_timeout 1800;\n        }\n    }\n    # HTTPS server\n    \n    server {\n        listen       443;\n        server_name  localhost;\n    \n        ssl                  on;\n        ssl_certificate      /my/absolute/directory/for/cert/server.crt;\n        ssl_certificate_key  /my/absolute/directory/for/key/server.key;\n        ssl_session_timeout  5m;\n    \n        ssl_protocols  SSLv2 SSLv3 TLSv1;\n        ssl_ciphers  ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;\n        ssl_prefer_server_ciphers   on;\n    \n        location / {\n          proxy_pass          http://localhost:8080;\n          proxy_set_header    Host             $host;\n          proxy_set_header    X-Real-IP        $remote_addr;\n          proxy_set_header    X-Forwarded-For  $proxy_add_x_forwarded_for;\n          proxy_set_header    X-Client-Verify  SUCCESS;\n          proxy_set_header    X-Client-DN      $ssl_client_s_dn;\n          proxy_set_header    X-SSL-Subject    $ssl_client_s_dn;\n          proxy_set_header    X-SSL-Issuer     $ssl_client_i_dn;\n          proxy_read_timeout 1800;\n          proxy_connect_timeout 1800;\n        }\n    }\n}\n```\n\n## Apache\n\n<div class=\"mt-5\" id=\"page_17\"><h1>Config with .env File</h1></div>\nIt may be useful to load your environment using a `.env` file in the root directory of your Statping server. The .env file will be automatically loaded on startup and will overwrite all values you have in config.yml.\n\nIf you have the `DB_CONN` environment variable set Statping will bypass all values in config.yml and will require you to have the other DB_* variables in place. You can pass in these environment variables without requiring a .env file.\n\n## `.env` File\n```bash\nDB_CONN=postgres\nDB_HOST=0.0.0.0\nDB_PORT=5432\nDB_USER=root\nDB_PASS=password123\nDB_DATABASE=root\n\nNAME=Demo\nDESCRIPTION=This is an awesome page\nDOMAIN=https://domain.com\nADMIN_USER=admin\nADMIN_PASSWORD=admin\nADMIN_EMAIL=info@admin.com\nUSE_CDN=true\nPOSTGRES_SSLMODE=false # enable ssl_mode for postgres (To enable use require)\nDISABLE_LOGS=false # disable logs from appearing and writing to disk\n\nIS_DOCKER=false\nIS_AWS=false\nSASS=/usr/local/bin/sass\nCMD_FILE=/bin/bash\n```\nThis .env file will include additional variables in the future, subscribe to this repo to keep up-to-date with changes and updates. \n\n<div class=\"mt-5\" id=\"page_18\"><h1>Static Export</h1></div>\nIf you want to use Statping as a CLI application without running a server, you can export your status page to a static HTML.\nThis export tool is very useful for people who want to export their HTML and upload/commit it to Github Pages or an FTP server.\n```dash\nstatup export\n```\n###### Creates `index.html` in the current directory with CDN asset URL's. 💃 \n\n<div class=\"mt-5\" id=\"page_19\"><h1>Statping Plugins</h1></div>\nSince Statping is built in Go Language we can use the [Go Plugin](https://golang.org/pkg/plugin/) feature to create dynamic plugins that run on load. Statping has an event anytime anything happens, you can create your own plugins and do any type of function. To implement your own ideas into Statping, use the plugin using the [statup/plugin](https://github.com/statping/statping/blob/master/plugin/main.go) package.\n```\ngo get github.com/statping/statping/plugin\n```\n\n## Example Plugin\nStart off with the [Example Statping Plugin](https://github.com/statping/statping_plugin) that includes all the interfaces and some custom options for you to expand on. You can include any type of function in your own plugin!\n\n<p align=\"center\">\n<img width=\"95%\" src=\"https://img.cjx.io/statuppluginrun.gif\">\n</p>\n\n## Building Plugins\nPlugins don't need a push request and they can be private! You'll need to compile your plugin to the Golang `.so` binary format. Once you've built your plugin, insert it into the `plugins` folder in your Statping directory and reboot the application. Clone the [Example Statping Plugin](https://github.com/statping/statping_plugin) repo and try to build it yourself!\n\n#### Build Requirements\n- You must have `main.go`\n- You must create the Plugin variable on `init()`\n\n```bash\ngit clone https://github.com/statping/statping_plugin\ncd statup-plugin\ngo build -buildmode=plugin -o example.so\n```\n###### Insert `example.so` into the `plugins` directory and reload Statping\n\n## Testing Statping Plugins\nStatping includes a couple tools to help you on your Plugin journey, you can use `statup test plugins` command to test all plugins in your `/plugins` folder. This test will attempt to parse your plugin details, and then it will send events for your plugin to be fired.\n```\nstatup test plugins\n```\n<p align=\"center\">\n<img width=\"85%\" src=\"https://img.cjx.io/statupplugintester.gif\">\n</p>\n\nYour plugin should be able to parse and receive events before distributing it. The test tools creates a temporary database (SQLite) that your plugin can interact with. Statping uses [upper.io/db.v3](https://upper.io/db.v3) for database interactions. The database is passed to your plugin `OnLoad(db sqlbuilder.Database)`, so you can use the `db` variable passed here.\n\n## Statping Plugin Interface\nPlease remember Golang plugin's are very new and Statping plugin package may change and 'could' brake your plugin. Checkout the [statup/plugin package](https://github.com/statping/statping/blob/master/plugin/main.go) to see the most current interfaces.\n```go\ntype PluginActions interface {\n\tGetInfo() Info\n\tGetForm() string\n\tSetInfo(map[string]interface{}) Info\n\tRoutes() []Routing\n\tOnSave(map[string]interface{})\n\tOnFailure(map[string]interface{})\n\tOnSuccess(map[string]interface{})\n\tOnSettingsSaved(map[string]interface{})\n\tOnNewUser(map[string]interface{})\n\tOnNewService(map[string]interface{})\n\tOnUpdatedService(map[string]interface{})\n\tOnDeletedService(map[string]interface{})\n\tOnInstall(map[string]interface{})\n\tOnUninstall(map[string]interface{})\n\tOnBeforeRequest(map[string]interface{})\n\tOnAfterRequest(map[string]interface{})\n\tOnShutdown()\n\tOnLoad(sqlbuilder.Database)\n}\n```\n\n## Event Parameters\nAll event interfaces for the Statping Plugin will return a `map[string]interface{}` type, this is because the plugin package will most likely update and change in the future, but using this type will allow your plugin to continue even after updates.\n\n## Example of an Event\nKnowing what happens during an event is important for your plugin. For example, lets have an event that echo something when a service has a Failure status being issued. Checkout some example below to see how this golang plugin action works. \n\n```go\nfunc (p pkg) OnSuccess(data map[string]interface{}) {\n    fmt.Println(\"Statping Example Plugin received a successful service hit! \")\n    fmt.Println(\"Name:    \", data[\"Name\"])\n    fmt.Println(\"Domain:  \", data[\"Domain\"])\n    fmt.Println(\"Method:  \", data[\"Method\"])\n    fmt.Println(\"Latency: \", data[\"Latency\"])\n}\n```\n###### OnSuccess is fired every time a service has check it be online\n\n```go\nfunc OnFailure(service map[string]interface{}) {\n    fmt.Println(\"oh no! an event is failing right now! do something!\")\n    fmt.Println(service)\n}\n```\n###### OnFailure is fired every time a service is failing\n\n```go\nfunc (p pkg) OnLoad(db sqlbuilder.Database) {\n    fmt.Println(\"=============================================================\")\n    fmt.Printf(\"  Statping Example Plugin Loaded using %v database\\n\", db.Name())\n    fmt.Println(\"=============================================================\")\n}\n```\n###### OnLoad is fired after plugin is loaded into the environment\n\n\n## Interacting with Database\nThe Example Statping Plugin includes a variable `Database` that will allow you to interact with the Statping database. Checkout [database.go](https://github.com/statping/statping_plugin/blob/master/database.go) to see a full example of Create, Read, Update and then Deleting a custom Communication entry into the database.\n```go\n// Insert a new communication into database\n// once inserted, return the Communication\nfunc (c *Communication) Create() *Communication {\n\tuuid, err := CommunicationTable().Insert(c)\n\tif err != nil {\n\t\tpanic(err)\n\t}\n\tc.Id = uuid.(int64)\n\treturn c\n}\n```\n\n## Custom HTTP Routes\nPlugin's can include their own HTTP route to accept GET/POST requests. Route are loaded after Statping loads all of it's Routes. Checkout [routes.go](https://github.com/statping/statping_plugin/blob/master/routes.go) on the example plugin to see a full example of how to use it.\n```go\n// You must have a Routes() method in your plugin\nfunc (p *pkg) Routes() []plugin.Routing {\n\treturn []plugin.Routing{{\n\t\tURL:     \"hello\",\n\t\tMethod:  \"GET\",\n\t\tHandler: CustomInfoHandler,\n\t}}\n}\n\n// This is the HTTP handler for the '/hello' URL created above\nfunc CustomInfoHandler(w http.ResponseWriter, r *http.Request) {\n\tw.WriteHeader(http.StatusOK)\n\tfmt.Fprintln(w, \"Oh Wow!!! This is cool...\")\n}\n```\n\n\n## Plugin To-Do List\n- [ ] Ability to includes assets like jpg, json, etc\n\n<div class=\"mt-5\" id=\"page_20\"><h1>Statuper</h1></div>\nStatping includes a simple to use installation shell script that will help you install locally, Docker, and even onto a AWS EC2 instance.\n\n<p align=\"center\">\n<img width=\"90%\" src=\"https://img.cjx.io/statuper1.png\">\n</p>\n\n## Installation\n```bash\ncurl -O https://assets.statup.io/statuper && chmod +x statuper\n```\n\n## Usage\n- `statuper`\n\n<div class=\"mt-5\" id=\"page_21\"><h1>Build and Test</h1></div>\nBuilding from the Go Language source code is pretty easy if you already have Go installed. Clone this repo and `cd` into it. \n\n### Git n' Go Get\n```bash\ngit clone https://github.com/statping/statping.git\ncd statup\ngo get -v\n```\n\n### Install go.rice\nStatping uses go.rice to compile HTML, JS, and CSS files into it's single binary output.\n```\ngo get github.com/GeertJohan/go.rice\ngo get github.com/GeertJohan/go.rice/rice\n```\n\n### Build Statping Binary\nStatping uses go.rice to compile HTML, JS, and CSS files into it's single binary output.\n```\nrice embed-go\ngo build -o statup .\n./statup version\n```\n\n### Test Coverage\nYou can also test Statio on your localhost, but it does require a MySQL, and Postgres server to be accessible since testing does create/drop tables for multiple databases. \n```\ngo test -v\n```\n\n<div class=\"mt-5\" id=\"page_22\"><h1>Contributing</h1></div>\nHave a feature you want to implement into Statping!? Awesome! Follow this guide to see how you can test, compile and build Statping for production use. I recommend you use `make` with this process, it will save you time and it will auto include many customized parameters to get everything working correctly.\n\n# Dependencies\nStatping has a couple of required dependencies when testing and compiling the binary. The [Makefile](https://github.com/statping/statping/blob/master/Makefile) will make these tasks a lot easier. Take a look at the Makefile to see what commands are ran. Run the command below to get setup right away.\n```bash\nmake dev-deps\n```\nList of requirements for compiling assets, building binary, and testing.\n- [Go Language](https://golang.org/) (currently `1.10.3`)\n- [Docker](https://docs.docker.com/)\n- [SASS](https://sass-lang.com/install)\n- [Cypress](https://www.cypress.io/) (only used for UI testing, `make cypress-install`)\n\n# Compiling Assets\nThis Golang project uses [rice](https://github.com/GeertJohan/go.rice) to compile static assets into a single file. The file `source/rice-box.go` is never committed to the Github repo, it is automatically created on build. Statping also requires `sass` to be installed on your local OS. To compile all the static assets run the command below:\n\n```bash\nmake compile\n```\nAfter this is complete, you'll notice the `source/rice-box.go` file has been generated. You can now continue to build, and test.\n\n# Testing\nStatping includes multiple ways to Test the application, you can run the `make` command, or the normal `go test` command. To see the full experience of your updates, you can even run Cypress tests which is in the `.dev/test` folder.\n\nStatping will run all tests in `cmd` folder on MySQL, Postgres, and SQLite databases. You can run `make databases` to automatically create MySQL and Postgres with Docker.\n\n###### Go Unit Testing:\n```bash\nmake test\n```\n\n###### Cypress UI Testing:\n```bash\nmake cypress-test\n```\n\n###### Test Everything:\n```bash\nmake test-all\n```\n\n# Build\nStatping will build on all operating systems except Windows 32-bit. I personally use [xgo](https://github.com/karalabe/xgo) to cross-compile on multiple systems using Docker. Follow the commands below to build on your local system.\n\n###### Build for local operating system:\n```bash\nmake build\n```\n\n# Compile for Production\nOnce you've tested and built locally, you can compile Statping for all available operating systems using the command below. This command will require you to have Docker.\n\n```bash\nmake build-all\n```\n\n# What Now\nEverything tested, compiled and worked out!? Awesome! 💃 You can now commit your changes, and submit a Pull Request with the features/bugs you added or removed.\n\n\n\n\n\n<div class=\"mt-5\" id=\"page_23\"><h1>PGP Signature</h1></div>\nYou can check if the Statping binary you downloaded is authentic by running a few commands.\n\n### Steps to Authenticate\n1. Download the Statping `tar.gz` file from [Latest Releases](https://github.com/statping/statping/releases/latest) and extract the `statping` binary and the `statup.asc` file.\n2. Run command: `gpg --verify statping.asc`\n3. You should see `Good signature from \"Hunter Long <info@statping.com>\" [ultimate]`.\n\n# Statping Public Key\n- [https://statping.com/statping.gpg](https://statping.com/statping.gpg)\n\nYou can also download the key with the command below:\n```\nwget https://statping.com/statping.gpg\n```\n\n###### `statping.gpg`\n```\n-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBFwGUYIBEADNsDY4aUOx8EoZuTRFPtjuadJzFRyKtHhw/tLlAnoFACanZPIT\nNZoRYvRR5v6lMDXdxsteDbJEOhZ1WDiKIr4OyMahPsyyH6ULzSBKgePUswa0sDef\nUnXYzPFQCzqQyQQFbp9AYfDP7dW6dTL9I6qU2NqlJvjxJiiZTAq87SmsLqHiASnI\n+ottnQuu6vJQBJz2PFIuaS1c3js/+HBbth9GK5B9YN1BIIyZoFmWKVU9HnJf+aM3\nUs6OLjjwYwWzQH38ZV84IjVXyiP9PQVhlCXeHK7XdhPZvnSP1m5Wszj/jowwY6Mz\nLgLotfL540X7yOJ7hJTFYLFBOtJdJr/3Ov8SH4HXdPFPVG+UqxsmtmPqUQ9iAxAE\njRFfkAxBvH5Szf2WZdaLnlrrOcOKJIIjZgHqalquBTAhlh5ul0lUVSSPxetwIBlW\n60L41k94NJFGDt8xOJ+122mLcywmQ1CzhDfeIKlxl6JDiVHjoRqlQQrqIoNZMV85\nrzGfrmbuwv1MXGBJoiNy3330ujOBmhQ9dQVwKpxhBKdjnAgIGM9szbUYxIkGgM1O\nU4b1WF3AF/9JOpKJ0LewslpM3BFFYnemGsHXAv3TBPqKidNdwMAiBOtNykGoXF6i\n0D6jOW/IB1da0gUA+kr5JdAOwIG7JXKhur2MO7Ncid59DL2N8RePRWj+jwARAQAB\ntB9IdW50ZXIgTG9uZyA8aW5mb0BzdGF0cGluZy5jb20+iQJOBBMBCAA4FiEEt21h\n+qbbdZRm6D2ZZLnGquLVUngFAlwGUYICGwMFCwkIBwIGFQoJCAsCBBYCAwECHgEC\nF4AACgkQZLnGquLVUnizwA//c7vmwTMq/8LYlbo37WM2kDE9AKIrz6VSMq4RhGbC\nLikH0X0epa+if79n9BZrVU/Af3aKTn7vu2J4XrvzcdCXtcsR0YmCWML2Y6OSFmhX\nw3o6woiFcp+SUWdcM/kithRun+j9sKV4akdgkdBQUdh/RMVln+radz1c6G59iTdh\nS+Ip3ObO7Gn5VnrLwxix+W9Jhg8YhDgDGEDt8e1yvjuMRY+WhjHFlwEMoE0kvQL8\nQvQH2dGD3dExWAuIL7+0xC0ZGU0PR8vRrq1ukdIsWlDY+42vvhcyPZKFFDTM/QLF\nFcCNiPSGhiK/NQq67xnRMFdh0fnqbydWj2atMpacIrheEkOt8db2/UMyDOwlIxgy\nKOG8x+yNKiG9LyvW4axRLctN608/+TbvtFo5TVOFJYxJQp4b5uz7LgJAJw7PBvfC\nbqx64BH8WGzgyGcAl9unQEtpDuxXoKvP2kbsS7hjvhK0gJgW9llpV4sRJJGApTBc\nWtbcS9DBGs3k1aZdA72bxnayD32syVz7czl4+tkRsbQZ4VgJh1yrHIDsdWQXFnYu\nEQJfCgX5HvvC13MpDUth0NWCFtWQirY3EFbIgSuhB/D5iXA+Dt1Dq5c1u7wQlUVi\nLQCU++oMGrlU3gZrnov5lnBGCEjn0O9bKQm8zmLdEcENFxUZvfPjOIY64YprZxD9\nBv65Ag0EXAZRggEQAMmjHmnvH8SvNJhku/oI96dFKen3bg9xdaFUD1vAuNglCalH\nwgXcCZd0RdobYNG46cXTzTQadtHS4hi/UBJ+oy5ZUpIRglW12eTYtqM2G11VbcQi\nj6rLITP9NIP+G1xBICSYK4UwmH55BolMEQ/1ZX0a9rESM9stDNglheCCudbMGR/1\nZYnufdEsh0yPwyC/1upZeu8LPWK62pt9mE/gccx77QTeDi5OJcRf1fPbUTCm3vSS\nwPPV2AGANodIhostjDymt5vh0tGwc7oUZZLnVdErfuctv7yMgZdiCpYu0jFy1NYf\nJgOpZasrcK7/1ozGzsfAo/sSU4kIkMwuWGgqfx5kGRK2CgU4T0i7oI6DMpOX9ZS8\ns3+oCWu83X0ofvm5R2CbjiUj2gR6JOhBQbJpCeTkLe+SFcUpnyrr7lG8B8QZHm5N\nnBi05V/s63RE3g/6WpR/fWuh+uswe01uqlSx9deW7jT49BL/MdSxwjfwLBLz/hLM\n0ld385XAd9bqMjUtp0XhZX2YORx3f/aKY7PYA62baGibb5RdPRw6viEAWU20eb+8\nX9Pa7hGmwUeal5lka4SD/TGl7wdY+g4oYP+jtKinH/ZftWA5wHTe3jWT5bdWrT2d\ne+0qA0SBkmKIDLpktvtTa19w2nfwBIwJ6fN36ZjYpOn/stxR7aRtnhSqvzxbABEB\nAAGJAjYEGAEIACAWIQS3bWH6ptt1lGboPZlkucaq4tVSeAUCXAZRggIbDAAKCRBk\nucaq4tVSeGWmD/9Pg1x6s98zdZCQa2apmUnuoQAQA9Gf2RBBuglCDGsY67wbvdHZ\n9wdFRs2QEhl2O3oFmidxthBOBRl9z62nXliLwNn1Lcy/yDfaB8wH6gMm4jn2N/z9\nvQXnyIzg8m4PItZ1p5mnY3qH5lpGF8r9Gb7tzK10rqulM2XTDojZOevlEGI6LGw8\nFjccXtNquqGZwxzytmKF3T7UBmpmt2qock8N5iJn987m6WeYmbFNc0ii0guHfdtO\nzQcItz2ngCdyvfgQPwCAoAv72ysSGhz5KZgAXRrEdcqj6Jw3ivoEUKq1aUrYncXQ\n3zC3ED6AjWOGRzjvTZzj22IVacUZ0gqx0x/oldXLOhMB9u6nFXHKj1n9nc0XHMNi\nLp9EuvQgcNLjFZGE9sxh25u9V+OhItfT/aarYEu/Xq0IkUUcdz4GehXth1/Cq1wH\nlSUie4nCs7I7OWhqMNClqP7ywElDXsQ66MCgvf01Dh64YUVjJNnyyK0QiYlCx/JQ\nZ85hNLtVXZfYqC5BRZlVFp8I8Rs2Qos9YEgn2M22+Rj+RIeD74LZFB7Q4myRvTMB\n/P466dFI83KYhwvjBYOP3jPTrV7Ky8poEGifQp2mM294CFIPS7z0z7a8+yMzcsRP\nOluFxewsEO0QNDrfFb+0gnjYlnGqOFcZjUMXbDdY5oLSPtXohynuTK1qyQ==\n=Xn0G\n-----END PGP PUBLIC KEY BLOCK-----\n```\n\n<div class=\"mt-5\" id=\"page_24\"><h1>Testing</h1></div>\nIf you want to test your updates with the current golang testing units, you can follow the guide below to run a full test process. Each test for Statping will run in MySQL, Postgres, and SQlite to make sure all database types work correctly.\n\n## Create Docker Databases\nThe easiest way to run the tests on all 3 databases is by starting temporary databases servers with Docker. Docker is available for Linux, Mac and Windows. You can download/install it by going to the [Docker Installation](https://docs.docker.com/install/) site.\n\n```go\ndocker run -it -d \\\n   -p 3306:3306 \\\n   -env MYSQL_ROOT_PASSWORD=password123 \\\n   -env MYSQL_DATABASE=root mysql\n```\n\n```go\ndocker run -it -d \\\n   -p 5432:5432 \\\n   -env POSTGRES_PASSWORD=password123 \\\n   -env POSTGRES_USER=root \\\n   -env POSTGRES_DB=root postgres\n```\n\nOnce you have MySQL and Postgres running, you can begin the testing. SQLite database will automatically create a `statup.db` file and will delete after testing.\n\n## Run Tests\nInsert the database environment variables to auto connect the the databases and run the normal test command: `go test -v`. You'll see a verbose output of each test. If all tests pass, make a push request! 💃\n```go\nDB_DATABASE=root \\\n   DB_USER=root \\\n   DB_PASS=password123 \\\n   DB_HOST=localhost \\\n   go test -v\n```\n\n<div class=\"mt-5\" id=\"page_25\"><h1>Deployment</h1></div>\nStatping is a pretty cool server for monitoring your services. The way we deploy might be a little cooler though. Statping is using the most bleeding edge technology to release updates and distribute binary files automatically.\n\n1. Source code commits get pushed to Github\n2. [Rice](https://github.com/GeertJohan/go.rice) will compile all the static assets into 1 file (rice-box.go in source)\n3. SASS will generate  a compiled version of the CSS. \n4. Statping Help page is generated by cloning the Wiki repo using `go generate`.\n5. Travis-CI tests the Golang application.\n6. Travis-CI tests the Statping API using [Postman](https://github.com/statping/statping/blob/master/source/tmpl/postman.json).\n7. If all tests are successful, Travis-CI will compile the binaries using [xgo](https://github.com/karalabe/xgo).\n8. Binaries are code signed using the official [PGP key](https://github.com/statping/statping/wiki/PGP-Signature) and compressed.\n9. [Docker](https://cloud.docker.com/repository/docker/hunterlong/statping/builds) receives a trigger to build for the `latest` tag.\n10. Travis-CI uploads the [latest release](https://github.com/statping/statping/releases) as a tagged version on Github.\n11. Travis-CI updates the [homebrew-statping](https://github.com/hunterlong/homebrew-statping) repo with the latest version.\n\nAnd that's it! Statping is ready to be shipped and installed.\n\n")
diff --git a/types/checkins/checkins_test.go b/types/checkins/checkins_test.go
index a850c9bd..8ca98e6e 100644
--- a/types/checkins/checkins_test.go
+++ b/types/checkins/checkins_test.go
@@ -13,8 +13,7 @@ import (
 var testCheckin = &Checkin{
 	ServiceId:   1,
 	Name:        "Test Checkin",
-	Interval:    60,
-	GracePeriod: 10,
+	Interval:    3,
 	ApiKey:      "tHiSiSaTeStXXX",
 	CreatedAt:   utils.Now(),
 	UpdatedAt:   utils.Now(),
@@ -34,15 +33,18 @@ var testCheckinHits = []*CheckinHit{{
 var testApiKey string
 
 func TestInit(t *testing.T) {
+	t.Parallel()
 	err := utils.InitLogs()
 	require.Nil(t, err)
 	db, err := database.OpenTester()
 	require.Nil(t, err)
 	SetDB(db)
+	failures.SetDB(db)
 	db.AutoMigrate(&Checkin{}, &CheckinHit{}, &failures.Failure{})
 	db.Create(&testCheckin)
 	for _, v := range testCheckinHits {
-		db.Create(&v)
+		err := db.Create(&v).Error()
+		require.Nil(t, err)
 	}
 	assert.True(t, db.HasTable(&Checkin{}))
 	assert.True(t, db.HasTable(&CheckinHit{}))
@@ -112,6 +114,11 @@ func TestInit(t *testing.T) {
 		assert.Len(t, all, 1)
 	})
 
+	t.Run("Test Samples", func(t *testing.T) {
+		require.Nil(t, Samples())
+		assert.Len(t, All(), 3)
+	})
+
 	t.Run("Test Checkin", func(t *testing.T) {
 		assert.Nil(t, db.Close())
 		assert.Nil(t, dbHits.Close())
diff --git a/types/checkins/database.go b/types/checkins/database.go
index 0fefd0bf..48554e01 100644
--- a/types/checkins/database.go
+++ b/types/checkins/database.go
@@ -15,6 +15,11 @@ func SetDB(database database.Database) {
 }
 
 func (c *Checkin) AfterFind() {
+	c.AllHits = c.Hits()
+	c.AllFailures = c.Failures().LastAmount(32)
+	if last := c.LastHit(); last != nil {
+		c.LastHitTime = last.CreatedAt
+	}
 	metrics.Query("checkin", "find")
 }
 
@@ -41,9 +46,6 @@ func (c *Checkin) Create() error {
 		c.ApiKey = utils.RandomString(32)
 	}
 	q := db.Create(c)
-
-	c.Start()
-	go c.checkinRoutine()
 	return q.Error()
 }
 
diff --git a/types/checkins/database_hits.go b/types/checkins/database_hits.go
index dbbb5713..b97c926d 100644
--- a/types/checkins/database_hits.go
+++ b/types/checkins/database_hits.go
@@ -2,13 +2,13 @@ package checkins
 
 func (c *Checkin) LastHit() *CheckinHit {
 	var hit CheckinHit
-	dbHits.Where("checkin = ?", c.Id).Limit(1).Find(&hit)
+	dbHits.Where("checkin = ?", c.Id).Last(&hit)
 	return &hit
 }
 
 func (c *Checkin) Hits() []*CheckinHit {
 	var hits []*CheckinHit
-	dbHits.Where("checkin = ?", c.Id).Find(&hits)
+	dbHits.Where("checkin = ?", c.Id).Order("id DESC").Find(&hits)
 	c.AllHits = hits
 	return hits
 }
diff --git a/types/checkins/failures.go b/types/checkins/failures.go
index c2745abe..78d23970 100644
--- a/types/checkins/failures.go
+++ b/types/checkins/failures.go
@@ -7,6 +7,7 @@ import (
 
 func (c *Checkin) CreateFailure(f *failures.Failure) error {
 	f.Checkin = c.Id
+	c.Failing = true
 	return failures.DB().Create(f).Error()
 }
 
diff --git a/types/checkins/generate.go b/types/checkins/generate.go
deleted file mode 100644
index 5e3ffbb0..00000000
--- a/types/checkins/generate.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package checkins
-
-//go:generate counterfeiter . Checkin
diff --git a/types/checkins/methods.go b/types/checkins/methods.go
index fde9867f..8e1054a7 100644
--- a/types/checkins/methods.go
+++ b/types/checkins/methods.go
@@ -10,22 +10,11 @@ func (c *Checkin) Expected() time.Duration {
 	last := c.LastHit()
 	now := utils.Now()
 	lastDir := now.Sub(last.CreatedAt)
-	sub := time.Duration(c.Period() - lastDir)
-	return sub
+	return c.Period() - lastDir
 }
 
 func (c *Checkin) Period() time.Duration {
-	duration, _ := time.ParseDuration(fmt.Sprintf("%ds", c.Interval))
-	if duration.Seconds() <= 15 {
-		return 15 * time.Second
-	}
-	return duration
-}
-
-// Grace will return the duration of the Checkin Grace Period (after service hasn't responded, wait a bit for a response)
-func (c *Checkin) Grace() time.Duration {
-	duration, _ := time.ParseDuration(fmt.Sprintf("%vs", c.GracePeriod))
-	return duration
+	return time.Duration(c.Interval) * time.Minute
 }
 
 // Start will create a channel for the checkin checking go routine
@@ -54,12 +43,3 @@ func (c *Checkin) IsRunning() bool {
 		return true
 	}
 }
-
-// String will return a Checkin API string
-func (c *Checkin) String() string {
-	return c.ApiKey
-}
-
-func (c *Checkin) Link() string {
-	return fmt.Sprintf("%v/checkin/%v", "DOMAINHERE", c.ApiKey)
-}
diff --git a/types/checkins/routine.go b/types/checkins/routine.go
index e9f960df..89bd7c62 100644
--- a/types/checkins/routine.go
+++ b/types/checkins/routine.go
@@ -9,27 +9,10 @@ import (
 
 var log = utils.Log.WithField("type", "checkin")
 
-// RecheckCheckinFailure will check if a Service Checkin has been reported yet
-func (c *Checkin) RecheckCheckinFailure(guard chan struct{}) {
-	between := utils.Now().Sub(utils.Now()).Seconds()
-	if between > float64(c.Interval) {
-		fmt.Println("rechecking every 15 seconds!")
-		time.Sleep(15 * time.Second)
-		guard <- struct{}{}
-		c.RecheckCheckinFailure(guard)
-	} else {
-		fmt.Println("i recovered!!")
-	}
-	<-guard
-}
-
 // checkinRoutine for checking if the last Checkin was within its interval
 func (c *Checkin) checkinRoutine() {
-	lastHit := c.LastHit()
-	if lastHit == nil {
-		return
-	}
 	reCheck := c.Period()
+
 CheckinLoop:
 	for {
 		select {
@@ -38,20 +21,25 @@ CheckinLoop:
 			c.Failing = false
 			break CheckinLoop
 		case <-time.After(reCheck):
-			log.Infoln(fmt.Sprintf("Checkin '%s' expects a request every %v", c.Name, utils.FormatDuration(c.Period())))
-			if c.Expected() <= 0 {
-				issue := fmt.Sprintf("Checkin '%s' is failing, no request since %v", c.Name, lastHit.CreatedAt)
-				//log.Errorln(issue)
+			lastHit := c.LastHit()
+			ago := utils.Now().Sub(lastHit.CreatedAt)
+
+			log.Infoln(fmt.Sprintf("Checkin '%s' expects a request every %s last request was %s ago", c.Name, c.Period(), utils.DurationReadable(ago)))
+
+			if ago.Seconds() > c.Period().Seconds() {
+				issue := fmt.Sprintf("Checkin expects a request every %d minutes", c.Interval)
+				log.Warnln(issue)
 
 				fail := &failures.Failure{
 					Issue:    issue,
 					Method:   "checkin",
 					Service:  c.ServiceId,
-					Checkin:  c.Id,
-					PingTime: c.Expected().Milliseconds(),
+					PingTime: ago.Milliseconds(),
 				}
 
-				c.CreateFailure(fail)
+				if err := c.CreateFailure(fail); err != nil {
+					log.Errorln(err)
+				}
 			}
 			reCheck = c.Period()
 		}
diff --git a/types/checkins/samples.go b/types/checkins/samples.go
index f7b48f37..a239804e 100644
--- a/types/checkins/samples.go
+++ b/types/checkins/samples.go
@@ -8,22 +8,20 @@ import (
 func Samples() error {
 	log.Infoln("Inserting Sample Checkins...")
 	checkin1 := &Checkin{
-		Name:        "Demo Checkin 1",
-		ServiceId:   1,
-		Interval:    300,
-		GracePeriod: 300,
-		ApiKey:      "demoCheckin123",
+		Name:      "Demo Checkin 1",
+		ServiceId: 1,
+		Interval:  3,
+		ApiKey:    "demoCheckin123",
 	}
 	if err := checkin1.Create(); err != nil {
 		return err
 	}
 
 	checkin2 := &Checkin{
-		Name:        "Example Checkin 2",
-		ServiceId:   2,
-		Interval:    900,
-		GracePeriod: 300,
-		ApiKey:      utils.RandomString(7),
+		Name:      "Example Checkin 2",
+		ServiceId: 2,
+		Interval:  1,
+		ApiKey:    utils.RandomString(7),
 	}
 	if err := checkin2.Create(); err != nil {
 		return err
diff --git a/types/checkins/struct.go b/types/checkins/struct.go
index 82f725c6..44292598 100644
--- a/types/checkins/struct.go
+++ b/types/checkins/struct.go
@@ -11,7 +11,6 @@ type Checkin struct {
 	ServiceId   int64               `gorm:"index;column:service" json:"service_id"`
 	Name        string              `gorm:"column:name" json:"name"`
 	Interval    int64               `gorm:"column:check_interval" json:"interval"`
-	GracePeriod int64               `gorm:"column:grace_period"  json:"grace"`
 	ApiKey      string              `gorm:"column:api_key"  json:"api_key"`
 	CreatedAt   time.Time           `gorm:"column:created_at" json:"created_at"`
 	UpdatedAt   time.Time           `gorm:"column:updated_at" json:"updated_at"`
diff --git a/types/configs/config_test.go b/types/configs/config_test.go
index 946b052e..ff5da88f 100644
--- a/types/configs/config_test.go
+++ b/types/configs/config_test.go
@@ -2,6 +2,7 @@ package configs
 
 import (
 	"github.com/statping/statping/utils"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"testing"
 )
@@ -51,3 +52,9 @@ func TestPostgresConfig(t *testing.T) {
 	err := Connect(postgres, false)
 	require.Nil(t, err)
 }
+
+func TestFileSQLFile(t *testing.T) {
+	file, err := findSQLin(utils.Directory)
+	require.Nil(t, err)
+	assert.Equal(t, "statping.db", file)
+}
diff --git a/types/configs/configs_form.go b/types/configs/configs_form.go
index a2c9da12..0f78e980 100644
--- a/types/configs/configs_form.go
+++ b/types/configs/configs_form.go
@@ -48,21 +48,21 @@ func LoadConfigForm(r *http.Request) (*DbConfig, error) {
 	p.Set("ADMIN_EMAIL", email)
 
 	confg := &DbConfig{
-		DbConn:      dbConn,
-		DbHost:      dbHost,
-		DbUser:      dbUser,
-		DbPass:      dbPass,
-		DbData:      dbDatabase,
-		DbPort:      int(dbPort),
-		Project:     project,
-		Description: description,
-		Domain:      domain,
-		Username:    username,
-		Password:    password,
-		Email:       email,
-		Location:    utils.Directory,
-		Language:    language,
-		SendReports: reports,
+		DbConn:       dbConn,
+		DbHost:       dbHost,
+		DbUser:       dbUser,
+		DbPass:       dbPass,
+		DbData:       dbDatabase,
+		DbPort:       int(dbPort),
+		Project:      project,
+		Description:  description,
+		Domain:       domain,
+		Username:     username,
+		Password:     password,
+		Email:        email,
+		Location:     utils.Directory,
+		Language:     language,
+		AllowReports: reports,
 	}
 
 	return confg, nil
diff --git a/types/configs/connection.go b/types/configs/connection.go
index 9f795864..1067b068 100644
--- a/types/configs/connection.go
+++ b/types/configs/connection.go
@@ -20,6 +20,20 @@ import (
 	"time"
 )
 
+// initModels sets the database for each Statping type packages
+func initModels(db database.Database) {
+	core.SetDB(db)
+	services.SetDB(db)
+	hits.SetDB(db)
+	failures.SetDB(db)
+	checkins.SetDB(db)
+	notifications.SetDB(db)
+	incidents.SetDB(db)
+	users.SetDB(db)
+	messages.SetDB(db)
+	groups.SetDB(db)
+}
+
 // Connect will attempt to connect to the sqlite, postgres, or mysql database
 func Connect(configs *DbConfig, retry bool) error {
 	conn := configs.ConnectionString()
@@ -54,6 +68,10 @@ func Connect(configs *DbConfig, retry bool) error {
 		log.Infoln(fmt.Sprintf("Database %s connection was successful.", configs.DbConn))
 	}
 
+	if utils.Params.GetBool("READ_ONLY") {
+		log.Warnln("Running in READ ONLY MODE")
+	}
+
 	configs.Db = dbSession
 
 	initModels(configs.Db)
@@ -61,20 +79,9 @@ func Connect(configs *DbConfig, retry bool) error {
 	return err
 }
 
-func initModels(db database.Database) {
-	core.SetDB(db)
-	services.SetDB(db)
-	hits.SetDB(db)
-	failures.SetDB(db)
-	checkins.SetDB(db)
-	notifications.SetDB(db)
-	incidents.SetDB(db)
-	users.SetDB(db)
-	messages.SetDB(db)
-	groups.SetDB(db)
-}
-
-func CreateAdminUser(c *DbConfig) error {
+// CreateAdminUser will create the default admin user "admin", "admin", or use the
+// environment variables ADMIN_USER, ADMIN_PASSWORD, and ADMIN_EMAIL if set.
+func CreateAdminUser() error {
 	adminUser := utils.Params.GetString("ADMIN_USER")
 	adminPass := utils.Params.GetString("ADMIN_PASSWORD")
 	adminEmail := utils.Params.GetString("ADMIN_EMAIL")
diff --git a/types/configs/file.go b/types/configs/file.go
index f336e62f..87ff21e6 100644
--- a/types/configs/file.go
+++ b/types/configs/file.go
@@ -8,8 +8,9 @@ import (
 	"strings"
 )
 
-var log = utils.Log
+var log = utils.Log.WithField("type", "configs")
 
+// ConnectConfigs will connect to the database and save the config.yml file
 func ConnectConfigs(configs *DbConfig, retry bool) error {
 	err := Connect(configs, retry)
 	if err != nil {
@@ -21,18 +22,8 @@ func ConnectConfigs(configs *DbConfig, retry bool) error {
 	return nil
 }
 
-func LoadConfigs(cfgFile string) (*DbConfig, error) {
-	writeAble, err := utils.DirWritable(utils.Directory)
-	if err != nil {
-		return nil, err
-	}
-	if !writeAble {
-		return nil, errors.Errorf("Directory %s is not writable!", utils.Directory)
-	}
-
-	return LoadConfigFile(cfgFile)
-}
-
+// findDbFile will attempt to find the "statping.db" database file in the current
+// working directory, or from STATPING_DIR env.
 func findDbFile(configs *DbConfig) (string, error) {
 	location := utils.Directory + "/" + SqliteFilename
 	if configs == nil {
@@ -49,6 +40,7 @@ func findDbFile(configs *DbConfig) (string, error) {
 	return location, nil
 }
 
+// findSQLin walks the current walking directory for statping.db
 func findSQLin(path string) (string, error) {
 	filename := SqliteFilename
 	var found []string
diff --git a/types/configs/load.go b/types/configs/load.go
index 572927e5..bc8db59f 100644
--- a/types/configs/load.go
+++ b/types/configs/load.go
@@ -1,21 +1,59 @@
 package configs
 
 import (
-	"github.com/statping/statping/types/errors"
+	"errors"
 	"github.com/statping/statping/utils"
 	"gopkg.in/yaml.v2"
 	"os"
 )
 
-func LoadConfigFile(configFile string) (*DbConfig, error) {
+func Save() error {
 	p := utils.Params
-	log.Infof("Attempting to read config file at: %s", configFile)
-	p.SetConfigFile(configFile)
+	configs := &DbConfig{
+		DbConn:             p.GetString("DB_CONN"),
+		DbHost:             p.GetString("DB_HOST"),
+		DbUser:             p.GetString("DB_USER"),
+		DbPass:             p.GetString("DB_PASS"),
+		DbData:             p.GetString("DB_DATABASE"),
+		DbPort:             p.GetInt("DB_PORT"),
+		Project:            p.GetString("NAME"),
+		Description:        p.GetString("DESCRIPTION"),
+		Domain:             p.GetString("DOMAIN"),
+		Email:              p.GetString("EMAIL"),
+		Username:           p.GetString("ADMIN_USER"),
+		Password:           p.GetString("ADMIN_PASSWORD"),
+		Location:           utils.Directory,
+		SqlFile:            p.GetString("SQL_FILE"),
+		Language:           p.GetString("LANGUAGE"),
+		AllowReports:       p.GetBool("ALLOW_REPORTS"),
+		LetsEncryptEnable:  p.GetBool("LETSENCRYPT_ENABLE"),
+		LetsEncryptHost:    p.GetString("LETSENCRYPT_HOST"),
+		LetsEncryptEmail:   p.GetString("LETSENCRYPT_EMAIL"),
+		ApiSecret:          p.GetString("API_SECRET"),
+		SampleData:         p.GetBool("SAMPLE_DATA"),
+		MaxOpenConnections: p.GetInt("MAX_OPEN_CONN"),
+		MaxIdleConnections: p.GetInt("MAX_IDLE_CONN"),
+		MaxLifeConnections: int(p.GetDuration("MAX_LIFE_CONN").Seconds()),
+	}
+	return configs.Save(utils.Directory)
+}
+
+func LoadConfigs(cfgFile string) (*DbConfig, error) {
+	writeAble, err := utils.DirWritable(utils.Directory)
+	if err != nil {
+		return nil, err
+	}
+	if !writeAble {
+		return nil, errors.New("Directory %s is not writable: " + utils.Directory)
+	}
+	p := utils.Params
+	log.Infof("Attempting to read config file at: %s", cfgFile)
+	p.SetConfigFile(cfgFile)
 	p.SetConfigType("yaml")
 	p.ReadInConfig()
 
 	db := new(DbConfig)
-	content, err := utils.OpenFile(configFile)
+	content, err := utils.OpenFile(cfgFile)
 	if err == nil {
 		if err := yaml.Unmarshal([]byte(content), &db); err != nil {
 			return nil, err
@@ -46,35 +84,49 @@ func LoadConfigFile(configFile string) (*DbConfig, error) {
 	if db.Location != "" {
 		p.Set("LOCATION", db.Location)
 	}
-	if db.ApiSecret != "" {
+	if db.ApiSecret != "" && p.GetString("API_SECRET") == "" {
 		p.Set("API_SECRET", db.ApiSecret)
 	}
 	if db.Language != "" {
-		p.Set("LANGUAGE", "en")
+		p.Set("LANGUAGE", db.Language)
 	}
-	if db.SendReports {
+	if db.AllowReports {
 		p.Set("ALLOW_REPORTS", true)
 	}
+	if db.LetsEncryptEmail != "" {
+		p.Set("LETSENCRYPT_EMAIL", db.LetsEncryptEmail)
+	}
+	if db.LetsEncryptHost != "" {
+		p.Set("LETSENCRYPT_HOST", db.LetsEncryptHost)
+	}
+	if db.LetsEncryptEnable {
+		p.Set("LETSENCRYPT_ENABLE", db.LetsEncryptEnable)
+	}
 
 	configs := &DbConfig{
-		DbConn:      p.GetString("DB_CONN"),
-		DbHost:      p.GetString("DB_HOST"),
-		DbUser:      p.GetString("DB_USER"),
-		DbPass:      p.GetString("DB_PASS"),
-		DbData:      p.GetString("DB_DATABASE"),
-		DbPort:      p.GetInt("DB_PORT"),
-		Project:     p.GetString("NAME"),
-		Description: p.GetString("DESCRIPTION"),
-		Domain:      p.GetString("DOMAIN"),
-		Email:       p.GetString("EMAIL"),
-		Username:    p.GetString("ADMIN_USER"),
-		Password:    p.GetString("ADMIN_PASSWORD"),
-		Location:    utils.Directory,
-		SqlFile:     p.GetString("SQL_FILE"),
-		Language:    p.GetString("LANGUAGE"),
-		SendReports: p.GetBool("ALLOW_REPORTS"),
+		DbConn:            p.GetString("DB_CONN"),
+		DbHost:            p.GetString("DB_HOST"),
+		DbUser:            p.GetString("DB_USER"),
+		DbPass:            p.GetString("DB_PASS"),
+		DbData:            p.GetString("DB_DATABASE"),
+		DbPort:            p.GetInt("DB_PORT"),
+		Project:           p.GetString("NAME"),
+		Description:       p.GetString("DESCRIPTION"),
+		Domain:            p.GetString("DOMAIN"),
+		Email:             p.GetString("EMAIL"),
+		Username:          p.GetString("ADMIN_USER"),
+		Password:          p.GetString("ADMIN_PASSWORD"),
+		Location:          utils.Directory,
+		SqlFile:           p.GetString("SQL_FILE"),
+		Language:          p.GetString("LANGUAGE"),
+		AllowReports:      p.GetBool("ALLOW_REPORTS"),
+		LetsEncryptEnable: p.GetBool("LETSENCRYPT_ENABLE"),
+		LetsEncryptHost:   p.GetString("LETSENCRYPT_HOST"),
+		LetsEncryptEmail:  p.GetString("LETSENCRYPT_EMAIL"),
+		ApiSecret:         p.GetString("API_SECRET"),
+		SampleData:        p.GetBool("SAMPLE_DATA"),
 	}
-	log.WithFields(utils.ToFields(configs)).Debugln("read config file: " + configFile)
+	log.WithFields(utils.ToFields(configs)).Debugln("read config file: " + cfgFile)
 
 	if configs.DbConn == "" {
 		return configs, errors.New("Starting in setup mode")
diff --git a/types/configs/methods.go b/types/configs/methods.go
index bbb08705..b0e549f3 100644
--- a/types/configs/methods.go
+++ b/types/configs/methods.go
@@ -18,6 +18,37 @@ func (d *DbConfig) Save(directory string) error {
 	return nil
 }
 
+// Merge will merge the database connection info into the input
+func (d *DbConfig) Merge(newCfg *DbConfig) *DbConfig {
+	d.DbConn = newCfg.DbConn
+	d.DbHost = newCfg.DbHost
+	d.DbPort = newCfg.DbPort
+	d.DbData = newCfg.DbData
+	d.DbUser = newCfg.DbUser
+	d.DbPass = newCfg.DbPass
+	return d
+}
+
+// Clean hides all sensitive database information for API requests
+func (d *DbConfig) Clean() *DbConfig {
+	d.DbConn = ""
+	d.DbHost = ""
+	d.DbPort = 0
+	d.DbData = ""
+	d.DbUser = ""
+	d.DbPass = ""
+	return d
+}
+
+func (d *DbConfig) ToYAML() []byte {
+	c, err := yaml.Marshal(d)
+	if err != nil {
+		log.Errorln(err)
+		return nil
+	}
+	return c
+}
+
 func (d *DbConfig) ConnectionString() string {
 	var conn string
 	postgresSSL := utils.Params.GetString("POSTGRES_SSLMODE")
diff --git a/types/configs/migration.go b/types/configs/migration.go
index 48c87660..1a3704f4 100644
--- a/types/configs/migration.go
+++ b/types/configs/migration.go
@@ -5,6 +5,7 @@ import (
 	_ "github.com/jinzhu/gorm/dialects/mysql"
 	_ "github.com/jinzhu/gorm/dialects/postgres"
 	_ "github.com/mattn/go-sqlite3"
+	"github.com/pkg/errors"
 	"github.com/statping/statping/source"
 	"github.com/statping/statping/types/notifications"
 	"github.com/statping/statping/utils"
@@ -20,6 +21,39 @@ import (
 	"github.com/statping/statping/types/users"
 )
 
+func (d *DbConfig) ResetCore() error {
+	if d.Db.HasTable("core") {
+		return nil
+	}
+	var srvs int64
+	if d.Db.HasTable(&services.Service{}) {
+		d.Db.Model(&services.Service{}).Count(&srvs)
+		if srvs > 0 {
+			return errors.New("there are already services setup.")
+		}
+	}
+	if err := d.DropDatabase(); err != nil {
+		return errors.Wrap(err, "error dropping database")
+	}
+	if err := d.CreateDatabase(); err != nil {
+		return errors.Wrap(err, "error creating database")
+	}
+	if err := CreateAdminUser(); err != nil {
+		return errors.Wrap(err, "error creating default admin user")
+	}
+	if utils.Params.GetBool("SAMPLE_DATA") {
+		log.Infoln("Adding Sample Data")
+		if err := TriggerSamples(); err != nil {
+			return errors.Wrap(err, "error adding sample data")
+		}
+	} else {
+		if err := core.Samples(); err != nil {
+			return errors.Wrap(err, "error added core details")
+		}
+	}
+	return nil
+}
+
 func (d *DbConfig) DatabaseChanges() error {
 	var cr core.Core
 	d.Db.Model(&core.Core{}).Find(&cr)
@@ -87,7 +121,7 @@ func (d *DbConfig) MigrateDatabase() error {
 		}
 	}
 
-	log.Infof("Migrating App to version: %s", core.App.Version)
+	log.Infof("Migrating App to version: %s (%s)", utils.Params.GetString("VERSION"), utils.Params.GetString("COMMIT"))
 	if err := tx.Table("core").AutoMigrate(&core.Core{}); err.Error() != nil {
 		tx.Rollback()
 		log.Errorln(fmt.Sprintf("Statping Database could not be migrated: %v", tx.Error()))
@@ -98,7 +132,7 @@ func (d *DbConfig) MigrateDatabase() error {
 		return err
 	}
 
-	d.Db.Table("core").Model(&core.Core{}).Update("version", core.App.Version)
+	d.Db.Table("core").Model(&core.Core{}).Update("version", utils.Params.GetString("VERSION"))
 
 	log.Infoln("Statping Database Tables Migrated")
 
diff --git a/types/configs/struct.go b/types/configs/struct.go
index 998b17f5..2917b5e7 100644
--- a/types/configs/struct.go
+++ b/types/configs/struct.go
@@ -6,26 +6,48 @@ const SqliteFilename = "statping.db"
 
 // DbConfig struct is used for the Db connection and creates the 'config.yml' file
 type DbConfig struct {
-	DbConn      string `yaml:"connection" json:"connection"`
-	DbHost      string `yaml:"host" json:"-"`
-	DbUser      string `yaml:"user" json:"-"`
-	DbPass      string `yaml:"password" json:"-"`
-	DbData      string `yaml:"database" json:"-"`
-	DbPort      int    `yaml:"port" json:"-"`
-	ApiSecret   string `yaml:"api_secret" json:"-"`
-	Language    string `yaml:"language" json:"language"`
-	SendReports bool   `yaml:"send_reports" json:"send_reports"`
-	Project     string `yaml:"-" json:"-"`
-	Description string `yaml:"-" json:"-"`
-	Domain      string `yaml:"-" json:"-"`
-	Username    string `yaml:"-" json:"-"`
-	Password    string `yaml:"-" json:"-"`
-	Email       string `yaml:"-" json:"-"`
-	Error       error  `yaml:"-" json:"-"`
-	Location    string `yaml:"location" json:"-"`
-	SqlFile     string `yaml:"sqlfile,omitempty" json:"-"`
-	LocalIP     string `yaml:"-" json:"-"`
-	filename    string `yaml:"-" json:"-"`
+	DbConn            string `yaml:"connection,omitempty" json:"connection"`
+	DbHost            string `yaml:"host,omitempty" json:"-"`
+	DbUser            string `yaml:"user,omitempty" json:"-"`
+	DbPass            string `yaml:"password,omitempty" json:"-"`
+	DbData            string `yaml:"database,omitempty" json:"-"`
+	DbPort            int    `yaml:"port,omitempty" json:"-"`
+	ApiSecret         string `yaml:"api_secret,omitempty" json:"-"`
+	Language          string `yaml:"language,omitempty" json:"language"`
+	AllowReports      bool   `yaml:"allow_reports,omitempty" json:"allow_reports"`
+	Project           string `yaml:"-" json:"-"`
+	Description       string `yaml:"-" json:"-"`
+	Domain            string `yaml:"-" json:"-"`
+	Username          string `yaml:"-" json:"-"`
+	Password          string `yaml:"-" json:"-"`
+	Email             string `yaml:"-" json:"-"`
+	Error             error  `yaml:"-" json:"-"`
+	Location          string `yaml:"location,omitempty" json:"-"`
+	SqlFile           string `yaml:"sqlfile,omitempty" json:"-"`
+	LetsEncryptHost   string `yaml:"letsencrypt_host,omitempty" json:"letsencrypt_host"`
+	LetsEncryptEmail  string `yaml:"letsencrypt_email,omitempty" json:"letsencrypt_email"`
+	LetsEncryptEnable bool   `yaml:"letsencrypt_enable,omitempty" json:"letsencrypt_enable"`
+	LocalIP           string `yaml:"-" json:"-"`
+
+	DisableHTTP bool   `yaml:"disable_http" json:"disable_http"`
+	DemoMode    bool   `yaml:"demo_mode" json:"demo_mode"`
+	DisableLogs bool   `yaml:"disable_logs" json:"disable_logs"`
+	UseAssets   bool   `yaml:"use_assets" json:"use_assets"`
+	BasePath    string `yaml:"base_path,omitempty" json:"base_path"`
+
+	AdminUser     string `yaml:"admin_user,omitempty" json:"admin_user"`
+	AdminPassword string `yaml:"admin_password,omitempty" json:"admin_password"`
+	AdminEmail    string `yaml:"admin_email,omitempty" json:"admin_email"`
+
+	MaxOpenConnections int `yaml:"db_open_connections,omitempty" json:"db_open_connections"`
+	MaxIdleConnections int `yaml:"db_idle_connections,omitempty" json:"db_idle_connections"`
+	MaxLifeConnections int `yaml:"db_max_life_connections,omitempty" json:"db_max_life_connections"`
+
+	SampleData    bool `yaml:"sample_data" json:"sample_data"`
+	UseCDN        bool `yaml:"use_cdn" json:"use_cdn"`
+	DisableColors bool `yaml:"disable_colors" json:"disable_colors"`
+
+	PostgresSSLMode string `yaml:"postgres_ssl,omitempty" json:"postgres_ssl"`
 
 	Db database.Database `yaml:"-" json:"-"`
 }
diff --git a/types/core/database.go b/types/core/database.go
index f1ae12dc..b5fec30f 100644
--- a/types/core/database.go
+++ b/types/core/database.go
@@ -12,6 +12,18 @@ var db database.Database
 
 func SetDB(database database.Database) {
 	db = database.Model(&Core{})
+	c, err := Select()
+	if err != nil {
+		utils.Log.Errorln(err)
+		return
+	}
+	apiEnv := utils.Params.GetString("API_SECRET")
+	if c.ApiSecret != apiEnv && apiEnv != "" {
+		c.ApiSecret = apiEnv
+		if err := c.Update(); err != nil {
+			utils.Log.Errorln(err)
+		}
+	}
 }
 
 func (c *Core) AfterFind() {
@@ -20,7 +32,6 @@ func (c *Core) AfterFind() {
 
 func Select() (*Core, error) {
 	var c Core
-	// SelectCore will return the CoreApp global variable and the settings/configs for Statping
 	if err := db.DB().Ping(); err != nil {
 		return nil, errors.New("database has not been initiated yet.")
 	}
@@ -43,10 +54,22 @@ func Select() (*Core, error) {
 	if utils.Params.GetString("LANGUAGE") != "" {
 		App.Language = utils.Params.GetString("LANGUAGE")
 	}
+	if utils.Params.GetString("API_SECRET") != "" {
+		App.ApiSecret = utils.Params.GetString("API_SECRET")
+	}
+	App.Version = utils.Params.GetString("VERSION")
+	App.Commit = utils.Params.GetString("COMMIT")
 	return App, q.Error()
 }
 
 func (c *Core) Create() error {
+	if c.ApiSecret == "" {
+		c.ApiSecret = utils.RandomString(16)
+		apiEnv := utils.Params.GetString("API_SECRET")
+		if apiEnv != "" {
+			c.ApiSecret = apiEnv
+		}
+	}
 	q := db.Create(c)
 	utils.Log.Infof("API Key created: %s", c.ApiSecret)
 	return q.Error()
diff --git a/types/core/samples.go b/types/core/samples.go
index 8c59a67b..48d80922 100644
--- a/types/core/samples.go
+++ b/types/core/samples.go
@@ -41,7 +41,8 @@ func Samples() error {
 		MigrationId: utils.Now().Unix(),
 		Language:    utils.Params.GetString("LANGUAGE"),
 		OAuth:       oauth,
-		Version:     utils.Version,
+		Version:     utils.Params.GetString("VERSION"),
+		Commit:      utils.Params.GetString("COMMIT"),
 	}
 
 	return core.Create()
diff --git a/types/core/struct.go b/types/core/struct.go
index 88334f3b..fdb0cd7c 100644
--- a/types/core/struct.go
+++ b/types/core/struct.go
@@ -10,9 +10,10 @@ var (
 	App *Core
 )
 
-func New(version string) {
+func New(version, commit string) {
 	App = new(Core)
 	App.Version = version
+	App.Commit = commit
 	App.Started = utils.Now()
 }
 
@@ -28,6 +29,7 @@ type Core struct {
 	Footer        null.NullString `gorm:"column:footer" json:"footer"`
 	Domain        string          `gorm:"not null;column:domain" json:"domain"`
 	Version       string          `gorm:"column:version" json:"version"`
+	Commit        string          `gorm:"-" json:"commit"`
 	Language      string          `gorm:"column:language" json:"language"`
 	Setup         bool            `gorm:"-" json:"setup"`
 	MigrationId   int64           `gorm:"column:migration_id" json:"migration_id,omitempty"`
@@ -43,24 +45,25 @@ type Core struct {
 }
 
 type OAuth struct {
-	Providers           string `gorm:"column:oauth_providers;" json:"oauth_providers"`
-	GithubClientID      string `gorm:"column:gh_client_id" json:"gh_client_id"`
-	GithubClientSecret  string `gorm:"column:gh_client_secret" json:"gh_client_secret" scope:"admin"`
-	GithubUsers         string `gorm:"column:gh_users" json:"gh_users" scope:"admin"`
-	GithubOrgs          string `gorm:"column:gh_orgs" json:"gh_orgs" scope:"admin"`
-	GoogleClientID      string `gorm:"column:google_client_id" json:"google_client_id"`
-	GoogleClientSecret  string `gorm:"column:google_client_secret" json:"google_client_secret" scope:"admin"`
-	GoogleUsers         string `gorm:"column:google_users" json:"google_users" scope:"admin"`
-	SlackClientID       string `gorm:"column:slack_client_id" json:"slack_client_id"`
-	SlackClientSecret   string `gorm:"column:slack_client_secret" json:"slack_client_secret" scope:"admin"`
-	SlackTeam           string `gorm:"column:slack_team" json:"slack_team" scope:"admin"`
-	SlackUsers          string `gorm:"column:slack_users" json:"slack_users" scope:"admin"`
-	CustomName          string `gorm:"column:custom_name" json:"custom_name"`
-	CustomClientID      string `gorm:"column:custom_client_id" json:"custom_client_id"`
-	CustomClientSecret  string `gorm:"column:custom_client_secret" json:"custom_client_secret" scope:"admin"`
-	CustomEndpointAuth  string `gorm:"column:custom_endpoint_auth" json:"custom_endpoint_auth"`
-	CustomEndpointToken string `gorm:"column:custom_endpoint_token" json:"custom_endpoint_token" scope:"admin"`
-	CustomScopes        string `gorm:"column:custom_scopes" json:"custom_scopes"`
+	Providers           string        `gorm:"column:oauth_providers;" json:"oauth_providers"`
+	GithubClientID      string        `gorm:"column:gh_client_id" json:"gh_client_id"`
+	GithubClientSecret  string        `gorm:"column:gh_client_secret" json:"gh_client_secret" scope:"admin"`
+	GithubUsers         string        `gorm:"column:gh_users" json:"gh_users" scope:"admin"`
+	GithubOrgs          string        `gorm:"column:gh_orgs" json:"gh_orgs" scope:"admin"`
+	GoogleClientID      string        `gorm:"column:google_client_id" json:"google_client_id"`
+	GoogleClientSecret  string        `gorm:"column:google_client_secret" json:"google_client_secret" scope:"admin"`
+	GoogleUsers         string        `gorm:"column:google_users" json:"google_users" scope:"admin"`
+	SlackClientID       string        `gorm:"column:slack_client_id" json:"slack_client_id"`
+	SlackClientSecret   string        `gorm:"column:slack_client_secret" json:"slack_client_secret" scope:"admin"`
+	SlackTeam           string        `gorm:"column:slack_team" json:"slack_team" scope:"admin"`
+	SlackUsers          string        `gorm:"column:slack_users" json:"slack_users" scope:"admin"`
+	CustomName          string        `gorm:"column:custom_name" json:"custom_name"`
+	CustomClientID      string        `gorm:"column:custom_client_id" json:"custom_client_id"`
+	CustomClientSecret  string        `gorm:"column:custom_client_secret" json:"custom_client_secret" scope:"admin"`
+	CustomEndpointAuth  string        `gorm:"column:custom_endpoint_auth" json:"custom_endpoint_auth"`
+	CustomEndpointToken string        `gorm:"column:custom_endpoint_token" json:"custom_endpoint_token" scope:"admin"`
+	CustomScopes        string        `gorm:"column:custom_scopes" json:"custom_scopes"`
+	CustomIsOpenID      null.NullBool `gorm:"column:custom_open_id" json:"custom_open_id"`
 }
 
 // AllNotifiers contains all the Notifiers loaded
diff --git a/types/failures/database.go b/types/failures/database.go
index e3aad286..0a67dc3b 100644
--- a/types/failures/database.go
+++ b/types/failures/database.go
@@ -31,12 +31,6 @@ func (f *Failure) AfterCreate() {
 	metrics.Query("failure", "create")
 }
 
-func All() []*Failure {
-	var failures []*Failure
-	db.Find(&failures)
-	return failures
-}
-
 func (f *Failure) Create() error {
 	q := db.Create(f)
 	return q.Error()
diff --git a/types/failures/failures_test.go b/types/failures/failures_test.go
new file mode 100644
index 00000000..884bb6d4
--- /dev/null
+++ b/types/failures/failures_test.go
@@ -0,0 +1,22 @@
+package failures
+
+import (
+	"github.com/statping/statping/database"
+	"github.com/statping/statping/utils"
+	"github.com/stretchr/testify/require"
+	"testing"
+)
+
+func TestInit(t *testing.T) {
+	t.Parallel()
+	err := utils.InitLogs()
+	require.Nil(t, err)
+	db, err := database.OpenTester()
+	require.Nil(t, err)
+	SetDB(db)
+	db.AutoMigrate(&Failure{})
+
+	t.Run("Test Samples", func(t *testing.T) {
+		require.Nil(t, Samples())
+	})
+}
diff --git a/types/failures/interface.go b/types/failures/interface.go
index 2954d118..44295f00 100644
--- a/types/failures/interface.go
+++ b/types/failures/interface.go
@@ -38,7 +38,7 @@ func (f Failurer) List() []*Failure {
 
 func (f Failurer) LastAmount(amount int) []*Failure {
 	var fail []*Failure
-	f.db.Order("id asc").Limit(amount).Find(&fail)
+	f.db.Order("id DESC").Limit(amount).Find(&fail)
 	return fail
 }
 
diff --git a/types/failures/samples.go b/types/failures/samples.go
index cd03f296..55e67c1d 100644
--- a/types/failures/samples.go
+++ b/types/failures/samples.go
@@ -22,6 +22,7 @@ func Example() Failure {
 		Service:   1,
 		Checkin:   0,
 		PingTime:  48309,
+		Reason:    "status_code",
 		CreatedAt: utils.Now(),
 	}
 }
@@ -34,6 +35,7 @@ func Samples() error {
 		f1 := &Failure{
 			Service:   i,
 			Issue:     "Server failure",
+			Reason:    "lookup",
 			CreatedAt: utils.Now().Add(-time.Duration(3*i) * 86400),
 		}
 		if err := f1.Create(); err != nil {
@@ -42,7 +44,8 @@ func Samples() error {
 
 		f2 := &Failure{
 			Service:   i,
-			Issue:     "Server failure",
+			Issue:     "Regex failed to match the response",
+			Reason:    "regex",
 			CreatedAt: utils.Now().Add(-time.Duration(5*i) * 12400),
 		}
 		if err := f2.Create(); err != nil {
diff --git a/types/failures/struct.go b/types/failures/struct.go
index 14bf75a0..2db03ebe 100644
--- a/types/failures/struct.go
+++ b/types/failures/struct.go
@@ -2,11 +2,6 @@ package failures
 
 import "time"
 
-const (
-	limitedFailures = 32
-	limitedHits     = 32
-)
-
 // Failure is a failed attempt to check a service. Any a service does not meet the expected requirements,
 // a new Failure will be inserted into Db.
 type Failure struct {
@@ -18,6 +13,7 @@ type Failure struct {
 	Service   int64     `gorm:"index;column:service" json:"-"`
 	Checkin   int64     `gorm:"index;column:checkin" json:"-"`
 	PingTime  int64     `gorm:"column:ping_time"  json:"ping"`
+	Reason    string    `gorm:"column:reason" json:"reason,omitempty"`
 	CreatedAt time.Time `gorm:"column:created_at" json:"created_at"`
 }
 
diff --git a/types/groups/database.go b/types/groups/database.go
index 2577620e..6523e2b9 100644
--- a/types/groups/database.go
+++ b/types/groups/database.go
@@ -17,6 +17,13 @@ func SetDB(database database.Database) {
 	db = database.Model(&Group{})
 }
 
+func (g *Group) Validate() error {
+	if g.Name == "" {
+		return errors.New("group name is empty")
+	}
+	return nil
+}
+
 func (g *Group) AfterFind() {
 	metrics.Query("group", "find")
 }
@@ -29,6 +36,14 @@ func (g *Group) AfterDelete() {
 	metrics.Query("group", "delete")
 }
 
+func (g *Group) BeforeUpdate() error {
+	return g.Validate()
+}
+
+func (g *Group) BeforeCreate() error {
+	return g.Validate()
+}
+
 func (g *Group) AfterCreate() {
 	metrics.Query("group", "create")
 }
diff --git a/types/groups/groups_test.go b/types/groups/groups_test.go
index c0100d37..99030847 100644
--- a/types/groups/groups_test.go
+++ b/types/groups/groups_test.go
@@ -106,6 +106,11 @@ func TestDelete(t *testing.T) {
 	assert.Len(t, all, 1)
 }
 
+func TestSamples(t *testing.T) {
+	require.Nil(t, Samples())
+	assert.Len(t, All(), 4)
+}
+
 func TestClose(t *testing.T) {
 	assert.Nil(t, db.Close())
 }
diff --git a/types/hits/interface.go b/types/hits/interface.go
index ab6db7a7..3604ca6b 100644
--- a/types/hits/interface.go
+++ b/types/hits/interface.go
@@ -61,7 +61,6 @@ func (h Hitters) DeleteAll() error {
 
 func (h Hitters) Sum() int64 {
 	var r IntResult
-
 	h.db.Select("CAST(SUM(latency) as INT) as amount").Scan(&r)
 	return r.Amount
 }
diff --git a/types/hits/struct.go b/types/hits/struct.go
index ecd29984..163c5e07 100644
--- a/types/hits/struct.go
+++ b/types/hits/struct.go
@@ -5,7 +5,7 @@ import "time"
 // Hit struct is a 'successful' ping or web response entry for a service.
 type Hit struct {
 	Id        int64     `gorm:"primary_key;column:id" json:"id"`
-	Service   int64     `gorm:"column:service" json:"-"`
+	Service   int64     `gorm:"index;column:service" json:"-"`
 	Latency   int64     `gorm:"column:latency" json:"latency"`
 	PingTime  int64     `gorm:"column:ping_time" json:"ping_time"`
 	CreatedAt time.Time `gorm:"column:created_at" json:"created_at"`
diff --git a/types/incidents/database.go b/types/incidents/database.go
index 32c6d9ce..7260cb61 100644
--- a/types/incidents/database.go
+++ b/types/incidents/database.go
@@ -2,6 +2,7 @@ package incidents
 
 import (
 	"github.com/statping/statping/database"
+	"github.com/statping/statping/types/errors"
 	"github.com/statping/statping/types/metrics"
 	"github.com/statping/statping/utils"
 )
@@ -17,7 +18,23 @@ func SetDB(database database.Database) {
 	dbUpdate = database.Model(&IncidentUpdate{})
 }
 
+func (i *Incident) Validate() error {
+	if i.Title == "" {
+		return errors.New("missing title")
+	}
+	return nil
+}
+
+func (i *Incident) BeforeUpdate() error {
+	return i.Validate()
+}
+
+func (i *Incident) BeforeCreate() error {
+	return i.Validate()
+}
+
 func (i *Incident) AfterFind() {
+	db.Model(i).Related(&i.Updates).Order("id DESC")
 	metrics.Query("incident", "find")
 }
 
@@ -33,6 +50,21 @@ func (i *Incident) AfterDelete() {
 	metrics.Query("incident", "delete")
 }
 
+func (i *IncidentUpdate) Validate() error {
+	if i.Message == "" {
+		return errors.New("missing incident update title")
+	}
+	return nil
+}
+
+func (i *IncidentUpdate) BeforeUpdate() error {
+	return i.Validate()
+}
+
+func (i *IncidentUpdate) BeforeCreate() error {
+	return i.Validate()
+}
+
 func (i *IncidentUpdate) AfterFind() {
 	metrics.Query("incident_update", "find")
 }
@@ -64,11 +96,6 @@ func Find(id int64) (*Incident, error) {
 func FindByService(id int64) []*Incident {
 	var incidents []*Incident
 	db.Where("service = ?", id).Find(&incidents)
-	for _, i := range incidents {
-		var updates []*IncidentUpdate
-		dbUpdate.Where("incident = ?", id).Find(&updates)
-		i.AllUpdates = updates
-	}
 	return incidents
 }
 
@@ -79,16 +106,18 @@ func All() []*Incident {
 }
 
 func (i *Incident) Create() error {
-	q := db.Create(i)
-	return q.Error()
+	return db.Create(i).Error()
 }
 
 func (i *Incident) Update() error {
-	q := db.Update(i)
-	return q.Error()
+	return db.Update(i).Error()
 }
 
 func (i *Incident) Delete() error {
-	q := db.Delete(i)
-	return q.Error()
+	for _, u := range i.Updates {
+		if err := u.Delete(); err != nil {
+			return err
+		}
+	}
+	return db.Delete(i).Error()
 }
diff --git a/types/incidents/database_updates.go b/types/incidents/database_updates.go
index 0c63734d..3ab40cd0 100644
--- a/types/incidents/database_updates.go
+++ b/types/incidents/database_updates.go
@@ -1,11 +1,10 @@
 package incidents
 
-func (i *Incident) Updates() []*IncidentUpdate {
-	var updates []*IncidentUpdate
-	dbUpdate.Where("incident = ?", i.Id).Find(&updates)
-	i.AllUpdates = updates
-	return updates
-}
+//func (i Incident) Updates() []*IncidentUpdate {
+//	var updates []*IncidentUpdate
+//	dbUpdate.Where("incident = ?", i.Id).Find(&updates)
+//	return updates
+//}
 
 func (i *IncidentUpdate) Create() error {
 	q := dbUpdate.Create(i)
diff --git a/types/incidents/incidents_test.go b/types/incidents/incidents_test.go
index 377680a4..49245277 100644
--- a/types/incidents/incidents_test.go
+++ b/types/incidents/incidents_test.go
@@ -32,8 +32,10 @@ func TestInit(t *testing.T) {
 	db, err := database.OpenTester()
 	require.Nil(t, err)
 	db.AutoMigrate(&Incident{}, &IncidentUpdate{})
-	db.Create(&example)
 	SetDB(db)
+	db.Create(&example)
+	db.Create(&update1)
+	db.Create(&update2)
 }
 
 func TestFind(t *testing.T) {
@@ -81,6 +83,11 @@ func TestDelete(t *testing.T) {
 	assert.Len(t, all, 1)
 }
 
+func TestSamples(t *testing.T) {
+	require.Nil(t, Samples())
+	assert.Len(t, All(), 3)
+}
+
 func TestClose(t *testing.T) {
 	assert.Nil(t, db.Close())
 }
diff --git a/types/incidents/struct.go b/types/incidents/struct.go
index bdac0aa1..5ddf3d2a 100644
--- a/types/incidents/struct.go
+++ b/types/incidents/struct.go
@@ -10,7 +10,7 @@ type Incident struct {
 	ServiceId   int64             `gorm:"index;column:service" json:"service"`
 	CreatedAt   time.Time         `gorm:"column:created_at" json:"created_at" json:"created_at"`
 	UpdatedAt   time.Time         `gorm:"column:updated_at" json:"updated_at" json:"updated_at"`
-	AllUpdates  []*IncidentUpdate `gorm:"-" json:"updates,omitempty"`
+	Updates     []*IncidentUpdate `gorm:"foreignkey:incident;association_foreignkey:id" json:"updates,omitempty"`
 }
 
 // IncidentUpdate contains updates based on a Incident
diff --git a/types/messages/hooks.go b/types/messages/hooks.go
index bf68e0f2..cfc303fe 100644
--- a/types/messages/hooks.go
+++ b/types/messages/hooks.go
@@ -1,17 +1,23 @@
 package messages
 
 import (
+	"github.com/statping/statping/types/errors"
 	"github.com/statping/statping/types/metrics"
-	"github.com/statping/statping/utils"
 )
 
-// BeforeCreate for Message will set CreatedAt to UTC
-func (m *Message) BeforeCreate() (err error) {
-	if m.CreatedAt.IsZero() {
-		m.CreatedAt = utils.Now()
-		m.UpdatedAt = utils.Now()
+func (m *Message) Validate() error {
+	if m.Title == "" {
+		return errors.New("missing message title")
 	}
-	return
+	return nil
+}
+
+func (m *Message) BeforeUpdate() error {
+	return m.Validate()
+}
+
+func (m *Message) BeforeCreate() error {
+	return m.Validate()
 }
 
 func (m *Message) AfterFind() {
diff --git a/types/messages/messages_test.go b/types/messages/messages_test.go
index a47ab6e6..d1fbdea0 100644
--- a/types/messages/messages_test.go
+++ b/types/messages/messages_test.go
@@ -73,6 +73,11 @@ func TestDelete(t *testing.T) {
 	assert.Len(t, all, 1)
 }
 
+func TestSamples(t *testing.T) {
+	require.Nil(t, Samples())
+	assert.Len(t, All(), 3)
+}
+
 func TestClose(t *testing.T) {
 	assert.Nil(t, db.Close())
 }
diff --git a/types/notifications/database.go b/types/notifications/database.go
index 29f923a3..37c5779a 100644
--- a/types/notifications/database.go
+++ b/types/notifications/database.go
@@ -1,7 +1,6 @@
 package notifications
 
 import (
-	"errors"
 	"github.com/statping/statping/database"
 )
 
@@ -13,29 +12,51 @@ func SetDB(database database.Database) {
 	db = database.Model(&Notification{})
 }
 
+func (n *Notification) Values() Values {
+	return Values{
+		Host:      n.Host.String,
+		Port:      n.Port.Int64,
+		Username:  n.Username.String,
+		Password:  n.Password.String,
+		Var1:      n.Var1.String,
+		Var2:      n.Var2.String,
+		ApiKey:    n.ApiKey.String,
+		ApiSecret: n.ApiSecret.String,
+	}
+}
+
+func All() []*Notification {
+	var n []*Notification
+	q := db.Find(&n)
+	if q.Error() != nil {
+		return nil
+	}
+	return n
+}
+
 func Find(method string) (*Notification, error) {
 	var n Notification
 	q := db.Where("method = ?", method).Find(&n)
-	if &n == nil {
-		return nil, errors.New("cannot find notifier")
+	if q.Error() != nil {
+		return nil, q.Error()
 	}
-	n.UpdateFields(&n)
-	return &n, q.Error()
+	return &n, nil
 }
 
 func (n *Notification) Create() error {
 	var p Notification
 	q := db.Where("method = ?", n.Method).Find(&p)
 	if q.RecordNotFound() {
+		log.Infof("Notifier '%s' was not found, adding into database...\n", n.Method)
 		if err := db.Create(n).Error(); err != nil {
 			return err
 		}
 		return nil
 	}
-	if p.FailureData == "" {
+	if p.FailureData.String == "" {
 		p.FailureData = n.FailureData
 	}
-	if p.SuccessData == "" {
+	if p.SuccessData.String == "" {
 		p.SuccessData = n.SuccessData
 	}
 	if err := p.Update(); err != nil {
@@ -45,6 +66,10 @@ func (n *Notification) Create() error {
 }
 
 func (n *Notification) UpdateFields(notif *Notification) *Notification {
+	if notif == nil {
+		return n
+	}
+	n.Id = notif.Id
 	n.Limits = notif.Limits
 	n.Enabled = notif.Enabled
 	n.Host = notif.Host
diff --git a/types/notifications/hooks.go b/types/notifications/hooks.go
index 05bc9890..756a7cf0 100644
--- a/types/notifications/hooks.go
+++ b/types/notifications/hooks.go
@@ -2,13 +2,9 @@ package notifications
 
 import (
 	"github.com/statping/statping/types/metrics"
-	"github.com/statping/statping/utils"
 )
 
-// AfterFind for Notification will set the timezone
 func (n *Notification) AfterFind() (err error) {
-	n.CreatedAt = utils.Now()
-	n.UpdatedAt = utils.Now()
 	metrics.Query("notifier", "find")
 	return
 }
diff --git a/types/notifications/methods.go b/types/notifications/methods.go
index b17b12ea..805d6ee3 100644
--- a/types/notifications/methods.go
+++ b/types/notifications/methods.go
@@ -14,30 +14,26 @@ func (n Notification) Name() string {
 }
 
 // LastSent returns a time.Duration of the last sent notification for the notifier
-func (n Notification) LastSent() time.Duration {
-	return time.Since(n.lastSent)
+func (n Notification) LastSentDur() time.Duration {
+	return time.Since(n.LastSent)
 }
 
 func (n *Notification) CanSend() bool {
 	if !n.Enabled.Bool {
 		return false
 	}
-
 	// the last sent notification was past 1 minute (limit per minute)
-	if n.lastSent.Add(60 * time.Minute).Before(utils.Now()) {
-		if n.lastSentCount != 0 {
-			n.lastSentCount--
+	if n.LastSent.Add(60 * time.Minute).Before(utils.Now()) {
+		if n.LastSentCount != 0 {
+			n.LastSentCount--
 		}
 	}
 
 	// dont send if already beyond the notifier's limit
-	if n.lastSentCount >= n.Limits {
+	if n.LastSentCount >= n.Limits {
 		return false
 	}
 
-	// action to do since notifier is able to send
-	n.lastSentCount++
-	n.lastSent = utils.Now()
 	return true
 }
 
@@ -45,49 +41,24 @@ func (n *Notification) CanSend() bool {
 func (n *Notification) GetValue(dbField string) string {
 	switch strings.ToLower(dbField) {
 	case "host":
-		return n.Host
+		return n.Host.String
 	case "port":
-		return fmt.Sprintf("%d", n.Port)
+		return fmt.Sprintf("%d", n.Port.Int64)
 	case "username":
-		return n.Username
+		return n.Username.String
 	case "password":
-		return n.Password
+		return n.Password.String
 	case "var1":
-		return n.Var1
+		return n.Var1.String
 	case "var2":
-		return n.Var2
+		return n.Var2.String
 	case "api_key":
-		return n.ApiKey
+		return n.ApiKey.String
 	case "api_secret":
-		return n.ApiSecret
+		return n.ApiSecret.String
 	case "limits":
 		return utils.ToString(n.Limits)
 	default:
 		return ""
 	}
 }
-
-// start will start the go routine for the notifier queue
-func (n *Notification) Start() {
-	n.Running = make(chan bool)
-}
-
-// close will stop the go routine for queue
-func (n *Notification) Close() {
-	if n.IsRunning() {
-		close(n.Running)
-	}
-}
-
-// IsRunning will return true if the notifier is currently running a queue
-func (n *Notification) IsRunning() bool {
-	if n.Running == nil {
-		return false
-	}
-	select {
-	case <-n.Running:
-		return false
-	default:
-		return true
-	}
-}
diff --git a/types/notifications/struct.go b/types/notifications/struct.go
index 30356165..c273155a 100644
--- a/types/notifications/struct.go
+++ b/types/notifications/struct.go
@@ -13,43 +13,60 @@ var (
 
 // Notification contains all the fields for a Statping Notifier.
 type Notification struct {
-	Id          int64         `gorm:"primary_key;column:id" json:"id"`
-	Method      string        `gorm:"column:method" json:"method"`
-	Host        string        `gorm:"not null;column:host" json:"host,omitempty"`
-	Port        int           `gorm:"not null;column:port" json:"port,omitempty"`
-	Username    string        `gorm:"not null;column:username" json:"username,omitempty"`
-	Password    string        `gorm:"not null;column:password" json:"password,omitempty"`
-	Var1        string        `gorm:"not null;column:var1" json:"var1,omitempty"`
-	Var2        string        `gorm:"not null;column:var2" json:"var2,omitempty"`
-	ApiKey      string        `gorm:"not null;column:api_key" json:"api_key,omitempty"`
-	ApiSecret   string        `gorm:"not null;column:api_secret" json:"api_secret,omitempty"`
-	Enabled     null.NullBool `gorm:"column:enabled;type:boolean;default:false" json:"enabled,omitempty"`
-	Limits      int           `gorm:"not null;column:limits" json:"limits"`
-	Removable   bool          `gorm:"column:removable" json:"removable"`
-	SuccessData string        `gorm:"type:text;column:success_data" json:"success_data,omitempty"`
-	FailureData string        `gorm:"type:text;column:failure_data" json:"failure_data,omitempty"`
-	DataType    string        `gorm:"-" json:"data_type,omitempty"`
-	RequestInfo string        `gorm:"-" json:"request_info,omitempty"`
-	CreatedAt   time.Time     `gorm:"column:created_at" json:"created_at"`
-	UpdatedAt   time.Time     `gorm:"column:updated_at" json:"updated_at"`
-	Title       string        `gorm:"-" json:"title"`
-	Description string        `gorm:"-" json:"description"`
-	Author      string        `gorm:"-" json:"author"`
-	AuthorUrl   string        `gorm:"-" json:"author_url"`
-	Icon        string        `gorm:"-" json:"icon"`
-	Delay       time.Duration `gorm:"-" json:"delay,string"`
-	Running     chan bool     `gorm:"-" json:"-"`
+	Id          int64           `gorm:"primary_key;column:id" json:"id"`
+	Method      string          `gorm:"column:method" json:"method"`
+	Host        null.NullString `gorm:"column:host" json:"host,omitempty"`
+	Port        null.NullInt64  `gorm:"column:port" json:"port,omitempty"`
+	Username    null.NullString `gorm:"column:username" json:"username,omitempty"`
+	Password    null.NullString `gorm:"column:password" json:"password,omitempty"`
+	Var1        null.NullString `gorm:"column:var1" json:"var1,omitempty"`
+	Var2        null.NullString `gorm:"column:var2" json:"var2,omitempty"`
+	ApiKey      null.NullString `gorm:"column:api_key" json:"api_key,omitempty"`
+	ApiSecret   null.NullString `gorm:"column:api_secret" json:"api_secret,omitempty"`
+	Enabled     null.NullBool   `gorm:"column:enabled;type:boolean;default:false" json:"enabled,omitempty"`
+	Limits      int             `gorm:"not null;column:limits" json:"limits"`
+	Removable   bool            `gorm:"column:removable" json:"removable"`
+	SuccessData null.NullString `gorm:"type:text;column:success_data" json:"success_data,omitempty"`
+	FailureData null.NullString `gorm:"type:text;column:failure_data" json:"failure_data,omitempty"`
+	DataType    string          `gorm:"-" json:"data_type,omitempty"`
+	RequestInfo string          `gorm:"-" json:"request_info,omitempty"`
+	CreatedAt   time.Time       `gorm:"column:created_at" json:"created_at"`
+	UpdatedAt   time.Time       `gorm:"column:updated_at" json:"updated_at"`
+	Title       string          `gorm:"-" json:"title"`
+	Description string          `gorm:"-" json:"description"`
+	Author      string          `gorm:"-" json:"author"`
+	AuthorUrl   string          `gorm:"-" json:"author_url"`
+	Icon        string          `gorm:"-" json:"icon"`
+	Delay       time.Duration   `gorm:"-" json:"delay,string"`
 
 	Form          []NotificationForm `gorm:"-" json:"form"`
-	lastSent      time.Time          `gorm:"-" json:"-"`
-	lastSentCount int                `gorm:"-" json:"-"`
+	LastSent      time.Time          `gorm:"-" json:"-"`
+	LastSentCount int                `gorm:"-" json:"-"`
+	Logs          []*NotificationLog `gorm:"-" json:"logs,omitempty"`
+}
+
+type NotificationLog struct {
+	Message   string    `gorm:"-" json:"message"`
+	Error     error     `gorm:"-" json:"error,omitempty"`
+	Success   bool      `gorm:"-" json:"success"`
+	Service   int64     `gorm:"-" json:"service"`
+	CreatedAt time.Time `gorm:"-" json:"created_at"`
 }
 
 func (n *Notification) Logger() *logrus.Logger {
 	return log.WithField("notifier", n.Method).Logger
 }
 
-type RunFunc func(interface{}) error
+type Values struct {
+	Host      string
+	Port      int64
+	Username  string
+	Password  string
+	Var1      string
+	Var2      string
+	ApiKey    string
+	ApiSecret string
+}
 
 // NotificationForm contains the HTML fields for each variable/input you want the notifier to accept.
 type NotificationForm struct {
diff --git a/types/null/marshal.go b/types/null/marshal.go
index dae3e551..ac23d436 100644
--- a/types/null/marshal.go
+++ b/types/null/marshal.go
@@ -1,10 +1,15 @@
 package null
 
 import (
+	"database/sql/driver"
 	"encoding/json"
 	"gopkg.in/yaml.v2"
 )
 
+func (s NullString) Value() (driver.Value, error) {
+	return s.String, nil
+}
+
 // MarshalJSON for NullInt64
 func (i NullInt64) MarshalJSON() ([]byte, error) {
 	if !i.Valid {
@@ -32,7 +37,7 @@ func (bb NullBool) MarshalJSON() ([]byte, error) {
 // MarshalJSON for NullString
 func (s NullString) MarshalJSON() ([]byte, error) {
 	if !s.Valid {
-		return []byte("null"), nil
+		return json.Marshal(nil)
 	}
 	return json.Marshal(s.String)
 }
diff --git a/types/null/null_test.go b/types/null/null_test.go
index 395c093e..dca0735e 100644
--- a/types/null/null_test.go
+++ b/types/null/null_test.go
@@ -1,10 +1,58 @@
 package null
 
 import (
+	"encoding/json"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"testing"
 )
 
+func TestJSONMarshal(t *testing.T) {
+	tests := []struct {
+		Input        interface{}
+		ExpectedJSON string
+	}{
+		{
+			Input:        NewNullBool(true),
+			ExpectedJSON: `true`,
+		},
+		{
+			Input:        NewNullBool(false),
+			ExpectedJSON: `false`,
+		},
+		{
+			Input:        NewNullFloat64(0.994),
+			ExpectedJSON: `0.994`,
+		},
+		{
+			Input:        NewNullFloat64(0),
+			ExpectedJSON: `0`,
+		},
+		{
+			Input:        NewNullInt64(42),
+			ExpectedJSON: `42`,
+		},
+		{
+			Input:        NewNullInt64(0),
+			ExpectedJSON: `0`,
+		},
+		{
+			Input:        NewNullString("test"),
+			ExpectedJSON: `"test"`,
+		},
+		{
+			Input:        NewNullString(""),
+			ExpectedJSON: `""`,
+		},
+	}
+
+	for _, test := range tests {
+		str, err := json.Marshal(test.Input)
+		require.Nil(t, err)
+		assert.Equal(t, test.ExpectedJSON, string(str))
+	}
+}
+
 func TestNewNullBool(t *testing.T) {
 	val := NewNullBool(true)
 	assert.True(t, val.Bool)
diff --git a/types/services/checkins.go b/types/services/checkins.go
index 6d023726..f034386b 100644
--- a/types/services/checkins.go
+++ b/types/services/checkins.go
@@ -1,18 +1,10 @@
 package services
 
-import (
-	"github.com/statping/statping/types/checkins"
-)
-
 // CheckinProcess runs the checkin routine for each checkin attached to service
 func CheckinProcess(s *Service) {
-	for _, c := range s.Checkins() {
-		c.Start()
+	for _, c := range s.Checkins {
+		if last := c.LastHit(); last != nil {
+			c.Start()
+		}
 	}
 }
-
-func (s *Service) Checkins() []*checkins.Checkin {
-	var chks []*checkins.Checkin
-	db.Where("service = ?", s.Id).Find(&chks)
-	return chks
-}
diff --git a/types/services/database.go b/types/services/database.go
index abc2c499..8ae003ce 100644
--- a/types/services/database.go
+++ b/types/services/database.go
@@ -15,10 +15,39 @@ var (
 	allServices map[int64]*Service
 )
 
+func (s *Service) Validate() error {
+	if s.Name == "" {
+		return errors.New("missing service name")
+	} else if s.Domain == "" && s.Type != "static" {
+		return errors.New("missing domain name")
+	} else if s.Type == "" {
+		return errors.New("missing service type")
+	} else if s.Interval == 0 && s.Type != "static" {
+		return errors.New("missing check interval")
+	}
+	return nil
+}
+
+func (s *Service) BeforeCreate() error {
+	return s.Validate()
+}
+
+func (s *Service) BeforeUpdate() error {
+	return s.Validate()
+}
+
 func (s *Service) AfterFind() {
+	db.Model(s).Related(&s.Incidents).Related(&s.Messages).Related(&s.Checkins).Related(&s.Incidents)
 	metrics.Query("service", "find")
 }
 
+func (s *Service) AfterCreate() error {
+	s.prevOnline = true
+	allServices[s.Id] = s
+	metrics.Query("service", "create")
+	return nil
+}
+
 func (s *Service) AfterUpdate() {
 	metrics.Query("service", "update")
 }
@@ -44,6 +73,7 @@ func Find(id int64) (*Service, error) {
 	if srv == nil {
 		return nil, errors.Missing(&Service{}, id)
 	}
+	db.First(&srv, id)
 	return srv, nil
 }
 
@@ -76,16 +106,10 @@ func (s *Service) Create() error {
 	return nil
 }
 
-func (s *Service) AfterCreate() error {
-	allServices[s.Id] = s
-	metrics.Query("service", "create")
-	return nil
-}
-
 func (s *Service) Update() error {
 	q := db.Update(s)
-	allServices[s.Id] = s
 	s.Close()
+	allServices[s.Id] = s
 	s.SleepDuration = s.Duration()
 	go ServiceCheckQueue(allServices[s.Id], true)
 	return q.Error()
@@ -93,30 +117,46 @@ func (s *Service) Update() error {
 
 func (s *Service) Delete() error {
 	s.Close()
-	if err := s.DeleteFailures(); err != nil {
+	if err := s.AllFailures().DeleteAll(); err != nil {
 		return err
 	}
-	if err := s.DeleteHits(); err != nil {
+	if err := s.AllHits().DeleteAll(); err != nil {
 		return err
 	}
+	if err := s.DeleteCheckins(); err != nil {
+		return err
+	}
+	db.Model(s).Association("Checkins").Clear()
+	if err := s.DeleteIncidents(); err != nil {
+		return err
+	}
+	db.Model(s).Association("Incidents").Clear()
+	if err := s.DeleteMessages(); err != nil {
+		return err
+	}
+	db.Model(s).Association("Messages").Clear()
+
 	delete(allServices, s.Id)
 	q := db.Model(&Service{}).Delete(s)
 	return q.Error()
 }
 
-func (s *Service) DeleteFailures() error {
-	return s.AllFailures().DeleteAll()
-}
-
-func (s *Service) DeleteHits() error {
-	return s.AllHits().DeleteAll()
+func (s *Service) DeleteMessages() error {
+	for _, m := range s.Messages {
+		if err := m.Delete(); err != nil {
+			return err
+		}
+	}
+	db.Model(s).Association("messages").Clear()
+	return nil
 }
 
 func (s *Service) DeleteCheckins() error {
-	for _, c := range s.Checkins() {
+	for _, c := range s.Checkins {
 		if err := c.Delete(); err != nil {
 			return err
 		}
 	}
+	db.Model(s).Association("checkins").Clear()
 	return nil
 }
diff --git a/types/services/failures.go b/types/services/failures.go
index 36027249..8bb38a55 100644
--- a/types/services/failures.go
+++ b/types/services/failures.go
@@ -2,12 +2,13 @@ package services
 
 import (
 	"fmt"
-	humanize "github.com/dustin/go-humanize"
 	"github.com/statping/statping/types/failures"
 	"strings"
 	"time"
 )
 
+const limitFailures = 32
+
 func (s *Service) FailuresColumnID() (string, int64) {
 	return "service", s.Id
 }
@@ -20,13 +21,6 @@ func (s *Service) FailuresSince(t time.Time) failures.Failurer {
 	return failures.Since(t, s)
 }
 
-func (s Service) DowntimeAgo() string {
-	if s.LastOnline.IsZero() {
-		return "Never been online"
-	}
-	return humanize.Time(s.LastOnline)
-}
-
 func (s Service) DowntimeText() string {
 	last := s.AllFailures().Last()
 	if last == nil {
diff --git a/types/services/incidents.go b/types/services/incidents.go
new file mode 100644
index 00000000..681075f0
--- /dev/null
+++ b/types/services/incidents.go
@@ -0,0 +1,11 @@
+package services
+
+func (s *Service) DeleteIncidents() error {
+	for _, i := range s.Incidents {
+		if err := i.Delete(); err != nil {
+			return err
+		}
+	}
+	db.Model(s).Association("Updates").Clear()
+	return nil
+}
diff --git a/types/services/methods.go b/types/services/methods.go
index 54ee3bff..18a71e19 100644
--- a/types/services/methods.go
+++ b/types/services/methods.go
@@ -178,32 +178,6 @@ func addDurations(s []series, on bool) int64 {
 	return dur
 }
 
-type ser struct {
-	Time   time.Time
-	Online bool
-}
-
-type UptimeSeries struct {
-	Start    time.Time `json:"start"`
-	End      time.Time `json:"end"`
-	Uptime   int64     `json:"uptime"`
-	Downtime int64     `json:"downtime"`
-	Series   []series  `json:"series"`
-}
-
-type ByTime []ser
-
-func (a ByTime) Len() int           { return len(a) }
-func (a ByTime) Less(i, j int) bool { return a[i].Time.Before(a[j].Time) }
-func (a ByTime) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-type series struct {
-	Start    time.Time `json:"start"`
-	End      time.Time `json:"end"`
-	Duration int64     `json:"duration"`
-	Online   bool      `json:"online"`
-}
-
 // Start will create a channel for the service checking go routine
 func (s *Service) Start() {
 	if s.IsRunning() {
@@ -253,17 +227,14 @@ func SelectAllServices(start bool) (map[int64]*Service, error) {
 		return allServices, nil
 	}
 	for _, s := range all() {
-
-		if start {
-			CheckinProcess(s)
-		}
 		s.Failures = s.AllFailures().LastAmount(limitedFailures)
-		for _, c := range s.Checkins() {
-			s.AllCheckins = append(s.AllCheckins, c)
-		}
+		s.prevOnline = true
 		// collect initial service stats
 		s.UpdateStats()
 		allServices[s.Id] = s
+		if start {
+			CheckinProcess(s)
+		}
 	}
 	return allServices, nil
 }
@@ -326,19 +297,12 @@ func (s *Service) OnlineSince(ago time.Time) float32 {
 	return s.Online24Hours
 }
 
+// Uptime returns the duration of how long the service was online
 func (s Service) Uptime() utils.Duration {
 	return utils.Duration{Duration: utils.Now().Sub(s.LastOffline)}
 }
 
-// Downtime returns the amount of time of a offline service
+// Downtime returns the duration of how long the service has been offline
 func (s Service) Downtime() utils.Duration {
 	return utils.Duration{Duration: utils.Now().Sub(s.LastOnline)}
 }
-
-// ServiceOrder will reorder the services based on 'order_id' (Order)
-type ServiceOrder []Service
-
-// Sort interface for resroting the Services in order
-func (c ServiceOrder) Len() int           { return len(c) }
-func (c ServiceOrder) Swap(i, j int)      { c[int64(i)], c[int64(j)] = c[int64(j)], c[int64(i)] }
-func (c ServiceOrder) Less(i, j int) bool { return c[i].Order < c[j].Order }
diff --git a/types/services/notifications.go b/types/services/notifications.go
new file mode 100644
index 00000000..352df55e
--- /dev/null
+++ b/types/services/notifications.go
@@ -0,0 +1,99 @@
+package services
+
+import (
+	"github.com/statping/statping/types/failures"
+	"github.com/statping/statping/types/notifications"
+	"github.com/statping/statping/utils"
+)
+
+func AddNotifier(n ServiceNotifier) {
+	notif := n.Select()
+	allNotifiers[notif.Method] = n
+}
+
+func UpdateNotifiers() {
+	for _, n := range notifications.All() {
+		notifier := allNotifiers[n.Method]
+		notifier.Select().UpdateFields(n)
+	}
+}
+
+func sendSuccess(s *Service) {
+	if !s.AllowNotifications.Bool {
+		return
+	}
+
+	if s.prevOnline == s.Online {
+		return
+	}
+
+	for _, n := range allNotifiers {
+		notif := n.Select()
+		if notif.CanSend() {
+			log.Infof("Sending notification to: %s!", notif.Method)
+			out, err := n.OnSuccess(*s)
+			if err != nil {
+				notif.Logger().Errorln(err)
+				logMessage(notif.Method, "", err, false, s.Id)
+				return
+			}
+			logMessage(notif.Method, out, nil, true, s.Id)
+			notif.LastSentCount++
+			notif.LastSent = utils.Now()
+		}
+	}
+
+	s.prevOnline = true
+	s.notifyAfterCount++
+}
+
+func sendFailure(s *Service, f *failures.Failure) {
+	if !s.AllowNotifications.Bool {
+		return
+	}
+
+	if s.prevOnline == s.Online && !s.UpdateNotify.Bool {
+		return
+	}
+
+	if s.NotifyAfter != 0 {
+		if s.NotifyAfter > s.notifyAfterCount {
+			s.notifyAfterCount++
+			return
+		}
+	}
+
+	for _, n := range allNotifiers {
+		notif := n.Select()
+		if notif.CanSend() {
+			log.Infof("Sending Failure notification to: %s!", notif.Method)
+			out, err := n.OnFailure(*s, *f)
+			if err != nil {
+				notif.Logger().WithField("failure", f.Issue).Errorln(err)
+				logMessage(notif.Method, "", err, false, s.Id)
+			}
+			logMessage(notif.Method, out, nil, false, s.Id)
+
+			notif.LastSentCount++
+			notif.LastSent = utils.Now()
+		}
+	}
+
+	s.prevOnline = false
+	s.notifyAfterCount++
+}
+
+func logMessage(method string, msg string, error error, onSuccesss bool, serviceId int64) {
+	notif := FindNotifier(method)
+	l := &notifications.NotificationLog{
+		Message:   msg,
+		Error:     error,
+		Success:   onSuccesss,
+		Service:   serviceId,
+		CreatedAt: utils.Now(),
+	}
+	notif.Logs = append(notif.Logs, l)
+	if len(notif.Logs) > 32 {
+		notif.Logs = notif.Logs[1:]
+	}
+}
diff --git a/types/services/notifier.go b/types/services/notifier.go
index a51b9a62..f2ac7d62 100644
--- a/types/services/notifier.go
+++ b/types/services/notifier.go
@@ -20,7 +20,13 @@ func ReturnNotifier(method string) ServiceNotifier {
 func FindNotifier(method string) *notifications.Notification {
 	n := allNotifiers[method]
 	if n != nil {
-		return n.Select()
+		notif := n.Select()
+		no, err := notifications.Find(notif.Method)
+		if err != nil {
+			log.Error(err)
+			return nil
+		}
+		return notif.UpdateFields(no)
 	}
 	return nil
 }
@@ -31,4 +37,5 @@ type ServiceNotifier interface {
 	OnTest() (string, error)                             // OnTest is triggered for testing
 	OnSave() (string, error)                             // OnSave is triggered for testing
 	Select() *notifications.Notification                 // OnTest is triggered for testing
+	Valid(notifications.Values) error                    // Valid checks your form values
 }
diff --git a/types/services/routine.go b/types/services/routine.go
index db70dea0..7a10fc21 100644
--- a/types/services/routine.go
+++ b/types/services/routine.go
@@ -91,14 +91,21 @@ func CheckIcmp(s *Service, record bool) (*Service, error) {
 	timer := prometheus.NewTimer(metrics.ServiceTimer(s.Name))
 	defer timer.ObserveDuration()
 
-	if err := utils.Ping(s.Domain, s.Timeout); err != nil {
+	dur, err := utils.Ping(s.Domain, s.Timeout)
+	if err != nil {
 		if record {
-			recordFailure(s, fmt.Sprintf("Could not send ICMP to service %v, %v", s.Domain, err))
+			RecordFailure(s, fmt.Sprintf("Could not send ICMP to service %v, %v", s.Domain, err), "lookup")
 		}
 		return s, err
 	}
+
+	s.PingTime = dur
+	s.Latency = dur
 	s.LastResponse = ""
 	s.Online = true
+	if record {
+		RecordSuccess(s)
+	}
 	return s, nil
 }
 
@@ -111,7 +118,7 @@ func CheckGrpc(s *Service, record bool) (*Service, error) {
 	dnsLookup, err := dnsCheck(s)
 	if err != nil {
 		if record {
-			recordFailure(s, fmt.Sprintf("Could not get IP address for GRPC service %v, %v", s.Domain, err))
+			RecordFailure(s, fmt.Sprintf("Could not get IP address for GRPC service %v, %v", s.Domain, err), "lookup")
 		}
 		return s, err
 	}
@@ -130,13 +137,13 @@ func CheckGrpc(s *Service, record bool) (*Service, error) {
 	}
 	if err != nil {
 		if record {
-			recordFailure(s, fmt.Sprintf("Dial Error %v", err))
+			RecordFailure(s, fmt.Sprintf("Dial Error %v", err), "connection")
 		}
 		return s, err
 	}
 	if err := conn.Close(); err != nil {
 		if record {
-			recordFailure(s, fmt.Sprintf("%v Socket Close Error %v", strings.ToUpper(s.Type), err))
+			RecordFailure(s, fmt.Sprintf("%v Socket Close Error %v", strings.ToUpper(s.Type), err), "close")
 		}
 		return s, err
 	}
@@ -144,7 +151,7 @@ func CheckGrpc(s *Service, record bool) (*Service, error) {
 	s.LastResponse = ""
 	s.Online = true
 	if record {
-		recordSuccess(s)
+		RecordSuccess(s)
 	}
 	return s, nil
 }
@@ -158,7 +165,7 @@ func CheckTcp(s *Service, record bool) (*Service, error) {
 	dnsLookup, err := dnsCheck(s)
 	if err != nil {
 		if record {
-			recordFailure(s, fmt.Sprintf("Could not get IP address for TCP service %v, %v", s.Domain, err))
+			RecordFailure(s, fmt.Sprintf("Could not get IP address for TCP service %v, %v", s.Domain, err), "lookup")
 		}
 		return s, err
 	}
@@ -182,7 +189,7 @@ func CheckTcp(s *Service, record bool) (*Service, error) {
 		conn, err := net.DialTimeout(s.Type, domain, time.Duration(s.Timeout)*time.Second)
 		if err != nil {
 			if record {
-				recordFailure(s, fmt.Sprintf("Dial Error: %v", err))
+				RecordFailure(s, fmt.Sprintf("Dial Error: %v", err), "tls")
 			}
 			return s, err
 		}
@@ -196,7 +203,7 @@ func CheckTcp(s *Service, record bool) (*Service, error) {
 		conn, err := tls.DialWithDialer(dialer, s.Type, domain, tlsConfig)
 		if err != nil {
 			if record {
-				recordFailure(s, fmt.Sprintf("Dial Error: %v", err))
+				RecordFailure(s, fmt.Sprintf("Dial Error: %v", err), "tls")
 			}
 			return s, err
 		}
@@ -207,7 +214,7 @@ func CheckTcp(s *Service, record bool) (*Service, error) {
 	s.LastResponse = ""
 	s.Online = true
 	if record {
-		recordSuccess(s)
+		RecordSuccess(s)
 	}
 	return s, nil
 }
@@ -225,7 +232,7 @@ func CheckHttp(s *Service, record bool) (*Service, error) {
 	dnsLookup, err := dnsCheck(s)
 	if err != nil {
 		if record {
-			recordFailure(s, fmt.Sprintf("Could not get IP address for domain %v, %v", s.Domain, err))
+			RecordFailure(s, fmt.Sprintf("Could not get IP address for domain %v, %v", s.Domain, err), "lookup")
 		}
 		return s, err
 	}
@@ -277,7 +284,7 @@ func CheckHttp(s *Service, record bool) (*Service, error) {
 	content, res, err = utils.HttpRequest(s.Domain, s.Method, contentType, headers, data, timeout, s.VerifySSL.Bool, customTLS)
 	if err != nil {
 		if record {
-			recordFailure(s, fmt.Sprintf("HTTP Error %v", err))
+			RecordFailure(s, fmt.Sprintf("HTTP Error %v", err), "request")
 		}
 		return s, err
 	}
@@ -294,26 +301,26 @@ func CheckHttp(s *Service, record bool) (*Service, error) {
 		}
 		if !match {
 			if record {
-				recordFailure(s, fmt.Sprintf("HTTP Response Body did not match '%v'", s.Expected))
+				RecordFailure(s, fmt.Sprintf("HTTP Response Body did not match '%v'", s.Expected), "regex")
 			}
 			return s, err
 		}
 	}
 	if s.ExpectedStatus != res.StatusCode {
 		if record {
-			recordFailure(s, fmt.Sprintf("HTTP Status Code %v did not match %v", res.StatusCode, s.ExpectedStatus))
+			RecordFailure(s, fmt.Sprintf("HTTP Status Code %v did not match %v", res.StatusCode, s.ExpectedStatus), "status_code")
 		}
 		return s, err
 	}
 	if record {
-		recordSuccess(s)
+		RecordSuccess(s)
 	}
 	s.Online = true
 	return s, err
 }
 
-// recordSuccess will create a new 'hit' record in the database for a successful/online service
-func recordSuccess(s *Service) {
+// RecordSuccess will create a new 'hit' record in the database for a successful/online service
+func RecordSuccess(s *Service) {
 	s.LastOnline = utils.Now()
 	s.Online = true
 	hit := &hits.Hit{
@@ -332,40 +339,10 @@ func recordSuccess(s *Service) {
 	metrics.Gauge("online", 1., s.Name, s.Type)
 	metrics.Inc("success", s.Name)
 	sendSuccess(s)
-	s.SuccessNotified = true
 }
 
-func AddNotifier(n ServiceNotifier) {
-	notif := n.Select()
-	allNotifiers[notif.Method] = n
-}
-
-func sendSuccess(s *Service) {
-	if !s.AllowNotifications.Bool {
-		return
-	}
-	// dont send notification if server was already previous online
-	if s.SuccessNotified {
-		return
-	}
-
-	for _, n := range allNotifiers {
-		notif := n.Select()
-		if notif.CanSend() {
-			log.Infof("Sending notification to: %s!", notif.Method)
-			if _, err := n.OnSuccess(*s); err != nil {
-				notif.Logger().Errorln(err)
-			}
-			s.UserNotified = true
-			s.SuccessNotified = true
-			//s.UpdateNotify.Bool
-		}
-	}
-	s.notifyAfterCount = 0
-}
-
-// recordFailure will create a new 'Failure' record in the database for a offline service
-func recordFailure(s *Service, issue string) {
+// RecordFailure will create a new 'Failure' record in the database for a offline service
+func RecordFailure(s *Service, issue, reason string) {
 	s.LastOffline = utils.Now()
 
 	fail := &failures.Failure{
@@ -374,6 +351,7 @@ func recordFailure(s *Service, issue string) {
 		PingTime:  s.PingTime,
 		CreatedAt: utils.Now(),
 		ErrorCode: s.LastStatusCode,
+		Reason:    reason,
 	}
 	log.WithFields(utils.ToFields(fail, s)).
 		Warnln(fmt.Sprintf("Service %v Failing: %v | Lookup in: %v", s.Name, issue, humanMicro(fail.PingTime)))
@@ -382,42 +360,20 @@ func recordFailure(s *Service, issue string) {
 		log.Error(err)
 	}
 	s.Online = false
-	s.SuccessNotified = false
 	s.DownText = s.DowntimeText()
+
+	limitOffset := len(s.Failures)
+	if len(s.Failures) >= limitFailures {
+		limitOffset = limitFailures - 1
+	}
+
+	s.Failures = append([]*failures.Failure{fail}, s.Failures[:limitOffset]...)
+
 	metrics.Gauge("online", 0., s.Name, s.Type)
 	metrics.Inc("failure", s.Name)
 	sendFailure(s, fail)
 }
 
-func sendFailure(s *Service, f *failures.Failure) {
-	if !s.AllowNotifications.Bool {
-		return
-	}
-
-	// ignore failure if user was already notified and
-	// they have "continuous notifications" switched off.
-	if s.UserNotified && !s.UpdateNotify.Bool {
-		return
-	}
-
-	if s.notifyAfterCount > s.NotifyAfter {
-		for _, n := range allNotifiers {
-			notif := n.Select()
-			if notif.CanSend() {
-				log.Infof("Sending Failure notification to: %s!", notif.Method)
-				if _, err := n.OnFailure(*s, *f); err != nil {
-					notif.Logger().WithField("failure", f.Issue).Errorln(err)
-				}
-				s.UserNotified = true
-				s.SuccessNotified = true
-				//s.UpdateNotify.Bool
-			}
-		}
-	}
-
-	s.notifyAfterCount++
-}
-
 // Check will run checkHttp for HTTP services and checkTcp for TCP services
 // if record param is set to true, it will add a record into the database.
 func (s *Service) CheckService(record bool) {
diff --git a/types/services/samples.go b/types/services/samples.go
index c979ac8c..1ed482b4 100644
--- a/types/services/samples.go
+++ b/types/services/samples.go
@@ -44,18 +44,16 @@ func Example(online bool) Service {
 		NotifyAfter:         0,
 		notifyAfterCount:    0,
 		AllowNotifications:  null.NewNullBool(true),
-		UserNotified:        false,
 		UpdateNotify:        null.NewNullBool(true),
 		DownText:            "The service was responding with 500 status code",
-		SuccessNotified:     false,
 		LastStatusCode:      200,
 		Failures:            nil,
-		AllCheckins:         nil,
 		LastLookupTime:      4600,
 		LastLatency:         124399,
 		LastCheck:           utils.Now().Add(-37 * time.Second),
 		LastOnline:          utils.Now().Add(-37 * time.Second),
 		LastOffline:         utils.Now().Add(-75 * time.Second),
+		prevOnline:          false,
 	}
 }
 
@@ -176,5 +174,17 @@ func Samples() error {
 		return err
 	}
 
+	s7 := &Service{
+		Name:      "Static Service",
+		Domain:    "none",
+		Type:      "static",
+		Order:     7,
+		Public:    null.NewNullBool(true),
+		CreatedAt: createdOn,
+	}
+	if err := s7.Create(); err != nil {
+		return err
+	}
+
 	return nil
 }
diff --git a/types/services/services_test.go b/types/services/services_test.go
index fd5fcbe2..81703b68 100644
--- a/types/services/services_test.go
+++ b/types/services/services_test.go
@@ -3,12 +3,14 @@ package services
 import (
 	"context"
 	"crypto/tls"
-	"fmt"
 	"github.com/gorilla/mux"
 	"github.com/statping/statping/database"
 	"github.com/statping/statping/types/checkins"
 	"github.com/statping/statping/types/failures"
 	"github.com/statping/statping/types/hits"
+	"github.com/statping/statping/types/incidents"
+	"github.com/statping/statping/types/messages"
+	"github.com/statping/statping/types/notifications"
 	"github.com/statping/statping/types/null"
 	"github.com/statping/statping/utils"
 	"github.com/stretchr/testify/assert"
@@ -61,11 +63,10 @@ var hit3 = &hits.Hit{
 }
 
 var exmapleCheckin = &checkins.Checkin{
-	ServiceId:   1,
-	Name:        "Example Checkin",
-	Interval:    60,
-	GracePeriod: 30,
-	ApiKey:      "wdededede",
+	ServiceId: 1,
+	Name:      "Example Checkin",
+	Interval:  3,
+	ApiKey:    "wdededede",
 }
 
 var fail1 = &failures.Failure{
@@ -84,6 +85,34 @@ var fail2 = &failures.Failure{
 	CreatedAt: utils.Now().Add(-5 * time.Second),
 }
 
+var incident1 = &incidents.Incident{
+	Title:       "Theres something going on",
+	Description: "this is an example",
+	ServiceId:   1,
+	CreatedAt:   utils.Now().Add(-30 * time.Second),
+}
+
+var incidentUpdate1 = &incidents.IncidentUpdate{
+	IncidentId: 1,
+	Message:    "This is an update",
+	Type:       "pending",
+	CreatedAt:  utils.Now().Add(-5 * time.Second),
+}
+
+var message1 = &messages.Message{
+	Title:             "Example Message",
+	Description:       "Used for testing",
+	StartOn:           utils.Now().Add(15 * time.Minute),
+	EndOn:             utils.Now().Add(30 * time.Minute),
+	ServiceId:         1,
+	NotifyUsers:       null.NewNullBool(false),
+	NotifyMethod:      "",
+	NotifyBefore:      null.NewNullInt64(0),
+	NotifyBeforeScale: "",
+	CreatedAt:         utils.Now(),
+	UpdatedAt:         utils.Now(),
+}
+
 type exampleGRPC struct {
 	pb.UnimplementedRouteGuideServer
 }
@@ -93,8 +122,7 @@ func (s *exampleGRPC) GetFeature(ctx context.Context, point *pb.Point) (*pb.Feat
 }
 
 func TestStartExampleEndpoints(t *testing.T) {
-	err := utils.InitLogs()
-	require.Nil(t, err)
+	startupDb(t)
 
 	// root CA for Linux:  /etc/ssl/certs/ca-certificates.crt
 	// root CA for MacOSX: /opt/local/share/curl/curl-ca-bundle.crt
@@ -164,14 +192,17 @@ func TestStartExampleEndpoints(t *testing.T) {
 	time.Sleep(15 * time.Second)
 }
 
-func TestServices(t *testing.T) {
+func startupDb(t *testing.T) {
 	err := utils.InitLogs()
 	require.Nil(t, err)
 	db, err := database.OpenTester()
 	require.Nil(t, err)
-	db.AutoMigrate(&Service{}, &hits.Hit{}, &checkins.Checkin{}, &checkins.CheckinHit{}, &failures.Failure{})
+	db.AutoMigrate(&Service{}, &notifications.Notification{}, &messages.Message{}, &hits.Hit{}, &checkins.Checkin{}, &checkins.CheckinHit{}, &failures.Failure{}, &incidents.Incident{}, &incidents.IncidentUpdate{})
 	checkins.SetDB(db)
 	failures.SetDB(db)
+	incidents.SetDB(db)
+	notifications.SetDB(db)
+	messages.SetDB(db)
 	hits.SetDB(db)
 	SetDB(db)
 
@@ -182,6 +213,13 @@ func TestServices(t *testing.T) {
 	db.Create(&exmapleCheckin)
 	db.Create(&fail1)
 	db.Create(&fail2)
+	db.Create(&incident1)
+	db.Create(&incidentUpdate1)
+	db.Create(&notification.Notification)
+	db.Create(&message1)
+}
+
+func TestServices(t *testing.T) {
 
 	tlsCert := utils.Params.GetString("STATPING_DIR") + "/cert.pem"
 	tlsCertKey := utils.Params.GetString("STATPING_DIR") + "/key.pem"
@@ -205,7 +243,7 @@ func TestServices(t *testing.T) {
 			Timeout:        5,
 			VerifySSL:      null.NewNullBool(false),
 		}
-		e, err = CheckHttp(e, false)
+		e, err := CheckHttp(e, false)
 		require.Nil(t, err)
 		assert.True(t, e.Online)
 		assert.False(t, e.LastCheck.IsZero())
@@ -246,7 +284,7 @@ func TestServices(t *testing.T) {
 			TLSCert:        null.NewNullString(tlsCert),
 			TLSCertKey:     null.NewNullString(tlsCertKey),
 		}
-		e, err = CheckHttp(e, false)
+		e, err := CheckHttp(e, false)
 		require.Nil(t, err)
 		assert.True(t, e.Online)
 		assert.False(t, e.LastCheck.IsZero())
@@ -262,7 +300,7 @@ func TestServices(t *testing.T) {
 			Type:    "tcp",
 			Timeout: 5,
 		}
-		e, err = CheckTcp(e, false)
+		e, err := CheckTcp(e, false)
 		require.Nil(t, err)
 		assert.True(t, e.Online)
 		assert.False(t, e.LastCheck.IsZero())
@@ -280,7 +318,7 @@ func TestServices(t *testing.T) {
 			TLSCert:    null.NewNullString(tlsCert),
 			TLSCertKey: null.NewNullString(tlsCertKey),
 		}
-		e, err = CheckTcp(e, false)
+		e, err := CheckTcp(e, false)
 		require.Nil(t, err)
 		assert.True(t, e.Online)
 		assert.False(t, e.LastCheck.IsZero())
@@ -296,7 +334,7 @@ func TestServices(t *testing.T) {
 			Type:    "udp",
 			Timeout: 5,
 		}
-		e, err = CheckTcp(e, false)
+		e, err := CheckTcp(e, false)
 		require.Nil(t, err)
 		assert.True(t, e.Online)
 		assert.False(t, e.LastCheck.IsZero())
@@ -312,7 +350,7 @@ func TestServices(t *testing.T) {
 			Type:    "grpc",
 			Timeout: 5,
 		}
-		e, err = CheckGrpc(e, false)
+		e, err := CheckGrpc(e, false)
 		require.Nil(t, err)
 		assert.True(t, e.Online)
 		assert.False(t, e.LastCheck.IsZero())
@@ -321,14 +359,13 @@ func TestServices(t *testing.T) {
 	})
 
 	t.Run("Test ICMP Check", func(t *testing.T) {
-		t.SkipNow()
 		e := &Service{
 			Name:    "Example ICMP",
 			Domain:  "localhost",
 			Type:    "icmp",
 			Timeout: 5,
 		}
-		e, err = CheckIcmp(e, false)
+		e, err := CheckIcmp(e, false)
 		require.Nil(t, err)
 		assert.True(t, e.Online)
 		assert.False(t, e.LastCheck.IsZero())
@@ -344,7 +381,7 @@ func TestServices(t *testing.T) {
 	t.Run("Test Checkins", func(t *testing.T) {
 		item, err := Find(1)
 		require.Nil(t, err)
-		assert.Len(t, item.Checkins(), 1)
+		assert.Len(t, item.Checkins, 1)
 	})
 
 	t.Run("Test All Hits", func(t *testing.T) {
@@ -432,7 +469,7 @@ func TestServices(t *testing.T) {
 		item, err := Find(1)
 		require.Nil(t, err)
 		amount := item.Downtime().Seconds()
-		assert.Equal(t, "75", fmt.Sprintf("%0.f", amount))
+		assert.GreaterOrEqual(t, int64(75), int64(amount))
 	})
 
 	t.Run("Test Failures Since", func(t *testing.T) {
@@ -500,12 +537,82 @@ func TestServices(t *testing.T) {
 		err = item.Delete()
 		require.Nil(t, err)
 
+		// after deleted service, make sure checkins, failures, hits, and incidents are also delete
+		assert.Len(t, item.AllFailures().List(), 0)
+		assert.Len(t, item.AllHits().List(), 0)
+
+		checkin := item.Checkins
+		assert.Len(t, checkin, 0)
+		for _, c := range checkin {
+			assert.Len(t, c.Failures().List(), 0)
+			assert.Len(t, c.Hits(), 0)
+			assert.False(t, c.IsRunning())
+		}
+
+		inc := item.Incidents
+		assert.Len(t, inc, 0)
+		for _, i := range inc {
+			assert.Len(t, i.Updates, 0)
+		}
+
 		all = All()
 		assert.Len(t, all, 1)
 	})
 
-	t.Run("Test Close", func(t *testing.T) {
-		assert.Nil(t, db.Close())
-	})
+	t.Run("Test Load services.yml", func(t *testing.T) {
 
+		file := `x-tcpservice: &tcpservice
+  type: tcp
+  check_interval: 60
+  timeout: 15
+  allow_notifications: true
+  notify_after: 0
+  notify_all_changes: true
+  public: true
+  redirect: true
+
+x-httpservice: &httpservice
+  type: http
+  method: GET
+  check_interval: 45
+  timeout: 10
+  expected_status: 200
+  allow_notifications: true
+  notify_after: 2
+  notify_all_changes: true
+  public: true
+  redirect: true
+
+services:
+
+  - name: Statping Demo
+    domain: https://demo.statping.com
+    <<: *httpservice
+
+  - name: Portainer
+    domain: portainer
+    port: 9000
+    <<: *tcpservice
+
+  - name: Statping Github
+    domain: https://github.com/statping/statping
+    <<: *httpservice`
+
+		err := utils.SaveFile(utils.Directory+"/services.yml", []byte(file))
+		require.Nil(t, err)
+
+		assert.FileExists(t, utils.Directory+"/services.yml")
+
+		srvs, err := LoadServicesYaml()
+		require.Nil(t, err)
+		require.Equal(t, 3, len(srvs.Services))
+
+		assert.Equal(t, "Statping Demo", srvs.Services[0].Name)
+		assert.Equal(t, 45, srvs.Services[0].Interval)
+		assert.Equal(t, "https://demo.statping.com", srvs.Services[0].Domain)
+
+		err = utils.DeleteFile(utils.Directory + "/services.yml")
+		require.Nil(t, err)
+		assert.NoFileExists(t, utils.Directory+"/services.yml")
+	})
 }
diff --git a/types/services/services_test_alerts_test.go b/types/services/services_test_alerts_test.go
new file mode 100644
index 00000000..f1111f56
--- /dev/null
+++ b/types/services/services_test_alerts_test.go
@@ -0,0 +1,334 @@
+package services
+
+import (
+	"github.com/statping/statping/types/failures"
+	"github.com/statping/statping/types/notifications"
+	"github.com/statping/statping/types/null"
+	"github.com/statping/statping/utils"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"testing"
+	"time"
+)
+
+func TestServiceNotifications(t *testing.T) {
+	t.Run("Strategy #1 - Startup - [online, always notify changes, notify after first", func(t *testing.T) {
+		allNotifiers[notification.Method] = notification
+
+		service := Example(true)
+		service.prevOnline = true // set online during startup
+		failure := failures.Example()
+
+		service.UpdateNotify = null.NewNullBool(true)
+		service.NotifyAfter = 0
+
+		tests := []notifyTest{
+			{
+				Name:             "service already online",
+				OnSuccess:        true,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notification,
+				ExpectedSuccess:  0,
+				ExpectedFailures: 0,
+				CountLogs:        0,
+			},
+			{
+				Name:             "service triggers online",
+				OnSuccess:        true,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notification,
+				ExpectedSuccess:  0,
+				ExpectedFailures: 0,
+				CountLogs:        0,
+			},
+			{
+				Name:             "service triggers offline, was online",
+				OnSuccess:        false,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notification,
+				ExpectedSuccess:  0,
+				ExpectedFailures: 1,
+				CountLogs:        1,
+			},
+			{
+				Name:             "service triggers offline again, already was offline, notify",
+				OnSuccess:        false,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notification,
+				ExpectedSuccess:  0,
+				ExpectedFailures: 2,
+				CountLogs:        2,
+			},
+		}
+
+		runNotifyTests(t, notification, tests...)
+	})
+
+	t.Run("Strategy #2 - Delayed Failure - [online, notify only 1 time on change, notify after 2 changes", func(t *testing.T) {
+		allNotifiers[notification.Method] = notification
+
+		service := Example(true)
+		service.prevOnline = true // set online during startup
+		failure := failures.Example()
+		notif := notification
+
+		service.UpdateNotify = null.NewNullBool(false)
+		service.NotifyAfter = 2
+
+		assert.True(t, notif.CanSend())
+		assert.True(t, notif.Enabled.Bool)
+
+		tests := []notifyTest{
+			{
+				Name:             "service already online",
+				OnSuccess:        true,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notif,
+				ExpectedSuccess:  0,
+				ExpectedFailures: 2,
+				CountLogs:        2,
+			},
+			{
+				Name:             "service triggers offline (1st)",
+				OnSuccess:        false,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notif,
+				ExpectedSuccess:  0,
+				ExpectedFailures: 2,
+				CountLogs:        2,
+			},
+			{
+				Name:             "service triggers offline (2nd) ignore",
+				OnSuccess:        false,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notif,
+				ExpectedSuccess:  0,
+				ExpectedFailures: 2,
+				CountLogs:        2,
+			},
+			{
+				Name:             "service triggers offline (3rd) NOTIFY",
+				OnSuccess:        false,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notif,
+				ExpectedSuccess:  0,
+				ExpectedFailures: 3,
+				CountLogs:        3,
+			},
+			{
+				Name:             "service triggers back online, notify",
+				OnSuccess:        true,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notif,
+				ExpectedSuccess:  1,
+				ExpectedFailures: 3,
+				CountLogs:        4,
+			},
+		}
+
+		runNotifyTests(t, notif, tests...)
+	})
+
+	t.Run("Strategy #3 - Back Online - [offline, notify once for changes, notify after 2 changes", func(t *testing.T) {
+		allNotifiers[notification.Method] = notification
+
+		service := Example(false)
+		failure := failures.Example()
+		notif := notification
+		service.prevOnline = false // set offline
+
+		service.UpdateNotify = null.NewNullBool(false)
+		service.NotifyAfter = 2
+
+		assert.True(t, notif.CanSend())
+		assert.True(t, notif.Enabled.Bool)
+
+		tests := []notifyTest{
+			{
+				Name:             "service already offline",
+				OnSuccess:        false,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notif,
+				ExpectedSuccess:  1,
+				ExpectedFailures: 3,
+				CountLogs:        4,
+			},
+			{
+				Name:             "service triggers offline again, ignore",
+				OnSuccess:        false,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notif,
+				ExpectedSuccess:  1,
+				ExpectedFailures: 3,
+				CountLogs:        4,
+			},
+			{
+				Name:             "service triggers offline again, ignore",
+				OnSuccess:        false,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notif,
+				ExpectedSuccess:  1,
+				ExpectedFailures: 3,
+				CountLogs:        4,
+			},
+			{
+				Name:             "service triggers back online, NOTIFY",
+				OnSuccess:        true,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notif,
+				ExpectedSuccess:  2,
+				ExpectedFailures: 3,
+				CountLogs:        5,
+			},
+			{
+				Name:             "service triggers online, ignore",
+				OnSuccess:        true,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notif,
+				ExpectedSuccess:  2,
+				ExpectedFailures: 3,
+				CountLogs:        5,
+			},
+		}
+
+		runNotifyTests(t, notif, tests...)
+	})
+
+	t.Run("Strategy #4 - Disabled - [online, notifications are disabled", func(t *testing.T) {
+		allNotifiers[notification.Method] = notification
+		service := Example(false)
+		service.prevOnline = true // set online during startup
+		service.AllowNotifications = null.NewNullBool(false)
+		failure := failures.Example()
+		notif := notification
+
+		tests := []notifyTest{
+			{
+				Name:             "service offline",
+				OnSuccess:        true,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notif,
+				ExpectedSuccess:  2,
+				ExpectedFailures: 3,
+				CountLogs:        5,
+			},
+			{
+				Name:             "service online",
+				OnSuccess:        false,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notif,
+				ExpectedSuccess:  2,
+				ExpectedFailures: 3,
+				CountLogs:        5,
+			},
+			{
+				Name:             "service offline",
+				OnSuccess:        true,
+				Service:          &service,
+				Failure:          &failure,
+				Notifier:         notif,
+				ExpectedSuccess:  2,
+				ExpectedFailures: 3,
+				CountLogs:        5,
+			},
+		}
+
+		runNotifyTests(t, notif, tests...)
+	})
+
+	t.Run("Test Samples", func(t *testing.T) {
+		require.Nil(t, Samples())
+		assert.Len(t, All(), 11)
+	})
+
+	t.Run("Test Close", func(t *testing.T) {
+		assert.Nil(t, db.Close())
+	})
+
+}
+
+func runNotifyTests(t *testing.T, notif *exampleNotifier, tests ...notifyTest) {
+	for _, test := range tests {
+		t.Run(test.Name, func(t *testing.T) {
+			if test.OnSuccess {
+				RecordSuccess(test.Service)
+			} else {
+				RecordFailure(test.Service, "test issue", "lookup")
+			}
+
+			assert.Equal(t, test.ExpectedSuccess, notif.success)
+			assert.Equal(t, test.ExpectedFailures, notif.failures)
+			assert.Equal(t, test.CountLogs, notif.LastSentCount)
+		})
+	}
+}
+
+var notification = &exampleNotifier{Notification: &notifications.Notification{
+	Method:    "test",
+	CreatedAt: utils.Now().Add(-5 * time.Second),
+	Limits:    60,
+	Enabled:   null.NewNullBool(true),
+}, failures: 0, success: 0}
+
+type notifyTest struct {
+	Name             string
+	OnSuccess        bool
+	Service          *Service
+	Failure          *failures.Failure
+	Notifier         ServiceNotifier
+	ExpectedSuccess  int
+	ExpectedFailures int
+	CountLogs        int
+}
+
+type exampleNotifier struct {
+	*notifications.Notification
+	failures int
+	success  int
+	saves    int
+	tests    int
+}
+
+func (e *exampleNotifier) OnSuccess(s Service) (string, error) {
+	e.success++
+	return "", nil
+}
+
+func (e *exampleNotifier) OnFailure(s Service, f failures.Failure) (string, error) {
+	e.failures++
+	return "", nil
+}
+
+func (e *exampleNotifier) OnSave() (string, error) {
+	e.saves++
+	return "", nil
+}
+
+func (e *exampleNotifier) Select() *notifications.Notification {
+	return e.Notification
+}
+
+func (e *exampleNotifier) OnTest() (string, error) {
+	e.tests++
+	return "", nil
+}
+
+func (e *exampleNotifier) Valid(form notifications.Values) error {
+	return nil
+}
diff --git a/types/services/struct.go b/types/services/struct.go
index 034b34d2..472614d3 100644
--- a/types/services/struct.go
+++ b/types/services/struct.go
@@ -3,66 +3,104 @@ package services
 import (
 	"github.com/statping/statping/types/checkins"
 	"github.com/statping/statping/types/failures"
+	"github.com/statping/statping/types/incidents"
+	"github.com/statping/statping/types/messages"
 	"github.com/statping/statping/types/null"
 	"time"
 )
 
 // Service is the main struct for Services
 type Service struct {
-	Id                  int64               `gorm:"primary_key;column:id" json:"id" yaml:"id"`
-	Name                string              `gorm:"column:name" json:"name" yaml:"name"`
-	Domain              string              `gorm:"column:domain" json:"domain" yaml:"domain" private:"true" scope:"user,admin"`
-	Expected            null.NullString     `gorm:"column:expected" json:"expected" yaml:"expected" scope:"user,admin"`
-	ExpectedStatus      int                 `gorm:"default:200;column:expected_status" json:"expected_status" yaml:"expected_status" scope:"user,admin"`
-	Interval            int                 `gorm:"default:30;column:check_interval" json:"check_interval" yaml:"check_interval"`
-	Type                string              `gorm:"column:check_type" json:"type" scope:"user,admin" yaml:"type"`
-	Method              string              `gorm:"column:method" json:"method" scope:"user,admin" yaml:"method"`
-	PostData            null.NullString     `gorm:"column:post_data" json:"post_data" scope:"user,admin" yaml:"post_data"`
-	Port                int                 `gorm:"not null;column:port" json:"port" scope:"user,admin" yaml:"port"`
-	Timeout             int                 `gorm:"default:30;column:timeout" json:"timeout" scope:"user,admin" yaml:"timeout"`
-	Order               int                 `gorm:"default:0;column:order_id" json:"order_id" yaml:"order_id"`
-	VerifySSL           null.NullBool       `gorm:"default:false;column:verify_ssl" json:"verify_ssl" scope:"user,admin" yaml:"verify_ssl"`
-	Public              null.NullBool       `gorm:"default:true;column:public" json:"public" yaml:"public"`
-	GroupId             int                 `gorm:"default:0;column:group_id" json:"group_id" yaml:"group_id"`
-	TLSCert             null.NullString     `gorm:"column:tls_cert" json:"tls_cert" scope:"user,admin" yaml:"tls_cert"`
-	TLSCertKey          null.NullString     `gorm:"column:tls_cert_key" json:"tls_cert_key" scope:"user,admin" yaml:"tls_cert_key"`
-	TLSCertRoot         null.NullString     `gorm:"column:tls_cert_root" json:"tls_cert_root" scope:"user,admin" yaml:"tls_cert_root"`
-	Headers             null.NullString     `gorm:"column:headers" json:"headers" scope:"user,admin" yaml:"headers"`
-	Permalink           null.NullString     `gorm:"column:permalink" json:"permalink" yaml:"permalink"`
-	Redirect            null.NullBool       `gorm:"default:false;column:redirect" json:"redirect" scope:"user,admin" yaml:"redirect"`
-	CreatedAt           time.Time           `gorm:"column:created_at" json:"created_at" yaml:"-"`
-	UpdatedAt           time.Time           `gorm:"column:updated_at" json:"updated_at" yaml:"-"`
-	Online              bool                `gorm:"-" json:"online" yaml:"-"`
-	Latency             int64               `gorm:"-" json:"latency" yaml:"-"`
-	PingTime            int64               `gorm:"-" json:"ping_time" yaml:"-"`
-	Online24Hours       float32             `gorm:"-" json:"online_24_hours" yaml:"-"`
-	Online7Days         float32             `gorm:"-" json:"online_7_days" yaml:"-"`
-	AvgResponse         int64               `gorm:"-" json:"avg_response" yaml:"-"`
-	FailuresLast24Hours int                 `gorm:"-" json:"failures_24_hours" yaml:"-"`
-	Running             chan bool           `gorm:"-" json:"-" yaml:"-"`
-	Checkpoint          time.Time           `gorm:"-" json:"-" yaml:"-"`
-	SleepDuration       time.Duration       `gorm:"-" json:"-" yaml:"-"`
-	LastResponse        string              `gorm:"-" json:"-" yaml:"-"`
-	NotifyAfter         int64               `gorm:"column:notify_after" json:"notify_after" yaml:"notify_after" scope:"user,admin"`
-	notifyAfterCount    int64               `gorm:"-" json:"-" yaml:"-"`
-	AllowNotifications  null.NullBool       `gorm:"default:true;column:allow_notifications" json:"allow_notifications" yaml:"allow_notifications" scope:"user,admin"`
-	UserNotified        bool                `gorm:"-" json:"-" yaml:"-"`                                                                                           // True if the User was already notified about a Downtime
-	UpdateNotify        null.NullBool       `gorm:"default:true;column:notify_all_changes" json:"notify_all_changes" yaml:"notify_all_changes" scope:"user,admin"` // This Variable is a simple copy of `core.CoreApp.UpdateNotify.Bool`
-	DownText            string              `gorm:"-" json:"-" yaml:"-"`                                                                                           // Contains the current generated Downtime Text
-	SuccessNotified     bool                `gorm:"-" json:"-" yaml:"-"`                                                                                           // Is 'true' if the user has already be informed that the Services now again available
-	LastStatusCode      int                 `gorm:"-" json:"status_code" yaml:"-"`
-	Failures            []*failures.Failure `gorm:"-" json:"failures,omitempty" yaml:"-" scope:"user,admin"`
-	AllCheckins         []*checkins.Checkin `gorm:"-" json:"checkins,omitempty" yaml:"-" scope:"user,admin"`
-	LastLookupTime      int64               `gorm:"-" json:"-" yaml:"-"`
-	LastLatency         int64               `gorm:"-" json:"-" yaml:"-"`
-	LastCheck           time.Time           `gorm:"-" json:"-" yaml:"-"`
-	LastOnline          time.Time           `gorm:"-" json:"last_success" yaml:"-"`
-	LastOffline         time.Time           `gorm:"-" json:"last_error" yaml:"-"`
-	Stats               *Stats              `gorm:"-" json:"stats,omitempty" yaml:"-"`
+	Id                  int64                 `gorm:"primary_key;column:id" json:"id" yaml:"id"`
+	Name                string                `gorm:"column:name" json:"name" yaml:"name"`
+	Domain              string                `gorm:"column:domain" json:"domain" yaml:"domain" private:"true" scope:"user,admin"`
+	Expected            null.NullString       `gorm:"column:expected" json:"expected" yaml:"expected" scope:"user,admin"`
+	ExpectedStatus      int                   `gorm:"default:200;column:expected_status" json:"expected_status" yaml:"expected_status" scope:"user,admin"`
+	Interval            int                   `gorm:"default:30;column:check_interval" json:"check_interval" yaml:"check_interval"`
+	Type                string                `gorm:"column:check_type" json:"type" scope:"user,admin" yaml:"type"`
+	Method              string                `gorm:"column:method" json:"method" scope:"user,admin" yaml:"method"`
+	PostData            null.NullString       `gorm:"column:post_data" json:"post_data" scope:"user,admin" yaml:"post_data"`
+	Port                int                   `gorm:"not null;column:port" json:"port" scope:"user,admin" yaml:"port"`
+	Timeout             int                   `gorm:"default:30;column:timeout" json:"timeout" scope:"user,admin" yaml:"timeout"`
+	Order               int                   `gorm:"default:0;column:order_id" json:"order_id" yaml:"order_id"`
+	VerifySSL           null.NullBool         `gorm:"default:false;column:verify_ssl" json:"verify_ssl" scope:"user,admin" yaml:"verify_ssl"`
+	Public              null.NullBool         `gorm:"default:true;column:public" json:"public" yaml:"public"`
+	GroupId             int                   `gorm:"default:0;column:group_id" json:"group_id" yaml:"group_id"`
+	TLSCert             null.NullString       `gorm:"column:tls_cert" json:"tls_cert" scope:"user,admin" yaml:"tls_cert"`
+	TLSCertKey          null.NullString       `gorm:"column:tls_cert_key" json:"tls_cert_key" scope:"user,admin" yaml:"tls_cert_key"`
+	TLSCertRoot         null.NullString       `gorm:"column:tls_cert_root" json:"tls_cert_root" scope:"user,admin" yaml:"tls_cert_root"`
+	Headers             null.NullString       `gorm:"column:headers" json:"headers" scope:"user,admin" yaml:"headers"`
+	Permalink           null.NullString       `gorm:"column:permalink" json:"permalink" yaml:"permalink"`
+	Redirect            null.NullBool         `gorm:"default:false;column:redirect" json:"redirect" scope:"user,admin" yaml:"redirect"`
+	CreatedAt           time.Time             `gorm:"column:created_at" json:"created_at" yaml:"-"`
+	UpdatedAt           time.Time             `gorm:"column:updated_at" json:"updated_at" yaml:"-"`
+	Online              bool                  `gorm:"-" json:"online" yaml:"-"`
+	Latency             int64                 `gorm:"-" json:"latency" yaml:"-"`
+	PingTime            int64                 `gorm:"-" json:"ping_time" yaml:"-"`
+	Online24Hours       float32               `gorm:"-" json:"online_24_hours" yaml:"-"`
+	Online7Days         float32               `gorm:"-" json:"online_7_days" yaml:"-"`
+	AvgResponse         int64                 `gorm:"-" json:"avg_response" yaml:"-"`
+	FailuresLast24Hours int                   `gorm:"-" json:"failures_24_hours" yaml:"-"`
+	Running             chan bool             `gorm:"-" json:"-" yaml:"-"`
+	Checkpoint          time.Time             `gorm:"-" json:"-" yaml:"-"`
+	SleepDuration       time.Duration         `gorm:"-" json:"-" yaml:"-"`
+	LastResponse        string                `gorm:"-" json:"-" yaml:"-"`
+	NotifyAfter         int64                 `gorm:"column:notify_after" json:"notify_after" yaml:"notify_after" scope:"user,admin"`
+	AllowNotifications  null.NullBool         `gorm:"default:true;column:allow_notifications" json:"allow_notifications" yaml:"allow_notifications" scope:"user,admin"`
+	UpdateNotify        null.NullBool         `gorm:"default:true;column:notify_all_changes" json:"notify_all_changes" yaml:"notify_all_changes" scope:"user,admin"` // This Variable is a simple copy of `core.CoreApp.UpdateNotify.Bool`
+	DownText            string                `gorm:"-" json:"-" yaml:"-"`                                                                                           // Contains the current generated Downtime Text 	// Is 'true' if the user has already be informed that the Services now again available // Is 'true' if the user has already be informed that the Services now again available
+	LastStatusCode      int                   `gorm:"-" json:"status_code" yaml:"-"`
+	LastLookupTime      int64                 `gorm:"-" json:"-" yaml:"-"`
+	LastLatency         int64                 `gorm:"-" json:"-" yaml:"-"`
+	LastCheck           time.Time             `gorm:"-" json:"-" yaml:"-"`
+	LastOnline          time.Time             `gorm:"-" json:"last_success" yaml:"-"`
+	LastOffline         time.Time             `gorm:"-" json:"last_error" yaml:"-"`
+	Stats               *Stats                `gorm:"-" json:"stats,omitempty" yaml:"-"`
+	Messages            []*messages.Message   `gorm:"foreignkey:service;association_foreignkey:id" json:"messages,omitempty" yaml:"messages"`
+	Incidents           []*incidents.Incident `gorm:"foreignkey:service;association_foreignkey:id" json:"incidents,omitempty" yaml:"incidents"`
+	Checkins            []*checkins.Checkin   `gorm:"foreignkey:service;association_foreignkey:id" json:"checkins,omitempty" yaml:"-" scope:"user,admin"`
+	Failures            []*failures.Failure   `gorm:"-" json:"failures,omitempty" yaml:"-" scope:"user,admin"`
+
+	notifyAfterCount int64 `gorm:"-" json:"-" yaml:"-"`
+	prevOnline       bool  `gorm:"-" json:"-" yaml:"-"`
 }
 
+// ServiceOrder will reorder the services based on 'order_id' (Order)
+type ServiceOrder []Service
+
+// Sort interface for resroting the Services in order
+func (c ServiceOrder) Len() int           { return len(c) }
+func (c ServiceOrder) Swap(i, j int)      { c[int64(i)], c[int64(j)] = c[int64(j)], c[int64(i)] }
+func (c ServiceOrder) Less(i, j int) bool { return c[i].Order < c[j].Order }
+
 type Stats struct {
 	Failures int       `gorm:"-" json:"failures"`
 	Hits     int       `gorm:"-" json:"hits"`
 	FirstHit time.Time `gorm:"-" json:"first_hit"`
 }
+
+type ser struct {
+	Time   time.Time
+	Online bool
+}
+
+type UptimeSeries struct {
+	Start    time.Time `json:"start"`
+	End      time.Time `json:"end"`
+	Uptime   int64     `json:"uptime"`
+	Downtime int64     `json:"downtime"`
+	Series   []series  `json:"series"`
+}
+
+type ByTime []ser
+
+func (a ByTime) Len() int           { return len(a) }
+func (a ByTime) Less(i, j int) bool { return a[i].Time.Before(a[j].Time) }
+func (a ByTime) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+
+type series struct {
+	Start    time.Time `json:"start"`
+	End      time.Time `json:"end"`
+	Duration int64     `json:"duration"`
+	Online   bool      `json:"online"`
+}
diff --git a/types/users/auth.go b/types/users/auth.go
index 5a0c842f..b6ce7c6d 100644
--- a/types/users/auth.go
+++ b/types/users/auth.go
@@ -7,14 +7,14 @@ import (
 )
 
 // AuthUser will return the User and a boolean if authentication was correct.
-// AuthUser accepts username, and password as a string
-func AuthUser(username, password string) (*User, bool) {
+// accepts username, and password as a string
+func AuthUser(username, passwordHash string) (*User, bool) {
 	user, err := FindByUsername(username)
 	if err != nil {
 		log.Warnln(fmt.Errorf("user %v not found", username))
 		return nil, false
 	}
-	if utils.CheckHash(password, user.Password) {
+	if utils.CheckHash(passwordHash, user.Password) {
 		user.UpdatedAt = time.Now().UTC()
 		user.Update()
 		return user, true
diff --git a/types/users/hooks.go b/types/users/hooks.go
index c66ca1af..956d369b 100644
--- a/types/users/hooks.go
+++ b/types/users/hooks.go
@@ -1,9 +1,37 @@
 package users
 
-import "github.com/statping/statping/utils"
+import (
+	"github.com/statping/statping/types/errors"
+	"github.com/statping/statping/utils"
+)
+
+func (u *User) Validate() error {
+	if u.Username == "" {
+		return errors.New("username is empty")
+	} else if u.Password == "" {
+		return errors.New("password is empty")
+	}
+	return nil
+}
+
+func (u *User) BeforeDelete() error {
+	if utils.Params.GetBool("DEMO_MODE") {
+		if u.Username == "admin" {
+			return errors.New("cannot delete admin in DEMO_MODE")
+		}
+	}
+	return nil
+}
 
 func (u *User) BeforeCreate() error {
+	if err := u.Validate(); err != nil {
+		return err
+	}
 	u.Password = utils.HashPassword(u.Password)
 	u.ApiKey = utils.NewSHA256Hash()
 	return nil
 }
+
+func (u *User) BeforeUpdate() error {
+	return u.Validate()
+}
diff --git a/types/users/users_test.go b/types/users/users_test.go
index 9a2e952e..6aa2cb20 100644
--- a/types/users/users_test.go
+++ b/types/users/users_test.go
@@ -64,6 +64,17 @@ func TestCreate(t *testing.T) {
 	assert.NotEmpty(t, example.ApiKey)
 }
 
+func TestAuthUser(t *testing.T) {
+	t.SkipNow()
+	u, ok := AuthUser("exampleuser2", utils.HashPassword("password12345"))
+	require.True(t, ok)
+	assert.Equal(t, "exampleuser2", u.Username)
+
+	u, ok = AuthUser("exampleuser2", "wrongpass")
+	assert.False(t, ok)
+	assert.Nil(t, u)
+}
+
 func TestUpdate(t *testing.T) {
 	item, err := Find(1)
 	require.Nil(t, err)
@@ -87,6 +98,11 @@ func TestDelete(t *testing.T) {
 	assert.Len(t, all, 1)
 }
 
+func TestSamples(t *testing.T) {
+	require.Nil(t, Samples())
+	assert.Len(t, All(), 3)
+}
+
 func TestClose(t *testing.T) {
 	assert.Nil(t, db.Close())
 }
diff --git a/utils/encryption.go b/utils/encryption.go
index 690f23e6..e53e4e50 100644
--- a/utils/encryption.go
+++ b/utils/encryption.go
@@ -28,6 +28,11 @@ func NewSHA256Hash() string {
 	return fmt.Sprintf("%x", sha256.Sum256(d))
 }
 
+// NewSHA1Hash returns a random SHA1 hash based on a specific length
+func Sha256Hash(val string) string {
+	return fmt.Sprintf("%x", sha256.Sum256([]byte(val)))
+}
+
 var characterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
 
 // RandomString generates a random string of n length
diff --git a/utils/env.go b/utils/env.go
index 3e54141c..a7bf9c12 100644
--- a/utils/env.go
+++ b/utils/env.go
@@ -24,12 +24,13 @@ func InitEnvs() {
 		Log.Errorln(err)
 		defaultDir = "."
 	}
-	Params.Set("VERSION", Version)
 	Params.SetDefault("DISABLE_HTTP", false)
 	Params.SetDefault("STATPING_DIR", defaultDir)
 	Params.SetDefault("GO_ENV", "production")
 	Params.SetDefault("DEBUG", false)
+	Params.SetDefault("DEMO_MODE", false)
 	Params.SetDefault("DB_CONN", "")
+	Params.SetDefault("DB_DSN", "")
 	Params.SetDefault("DISABLE_LOGS", false)
 	Params.SetDefault("USE_ASSETS", false)
 	Params.SetDefault("BASE_PATH", "")
@@ -49,6 +50,11 @@ func InitEnvs() {
 	Params.SetDefault("REMOVE_AFTER", 2160*time.Hour)
 	Params.SetDefault("CLEANUP_INTERVAL", 1*time.Hour)
 	Params.SetDefault("LANGUAGE", "en")
+	Params.SetDefault("LETSENCRYPT_HOST", "")
+	Params.SetDefault("LETSENCRYPT_EMAIL", "")
+	Params.SetDefault("LETSENCRYPT_LOCAL", false)
+	Params.SetDefault("LETSENCRYPT_ENABLE", false)
+	Params.SetDefault("READ_ONLY", false)
 	Params.SetDefault("LOGS_MAX_COUNT", 5)
 	Params.SetDefault("LOGS_MAX_AGE", 28)
 	Params.SetDefault("LOGS_MAX_SIZE", 16)
diff --git a/utils/file.go b/utils/file.go
index 1019b6fd..db753d76 100644
--- a/utils/file.go
+++ b/utils/file.go
@@ -68,7 +68,7 @@ func RenameDirectory(fromDir string, toDir string) error {
 // SaveFile will create a new file with data inside it
 //		SaveFile("newfile.json", []byte('{"data": "success"}')
 func SaveFile(filename string, data []byte) error {
-	err := ioutil.WriteFile(filename, data, os.ModePerm)
+	err := ioutil.WriteFile(filename, data, os.FileMode(0755))
 	return err
 }
 
diff --git a/utils/log.go b/utils/log.go
index 35da0913..68f371bd 100644
--- a/utils/log.go
+++ b/utils/log.go
@@ -21,7 +21,6 @@ var (
 	LastLines    []*logRow
 	LockLines    sync.Mutex
 	VerboseMode  int
-	Version      string
 	allowReports bool
 )
 
@@ -30,21 +29,15 @@ const (
 	errorReporter = "https://ddf2784201134d51a20c3440e222cebe@sentry.statping.com/4"
 )
 
-func SentryInit(v *string, allow bool) {
+func SentryInit(allow bool) {
 	allowReports = allow
-	if v != nil {
-		if *v == "" {
-			*v = "development"
-		}
-		Version = *v
-	}
 	goEnv := Params.GetString("GO_ENV")
 	allowReports := Params.GetBool("ALLOW_REPORTS")
-	if allowReports || allow || goEnv == "test" {
+	if allow || goEnv == "test" || allowReports {
 		if err := sentry.Init(sentry.ClientOptions{
 			Dsn:              errorReporter,
 			Environment:      goEnv,
-			Release:          Version,
+			Release:          Params.GetString("VERSION"),
 			AttachStacktrace: true,
 		}); err != nil {
 			Log.Errorln(err)
@@ -60,10 +53,17 @@ func SentryErr(err error) {
 	sentry.CaptureException(err)
 }
 
+func sentryTags() map[string]string {
+	val := make(map[string]string)
+	val["database"] = Params.GetString("DB_CONN")
+	return val
+}
+
 func SentryLogEntry(entry *Logger.Entry) {
 	e := sentry.NewEvent()
 	e.Message = entry.Message
-	e.Release = Version
+	e.Tags = sentryTags()
+	e.Release = Params.GetString("VERSION")
 	e.Contexts = entry.Data
 	sentry.CaptureEvent(e)
 }
diff --git a/utils/metrics.go b/utils/metrics.go
deleted file mode 100644
index 489c2808..00000000
--- a/utils/metrics.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package utils
-
-var (
-	StartTime = Now()
-)
diff --git a/utils/time.go b/utils/time.go
index 1cbdd736..76c56b79 100644
--- a/utils/time.go
+++ b/utils/time.go
@@ -22,7 +22,3 @@ func (d Duration) Human() string {
 func FormatDuration(d time.Duration) string {
 	return durafmt.ParseShort(d).LimitFirstN(3).String()
 }
-
-func rev(f float64) float64 {
-	return f * -1
-}
diff --git a/utils/utils.go b/utils/utils.go
index 353c4be7..2b12480b 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -10,39 +10,25 @@ import (
 	"io/ioutil"
 	"net"
 	"net/http"
+	"net/url"
 	"os"
 	"os/exec"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
-
-	"github.com/ararog/timeago"
 )
 
 var (
 	// Directory returns the current path or the STATPING_DIR environment variable
-	Directory   string
-	disableLogs bool
+	Directory string
 )
 
-type env struct {
-	data interface{}
-}
-
 func NotNumber(val string) bool {
 	_, err := strconv.ParseInt(val, 10, 64)
 	return err != nil
 }
 
-func (e *env) Duration() time.Duration {
-	t, err := time.ParseDuration(e.data.(string))
-	if err != nil {
-		Log.Errorln(err)
-	}
-	return t
-}
-
 // ToInt converts a int to a string
 func ToInt(s interface{}) int64 {
 	switch v := s.(type) {
@@ -91,21 +77,9 @@ func ToString(s interface{}) string {
 	}
 }
 
-type Timestamp time.Time
-type Timestamper interface {
-	Ago() string
-}
-
-// Ago returns a human readable timestamp based on the Timestamp (time.Time) interface
-func (t Timestamp) Ago() string {
-	got, _ := timeago.TimeAgoWithTime(time.Now(), time.Time(t))
-	return got
-}
-
 // Command will run a terminal command with 'sh -c COMMAND' and return stdout and errOut as strings
 //		in, out, err := Command("sass assets/scss assets/css/base.css")
 func Command(name string, args ...string) (string, string, error) {
-	Log.Info("Running command: " + name + " " + strings.Join(args, " "))
 	testCmd := exec.Command(name, args...)
 	var stdout, stderr []byte
 	var errStdout, errStderr error
@@ -188,19 +162,21 @@ func DurationReadable(d time.Duration) string {
 // // body - The body or form data to send with HTTP request
 // // timeout - Specific duration to timeout on. time.Duration(30 * time.Seconds)
 // // You can use a HTTP Proxy if you HTTP_PROXY environment variable
-func HttpRequest(url, method string, content interface{}, headers []string, body io.Reader, timeout time.Duration, verifySSL bool, customTLS *tls.Config) ([]byte, *http.Response, error) {
+func HttpRequest(endpoint, method string, contentType interface{}, headers []string, body io.Reader, timeout time.Duration, verifySSL bool, customTLS *tls.Config) ([]byte, *http.Response, error) {
 	var err error
 	var req *http.Request
 	if method == "" {
 		method = "GET"
 	}
 	t1 := Now()
-	if req, err = http.NewRequest(method, url, body); err != nil {
+	if req, err = http.NewRequest(method, endpoint, body); err != nil {
 		return nil, nil, err
 	}
+	// set default headers so end user can overwrite them if needed
 	req.Header.Set("User-Agent", "Statping")
-	if content != nil {
-		req.Header.Set("Content-Type", content.(string))
+	req.Header.Set("Statping-Version", Params.GetString("VERSION"))
+	if contentType != nil {
+		req.Header.Set("Content-Type", contentType.(string))
 	}
 
 	verifyHost := req.URL.Hostname()
@@ -218,11 +194,7 @@ func HttpRequest(url, method string, content interface{}, headers []string, body
 		}
 	}
 
-	req.Header.Set("User-Agent", "Statping")
-	req.Header.Set("Statping-Version", Version)
-
 	var resp *http.Response
-
 	dialer := &net.Dialer{
 		Timeout:   timeout,
 		KeepAlive: timeout,
@@ -244,6 +216,13 @@ func HttpRequest(url, method string, content interface{}, headers []string, body
 			return dialer.DialContext(ctx, network, addr)
 		},
 	}
+	if Params.GetString("HTTP_PROXY") != "" {
+		proxyUrl, err := url.Parse(Params.GetString("HTTP_PROXY"))
+		if err != nil {
+			return nil, nil, err
+		}
+		transport.Proxy = http.ProxyURL(proxyUrl)
+	}
 	if customTLS != nil {
 		transport.TLSClientConfig.RootCAs = customTLS.RootCAs
 		transport.TLSClientConfig.Certificates = customTLS.Certificates
@@ -270,8 +249,8 @@ func HttpRequest(url, method string, content interface{}, headers []string, body
 	}
 
 	// record HTTP metrics
-	metrics.Histo("bytes", float64(len(contents)), url, method)
-	metrics.Histo("duration", Now().Sub(t1).Seconds(), url, method)
+	metrics.Histo("bytes", float64(len(contents)), endpoint, method)
+	metrics.Histo("duration", Now().Sub(t1).Seconds(), endpoint, method)
 
 	return contents, resp, err
 }
diff --git a/utils/utils_custom.go b/utils/utils_custom.go
index 826b05b3..90253d60 100644
--- a/utils/utils_custom.go
+++ b/utils/utils_custom.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"os"
 	"os/exec"
+	"regexp"
 	"strconv"
 	"strings"
 	"syscall"
@@ -36,20 +37,27 @@ func DirWritable(path string) (bool, error) {
 	return true, nil
 }
 
-func Ping(address string, secondsTimeout int) error {
+func Ping(address string, secondsTimeout int) (int64, error) {
 	ping, err := exec.LookPath("ping")
 	if err != nil {
-		return err
+		return 0, err
 	}
 	out, _, err := Command(ping, address, "-c", "1", "-W", strconv.Itoa(secondsTimeout))
 	if err != nil {
-		return err
+		return 0, err
 	}
 	if strings.Contains(out, "Unknown host") {
-		return errors.New("unknown host")
+		return 0, errors.New("unknown host")
 	}
 	if strings.Contains(out, "100.0% packet loss") {
-		return errors.New("destination host unreachable")
+		return 0, errors.New("destination host unreachable")
 	}
-	return nil
+
+	r := regexp.MustCompile(`time=(.*) ms`)
+	strs := r.FindStringSubmatch(out)
+	if len(strs) < 2 {
+		return 0, errors.New("could not parse ping duration")
+	}
+	f, _ := strconv.ParseFloat(strs[1], 64)
+	return int64(f * 1000), nil
 }
diff --git a/utils/utils_test.go b/utils/utils_test.go
index 961a3315..2880d69a 100644
--- a/utils/utils_test.go
+++ b/utils/utils_test.go
@@ -123,13 +123,28 @@ func ExampleStringInt() {
 	// Output: 42
 }
 
-func TestTimestamp_Ago(t *testing.T) {
-	now := Timestamp(time.Now())
-	assert.Equal(t, "Just now", now.Ago())
+func TestHashPassword(t *testing.T) {
+	pass := HashPassword("password123")
+	assert.Equal(t, 60, len(pass))
+	assert.True(t, CheckHash("password123", pass))
+	assert.False(t, CheckHash("wrongpasswd", pass))
 }
 
-func TestHashPassword(t *testing.T) {
-	assert.Equal(t, 60, len(HashPassword("password123")))
+func TestHuman(t *testing.T) {
+	assert.Equal(t, "10 seconds", Duration{10 * time.Second}.Human())
+	assert.Equal(t, "1 day 12 hours", Duration{36 * time.Hour}.Human())
+	assert.Equal(t, "45 minutes", Duration{45 * time.Minute}.Human())
+}
+
+func TestSha256Hash(t *testing.T) {
+	assert.Equal(t, "ef92b778bafe771e89245b89ecbc08a44a4e166c06659911881f383d4473e94f", Sha256Hash("password123"))
+}
+
+func TestNotNumbber(t *testing.T) {
+	assert.True(t, NotNumber("notint"))
+	assert.True(t, NotNumber("1293notanint922"))
+	assert.False(t, NotNumber("0"))
+	assert.False(t, NotNumber("5"))
 }
 
 func TestNewSHA1Hash(t *testing.T) {
@@ -177,7 +192,8 @@ func TestHttpRequest(t *testing.T) {
 }
 
 func TestConfigLoad(t *testing.T) {
-	InitLogs()
+	err := InitLogs()
+	require.Nil(t, err)
 	InitEnvs()
 
 	s := Params.GetString
@@ -190,3 +206,12 @@ func TestConfigLoad(t *testing.T) {
 	assert.True(t, b("SAMPLE_DATA"))
 	assert.True(t, b("ALLOW_REPORTS"))
 }
+
+func TestPerlin(t *testing.T) {
+	p := NewPerlin(2, 2, 5, Now().UnixNano())
+	require.NotNil(t, p)
+
+	for hi := 1.; hi <= 100.; hi++ {
+		assert.NotZero(t, p.Noise1D(hi/500))
+	}
+}
diff --git a/utils/utils_windows.go b/utils/utils_windows.go
index e23860c0..ac1a7ece 100644
--- a/utils/utils_windows.go
+++ b/utils/utils_windows.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"os"
 	"os/exec"
+	"regexp"
 	"strconv"
 	"strings"
 )
@@ -25,17 +26,23 @@ func DirWritable(path string) (bool, error) {
 	return true, nil
 }
 
-func Ping(address string, secondsTimeout int) error {
+func Ping(address string, secondsTimeout int) (int64, error) {
 	ping, err := exec.LookPath("ping")
 	if err != nil {
-		return err
+		return 0, err
 	}
 	out, _, err := Command(ping, address, "-n", "1", "-w", strconv.Itoa(secondsTimeout*1000))
 	if err != nil {
-		return err
+		return 0, err
 	}
 	if strings.Contains(out, "Destination Host Unreachable") {
-		return errors.New("destination host unreachable")
+		return 0, errors.New("destination host unreachable")
 	}
-	return nil
+	r := regexp.MustCompile(`Average = (.*)ms`)
+	strs := r.FindStringSubmatch(out)
+	if len(strs) < 2 {
+		return 0, errors.New("could not parse ping duration")
+	}
+	f, _ := strconv.ParseFloat(strs[1], 64)
+	return int64(f * 1000), nil
 }
diff --git a/version.txt b/version.txt
index 2e31fdc9..94b742c3 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.90.56
+0.90.69
\ No newline at end of file