diff --git a/.gitignore b/.gitignore
index d35f8440c..98c05a275 100644
--- a/.gitignore
+++ b/.gitignore
@@ -342,7 +342,9 @@ ASALocalRun/
 src/HttPlaceholder/gui
 !src/HttPlaceholder/gui/.guiwillbeplacedhere
 .vagrant
-*.swp*.swp# Local History for Visual Studio
+*.swp
+launchSettings.json
+
 # Local History for Visual Studio
 .localhistory/
 
diff --git a/docs/API.md b/docs/API.md
index 4ec5757e9..dc409a3ac 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -10,377 +10,18 @@ The REST API accepts both JSON and YAML strings (when doing a POST or PUT). If y
 
 If you have enabled authentication (see [CONFIG.md](CONFIG.md) for more information), you also need to provide an `Authorization` header with the correct basic authentication. So if, for example, the username is `user` and the password is `pass`, the following value should be used for the `Authorization` header: `Basic dXNlcjpwYXNz`. For every call in the REST API, a `401 Unauthorized` is returned if the authentication is incorrect.
 
-## Stubs
+### Stubs
 
-### (POST) Add stub
+A stub is a combination of condition checkers and response writers that will be executed when a valid request is sent.
 
-Adds a new stub.
+### Requests
 
-**Request URL**<br />
-`http://httplaceholder/ph-api/stubs`
+Any kind of HTTP request that is made against HttPlaceholder. Also requests where no stub could be matched are saved, because you might want to create a stub based on that request.
 
-**Request body**
-```yml
-id: situation-01
-conditions:
-  method: GET
-  url:
-    path: /users
-    query:
-      id: 12
-      filter: first_name
-response:
-  statusCode: 200
-  text: |
-    {
-      ""first_name"": ""John""
-    }
-  headers:
-    Content-Type: application/json
-```
+### Users
 
-**Request headers**
-- `Content-Type`: `application/x-yaml`
+A simple collection to check whether a given user is valid or not.
 
-**Response**<br />
-`204 NoContent`
+### Tenants
 
-### (GET) Get all stubs
-
-Returns a list with all configured stubs.
-
-**Request URL**<br />
-`http://httplaceholder/ph-api/stubs`
-
-**Request headers**
-- `Accept`: `application/x-yaml`
-
-**Response**<br />
-`200 OK`
-```yml
-- stub:
-    id: situation-01
-    conditions:
-      method: GET
-      url:
-        path: /users
-        query:
-          id: 12
-          filter: first_name
-    response:
-      statusCode: 200
-      text: |
-        {
-          ""first_name"": ""John""
-        }
-      headers:
-        Content-Type: application/json
-  metadata:
-    readOnly: true
-
-- stub:
-    id: situation-02
-    conditions:
-      method: POST
-      url:
-        path: /users
-        query:
-          id: 12
-          filter: first_name
-    response:
-      statusCode: 200
-      text: |
-        {
-          ""first_name"": ""John""
-        }
-      headers:
-        Content-Type: application/json
-  metadata:
-    readOnly: true
-```
-
-### (GET) Get stub
-
-Returns a specific stub by its ID.
-
-**Request URL**<br />
-`http://httplaceholder/ph-api/stubs/{stubId}`
-
-- `stubId`: the ID of the stub to retrieve (e.g. `situation-01`)
-
-**Request headers**
-- `Accept`: `application/x-yaml`
-
-**Response**<br />
-`200 OK`
-```yml
-stub:
-  id: situation-01
-  conditions:
-    method: GET
-    url:
-      path: /users
-      query:
-        id: 12
-        filter: first_name
-  response:
-    statusCode: 200
-    text: |
-      {
-        ""first_name"": ""John""
-      }
-    headers:
-      Content-Type: application/json
-metadata:
-  readOnly: true
-```
-
-`404 NotFound`
-
-### (DELETE) Delete stub
-
-Deletes a specific stub by its ID.
-
-**Request URL**<br />
-`http://httplaceholder/ph-api/stubs/{stubId}`
-
-- `stubId`: the ID of the stub to delete (e.g. `situation-01`)
-
-**Request headers**
-- `Accept`: `application/x-yaml`
-
-**Response**<br />
-`204 NoContent`
-
-`404 NotFound`
-
-## Requests
-
-### (GET) Get all performed requests
-
-Returns a list with all performed HTTP requests to HttPlaceholder.
-
-**Request URL**<br />
-`http://httplaceholder/ph-api/requests`
-
-**Request headers**
-- `Accept`: `application/json`
-
-**Response**<br />
-`200 OK`
-```json
-[{
-	"correlationId": "20421e53-dde2-4dbb-8565-afb0b34ebd83",
-	"requestParameters": null,
-	"logLines": [],
-	"stubExecutionResult": [],
-	"executingStubId": null,
-	"requestBeginTime": "0001-01-01T00:00:00",
-	"requestEndTime": "0001-01-01T00:00:00"
-}]
-```
-
-### (GET) Get all performed requests by stub ID
-
-Returns a list with all performed HTTP requests to HttPlaceholder by a specific stub ID.
-
-**Request URL**<br />
-`http://httplaceholder/ph-api/requests/{stubId}`
-
-- `stubId`: the ID of the stub to delete (e.g. `stub1`)
-
-**Request headers**
-- `Accept`: `application/json`
-
-**Response**<br />
-`200 OK`
-```json
-[{
-	"correlationId": null,
-	"requestParameters": null,
-	"logLines": [],
-	"stubExecutionResult": [],
-	"executingStubId": "stub1",
-	"requestBeginTime": "0001-01-01T00:00:00",
-	"requestEndTime": "0001-01-01T00:00:00"
-}]
-```
-
-## Users
-
-### (GET) Logged in user
-
-Returns the given username.
-
-Note: while this method might look unnecessary at first sight, it can be used to check if an instance of HttPlaceholder has basic authentication configured.
-
-**Request URL**<br />
-`http://httplaceholder/ph-api/users/{username}`
-
-- `username`: the username to check
-
-**Request headers**
-- `Accept`: `application/json`
-
-**Response**<br />
-`200 OK`
-```json
-{
-    "username": "username"
-}
-```
-
-`403 Forbidden` (if username in basic authentication and URL don't match)
-
-## Tenants
-
-Tenants allow you to group your stubs in groups. When you've assigned a "tenant" field to your stub (see [conditions](CONDITIONS.md) for more information), you can perform batch operations on a larger set of stubs. The tenants endpoint helps you with this.
-
-### (GET) Get all stubs in a tenant
-
-Returns all stubs in a given tenant.
-
-**Request URL**<br />
-`http://httplaceholder/ph-api/tenants/{tenant}/stubs`
-
-- `tenant`: the tenant for which the stubs should be returned
-
-**Request headers**
-- `Accept`: `application/json`
-
-**Response**<br />
-`200 OK`
-```json
-[
-    {
-      "stub": {
-        "id": "regular-xml",
-        "conditions": {
-            "method": "POST",
-            "url": {
-                "path": "/thingy"
-            },
-            "headers": {
-                "Content-Type": "application/soap+xml; charset=utf-8"
-            },
-            "xpath": [
-                {
-                    "queryString": "/object/a[text() = 'TEST']"
-                }
-            ]
-        },
-        "response": {
-            "statusCode": 200,
-            "text": "<result>OK</result>",
-            "headers": {
-                "Content-Type": "text/xml"
-            }
-        },
-        "priority": 1,
-        "tenant": "03-xml"
-      },
-      "metadata": {
-        "readOnly": true
-      }
-    },
-    {
-      "stub": {
-        "id": "soap-xml",
-        "conditions": {
-            "method": "POST",
-            "url": {
-                "path": "/InStock"
-            },
-            "headers": {
-                "Content-Type": "application/soap+xml; charset=utf-8"
-            },
-            "xpath": [
-                {
-                    "queryString": "/soap:Envelope/soap:Body/m:GetStockPrice/m:StockName[text() = 'GOOG']",
-                    "namespaces": {
-                        "soap": "http://www.w3.org/2003/05/soap-envelope",
-                        "m": "http://www.example.org/stock/Reddy"
-                    }
-                }
-            ]
-        },
-        "response": {
-            "statusCode": 200,
-            "text": "<result>OK</result>",
-            "headers": {
-                "Content-Type": "text/xml"
-            }
-        },
-        "priority": 1,
-        "tenant": "03-xml"
-      },
-      "metadata": {
-        "readOnly": true
-      }
-    }
-]
-```
-
-### (DELETE) Delete all stubs from a tenant
-
-Deletes all stubs in a given tenant.
-
-**Request URL**<br />
-`http://httplaceholder/ph-api/tenants/{tenant}/stubs`
-
-- `tenant`: the tenant for which the stubs should be returned
-
-**Response**
-`204 NoContent`
-
-### (PUT) Update all stubs in a tenant
-
-Update all stubs for a given tenant. Stubs that are in the request will be added and stubs already present in HttPlaceholder under the same tenant, but not in the request, will be deleted. In this sense, this is a "make it so" request.
-
-**Request URL**<br />
-`http://httplaceholder/ph-api/tenants/{tenant}/stubs`
-
-- `tenant`: the tenant for which the stubs should be returned
-
-**Request headers**
-- `Accept`: `text/yaml`
-
-**Request body**
-```yml
-- id: situation-01
-  conditions:
-    method: GET
-    url:
-      path: /users
-      query:
-        id: 12
-        filter: first_name
-  response:
-    statusCode: 200
-    text: |
-      {
-        ""first_name"": ""John""
-      }
-    headers:
-      Content-Type: application/json
-
-- id: situation-02
-  conditions:
-    method: POST
-    url:
-      path: /users
-      query:
-        id: 12
-        filter: first_name
-  response:
-    statusCode: 200
-    text: |
-      {
-        ""first_name"": ""John""
-      }
-    headers:
-      Content-Type: application/json
-```
-
-**Response**
-`204 NoContent`
\ No newline at end of file
+Tenants allow you to group your stubs. When you've assigned a "tenant" field to your stub (see [conditions](CONDITIONS.md) for more information), you can perform batch operations on a larger set of stubs. The tenants endpoint helps you with this.
\ No newline at end of file
diff --git a/gui/package-lock.json b/gui/package-lock.json
index b358fe166..2f0a93a7d 100644
--- a/gui/package-lock.json
+++ b/gui/package-lock.json
@@ -4,6 +4,16 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@aspnet/signalr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@aspnet/signalr/-/signalr-1.1.4.tgz",
+      "integrity": "sha512-Jp9nPc8hmmhbG9OKiHe2fOKskBHfg+3Y9foSKHxjgGtyI743hXjGFv3uFlUg503K9f8Ilu63gQt3fDkLICBRyg==",
+      "requires": {
+        "eventsource": "^1.0.7",
+        "request": "^2.88.0",
+        "ws": "^6.0.0"
+      }
+    },
     "@babel/code-frame": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
@@ -1572,7 +1582,6 @@
       "version": "6.10.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
       "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
-      "dev": true,
       "requires": {
         "fast-deep-equal": "^2.0.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -1746,7 +1755,6 @@
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
       "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
       "requires": {
         "safer-buffer": "~2.1.0"
       }
@@ -1791,8 +1799,7 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -1815,14 +1822,12 @@
     "async-limiter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
-      "dev": true
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
     },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "atob": {
       "version": "2.1.2",
@@ -1847,14 +1852,12 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-      "dev": true
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
     "axios": {
       "version": "0.18.0",
@@ -1890,7 +1893,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -1982,7 +1985,7 @@
     },
     "babel-plugin-syntax-object-rest-spread": {
       "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
       "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
       "dev": true
     },
@@ -2097,7 +2100,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
       "requires": {
         "tweetnacl": "^0.14.3"
       }
@@ -2459,7 +2461,7 @@
       "dependencies": {
         "callsites": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+          "resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
           "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
           "dev": true
         }
@@ -2525,8 +2527,7 @@
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "chalk": {
       "version": "2.4.2",
@@ -2740,8 +2741,7 @@
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "coa": {
       "version": "2.0.2",
@@ -2814,7 +2814,6 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
       "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
-      "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -3186,8 +3185,7 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
       "version": "5.2.0",
@@ -3542,7 +3540,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -3684,7 +3681,7 @@
       "dependencies": {
         "globby": {
           "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
           "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
           "dev": true,
           "requires": {
@@ -3697,7 +3694,7 @@
           "dependencies": {
             "pify": {
               "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
               "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
               "dev": true
             }
@@ -3708,8 +3705,7 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "depd": {
       "version": "1.1.2",
@@ -3898,7 +3894,6 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
       "requires": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
@@ -4137,7 +4132,7 @@
         },
         "fast-deep-equal": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+          "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
           "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
           "dev": true,
           "optional": true
@@ -4293,7 +4288,6 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
       "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
-      "dev": true,
       "requires": {
         "original": "^1.0.0"
       }
@@ -4419,8 +4413,7 @@
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "extend-shallow": {
       "version": "3.0.2",
@@ -4523,14 +4516,12 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-deep-equal": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
     },
     "fast-glob": {
       "version": "2.2.6",
@@ -4549,8 +4540,7 @@
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -4744,14 +4734,12 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.6",
@@ -4838,8 +4826,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4860,14 +4847,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4882,20 +4867,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5012,8 +4994,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5025,7 +5006,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5040,7 +5020,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5048,14 +5027,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5074,7 +5051,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5155,8 +5131,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5168,7 +5143,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5254,8 +5228,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5291,7 +5264,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5311,7 +5283,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5355,14 +5326,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -5410,7 +5379,6 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -5511,14 +5479,12 @@
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
       "version": "5.1.3",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
       "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "dev": true,
       "requires": {
         "ajv": "^6.5.5",
         "har-schema": "^2.0.0"
@@ -5755,7 +5721,7 @@
         },
         "json5": {
           "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
           "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
           "dev": true
         },
@@ -5851,7 +5817,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -6381,8 +6346,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-windows": {
       "version": "1.0.2",
@@ -6426,8 +6390,7 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "javascript-stringify": {
       "version": "1.6.0",
@@ -6490,8 +6453,7 @@
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
     "jsesc": {
       "version": "2.5.2",
@@ -6508,14 +6470,12 @@
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "json-stable-stringify": {
       "version": "1.0.1",
@@ -6536,8 +6496,7 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json3": {
       "version": "3.3.2",
@@ -6573,7 +6532,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -6626,7 +6584,6 @@
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "dev": true,
-      "optional": true,
       "requires": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -6988,14 +6945,12 @@
     "mime-db": {
       "version": "1.38.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
-      "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
-      "dev": true
+      "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="
     },
     "mime-types": {
       "version": "2.1.22",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
       "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
-      "dev": true,
       "requires": {
         "mime-db": "~1.38.0"
       }
@@ -7065,7 +7020,7 @@
     },
     "minimist": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
       "dev": true
     },
@@ -7110,7 +7065,7 @@
     },
     "mkdirp": {
       "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
       "dev": true,
       "requires": {
@@ -7119,7 +7074,7 @@
       "dependencies": {
         "minimist": {
           "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
           "dev": true
         }
@@ -7371,8 +7326,7 @@
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
     },
     "object-assign": {
       "version": "4.1.1",
@@ -7562,7 +7516,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
       "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
-      "dev": true,
       "requires": {
         "url-parse": "^1.4.3"
       }
@@ -7788,8 +7741,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pify": {
       "version": "4.0.1",
@@ -8397,8 +8349,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "prepend-http": {
       "version": "2.0.0",
@@ -8484,8 +8435,7 @@
     "psl": {
       "version": "1.1.31",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
-      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
-      "dev": true
+      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="
     },
     "public-encrypt": {
       "version": "4.0.3",
@@ -8537,8 +8487,7 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "q": {
       "version": "1.5.1",
@@ -8549,8 +8498,7 @@
     "qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
     },
     "query-string": {
       "version": "5.1.1",
@@ -8578,8 +8526,7 @@
     "querystringify": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
-      "dev": true
+      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
     },
     "randombytes": {
       "version": "2.1.0",
@@ -8842,7 +8789,6 @@
       "version": "2.88.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
       "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
         "aws4": "^1.8.0",
@@ -8918,8 +8864,7 @@
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
     "resolve": {
       "version": "1.10.0",
@@ -9030,8 +8975,7 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
       "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "rx-lite-aggregates": {
       "version": "4.0.8",
@@ -9046,8 +8990,7 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -9061,8 +9004,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sax": {
       "version": "1.2.4",
@@ -9646,7 +9588,6 @@
       "version": "1.16.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
       "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
       "requires": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -9963,7 +9904,7 @@
         },
         "fast-deep-equal": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+          "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
           "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
           "dev": true,
           "optional": true
@@ -10202,7 +10143,6 @@
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
       "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-      "dev": true,
       "requires": {
         "psl": "^1.1.24",
         "punycode": "^1.4.1"
@@ -10211,8 +10151,7 @@
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
         }
       }
     },
@@ -10244,7 +10183,6 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -10252,15 +10190,13 @@
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
     },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dev": true,
-      "optional": true,
       "requires": {
         "prelude-ls": "~1.1.2"
       }
@@ -10495,7 +10431,6 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -10552,7 +10487,6 @@
       "version": "1.4.7",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
       "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
-      "dev": true,
       "requires": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -10604,8 +10538,7 @@
     "uuid": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
-      "dev": true
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -10633,7 +10566,6 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -11371,7 +11303,6 @@
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
       "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
-      "dev": true,
       "requires": {
         "async-limiter": "~1.0.0"
       }
@@ -11557,7 +11488,7 @@
         },
         "get-stream": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
           "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
           "dev": true
         },
diff --git a/gui/package.json b/gui/package.json
index da1d439e4..ef14589b2 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -8,6 +8,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "@aspnet/signalr": "^1.1.4",
     "axios": "^0.18.0",
     "bootstrap": "^4.3.1",
     "font-awesome": "^4.7.0",
diff --git a/gui/src/App.vue b/gui/src/App.vue
index 93d1cf072..d713e85e6 100644
--- a/gui/src/App.vue
+++ b/gui/src/App.vue
@@ -1,9 +1,7 @@
 <template>
   <div id="app">
     <nav class="navbar navbar-expand-lg">
-      <a class="navbar-brand" href="#">
-        <img src="img/logo.png" alt="HttPlaceholder">
-      </a>
+      <a class="navbar-brand" href="#"></a>
       <button
         class="navbar-toggler"
         type="button"
diff --git a/gui/src/css/dark-theme.css b/gui/src/css/dark-theme.css
index f0613fb50..fb91bb3c1 100644
--- a/gui/src/css/dark-theme.css
+++ b/gui/src/css/dark-theme.css
@@ -125,6 +125,10 @@
   background-color: #0F2931;
 }
 
+.dark-theme .navbar-brand {
+  background-image: url(../img/logo-white.png);
+}
+
 /* Navbar
   --------- */
 
diff --git a/gui/src/css/light-theme.css b/gui/src/css/light-theme.css
index 2425fe962..e1c9123d6 100644
--- a/gui/src/css/light-theme.css
+++ b/gui/src/css/light-theme.css
@@ -1,6 +1,7 @@
 /* General
 ---------- */
 
+
 .light-theme {
   background-color: #FDF6E3;
   color: #586E75;
@@ -125,6 +126,10 @@
   background-color: #F0ECE1;
 }
 
+.light-theme .navbar-brand {
+  background-image: url(../img/logo.png);
+}
+
 /* Navbar
 --------- */
 
diff --git a/gui/src/css/style.css b/gui/src/css/style.css
index c1958cfdd..e66851663 100644
--- a/gui/src/css/style.css
+++ b/gui/src/css/style.css
@@ -14,8 +14,12 @@ body, html {
   cursor: pointer;
 }
 
-.navbar-brand img {
+.navbar-brand {
   height: 35px;
+  width: 150px;
+  display: inline-block;
+  background-size: 100%;
+  background-repeat: no-repeat;
 }
 
 @media (max-width: 767px) {
diff --git a/gui/public/img/logo-white.png b/gui/src/img/logo-white.png
similarity index 100%
rename from gui/public/img/logo-white.png
rename to gui/src/img/logo-white.png
diff --git a/gui/public/img/logo.png b/gui/src/img/logo.png
similarity index 100%
rename from gui/public/img/logo.png
rename to gui/src/img/logo.png
diff --git a/gui/src/store/mutations.js b/gui/src/store/mutations.js
index 8ff4c3926..ec74dfb82 100644
--- a/gui/src/store/mutations.js
+++ b/gui/src/store/mutations.js
@@ -4,7 +4,7 @@ export default {
     },
     storeAuthenticated: (state, authenticated) => {
         state.authenticated = authenticated
-        if(!authenticated) {
+        if (!authenticated) {
             state.userToken = null
         }
     },
@@ -20,6 +20,9 @@ export default {
     storeRequests: (state, requests) => {
         state.requests = requests
     },
+    addAdditionalRequest: (state, request) => {
+        state.requests.unshift(request); 
+    },
     storeStubs: (state, stubs) => {
         state.stubs = stubs
     },
diff --git a/gui/src/views/Requests.vue b/gui/src/views/Requests.vue
index b8a4dad34..7bd297c78 100644
--- a/gui/src/views/Requests.vue
+++ b/gui/src/views/Requests.vue
@@ -42,21 +42,27 @@
 <script>
 import Request from "@/components/Request";
 import resources from "@/resources";
+import { HubConnectionBuilder } from "@aspnet/signalr";
 
 export default {
   name: "requests",
   data() {
     return {
       filteredRequests: [],
-      searchTerm: ""
+      searchTerm: "",
+      connection: {}
     };
   },
   components: {
     Request
   },
   created() {
+    this.initializeSignalR();
     this.getRequests();
   },
+  destroyed() {
+    this.connection.stop();
+  },
   computed: {
     requests() {
       return this.$store.getters.getRequests;
@@ -90,6 +96,20 @@ export default {
     },
     clearInput() {
       this.searchTerm = "";
+    },
+    initializeSignalR() {
+      this.connection = new HubConnectionBuilder()
+        .withUrl("/requestHub")
+        .build();
+      this.connection.on("RequestReceived", request => {
+        this.$store.commit("addAdditionalRequest", request);
+      });
+      this.connection
+        .start()
+        .then(() => {})
+        .catch(err => {
+          return console.error(err.toString());
+        });
     }
   },
   watch: {
diff --git a/gui/urls.dev.js b/gui/urls.dev.js
index 3d354e780..161b5f2d5 100644
--- a/gui/urls.dev.js
+++ b/gui/urls.dev.js
@@ -1,5 +1,5 @@
 const urls = {
-    rootUrl: 'http://127.0.0.1:5000/'
+    rootUrl: 'http://127.0.0.1:8080/'
 }
 
 export default urls
diff --git a/gui/vue.config.js b/gui/vue.config.js
index c7a96d2bc..a7db4d2ca 100644
--- a/gui/vue.config.js
+++ b/gui/vue.config.js
@@ -5,5 +5,16 @@ module.exports = {
   baseUrl: '',
   configureWebpack: config => {
     config.resolve.alias.urls = process.env.NODE_ENV === 'production' ? path.join(__dirname, 'urls.prod') : path.join(__dirname, 'urls.dev')
+  },
+  devServer: {
+    proxy: {
+      '/ph-api': {
+        target: 'http://localhost:5000'
+      },
+      '/requestHub': {
+        target: 'http://localhost:5000',
+        ws: true
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/src/HttPlaceholder.BusinessLogic.Tests/HttPlaceholder.BusinessLogic.Tests.csproj b/src/HttPlaceholder.BusinessLogic.Tests/HttPlaceholder.BusinessLogic.Tests.csproj
index 639e5f937..4387be73d 100644
--- a/src/HttPlaceholder.BusinessLogic.Tests/HttPlaceholder.BusinessLogic.Tests.csproj
+++ b/src/HttPlaceholder.BusinessLogic.Tests/HttPlaceholder.BusinessLogic.Tests.csproj
@@ -20,7 +20,7 @@
     <WarningsAsErrors />
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
     <PackageReference Include="Moq" Version="4.10.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
diff --git a/src/HttPlaceholder.BusinessLogic/DependencyRegistration.cs b/src/HttPlaceholder.BusinessLogic/DependencyRegistration.cs
index 9df1c28e9..697d6655f 100644
--- a/src/HttPlaceholder.BusinessLogic/DependencyRegistration.cs
+++ b/src/HttPlaceholder.BusinessLogic/DependencyRegistration.cs
@@ -14,23 +14,22 @@ public static IServiceCollection AddBusinessLogic(this IServiceCollection servic
             services.AddSingleton<IStubResponseGenerator, StubResponseGenerator>();
             services.AddSingleton<IVariableParser, VariableParser>();
 
+            string filter = "HttPlaceholder";
+
             // Condition checkers
-            var conditionCheckerTypes = AssemblyHelper.GetImplementations<IConditionChecker>();
-            foreach (var type in conditionCheckerTypes)
+            foreach (var type in AssemblyHelper.GetImplementations<IConditionChecker>(filter))
             {
                 services.AddTransient(typeof(IConditionChecker), type);
             }
 
             // Response writers
-            var responseWriterTypes = AssemblyHelper.GetImplementations<IResponseWriter>();
-            foreach (var type in responseWriterTypes)
+            foreach (var type in AssemblyHelper.GetImplementations<IResponseWriter>(filter))
             {
                 services.AddTransient(typeof(IResponseWriter), type);
             }
 
             // Variable handlers
-            var variableHandlers = AssemblyHelper.GetImplementations<IVariableHandler>();
-            foreach (var type in variableHandlers)
+            foreach (var type in AssemblyHelper.GetImplementations<IVariableHandler>(filter))
             {
                 services.AddTransient(typeof(IVariableHandler), type);
             }
diff --git a/src/HttPlaceholder.BusinessLogic/HttPlaceholder.BusinessLogic.csproj b/src/HttPlaceholder.BusinessLogic/HttPlaceholder.BusinessLogic.csproj
index d7c59e777..3dc8a7c6f 100644
--- a/src/HttPlaceholder.BusinessLogic/HttPlaceholder.BusinessLogic.csproj
+++ b/src/HttPlaceholder.BusinessLogic/HttPlaceholder.BusinessLogic.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Version>0.1.0.0</Version>
@@ -19,10 +19,10 @@
     <WarningsAsErrors />
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Ducode.Essentials.Assembly" Version="0.0.4" />
+    <PackageReference Include="Ducode.Essentials.Assembly" Version="0.0.5" />
     <PackageReference Include="Ducode.Essentials.Async" Version="0.0.2" />
     <PackageReference Include="IPAddressRange" Version="3.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\HttPlaceholder.DataLogic\HttPlaceholder.DataLogic.csproj" />
diff --git a/src/HttPlaceholder.Client.Tests/HttPlaceholder.Client.Tests.csproj b/src/HttPlaceholder.Client.Tests/HttPlaceholder.Client.Tests.csproj
index 573a6d0a6..cb4ba97a6 100644
--- a/src/HttPlaceholder.Client.Tests/HttPlaceholder.Client.Tests.csproj
+++ b/src/HttPlaceholder.Client.Tests/HttPlaceholder.Client.Tests.csproj
@@ -8,7 +8,7 @@
     <Configurations>Debug;Release;Tool</Configurations>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
   </ItemGroup>
diff --git a/src/HttPlaceholder.Client/HttPlaceholder.Client.csproj b/src/HttPlaceholder.Client/HttPlaceholder.Client.csproj
index 808b01c49..735921742 100644
--- a/src/HttPlaceholder.Client/HttPlaceholder.Client.csproj
+++ b/src/HttPlaceholder.Client/HttPlaceholder.Client.csproj
@@ -46,8 +46,8 @@
     <Compile Include="..\HttPlaceholder.Models\UserModel.cs" Link="Models\UserModel.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Flurl.Http" Version="2.4.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Flurl.Http" Version="2.4.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="YamlDotNet" Version="6.0.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/HttPlaceholder.DataLogic.Tests/HttPlaceholder.DataLogic.Tests.csproj b/src/HttPlaceholder.DataLogic.Tests/HttPlaceholder.DataLogic.Tests.csproj
index 19fabee60..ecef555bb 100644
--- a/src/HttPlaceholder.DataLogic.Tests/HttPlaceholder.DataLogic.Tests.csproj
+++ b/src/HttPlaceholder.DataLogic.Tests/HttPlaceholder.DataLogic.Tests.csproj
@@ -20,7 +20,7 @@
     <WarningsAsErrors />
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
     <PackageReference Include="Moq" Version="4.10.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
diff --git a/src/HttPlaceholder.DataLogic/HttPlaceholder.DataLogic.csproj b/src/HttPlaceholder.DataLogic/HttPlaceholder.DataLogic.csproj
index 21fcc7403..ee7e3ac58 100644
--- a/src/HttPlaceholder.DataLogic/HttPlaceholder.DataLogic.csproj
+++ b/src/HttPlaceholder.DataLogic/HttPlaceholder.DataLogic.csproj
@@ -16,12 +16,12 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Dapper" Version="1.60.6" />
-    <PackageReference Include="Ducode.Essentials.Assembly" Version="0.0.4" />
+    <PackageReference Include="Ducode.Essentials.Assembly" Version="0.0.5" />
     <PackageReference Include="Ducode.Essentials.Console" Version="0.0.3" />
     <PackageReference Include="Ducode.Essentials.Files" Version="0.0.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
-    <PackageReference Include="MySqlConnector" Version="0.51.1" />
+    <PackageReference Include="MySqlConnector" Version="0.54.0" />
     <PackageReference Include="System.Data.SQLite" Version="1.0.110" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/HttPlaceholder.Models/Constants.cs b/src/HttPlaceholder.Models/Constants.cs
index 28f1daa7e..a16553a24 100644
--- a/src/HttPlaceholder.Models/Constants.cs
+++ b/src/HttPlaceholder.Models/Constants.cs
@@ -62,5 +62,10 @@ public static class Regexes
         {
             public static Regex VarRegex = new Regex(@"\(\(([a-zA-Z0-9_]*)\:? ?([^)]*)?\)\)", RegexOptions.Compiled);
         }
+
+        public static class CookieKeys
+        {
+            public const string LoginCookieKey = "HttPlaceholderLoggedin";
+        }
     }
 }
\ No newline at end of file
diff --git a/src/HttPlaceholder.Models/HttPlaceholder.Models.csproj b/src/HttPlaceholder.Models/HttPlaceholder.Models.csproj
index f1ad88257..ab4a3f44d 100644
--- a/src/HttPlaceholder.Models/HttPlaceholder.Models.csproj
+++ b/src/HttPlaceholder.Models/HttPlaceholder.Models.csproj
@@ -19,7 +19,7 @@
     <WarningsAsErrors />
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="YamlDotNet" Version="6.0.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/HttPlaceholder.Services.Tests/HttPlaceholder.Services.Tests.csproj b/src/HttPlaceholder.Services.Tests/HttPlaceholder.Services.Tests.csproj
index 8c32b3c38..5175734e7 100644
--- a/src/HttPlaceholder.Services.Tests/HttPlaceholder.Services.Tests.csproj
+++ b/src/HttPlaceholder.Services.Tests/HttPlaceholder.Services.Tests.csproj
@@ -16,7 +16,7 @@
     <WarningsAsErrors />
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
     <PackageReference Include="Moq" Version="4.10.1" />
diff --git a/src/HttPlaceholder.Services/HttPlaceholder.Services.csproj b/src/HttPlaceholder.Services/HttPlaceholder.Services.csproj
index 128b60afc..a4a9a5f0c 100644
--- a/src/HttPlaceholder.Services/HttPlaceholder.Services.csproj
+++ b/src/HttPlaceholder.Services/HttPlaceholder.Services.csproj
@@ -15,7 +15,7 @@
     <WarningsAsErrors />
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Ducode.Essentials.Assembly" Version="0.0.4" />
+    <PackageReference Include="Ducode.Essentials.Assembly" Version="0.0.5" />
     <PackageReference Include="Ducode.Essentials.Console" Version="0.0.3" />
     <PackageReference Include="Ducode.Essentials.Files" Version="0.0.2" />
     <PackageReference Include="Ducode.Essentials.Mvc" Version="0.0.3" />
diff --git a/src/HttPlaceholder.Tests/Authorization/LoginServiceFacts.cs b/src/HttPlaceholder.Tests/Authorization/LoginServiceFacts.cs
new file mode 100644
index 000000000..077011731
--- /dev/null
+++ b/src/HttPlaceholder.Tests/Authorization/LoginServiceFacts.cs
@@ -0,0 +1,98 @@
+using Ducode.Essentials.Mvc.TestUtilities;
+using HttPlaceholder.Authorization.Implementations;
+using HttPlaceholder.Models;
+using HttPlaceholder.Services;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.Extensions.ObjectPool;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using System.Collections.Generic;
+using System.Text;
+
+namespace HttPlaceholder.Tests.Authorization
+{
+    [TestClass]
+    public class LoginServiceFacts
+    {
+        private readonly Dictionary<string, string> _cookies = new Dictionary<string, string>();
+        private readonly Dictionary<string, string> _config = new Dictionary<string, string>();
+        private readonly Mock<IConfigurationService> _configurationServiceMock = new Mock<IConfigurationService>();
+        private readonly MockHttpContext _mockHttpContext = new MockHttpContext();
+        private LoginService _service;
+
+        [TestInitialize]
+        public void Initialize()
+        {
+            var accessorMock = new Mock<IHttpContextAccessor>();
+            accessorMock
+                .Setup(m => m.HttpContext)
+                .Returns(_mockHttpContext);
+
+            _configurationServiceMock
+                .Setup(m => m.GetConfiguration())
+                .Returns(_config);
+
+            _mockHttpContext
+                .HttpRequestMock
+                .Setup(m => m.Cookies)
+                .Returns(() => new RequestCookieCollection(_cookies));
+
+            _service = new LoginService(_configurationServiceMock.Object, accessorMock.Object);
+        }
+
+        [TestMethod]
+        public void LoginService_CheckLoginCookie_NoUsernameAndPasswordSet_ShouldReturnTrue()
+        {
+            // Act
+            bool result = _service.CheckLoginCookie();
+
+            // Assert
+            Assert.IsTrue(result);
+        }
+
+        [TestMethod]
+        public void LoginService_CheckLoginCookie_UsernameAndPasswordSet_NoCookieSet_ShouldReturnFalse()
+        {
+            // Arrange
+            _config.Add(Constants.ConfigKeys.ApiUsernameKey, "user");
+            _config.Add(Constants.ConfigKeys.ApiPasswordKey, "pass");
+
+            // Act
+            bool result = _service.CheckLoginCookie();
+
+            // Assert
+            Assert.IsFalse(result);
+        }
+
+        [TestMethod]
+        public void LoginService_CheckLoginCookie_UsernameAndPasswordSet_HashIncorrect_ShouldReturnFalse()
+        {
+            // Arrange
+            _config.Add(Constants.ConfigKeys.ApiUsernameKey, "user");
+            _config.Add(Constants.ConfigKeys.ApiPasswordKey, "pass");
+            _cookies.Add(Constants.CookieKeys.LoginCookieKey, "INCORRECT");
+
+            // Act
+            bool result = _service.CheckLoginCookie();
+
+            // Assert
+            Assert.IsFalse(result);
+        }
+
+        [TestMethod]
+        public void LoginService_CheckLoginCookie_UsernameAndPasswordSet_HashCorrect_ShouldReturnTrue()
+        {
+            // Arrange
+            _config.Add(Constants.ConfigKeys.ApiUsernameKey, "user");
+            _config.Add(Constants.ConfigKeys.ApiPasswordKey, "pass");
+            _cookies.Add(Constants.CookieKeys.LoginCookieKey, "qkUYd4wTaLeznD/nN1v9ei9/5XUekWt1hyOctq3bQZ9DMhSk7FJz+l1ILk++kyYlu+VguxVcuEC9R4Ryk763GA==");
+
+            // Act
+            bool result = _service.CheckLoginCookie();
+
+            // Assert
+            Assert.IsTrue(result);
+        }
+    }
+}
diff --git a/src/HttPlaceholder.Tests/HttPlaceholder.Tests.csproj b/src/HttPlaceholder.Tests/HttPlaceholder.Tests.csproj
index 544fba29b..eb015ab42 100644
--- a/src/HttPlaceholder.Tests/HttPlaceholder.Tests.csproj
+++ b/src/HttPlaceholder.Tests/HttPlaceholder.Tests.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Ducode.Essentials.Mvc.TestUtilities" Version="0.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
     <PackageReference Include="Moq" Version="4.10.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
diff --git a/src/HttPlaceholder.Tests/Middleware/StubHandlingMiddlewareFacts.cs b/src/HttPlaceholder.Tests/Middleware/StubHandlingMiddlewareFacts.cs
index 5d2ac536d..32249f5c0 100644
--- a/src/HttPlaceholder.Tests/Middleware/StubHandlingMiddlewareFacts.cs
+++ b/src/HttPlaceholder.Tests/Middleware/StubHandlingMiddlewareFacts.cs
@@ -3,10 +3,13 @@
 using Ducode.Essentials.Mvc.Interfaces;
 using Ducode.Essentials.Mvc.TestUtilities;
 using HttPlaceholder.BusinessLogic;
+using HttPlaceholder.Hubs;
+using HttPlaceholder.Hubs.Implementations;
 using HttPlaceholder.Middleware;
 using HttPlaceholder.Models;
 using HttPlaceholder.Services;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Primitives;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -26,6 +29,7 @@ public class StubHandlingMiddlewareFacts
         private Mock<ILogger<StubHandlingMiddleware>> _loggerMock;
         private Mock<IRequestLoggerFactory> _requestLoggerFactoryMock;
         private Mock<IRequestLogger> _requestLoggerMock;
+        private Mock<IRequestNotify> _requestNotifyMock;
         private Mock<IStubContainer> _stubContainerMock;
         private Mock<IStubRequestExecutor> _stubRequestExecutorMock;
         private StubHandlingMiddleware _middleware;
@@ -45,6 +49,7 @@ public void Initialize()
             _loggerMock = new Mock<ILogger<StubHandlingMiddleware>>();
             _requestLoggerFactoryMock = new Mock<IRequestLoggerFactory>();
             _requestLoggerMock = new Mock<IRequestLogger>();
+            _requestNotifyMock = new Mock<IRequestNotify>();
             _stubContainerMock = new Mock<IStubContainer>();
             _stubRequestExecutorMock = new Mock<IStubRequestExecutor>();
 
@@ -55,6 +60,7 @@ public void Initialize()
                 _httpContextServiceMock.Object,
                 _loggerMock.Object,
                 _requestLoggerFactoryMock.Object,
+                _requestNotifyMock.Object,
                 _stubContainerMock.Object,
                 _stubRequestExecutorMock.Object);
         }
@@ -67,6 +73,7 @@ public void Cleanup()
             _httpContextServiceMock.VerifyAll();
             _loggerMock.VerifyAll();
             _requestLoggerFactoryMock.VerifyAll();
+            _requestNotifyMock.VerifyAll();
             _stubContainerMock.VerifyAll();
             _stubRequestExecutorMock.VerifyAll();
         }
diff --git a/src/HttPlaceholder/Filters/ApiAuthorizationAttribute.cs b/src/HttPlaceholder/Authorization/ApiAuthorizationAttribute.cs
similarity index 78%
rename from src/HttPlaceholder/Filters/ApiAuthorizationAttribute.cs
rename to src/HttPlaceholder/Authorization/ApiAuthorizationAttribute.cs
index ce535cdc3..ac4742e67 100644
--- a/src/HttPlaceholder/Filters/ApiAuthorizationAttribute.cs
+++ b/src/HttPlaceholder/Authorization/ApiAuthorizationAttribute.cs
@@ -11,7 +11,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace HttPlaceholder.Filters
+namespace HttPlaceholder.Authorization
 {
     /// <summary>
     /// 
@@ -24,12 +24,20 @@ public class ApiAuthorizationAttribute : ActionFilterAttribute
         /// <param name="context"></param>
         public override void OnActionExecuting(ActionExecutingContext context)
         {
-            bool result;
+            var loginService = context.HttpContext.RequestServices.GetService<ILoginService>();
             var configurationService = context.HttpContext.RequestServices.GetService<IConfigurationService>();
+
+            bool result;
             var logger = context.HttpContext.RequestServices.GetService<ILogger<ApiAuthorizationAttribute>>();
             var config = configurationService.GetConfiguration();
             string username = config.GetValue(Constants.ConfigKeys.ApiUsernameKey, string.Empty);
             string password = config.GetValue(Constants.ConfigKeys.ApiPasswordKey, string.Empty);
+            if (loginService.CheckLoginCookie())
+            {
+                AddUserContext(context, username);
+                return;
+            }
+
             if (!string.IsNullOrWhiteSpace(username) && !string.IsNullOrWhiteSpace(password))
             {
                 // Try to retrieve basic auth header here.
@@ -73,12 +81,18 @@ public override void OnActionExecuting(ActionExecutingContext context)
             }
             else
             {
-                // Everything went OK, so put let's add the username to the claims.
-                context.HttpContext.User = new ClaimsPrincipal(new ClaimsIdentity(new[]
-                {
-                   new Claim(ClaimTypes.Name, username)
-                }));
+                // Everything went OK, so let's add the user to the claims.
+                AddUserContext(context, username);
+                loginService.SetLoginCookie(username, password);
             }
         }
+
+        private static void AddUserContext(ActionExecutingContext context, string username)
+        {
+            context.HttpContext.User = new ClaimsPrincipal(new ClaimsIdentity(new[]
+            {
+                new Claim(ClaimTypes.Name, username)
+            }));
+        }
     }
 }
\ No newline at end of file
diff --git a/src/HttPlaceholder/Authorization/CookieAuthorizationHandler.cs b/src/HttPlaceholder/Authorization/CookieAuthorizationHandler.cs
new file mode 100644
index 000000000..853ba947d
--- /dev/null
+++ b/src/HttPlaceholder/Authorization/CookieAuthorizationHandler.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+
+namespace HttPlaceholder.Authorization
+{
+    public class CookieAuthorizationHandler : IAuthorizationHandler
+    {
+        public Task HandleAsync(AuthorizationHandlerContext context)
+        {
+            //context.Succeed();
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/src/HttPlaceholder/Authorization/ILoginService.cs b/src/HttPlaceholder/Authorization/ILoginService.cs
new file mode 100644
index 000000000..af97ebdb5
--- /dev/null
+++ b/src/HttPlaceholder/Authorization/ILoginService.cs
@@ -0,0 +1,9 @@
+namespace HttPlaceholder.Authorization
+{
+    public interface ILoginService
+    {
+        void SetLoginCookie(string username, string password);
+
+        bool CheckLoginCookie();
+    }
+}
diff --git a/src/HttPlaceholder/Authorization/Implementations/LoginService.cs b/src/HttPlaceholder/Authorization/Implementations/LoginService.cs
new file mode 100644
index 000000000..138d71908
--- /dev/null
+++ b/src/HttPlaceholder/Authorization/Implementations/LoginService.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using Ducode.Essentials.Console;
+using HttPlaceholder.Models;
+using HttPlaceholder.Services;
+using Microsoft.AspNetCore.Http;
+
+namespace HttPlaceholder.Authorization.Implementations
+{
+    internal class LoginService : ILoginService
+    {
+        private const string Salt = "83b2737f-7d85-4a0a-8113-b98ed4a255a1";
+        private readonly IConfigurationService _configurationService;
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        public LoginService(
+            IConfigurationService configurationService,
+            IHttpContextAccessor httpContextAccessor)
+        {
+            _configurationService = configurationService;
+            _httpContextAccessor = httpContextAccessor;
+        }
+
+        public bool CheckLoginCookie()
+        {
+            var config = _configurationService.GetConfiguration();
+            string username = config.GetValue(Constants.ConfigKeys.ApiUsernameKey, string.Empty);
+            string password = config.GetValue(Constants.ConfigKeys.ApiPasswordKey, string.Empty);
+            if (string.IsNullOrWhiteSpace(username) && string.IsNullOrWhiteSpace(password))
+            {
+                return true;
+            }
+
+            string expectedHash = CreateHash(username, password);
+            var cookie = _httpContextAccessor.HttpContext.Request.Cookies.FirstOrDefault(c => c.Key == Constants.CookieKeys.LoginCookieKey);
+            return cookie.Value == expectedHash;
+        }
+
+        public void SetLoginCookie(string username, string password)
+        {
+            _httpContextAccessor.HttpContext.Response.Cookies.Append(
+                Constants.CookieKeys.LoginCookieKey,
+                CreateHash(username, password),
+                new CookieOptions { HttpOnly = true });
+        }
+
+        private string CreateHash(string username, string password)
+        {
+            using (var sha = SHA512.Create())
+            {
+                string inputString = $"{Salt}:{username}:{password}";
+                var bytes = Encoding.UTF8.GetBytes(inputString);
+                var hash = sha.ComputeHash(bytes);
+                return Convert.ToBase64String(hash);
+            }
+        }
+    }
+}
diff --git a/src/HttPlaceholder/Controllers/BaseApiController.cs b/src/HttPlaceholder/Controllers/BaseApiController.cs
index 5466e4c65..e254e8cb9 100644
--- a/src/HttPlaceholder/Controllers/BaseApiController.cs
+++ b/src/HttPlaceholder/Controllers/BaseApiController.cs
@@ -1,4 +1,4 @@
-using HttPlaceholder.Filters;
+using HttPlaceholder.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
@@ -12,6 +12,5 @@ namespace HttPlaceholder.Controllers
     [ApiAuthorization]
     public class BaseApiController : Controller
     {
-
     }
 }
diff --git a/src/HttPlaceholder/Controllers/MetadataController.cs b/src/HttPlaceholder/Controllers/MetadataController.cs
index eaad2a951..bd12abcb4 100644
--- a/src/HttPlaceholder/Controllers/MetadataController.cs
+++ b/src/HttPlaceholder/Controllers/MetadataController.cs
@@ -2,7 +2,6 @@
 using HttPlaceholder.Models;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
 namespace HttPlaceholder.Controllers
 {
@@ -13,23 +12,18 @@ namespace HttPlaceholder.Controllers
     public class MetadataController : BaseApiController
     {
         private readonly IAssemblyService _assemblyService;
-        private readonly ILogger<MetadataController> _logger;
 
         /// <summary>
         /// constructor metadata controller
         /// </summary>
         /// <param name="assemblyService"></param>
-        /// <param name="logger"></param>
-        public MetadataController(
-            IAssemblyService assemblyService,
-            ILogger<MetadataController> logger)
+        public MetadataController(IAssemblyService assemblyService)
         {
             _assemblyService = assemblyService;
-            _logger = logger;
         }
 
         /// <summary>
-        /// Get the assembly version
+        /// Gets metadata about the API (like the assembly version).
         /// </summary>
         /// <returns>Assembly version as string</returns>
         [HttpGet]
diff --git a/src/HttPlaceholder/Controllers/RequestController.cs b/src/HttPlaceholder/Controllers/RequestController.cs
index d5a7527ce..6ba33d0f2 100644
--- a/src/HttPlaceholder/Controllers/RequestController.cs
+++ b/src/HttPlaceholder/Controllers/RequestController.cs
@@ -31,7 +31,7 @@ public class RequestController : BaseApiController
         }
 
         /// <summary>
-        /// Get all Requests
+        /// Get all Requests.
         /// </summary>
         /// <returns>All request results</returns>
         [HttpGet]
@@ -44,7 +44,7 @@ public async Task<ActionResult<IEnumerable<RequestResultModel>>> GetAll()
         }
 
         /// <summary>
-        /// Get requests for the given stub id 
+        /// Get requests for the given stub ID.
         /// </summary>
         /// <param name="stubId">stub identifier</param>
         /// <returns>request results for the given stubId</returns>
@@ -59,7 +59,7 @@ public async Task<ActionResult<IEnumerable<RequestResultModel>>> GetByStubId([Fr
         }
 
         /// <summary>
-        /// Delete all requests. This call flushes all the requests
+        /// Delete all requests. This call flushes all the requests.
         /// </summary>
         /// <returns>OK, but no content returned</returns>
         [HttpDelete]
diff --git a/src/HttPlaceholder/Controllers/StubController.cs b/src/HttPlaceholder/Controllers/StubController.cs
index a76665722..4fc34301d 100644
--- a/src/HttPlaceholder/Controllers/StubController.cs
+++ b/src/HttPlaceholder/Controllers/StubController.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using HttPlaceholder.BusinessLogic;
-using HttPlaceholder.Filters;
 using HttPlaceholder.Models;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -9,8 +8,6 @@
 
 namespace HttPlaceholder.Controllers
 {
-
-
     /// <summary>
     /// Stub Controller
     /// </summary>
@@ -21,7 +18,7 @@ public class StubController : BaseApiController
         private readonly IStubContainer _stubContainer;
 
         /// <summary>
-        /// 
+        /// The stub controller.
         /// </summary>
         /// <param name="logger"></param>
         /// <param name="stubContaner"></param>
@@ -34,10 +31,10 @@ public class StubController : BaseApiController
         }
 
         /// <summary>
-        /// 
+        /// Adds a new stub.
         /// </summary>
         /// <param name="stubModel"></param>
-        /// <returns></returns>
+        /// <returns>OK, but no content returned</returns>
         [HttpPost]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         [ProducesResponseType(StatusCodes.Status409Conflict)]
@@ -53,9 +50,9 @@ public async Task<ActionResult> Add([FromBody]StubModel stubModel)
         }
 
         /// <summary>
-        /// 
+        /// Get all stubs.
         /// </summary>
-        /// <returns></returns>
+        /// <returns>All stubs.</returns>
         [HttpGet]
         public async Task<ActionResult<IEnumerable<FullStubModel>>> GetAll()
         {
@@ -65,17 +62,15 @@ public async Task<ActionResult<IEnumerable<FullStubModel>>> GetAll()
         }
 
         /// <summary>
-        /// 
+        /// Get a specific stub by stub identifier.
         /// </summary>
         /// <param name="stubId"></param>
-        /// <returns></returns>
+        /// <returns>The stub.</returns>
         [HttpGet]
         [Route("{stubId}")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         [ProducesDefaultResponseType]
-        //  [SwaggerResponse((int)HttpStatusCode.OK, Description = "OK", Type = typeof(StubModel))]
-        //    [SwaggerResponse((int)HttpStatusCode.NotFound, Description = "Stub not found")]
         public async Task<ActionResult<FullStubModel>> Get([FromRoute]string stubId)
         {
             _logger.LogInformation($"Retrieving stub with ID '{stubId}'.");
@@ -89,14 +84,12 @@ public async Task<ActionResult<FullStubModel>> Get([FromRoute]string stubId)
         }
 
         /// <summary>
-        /// 
+        /// Delete a specific stub by stub identifier.
         /// </summary>
         /// <param name="stubId"></param>
-        /// <returns></returns>
+        /// <returns>OK, but not content</returns>
         [HttpDelete]
         [Route("{stubId}")]
-        // [SwaggerResponse((int)HttpStatusCode.NotFound, Description = "Stub not found")]
-        // [SwaggerResponse((int)HttpStatusCode.NoContent, Description = "OK, but no content returned")]
         public async Task<ActionResult> Delete([FromRoute]string stubId)
         {
             _logger.LogInformation($"Deleting stub with ID '{stubId}'");
diff --git a/src/HttPlaceholder/Controllers/TenantController.cs b/src/HttPlaceholder/Controllers/TenantController.cs
index 1e3ca8c56..6664db46d 100644
--- a/src/HttPlaceholder/Controllers/TenantController.cs
+++ b/src/HttPlaceholder/Controllers/TenantController.cs
@@ -9,7 +9,7 @@
 namespace HttPlaceholder.Controllers
 {
     /// <summary>
-    /// 
+    /// Tenant Controller
     /// </summary>
     [Route("ph-api/tenants")]
     public class TenantController : BaseApiController
@@ -18,7 +18,7 @@ public class TenantController : BaseApiController
         private readonly IStubContainer _stubContainer;
 
         /// <summary>
-        /// 
+        /// The tenant controller.
         /// </summary>
         /// <param name="logger"></param>
         /// <param name="stubContaner"></param>
@@ -31,10 +31,10 @@ public class TenantController : BaseApiController
         }
 
         /// <summary>
-        /// 
+        /// Gets all stubs in a specific tenant.
         /// </summary>
         /// <param name="tenant"></param>
-        /// <returns></returns>
+        /// <returns>All stubs in the tenant.</returns>
         [HttpGet]
         [Route("{tenant}/stubs")]
         public async Task<IEnumerable<FullStubModel>> GetAll(string tenant)
@@ -45,10 +45,10 @@ public async Task<IEnumerable<FullStubModel>> GetAll(string tenant)
         }
 
         /// <summary>
-        /// 
+        /// Deletes all stubs in a specific tenant.
         /// </summary>
         /// <param name="tenant"></param>
-        /// <returns></returns>
+        /// <returns>OK, but no content</returns>
         [HttpDelete]
         [Route("{tenant}/stubs")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
@@ -61,11 +61,13 @@ public async Task<IActionResult> DeleteAll(string tenant)
         }
 
         /// <summary>
-        /// 
+        /// Updates the stubs in a specific tenant with the posted values.
+        /// If a stub that is currently available in a tenant isn't sent in the request,
+        /// it will be deleted.
         /// </summary>
         /// <param name="tenant"></param>
         /// <param name="stubs"></param>
-        /// <returns></returns>
+        /// <returns>OK, but no content</returns>
         [HttpPut]
         [Route("{tenant}/stubs")]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
diff --git a/src/HttPlaceholder/Controllers/UserController.cs b/src/HttPlaceholder/Controllers/UserController.cs
index 80f67b6e1..08d11f9b0 100644
--- a/src/HttPlaceholder/Controllers/UserController.cs
+++ b/src/HttPlaceholder/Controllers/UserController.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using System.Security.Claims;
-using HttPlaceholder.Filters;
 using HttPlaceholder.Models;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -26,15 +25,14 @@ public UserController(ILogger<UserController> logger)
         }
 
         /// <summary>
-        /// Get the user for the given username
+        /// Get the user for the given username.
         /// </summary>
-        /// <param name="username">The user to search for</param>
-        /// <returns>the User</returns>
+        /// <param name="username">The user to search for.</param>
+        /// <returns>The User.</returns>
         [HttpGet]
         [Route("{username}")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status403Forbidden)]
-        [ProducesDefaultResponseType]
         public ActionResult<UserModel> Get(string username)
         {
             _logger.LogInformation($"Getting user data for '{username}'.");
diff --git a/src/HttPlaceholder/HttPlaceholder.csproj b/src/HttPlaceholder/HttPlaceholder.csproj
index 9a3ed1de4..4f2204074 100644
--- a/src/HttPlaceholder/HttPlaceholder.csproj
+++ b/src/HttPlaceholder/HttPlaceholder.csproj
@@ -21,6 +21,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
+    <NoWarn>1701;1702;RCS1138;CS1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -31,12 +32,8 @@
     <WarningsAsErrors />
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.2.0" />
-    <PackageReference Include="NSwag.AspNetCore" Version="12.2.5" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.5" />
+    <PackageReference Include="NSwag.AspNetCore" Version="12.3.0" />
     <PackageReference Include="YamlDotNet" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/HttPlaceholder/Hubs/IRequestNotify.cs b/src/HttPlaceholder/Hubs/IRequestNotify.cs
new file mode 100644
index 000000000..1fc094934
--- /dev/null
+++ b/src/HttPlaceholder/Hubs/IRequestNotify.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using HttPlaceholder.Models;
+
+namespace HttPlaceholder.Hubs
+{
+    public interface IRequestNotify
+    {
+        Task NewRequestReceivedAsync(RequestResultModel request);
+    }
+}
diff --git a/src/HttPlaceholder/Hubs/Implementations/RequestHub.cs b/src/HttPlaceholder/Hubs/Implementations/RequestHub.cs
new file mode 100644
index 000000000..de16083f5
--- /dev/null
+++ b/src/HttPlaceholder/Hubs/Implementations/RequestHub.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Threading.Tasks;
+using HttPlaceholder.Authorization;
+using Microsoft.AspNetCore.SignalR;
+
+namespace HttPlaceholder.Hubs.Implementations
+{
+    /// <summary>
+    /// The request SignalR hub.
+    /// </summary>
+    public class RequestHub : Hub
+    {
+        private readonly ILoginService _loginService;
+
+        public RequestHub(ILoginService loginService)
+        {
+            _loginService = loginService;
+        }
+
+        public override Task OnConnectedAsync()
+        {
+            if (!_loginService.CheckLoginCookie())
+            {
+                throw new Exception("NOT AUTHORIZED!");
+            }
+
+            return base.OnConnectedAsync();
+        }
+    }
+}
diff --git a/src/HttPlaceholder/Hubs/Implementations/RequestNotify.cs b/src/HttPlaceholder/Hubs/Implementations/RequestNotify.cs
new file mode 100644
index 000000000..aba1c68ee
--- /dev/null
+++ b/src/HttPlaceholder/Hubs/Implementations/RequestNotify.cs
@@ -0,0 +1,21 @@
+using System.Threading.Tasks;
+using HttPlaceholder.Models;
+using Microsoft.AspNetCore.SignalR;
+
+namespace HttPlaceholder.Hubs.Implementations
+{
+    public class RequestNotify : IRequestNotify
+    {
+        private readonly IHubContext<RequestHub> _hubContext;
+
+        public RequestNotify(IHubContext<RequestHub> hubContext)
+        {
+            _hubContext = hubContext;
+        }
+
+        public async Task NewRequestReceivedAsync(RequestResultModel request)
+        {
+            await _hubContext.Clients.All.SendAsync("RequestReceived", request);
+        }
+    }
+}
diff --git a/src/HttPlaceholder/Middleware/StubHandlingMiddleware.cs b/src/HttPlaceholder/Middleware/StubHandlingMiddleware.cs
index f300c1e6f..9c2273317 100644
--- a/src/HttPlaceholder/Middleware/StubHandlingMiddleware.cs
+++ b/src/HttPlaceholder/Middleware/StubHandlingMiddleware.cs
@@ -6,17 +6,17 @@
 using Ducode.Essentials.Mvc.Interfaces;
 using HttPlaceholder.BusinessLogic;
 using HttPlaceholder.Exceptions;
+using HttPlaceholder.Hubs;
+using HttPlaceholder.Hubs.Implementations;
 using HttPlaceholder.Models;
 using HttPlaceholder.Services;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Linq;
 
 namespace HttPlaceholder.Middleware
 {
-    /// <summary>
-    /// 
-    /// </summary>
     public class StubHandlingMiddleware
     {
         private static string[] _segmentsToIgnore = new[]
@@ -34,18 +34,8 @@ public class StubHandlingMiddleware
         private readonly IRequestLoggerFactory _requestLoggerFactory;
         private readonly IStubContainer _stubContainer;
         private readonly IStubRequestExecutor _stubRequestExecutor;
+        private readonly IRequestNotify _requestNotify;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="next"></param>
-        /// <param name="clientIpResolver"></param>
-        /// <param name="configurationService"></param>
-        /// <param name="httpContextService"></param>
-        /// <param name="logger"></param>
-        /// <param name="requestLoggerFactory"></param>
-        /// <param name="stubContainer"></param>
-        /// <param name="stubRequestExecutor"></param>
         public StubHandlingMiddleware(
            RequestDelegate next,
            IClientIpResolver clientIpResolver,
@@ -53,6 +43,7 @@ public class StubHandlingMiddleware
            IHttpContextService httpContextService,
            ILogger<StubHandlingMiddleware> logger,
            IRequestLoggerFactory requestLoggerFactory,
+           IRequestNotify requestNotify,
            IStubContainer stubContainer,
            IStubRequestExecutor stubRequestExecutor)
         {
@@ -62,15 +53,11 @@ public class StubHandlingMiddleware
             _httpContextService = httpContextService;
             _logger = logger;
             _requestLoggerFactory = requestLoggerFactory;
+            _requestNotify = requestNotify;
             _stubContainer = stubContainer;
             _stubRequestExecutor = stubRequestExecutor;
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="context"></param>
-        /// <returns></returns>
         public async Task Invoke(HttpContext context)
         {
             string path = _httpContextService.Path;
@@ -134,6 +121,7 @@ public async Task Invoke(HttpContext context)
             }
 
             await _stubContainer.AddRequestResultAsync(loggingResult);
+            await _requestNotify.NewRequestReceivedAsync(loggingResult);
         }
     }
 }
\ No newline at end of file
diff --git a/src/HttPlaceholder/Properties/AssemblyInfo.cs b/src/HttPlaceholder/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..e56a1bf8a
--- /dev/null
+++ b/src/HttPlaceholder/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("HttPlaceholder.Tests")]
\ No newline at end of file
diff --git a/src/HttPlaceholder/Startup.cs b/src/HttPlaceholder/Startup.cs
index d562ce238..cc78be43a 100644
--- a/src/HttPlaceholder/Startup.cs
+++ b/src/HttPlaceholder/Startup.cs
@@ -4,12 +4,17 @@
 using Ducode.Essentials.Async;
 using Ducode.Essentials.Files;
 using Ducode.Essentials.Mvc;
+using HttPlaceholder.Authorization;
+using HttPlaceholder.Authorization.Implementations;
 using HttPlaceholder.BusinessLogic;
 using HttPlaceholder.DataLogic;
 using HttPlaceholder.Formatters;
+using HttPlaceholder.Hubs;
+using HttPlaceholder.Hubs.Implementations;
 using HttPlaceholder.Middleware;
 using HttPlaceholder.Services;
 using HttPlaceholder.Utilities;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
@@ -54,6 +59,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         public static void ConfigureStatic(IApplicationBuilder app, IHostingEnvironment env, bool preloadStubs, bool loadStaticFiles)
         {
             app
+                .UseSignalR(routes =>
+                {
+                    routes.MapHub<RequestHub>("/requestHub");
+                })
                .UseMiddleware<ApiHeadersMiddleware>()
                .UseMiddleware<ApiExceptionHandlingMiddleware>()
                .UseMiddleware<StubHandlingMiddleware>()
@@ -99,6 +108,12 @@ public static void ConfigureServicesStatic(IServiceCollection services)
                .AddJsonOptions(options => options.SerializerSettings.NullValueHandling = NullValueHandling.Ignore)
                .SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_2_2);
 
+            services
+                .AddSignalR();
+
+            services.AddTransient<ILoginService, LoginService>();
+            services.AddTransient<IRequestNotify, RequestNotify>();
+
             services
                .AddBusinessLogic()
                .AddUtilities()