diff --git a/package-lock.json b/package-lock.json
index bad04c42a661..89dcfc2cc0c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3670,7 +3670,6 @@
       "version": "7.29.0",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
       "integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==",
-      "dev": true,
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -3680,7 +3679,6 @@
       "version": "3.7.3",
       "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
       "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
-      "dev": true,
       "dependencies": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -3689,8 +3687,7 @@
     "node_modules/@types/estree": {
       "version": "0.0.51",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
-      "dev": true
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
     },
     "node_modules/@types/express": {
       "version": "4.17.13",
@@ -3783,8 +3780,7 @@
     "node_modules/@types/json-schema": {
       "version": "7.0.9",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
-      "dev": true
+      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
@@ -4242,7 +4238,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
       "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
-      "dev": true,
       "dependencies": {
         "@webassemblyjs/helper-numbers": "1.11.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
@@ -4251,26 +4246,22 @@
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-      "dev": true
+      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="
     },
     "node_modules/@webassemblyjs/helper-api-error": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-      "dev": true
+      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="
     },
     "node_modules/@webassemblyjs/helper-buffer": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-      "dev": true
+      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="
     },
     "node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
       "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
-      "dev": true,
       "dependencies": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.1",
         "@webassemblyjs/helper-api-error": "1.11.1",
@@ -4280,14 +4271,12 @@
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-      "dev": true
+      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
       "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
-      "dev": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -4299,7 +4288,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
       "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
-      "dev": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
@@ -4308,7 +4296,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
       "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
-      "dev": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
@@ -4316,14 +4303,12 @@
     "node_modules/@webassemblyjs/utf8": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-      "dev": true
+      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="
     },
     "node_modules/@webassemblyjs/wasm-edit": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
       "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
-      "dev": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -4339,7 +4324,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
       "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
-      "dev": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
@@ -4352,7 +4336,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
       "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
-      "dev": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -4364,7 +4347,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
       "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
-      "dev": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-api-error": "1.11.1",
@@ -4378,7 +4360,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
       "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
-      "dev": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.1",
         "@xtuc/long": "4.2.2"
@@ -4419,14 +4400,12 @@
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "node_modules/abab": {
       "version": "2.0.5",
@@ -4450,7 +4429,6 @@
       "version": "8.7.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
       "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-      "dev": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4484,7 +4462,6 @@
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
       "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "dev": true,
       "peerDependencies": {
         "acorn": "^8"
       }
@@ -4581,7 +4558,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -4636,7 +4612,6 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
@@ -5467,7 +5442,6 @@
       "version": "4.19.3",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.3.tgz",
       "integrity": "sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==",
-      "dev": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001312",
         "electron-to-chromium": "^1.4.71",
@@ -5509,8 +5483,7 @@
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
     },
     "node_modules/buffer-indexof": {
       "version": "1.1.1",
@@ -5643,7 +5616,6 @@
       "version": "1.0.30001312",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz",
       "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==",
-      "dev": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/browserslist"
@@ -5824,7 +5796,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
       "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true,
       "engines": {
         "node": ">=6.0"
       }
@@ -7172,8 +7143,7 @@
     "node_modules/electron-to-chromium": {
       "version": "1.4.75",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.75.tgz",
-      "integrity": "sha512-LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q==",
-      "dev": true
+      "integrity": "sha512-LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q=="
     },
     "node_modules/element-resize-detector": {
       "version": "1.2.4",
@@ -7223,7 +7193,6 @@
       "version": "5.9.2",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz",
       "integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==",
-      "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -7343,8 +7312,7 @@
     "node_modules/es-module-lexer": {
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-      "dev": true
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
     },
     "node_modules/es-to-primitive": {
       "version": "1.2.1",
@@ -7366,7 +7334,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -8125,7 +8092,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -8137,7 +8103,6 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -8181,7 +8146,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
       "engines": {
         "node": ">=0.8.x"
       }
@@ -8330,8 +8294,7 @@
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-diff": {
       "version": "1.2.0",
@@ -8370,8 +8333,7 @@
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
@@ -9073,8 +9035,7 @@
     "node_modules/glob-to-regexp": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
     },
     "node_modules/global-modules": {
       "version": "2.0.0",
@@ -9151,8 +9112,7 @@
     "node_modules/graceful-fs": {
       "version": "4.2.9",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
-      "dev": true
+      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="
     },
     "node_modules/gzip-size": {
       "version": "6.0.0",
@@ -12165,7 +12125,6 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
       "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "dev": true,
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -12179,7 +12138,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -12188,7 +12146,6 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -12303,8 +12260,7 @@
     "node_modules/json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
@@ -12321,8 +12277,7 @@
     "node_modules/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=="
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -12499,7 +12454,6 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
       "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
-      "dev": true,
       "engines": {
         "node": ">=6.11.5"
       }
@@ -12775,8 +12729,7 @@
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
     },
     "node_modules/merge2": {
       "version": "1.4.1",
@@ -12825,7 +12778,6 @@
       "version": "1.51.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
       "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
-      "dev": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -12834,7 +12786,6 @@
       "version": "2.1.34",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
       "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
-      "dev": true,
       "dependencies": {
         "mime-db": "1.51.0"
       },
@@ -12951,9 +12902,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "node_modules/minimist-options": {
@@ -13075,8 +13026,7 @@
     "node_modules/neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
     },
     "node_modules/no-case": {
       "version": "3.0.4",
@@ -13109,9 +13059,9 @@
       }
     },
     "node_modules/node-forge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz",
-      "integrity": "sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "dev": true,
       "engines": {
         "node": ">= 6.13.0"
@@ -13126,8 +13076,7 @@
     "node_modules/node-releases": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz",
-      "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==",
-      "dev": true
+      "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="
     },
     "node_modules/normalize-package-data": {
       "version": "3.0.3",
@@ -13688,8 +13637,7 @@
     "node_modules/picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
@@ -15209,7 +15157,6 @@
       "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,
       "engines": {
         "node": ">=6"
       }
@@ -15294,7 +15241,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -16550,8 +16496,7 @@
     "node_modules/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=="
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
@@ -16650,7 +16595,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
       "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -16740,7 +16684,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
       "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-      "dev": true,
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -16989,7 +16932,6 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -17026,7 +16968,6 @@
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -17915,7 +17856,6 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
       "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -17979,7 +17919,6 @@
       "version": "5.12.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz",
       "integrity": "sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==",
-      "dev": true,
       "dependencies": {
         "acorn": "^8.5.0",
         "commander": "^2.20.0",
@@ -17997,7 +17936,6 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz",
       "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
-      "dev": true,
       "dependencies": {
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
@@ -18030,14 +17968,12 @@
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
     },
     "node_modules/terser/node_modules/source-map": {
       "version": "0.7.3",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
       "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
       "engines": {
         "node": ">= 8"
       }
@@ -18404,7 +18340,6 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -18545,7 +18480,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
       "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
-      "dev": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -18576,7 +18510,6 @@
       "version": "5.69.1",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.69.1.tgz",
       "integrity": "sha512-+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A==",
-      "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
@@ -18881,7 +18814,6 @@
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
       "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
       "engines": {
         "node": ">=10.13.0"
       }
@@ -18890,7 +18822,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -18903,7 +18834,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -20825,19 +20755,22 @@
         "@coreui/coreui": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/@coreui/coreui/-/coreui-4.0.0.tgz",
-          "integrity": "sha512-8vH6fJrmvCR/Oy5v0E+/1AL3Ygb4jhQ7NXK2fMYWJyK13BePDm9muB3y6S0IdqkpBwjY3hHVwHyt2lJqJdesmQ=="
+          "integrity": "sha512-8vH6fJrmvCR/Oy5v0E+/1AL3Ygb4jhQ7NXK2fMYWJyK13BePDm9muB3y6S0IdqkpBwjY3hHVwHyt2lJqJdesmQ==",
+          "requires": {}
         }
       }
     },
     "@coreui/coreui": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/@coreui/coreui/-/coreui-4.1.0.tgz",
-      "integrity": "sha512-2iMKPpxXquN3ZyL44s6Urvsnk03iw+KuJk/AKz5spSgKReUr7AM3WEiaTNFNo1/ZypB67pg0966tT22BSmgkGg=="
+      "integrity": "sha512-2iMKPpxXquN3ZyL44s6Urvsnk03iw+KuJk/AKz5spSgKReUr7AM3WEiaTNFNo1/ZypB67pg0966tT22BSmgkGg==",
+      "requires": {}
     },
     "@coreui/react": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/@coreui/react/-/react-4.1.2.tgz",
-      "integrity": "sha512-+e2/m5XYF0Ef/1OpWYkw6+HkudBt0jAJYQ15rI0A1JW7gsn5sOdML3fvuUGhBemEdSRItv6cETdnUsWmpdemEA=="
+      "integrity": "sha512-+e2/m5XYF0Ef/1OpWYkw6+HkudBt0jAJYQ15rI0A1JW7gsn5sOdML3fvuUGhBemEdSRItv6cETdnUsWmpdemEA==",
+      "requires": {}
     },
     "@coreui/react-chartjs": {
       "version": "2.0.3",
@@ -22016,7 +21949,6 @@
       "version": "7.29.0",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
       "integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==",
-      "dev": true,
       "requires": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -22026,7 +21958,6 @@
       "version": "3.7.3",
       "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
       "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
-      "dev": true,
       "requires": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -22035,8 +21966,7 @@
     "@types/estree": {
       "version": "0.0.51",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
-      "dev": true
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
     },
     "@types/express": {
       "version": "4.17.13",
@@ -22129,8 +22059,7 @@
     "@types/json-schema": {
       "version": "7.0.9",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
-      "dev": true
+      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="
     },
     "@types/json5": {
       "version": "0.0.29",
@@ -22477,7 +22406,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
       "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/helper-numbers": "1.11.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
@@ -22486,26 +22414,22 @@
     "@webassemblyjs/floating-point-hex-parser": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-      "dev": true
+      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ=="
     },
     "@webassemblyjs/helper-api-error": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-      "dev": true
+      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg=="
     },
     "@webassemblyjs/helper-buffer": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-      "dev": true
+      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA=="
     },
     "@webassemblyjs/helper-numbers": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
       "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.1",
         "@webassemblyjs/helper-api-error": "1.11.1",
@@ -22515,14 +22439,12 @@
     "@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-      "dev": true
+      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q=="
     },
     "@webassemblyjs/helper-wasm-section": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
       "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -22534,7 +22456,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
       "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
-      "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
@@ -22543,7 +22464,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
       "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
-      "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
@@ -22551,14 +22471,12 @@
     "@webassemblyjs/utf8": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-      "dev": true
+      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ=="
     },
     "@webassemblyjs/wasm-edit": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
       "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -22574,7 +22492,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
       "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
@@ -22587,7 +22504,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
       "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-buffer": "1.11.1",
@@ -22599,7 +22515,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
       "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@webassemblyjs/helper-api-error": "1.11.1",
@@ -22613,7 +22528,6 @@
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
       "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
-      "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.11.1",
         "@xtuc/long": "4.2.2"
@@ -22646,14 +22560,12 @@
     "@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
     },
     "@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "abab": {
       "version": "2.0.5",
@@ -22673,8 +22585,7 @@
     "acorn": {
       "version": "8.7.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-      "dev": true
+      "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="
     },
     "acorn-globals": {
       "version": "6.0.0",
@@ -22698,13 +22609,14 @@
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
       "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "dev": true
+      "requires": {}
     },
     "acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "acorn-node": {
       "version": "1.8.2",
@@ -22770,7 +22682,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -22811,7 +22722,7 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true
+      "requires": {}
     },
     "ansi-escapes": {
       "version": "4.3.2",
@@ -23192,7 +23103,8 @@
       "version": "0.3.8",
       "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz",
       "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "babel-plugin-polyfill-corejs2": {
       "version": "0.3.1",
@@ -23452,7 +23364,6 @@
       "version": "4.19.3",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.3.tgz",
       "integrity": "sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==",
-      "dev": true,
       "requires": {
         "caniuse-lite": "^1.0.30001312",
         "electron-to-chromium": "^1.4.71",
@@ -23478,8 +23389,7 @@
     "buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
     },
     "buffer-indexof": {
       "version": "1.1.1",
@@ -23580,8 +23490,7 @@
     "caniuse-lite": {
       "version": "1.0.30001312",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz",
-      "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==",
-      "dev": true
+      "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ=="
     },
     "canvg": {
       "version": "3.0.10",
@@ -23709,8 +23618,7 @@
     "chrome-trace-event": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
     },
     "ci-info": {
       "version": "3.3.0",
@@ -24168,7 +24076,8 @@
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
       "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "css-select": {
       "version": "4.2.1",
@@ -24277,7 +24186,8 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
       "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "csso": {
       "version": "4.2.0",
@@ -24737,8 +24647,7 @@
     "electron-to-chromium": {
       "version": "1.4.75",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.75.tgz",
-      "integrity": "sha512-LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q==",
-      "dev": true
+      "integrity": "sha512-LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q=="
     },
     "element-resize-detector": {
       "version": "1.2.4",
@@ -24776,7 +24685,6 @@
       "version": "5.9.2",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz",
       "integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==",
-      "dev": true,
       "requires": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -24878,8 +24786,7 @@
     "es-module-lexer": {
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-      "dev": true
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ=="
     },
     "es-to-primitive": {
       "version": "1.2.1",
@@ -24894,8 +24801,7 @@
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "dev": true
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
     },
     "escape-html": {
       "version": "1.0.3",
@@ -25096,7 +25002,8 @@
       "version": "8.5.0",
       "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
       "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "eslint-config-react-app": {
       "version": "7.0.0",
@@ -25353,7 +25260,8 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz",
       "integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "eslint-plugin-testing-library": {
       "version": "5.0.5",
@@ -25440,7 +25348,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
       "requires": {
         "estraverse": "^5.2.0"
       }
@@ -25448,8 +25355,7 @@
     "estraverse": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
     },
     "estree-walker": {
       "version": "1.0.1",
@@ -25483,8 +25389,7 @@
     "events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
     },
     "execa": {
       "version": "5.1.1",
@@ -25600,8 +25505,7 @@
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-diff": {
       "version": "1.2.0",
@@ -25636,8 +25540,7 @@
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -26140,8 +26043,7 @@
     "glob-to-regexp": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
     },
     "global-modules": {
       "version": "2.0.0",
@@ -26202,8 +26104,7 @@
     "graceful-fs": {
       "version": "4.2.9",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
-      "dev": true
+      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="
     },
     "gzip-size": {
       "version": "6.0.0",
@@ -26580,7 +26481,8 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "idb": {
       "version": "6.1.5",
@@ -27756,7 +27658,8 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
       "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "jest-regex-util": {
       "version": "27.5.1",
@@ -28408,7 +28311,6 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
       "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "dev": true,
       "requires": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -28418,14 +28320,12 @@
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "supports-color": {
           "version": "8.1.1",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
           "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
@@ -28512,8 +28412,7 @@
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
     },
     "json-parse-even-better-errors": {
       "version": "2.3.1",
@@ -28530,8 +28429,7 @@
     "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-without-jsonify": {
       "version": "1.0.1",
@@ -28588,7 +28486,8 @@
     "jspdf-autotable": {
       "version": "3.5.23",
       "resolved": "https://registry.npmjs.org/jspdf-autotable/-/jspdf-autotable-3.5.23.tgz",
-      "integrity": "sha512-uIYxQsdKrDdbhygEFlbTVoaxawZMZXMasAOryQ1oMFTragcxLhhWIfc8peLCBXuB7fJ5SICtPZ2De7Pk7eS8SQ=="
+      "integrity": "sha512-uIYxQsdKrDdbhygEFlbTVoaxawZMZXMasAOryQ1oMFTragcxLhhWIfc8peLCBXuB7fJ5SICtPZ2De7Pk7eS8SQ==",
+      "requires": {}
     },
     "jsx-ast-utils": {
       "version": "3.2.1",
@@ -28670,8 +28569,7 @@
     "loader-runner": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
-      "dev": true
+      "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw=="
     },
     "loader-utils": {
       "version": "2.0.2",
@@ -28893,8 +28791,7 @@
     "merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
     },
     "merge2": {
       "version": "1.4.1",
@@ -28927,14 +28824,12 @@
     "mime-db": {
       "version": "1.51.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
-      "dev": true
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
     },
     "mime-types": {
       "version": "2.1.34",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
       "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
-      "dev": true,
       "requires": {
         "mime-db": "1.51.0"
       }
@@ -29017,9 +28912,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "minimist-options": {
@@ -29112,8 +29007,7 @@
     "neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
     },
     "no-case": {
       "version": "3.0.4",
@@ -29135,9 +29029,9 @@
       }
     },
     "node-forge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz",
-      "integrity": "sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "dev": true
     },
     "node-int64": {
@@ -29149,8 +29043,7 @@
     "node-releases": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz",
-      "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==",
-      "dev": true
+      "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="
     },
     "normalize-package-data": {
       "version": "3.0.3",
@@ -29559,8 +29452,7 @@
     "picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
     },
     "picomatch": {
       "version": "2.3.1",
@@ -29721,7 +29613,8 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz",
       "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-calc": {
       "version": "8.2.4",
@@ -29785,7 +29678,8 @@
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz",
       "integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-custom-properties": {
       "version": "12.1.4",
@@ -29818,25 +29712,29 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.0.tgz",
       "integrity": "sha512-L0IKF4jAshRyn03SkEO6ar/Ipz2oLywVbg2THf2EqqdNkBwmVMxuTR/RoAltOw4piiaLt3gCAdrbAqmTBInmhg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-discard-duplicates": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
       "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-discard-empty": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.0.tgz",
       "integrity": "sha512-782T/buGgb3HOuHOJAHpdyKzAAKsv/BxWqsutnZ+QsiHEcDkY7v+6WWdturuBiSal6XMOO1p1aJvwXdqLD5vhA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-discard-overridden": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
       "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-double-position-gradients": {
       "version": "3.1.0",
@@ -29861,7 +29759,8 @@
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz",
       "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-focus-visible": {
       "version": "6.0.4",
@@ -29885,13 +29784,15 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
       "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-gap-properties": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.3.tgz",
       "integrity": "sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-image-set-function": {
       "version": "4.0.6",
@@ -29906,7 +29807,8 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
       "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-js": {
       "version": "4.0.0",
@@ -29963,13 +29865,15 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
       "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-media-minmax": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
       "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-media-query-parser": {
       "version": "0.2.3",
@@ -30043,7 +29947,8 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
@@ -30107,7 +30012,8 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
       "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-normalize-display-values": {
       "version": "5.1.0",
@@ -30203,13 +30109,15 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.3.tgz",
       "integrity": "sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-page-break": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
       "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-place": {
       "version": "7.0.4",
@@ -30302,7 +30210,8 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
       "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-resolve-nested-selector": {
       "version": "0.1.1",
@@ -30314,13 +30223,15 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
       "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-scss": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.3.tgz",
       "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-selector-not": {
       "version": "5.0.0",
@@ -30345,7 +30256,8 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
       "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-svgo": {
       "version": "5.1.0",
@@ -30547,8 +30459,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",
@@ -30600,7 +30511,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
       "requires": {
         "safe-buffer": "^5.1.0"
       }
@@ -30665,7 +30575,8 @@
     "react-bootstrap-table2-paginator": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/react-bootstrap-table2-paginator/-/react-bootstrap-table2-paginator-2.1.2.tgz",
-      "integrity": "sha512-LC5znEphhgKJvaSY1q8d+Gj0Nc/1X+VS3tKJjkmWmfv9P61YC/BnwJ+aoqEmQzsLiVGowrzss+i/u+Tip5H+Iw=="
+      "integrity": "sha512-LC5znEphhgKJvaSY1q8d+Gj0Nc/1X+VS3tKJjkmWmfv9P61YC/BnwJ+aoqEmQzsLiVGowrzss+i/u+Tip5H+Iw==",
+      "requires": {}
     },
     "react-bootstrap-table2-toolkit": {
       "version": "2.1.3",
@@ -30864,7 +30775,8 @@
     "react-media-hook": {
       "version": "0.4.9",
       "resolved": "https://registry.npmjs.org/react-media-hook/-/react-media-hook-0.4.9.tgz",
-      "integrity": "sha512-FZr/2xA1+23vDJ1IZ794yLqMRRkBoCNOiJATdtTfB5GyVc5djf8FL2qEB/68pSkiNgHdHsmKknMSDr0sC4zBKQ=="
+      "integrity": "sha512-FZr/2xA1+23vDJ1IZ794yLqMRRkBoCNOiJATdtTfB5GyVc5djf8FL2qEB/68pSkiNgHdHsmKknMSDr0sC4zBKQ==",
+      "requires": {}
     },
     "react-papaparse": {
       "version": "3.18.2",
@@ -31012,7 +30924,8 @@
     "react-side-effect": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz",
-      "integrity": "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ=="
+      "integrity": "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==",
+      "requires": {}
     },
     "react-syntax-highlighter": {
       "version": "15.4.5",
@@ -31208,12 +31121,14 @@
     "redux-persist": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/redux-persist/-/redux-persist-6.0.0.tgz",
-      "integrity": "sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ=="
+      "integrity": "sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==",
+      "requires": {}
     },
     "redux-thunk": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz",
-      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q=="
+      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==",
+      "requires": {}
     },
     "refractor": {
       "version": "3.6.0",
@@ -31529,8 +31444,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=="
     },
     "safer-buffer": {
       "version": "2.1.2",
@@ -31592,7 +31506,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
       "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -31670,7 +31583,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
       "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-      "dev": true,
       "requires": {
         "randombytes": "^2.1.0"
       }
@@ -31882,8 +31794,7 @@
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
     },
     "source-map-js": {
       "version": "1.0.2",
@@ -31904,7 +31815,6 @@
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -32194,7 +32104,8 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
       "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "style-search": {
       "version": "0.1.0",
@@ -32595,8 +32506,7 @@
     "tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "dev": true
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
     },
     "temp-dir": {
       "version": "2.0.0",
@@ -32638,7 +32548,6 @@
       "version": "5.12.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz",
       "integrity": "sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==",
-      "dev": true,
       "requires": {
         "acorn": "^8.5.0",
         "commander": "^2.20.0",
@@ -32649,14 +32558,12 @@
         "commander": {
           "version": "2.20.3",
           "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
         },
         "source-map": {
           "version": "0.7.3",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
         }
       }
     },
@@ -32664,7 +32571,6 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz",
       "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
-      "dev": true,
       "requires": {
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
@@ -32959,7 +32865,6 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -33081,7 +32986,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
       "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
-      "dev": true,
       "requires": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -33106,7 +33010,6 @@
       "version": "5.69.1",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.69.1.tgz",
       "integrity": "sha512-+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A==",
-      "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
@@ -33138,7 +33041,6 @@
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
           "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-          "dev": true,
           "requires": {
             "esrecurse": "^4.3.0",
             "estraverse": "^4.1.1"
@@ -33147,8 +33049,7 @@
         "estraverse": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-          "dev": true
+          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
         }
       }
     },
@@ -33302,7 +33203,8 @@
           "version": "8.5.0",
           "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
           "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         }
       }
     },
@@ -33331,8 +33233,7 @@
     "webpack-sources": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="
     },
     "websocket-driver": {
       "version": "0.7.4",
@@ -33772,7 +33673,8 @@
       "version": "7.5.7",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
       "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "xml-name-validator": {
       "version": "3.0.0",
diff --git a/public/version_latest.txt b/public/version_latest.txt
index cc6612c36e05..9183195ace75 100644
--- a/public/version_latest.txt
+++ b/public/version_latest.txt
@@ -1 +1 @@
-2.3.0
\ No newline at end of file
+2.4.0
\ No newline at end of file
diff --git a/src/_nav.js b/src/_nav.js
index cd182420430f..03fd2a34aa20 100644
--- a/src/_nav.js
+++ b/src/_nav.js
@@ -15,6 +15,8 @@ import {
   faEnvelope,
   faWindowRestore,
   faUnlock,
+  faKey,
+  faBus,
 } from '@fortawesome/free-solid-svg-icons'
 
 const _nav = [
@@ -133,11 +135,10 @@ const _nav = [
         name: 'Licence Report',
         to: '/tenant/administration/list-licenses',
       },
-
       {
         component: CNavItem,
-        name: 'Conditional Access Policies',
-        to: '/tenant/administration/conditional-access-policies',
+        name: 'Service Health',
+        to: '/tenant/administration/service-health',
       },
     ],
   },
@@ -175,6 +176,35 @@ const _nav = [
       },
     ],
   },
+  {
+    component: CNavGroup,
+    name: 'Conditional Access',
+    section: 'Conditional Access',
+    to: '/tenant/administration',
+    icon: <FontAwesomeIcon icon={faKey} className="nav-icon" />,
+    items: [
+      {
+        component: CNavItem,
+        name: 'List Policies',
+        to: '/tenant/conditional/list-policies',
+      },
+      {
+        component: CNavItem,
+        name: 'Deploy Conditional Access',
+        to: '/tenant/conditional/deploy',
+      },
+      {
+        component: CNavItem,
+        name: 'Add Template',
+        to: '/tenant/conditional/add-template',
+      },
+      {
+        component: CNavItem,
+        name: 'List Templates',
+        to: '/tenant/conditional/list-template',
+      },
+    ],
+  },
   {
     component: CNavTitle,
     name: 'Security & Compliance',
@@ -392,6 +422,35 @@ const _nav = [
       },
     ],
   },
+  {
+    component: CNavGroup,
+    name: 'Transport Rules',
+    section: 'Transport Rules',
+    to: '/tenant/administration',
+    icon: <FontAwesomeIcon icon={faBus} className="nav-icon" />,
+    items: [
+      {
+        component: CNavItem,
+        name: 'List Transport rules',
+        to: '/email/transport/list-rules',
+      },
+      {
+        component: CNavItem,
+        name: 'Deploy Transport rule',
+        to: '/email/transport/deploy-rules',
+      },
+      {
+        component: CNavItem,
+        name: 'Add Template',
+        to: '/email/transport/add-template',
+      },
+      {
+        component: CNavItem,
+        name: 'List Templates',
+        to: '/email/transport/list-templates',
+      },
+    ],
+  },
   {
     component: CNavGroup,
     name: 'Reports',
@@ -434,14 +493,19 @@ const _nav = [
     items: [
       {
         component: CNavItem,
-        name: 'Documentation',
-        href: 'https://cipp.app',
-        target: '_blank',
+        name: 'Settings',
+        to: '/cipp/settings',
       },
       {
         component: CNavItem,
-        name: 'Settings',
-        to: '/cipp/settings',
+        name: 'SAM Setup Wizard (β)',
+        to: '/cipp/setup',
+      },
+      {
+        component: CNavItem,
+        name: 'Documentation',
+        href: 'https://cipp.app',
+        target: '_blank',
       },
     ],
   },
diff --git a/src/adminRoutes.js b/src/adminRoutes.js
index f6015fc81626..d94eb75aa1e7 100644
--- a/src/adminRoutes.js
+++ b/src/adminRoutes.js
@@ -1,11 +1,14 @@
 import React from 'react'
 const CIPPSettings = React.lazy(() => import('src/views/cipp/CIPPSettings'))
+const Setup = React.lazy(() => import('src/views/cipp/Setup'))
 const ApplyStandard = React.lazy(() => import('src/views/tenant/standards/ApplyStandard'))
 
 const adminRoutes = [
   { path: '/cipp', name: 'CIPP' },
   { path: '/cipp/cipp', name: 'CIPP' },
   { path: '/cipp/settings', name: 'Settings', component: CIPPSettings },
+  { path: '/cipp/setup', name: 'Setup', component: Setup },
+
   { path: '/tenant/standards/apply-standard', name: 'Apply Standard', component: ApplyStandard },
 ]
 
diff --git a/src/components/utilities/CippActionsOffcanvas.js b/src/components/utilities/CippActionsOffcanvas.js
index 2cbd3a241af1..419761c36bc7 100644
--- a/src/components/utilities/CippActionsOffcanvas.js
+++ b/src/components/utilities/CippActionsOffcanvas.js
@@ -4,27 +4,41 @@ import { CCallout, CListGroup, CListGroupItem, COffcanvasTitle, CSpinner } from
 import { CippOffcanvas, ModalService } from 'src/components/utilities'
 import { CippOffcanvasPropTypes } from 'src/components/utilities/CippOffcanvas'
 import { CippOffcanvasTable } from 'src/components/tables'
-import { useLazyGenericGetRequestQuery } from 'src/store/api/app'
+import { useLazyGenericGetRequestQuery, useLazyGenericPostRequestQuery } from 'src/store/api/app'
 import { useNavigate } from 'react-router-dom'
 
 export default function CippActionsOffcanvas(props) {
   const [genericGetRequest, getResults] = useLazyGenericGetRequestQuery()
+  const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
+
   const handleLink = useNavigate()
   const handleExternalLink = (link) => {
     window.open(link, '_blank')
   }
-  const handleModal = (modalMessage, modalUrl) => {
-    ModalService.confirm({
-      body: (
-        <div style={{ overflow: 'visible' }}>
-          <div>{modalMessage}</div>
-        </div>
-      ),
-      title: 'Confirm',
-      onConfirm: () => genericGetRequest({ path: modalUrl }),
-    })
+  const handleModal = (modalMessage, modalUrl, modalType = 'GET', modalBody) => {
+    if (modalType === 'GET') {
+      ModalService.confirm({
+        body: (
+          <div style={{ overflow: 'visible' }}>
+            <div>{modalMessage}</div>
+          </div>
+        ),
+        title: 'Confirm',
+        onConfirm: () => genericGetRequest({ path: modalUrl }),
+      })
+    } else {
+      ModalService.confirm({
+        body: (
+          <div style={{ overflow: 'visible' }}>
+            <div>{modalMessage}</div>
+          </div>
+        ),
+        title: 'Confirm',
+        onConfirm: () => genericPostRequest({ path: modalUrl, values: modalBody }),
+      })
+    }
   }
-  const handleOnClick = (link, modal, modalMessage, modalUrl, external) => {
+  const handleOnClick = (link, modal, modalMessage, modalUrl, external, modalType, modalBody) => {
     if (link) {
       if (external) {
         handleExternalLink(link)
@@ -32,7 +46,7 @@ export default function CippActionsOffcanvas(props) {
         handleLink(link)
       }
     } else if (modal) {
-      handleModal(modalMessage, modalUrl)
+      handleModal(modalMessage, modalUrl, modalType, modalBody)
     }
   }
   const extendedInfoContent = <CippOffcanvasTable rows={props.extendedInfo} guid={props.id} />
@@ -48,6 +62,8 @@ export default function CippActionsOffcanvas(props) {
           action.modalMessage,
           action.modalUrl,
           action.external,
+          action.modalType,
+          action.modalBody,
         )
       }
       key={index}
@@ -69,6 +85,15 @@ export default function CippActionsOffcanvas(props) {
           <CSpinner>Loading</CSpinner>
         </CCallout>
       )}
+      {postResults.isFetching && (
+        <CCallout color="info">
+          <CSpinner>Loading</CSpinner>
+        </CCallout>
+      )}
+      {postResults.isSuccess && <CCallout color="info">{postResults.data?.Results}</CCallout>}
+      {postResults.isError && (
+        <CCallout color="danger">Could not connect to API: {postResults.error.message}</CCallout>
+      )}
       {getResults.isSuccess && <CCallout color="info">{getResults.data?.Results}</CCallout>}
       {getResults.isError && (
         <CCallout color="danger">Could not connect to API: {getResults.error.message}</CCallout>
@@ -97,6 +122,8 @@ const CippActionsOffcanvasPropTypes = {
       onClick: PropTypes.func,
       modal: PropTypes.bool,
       modalUrl: PropTypes.string,
+      modalBody: PropTypes.string,
+      modalType: PropTypes.string,
       modalMessage: PropTypes.string,
       external: PropTypes.bool,
     }),
diff --git a/src/routes.js b/src/routes.js
index 884acba8557f..6526e664bab6 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -24,9 +24,17 @@ const GraphExplorer = React.lazy(() => import('src/views/tenant/administration/G
 
 const Domains = React.lazy(() => import('src/views/tenant/administration/Domains'))
 const EditTenant = React.lazy(() => import('src/views/tenant/administration/EditTenant'))
-const ConditionalAccess = React.lazy(() =>
-  import('src/views/tenant/administration/ConditionalAccess'),
+const ConditionalAccess = React.lazy(() => import('src/views/tenant/conditional/ConditionalAccess'))
+const ListConditionalTemplates = React.lazy(() =>
+  import('src/views/tenant/conditional/ListCATemplates'),
 )
+
+const AddConditionalTemplate = React.lazy(() =>
+  import('src/views/tenant/conditional/AddCATemplate'),
+)
+
+const DeployConditional = React.lazy(() => import('src/views/tenant/conditional/DeployCA'))
+
 const ListLicences = React.lazy(() => import('src/views/tenant/administration/ListLicences'))
 
 const BasicAuthReport = React.lazy(() => import('src/views/identity/reports/BasicAuthReport'))
@@ -123,8 +131,21 @@ const MessageTrace = React.lazy(() => import('src/views/email-exchange/reports/M
 const PhishingPoliciesList = React.lazy(() =>
   import('src/views/email-exchange/reports/PhishingPoliciesList'),
 )
+const TransportRulesList = React.lazy(() =>
+  import('src/views/email-exchange/transport/TransportRules'),
+)
+const TransportTemplate = React.lazy(() =>
+  import('src/views/email-exchange/transport/ListTransportTemplates'),
+)
+const AddTransportTemplate = React.lazy(() =>
+  import('src/views/email-exchange/transport/AddTransportTemplate'),
+)
+const TransportDeploy = React.lazy(() =>
+  import('src/views/email-exchange/transport/DeployTransport'),
+)
 const SecurityComplianceAlerts = React.lazy(() => import('src/views/security/reports/ListAlerts'))
 const License = React.lazy(() => import('src/views/pages/license/License'))
+const ServiceHealth = React.lazy(() => import('src/views/tenant/administration/ServiceHealth'))
 
 const routes = [
   // { path: '/', exact: true, name: 'Home' },
@@ -175,12 +196,31 @@ const routes = [
     name: 'Graph Explorer',
     component: GraphExplorer,
   },
-
   {
-    path: '/tenant/administration/conditional-access-policies',
+    path: '/tenant/administration/service-health',
+    name: 'Service Health',
+    component: ServiceHealth,
+  },
+  {
+    path: '/tenant/conditional/list-policies',
     name: 'Conditional Access',
     component: ConditionalAccess,
   },
+  {
+    path: '/tenant/conditional/deploy',
+    name: 'Deploy Conditional Access',
+    component: DeployConditional,
+  },
+  {
+    path: '/tenant/conditional/list-template',
+    name: 'Conditional Access Templates',
+    component: ListConditionalTemplates,
+  },
+  {
+    path: '/tenant/conditional/add-template',
+    name: 'Conditional Access add Temmplate',
+    component: AddConditionalTemplate,
+  },
   {
     path: '/tenant/administration/list-licenses',
     name: 'List Licenses',
@@ -289,6 +329,26 @@ const routes = [
   { name: 'Email & Exchange', path: '/email' },
   { name: 'Email Administration', path: '/email/administration' },
   { name: 'List Contacts', path: '/email/administration/contacts', component: ContactsList },
+  {
+    path: '/email/transport/list-rules',
+    name: 'List Transport rules',
+    component: TransportRulesList,
+  },
+  {
+    path: '/email/transport/deploy-rules',
+    name: 'Deploy Transport rule',
+    component: TransportDeploy,
+  },
+  {
+    path: '/email/transport/list-templates',
+    name: 'Transport Rule Templates',
+    component: TransportTemplate,
+  },
+  {
+    path: '/email/transport/add-template',
+    name: 'Transport Rule add Temmplate',
+    component: AddTransportTemplate,
+  },
   {
     name: 'Edit Mailbox Permissions',
     path: '/email/administration/edit-mailbox-permissions',
diff --git a/src/views/cipp/Setup.js b/src/views/cipp/Setup.js
new file mode 100644
index 000000000000..9e1aabeab644
--- /dev/null
+++ b/src/views/cipp/Setup.js
@@ -0,0 +1,278 @@
+import React, { useEffect, useRef, useState } from 'react'
+import { CCol, CRow, CCallout, CSpinner, CButton } from '@coreui/react'
+import { Field, FormSpy } from 'react-final-form'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faCheck, faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'
+import { CippWizard } from 'src/components/layout'
+import PropTypes from 'prop-types'
+import { Condition, RFFCFormInput, RFFCFormRadio } from 'src/components/forms'
+import { useLazyGenericGetRequestQuery, useLazyGenericPostRequestQuery } from 'src/store/api/app'
+
+function useInterval(callback, delay, state) {
+  const savedCallback = useRef()
+
+  // Remember the latest callback.
+  useEffect(() => {
+    savedCallback.current = callback
+  })
+
+  // Set up the interval.
+  useEffect(() => {
+    function tick() {
+      savedCallback.current()
+    }
+    if (delay !== null) {
+      let id = setInterval(tick, delay)
+      return () => clearInterval(id)
+    }
+  }, [delay, state])
+}
+const Error = ({ name }) => (
+  <Field
+    name={name}
+    subscription={{ touched: true, error: true }}
+    render={({ meta: { touched, error } }) =>
+      touched && error ? (
+        <CCallout color="danger">
+          <FontAwesomeIcon icon={faExclamationTriangle} color="danger" />
+          {error}
+        </CCallout>
+      ) : null
+    }
+  />
+)
+
+Error.propTypes = {
+  name: PropTypes.string.isRequired,
+}
+
+const Setup = () => {
+  const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
+  const [genericGetRequest, getResults] = useLazyGenericGetRequestQuery()
+  const onSubmit = (values) => {
+    if (!usedWizard) {
+      const shippedValues = {
+        setkeys: true,
+        ...values,
+      }
+      genericPostRequest({ path: 'api/ExecSAMSetup', values: shippedValues })
+    }
+  }
+  const [usedWizard, setNoSubmit] = useState(false)
+
+  const startCIPPSetup = (partner) => {
+    genericGetRequest({
+      path: 'api/ExecSAMSetup',
+      params: { CreateSAM: true, partnersetup: partner },
+    })
+    setNoSubmit(true)
+  }
+
+  useInterval(
+    async () => {
+      if (getResults.data?.step < 7 && getResults.data?.step > 0) {
+        genericGetRequest({
+          path: 'api/ExecSAMSetup',
+          params: { CheckSetupProcess: true, step: getResults.data?.step },
+        })
+      }
+    },
+    10000,
+    getResults.data,
+  )
+
+  const formValues = {}
+  return (
+    <CippWizard
+      onSubmit={onSubmit}
+      initialValues={{ ...formValues }}
+      wizardTitle="Secure Application Model Setup Wizard"
+    >
+      <CippWizard.Page title="Step one" description="Choose the type of deployment.">
+        <center>
+          <h3 className="text-primary">Step 1</h3>
+          <h5 className="card-title mb-4">Choose Options</h5>
+        </center>
+        <hr className="my-4" />
+        This wizard will guide you through setting up a SAM application and using the correct keys.
+        This setup is still a beta feature, and as such so be treated with care.
+        <RFFCFormRadio
+          value="CreateSAM"
+          name="SetupType"
+          label="I'd like CIPP to create a SAM Application for me"
+        ></RFFCFormRadio>
+        <RFFCFormRadio
+          value="ExistingSAM"
+          name="SetupType"
+          label="I have an existing SAM application and would like to enter my tokens"
+        ></RFFCFormRadio>
+        <hr className="my-4" />
+      </CippWizard.Page>
+      <CippWizard.Page title="Select Options" description="Select which options you want to apply.">
+        <center>
+          <h3 className="text-primary">Step 2</h3>
+          <h5 className="card-title mb-4">Enter the secure application model credentials.</h5>
+        </center>
+        <hr className="my-4" />
+        <Condition when="SetupType" is="CreateSAM">
+          <RFFCFormRadio
+            value="True"
+            name="Partner"
+            label="I am a Microsoft Partner, and would like to access all tenants using CIPP"
+          ></RFFCFormRadio>
+          <RFFCFormRadio
+            value="False"
+            name="Partner"
+            label="I am not a Microsoft Partner, and am using CIPP for only my own tenant"
+          ></RFFCFormRadio>
+          <Condition when="Partner" is="True">
+            <CRow>
+              <p>
+                When clicking the button below, the setup wizard starts. This is a 7 step process.
+                Please use a Global Administrator to perform these tasks. You can restart the
+                process at any time, by clicking on the start button once more.
+              </p>
+              <CCol md={2}>
+                <CButton type="button" onClick={() => startCIPPSetup(true)}>
+                  Start Setup Wizard
+                </CButton>
+              </CCol>
+              <hr className="my-4" />
+            </CRow>
+            <CRow>
+              <CCol md={12}>
+                {getResults.isFetching && <CSpinner size="sm">Loading</CSpinner>}
+                {getResults.isSuccess && (
+                  <>
+                    {getResults.data?.step < 7 ? (
+                      <CSpinner size="sm"></CSpinner>
+                    ) : (
+                      <FontAwesomeIcon icon={faCheck}></FontAwesomeIcon>
+                    )}
+                    Step {getResults.data?.step} - {getResults.data.message}{' '}
+                    {getResults.data.url && <a href={getResults.data?.url}>HERE</a>}
+                  </>
+                )}
+              </CCol>
+            </CRow>
+          </Condition>
+          <Condition when="Partner" is="False">
+            <CRow>
+              <CCol md={2}>
+                <CButton type="button" onClick={() => startCIPPSetup(false)}>
+                  Start Setup Wizard
+                </CButton>
+              </CCol>
+              <hr className="my-4" />
+            </CRow>
+            <CRow>
+              <CCol md={12}>
+                {getResults.isFetching && <CSpinner size="sm">Loading</CSpinner>}
+                {getResults.isSuccess && (
+                  <>
+                    {getResults.data?.step < 7 ? (
+                      <CSpinner size="sm"></CSpinner>
+                    ) : (
+                      <FontAwesomeIcon icon={faCheck}></FontAwesomeIcon>
+                    )}
+                    Step {getResults.data?.step} - {getResults.data.message}{' '}
+                    {getResults.data.url && <a href={getResults.data?.url}>HERE</a>}
+                  </>
+                )}
+              </CCol>
+            </CRow>
+          </Condition>
+        </Condition>
+        <Condition when="SetupType" is="ExistingSAM">
+          <CRow>
+            <CCol md={12}>
+              <RFFCFormInput
+                type="text"
+                name="TenantID"
+                label="Tenant ID"
+                placeholder="Enter the Tenant ID. e.g. mymsp.onmicrosoft.com"
+              />
+            </CCol>
+          </CRow>
+          <CRow>
+            <CCol md={12}>
+              <RFFCFormInput
+                type="text"
+                name="ApplicationID"
+                label="Application ID"
+                placeholder="Enter the application ID. e.g 1111-1111-1111-1111-11111"
+              />
+            </CCol>
+          </CRow>
+          <CRow>
+            <CCol md={12}>
+              <RFFCFormInput
+                type="password"
+                name="ApplicationSecret"
+                label="Application Secret"
+                placeholder="Enter the application secret"
+              />
+            </CCol>
+          </CRow>
+          <CRow>
+            <CCol md={12}>
+              <RFFCFormInput
+                type="password"
+                name="RefreshToken"
+                label="Refresh Token"
+                placeholder="Enter the refresh token"
+              />
+            </CCol>
+          </CRow>
+          <CRow>
+            <CCol md={12}>
+              <RFFCFormInput
+                type="password"
+                name="ExchangeRefreshToken"
+                label="Exchange Refresh Token"
+                placeholder="Enter the Exchange refresh tokens"
+              />
+            </CCol>
+          </CRow>
+        </Condition>
+        <hr className="my-4" />
+      </CippWizard.Page>
+      <CippWizard.Page title="Review and Confirm" description="Confirm the settings to apply">
+        <center>
+          <h3 className="text-primary">Step 3</h3>
+          <h5 className="card-title mb-4">Confirm and apply</h5>
+        </center>
+        <hr className="my-4" />
+        {!postResults.isSuccess && (
+          <FormSpy>
+            {(props) => {
+              /* eslint-disable react/prop-types */
+              return (
+                <>
+                  <CRow>
+                    <CCol md={3}></CCol>
+                    <CCol md={6}>
+                      {usedWizard &&
+                        'You have used the setup wizard. You can close this screen. Setup has been completed'}
+                      {!usedWizard &&
+                        'You are sending your own Secure Application Model setup to the Keyvault. For security reasons we do not show the keys. Please make sure you have entered the keys correctly.'}
+                    </CCol>
+                  </CRow>
+                </>
+              )
+            }}
+          </FormSpy>
+        )}
+        {postResults.isFetching && (
+          <CCallout color="info">
+            <CSpinner>Loading</CSpinner>
+          </CCallout>
+        )}
+        {postResults.isSuccess && <CCallout color="success">{postResults.data.Results}</CCallout>}
+        <hr className="my-4" />
+      </CippWizard.Page>
+    </CippWizard>
+  )
+}
+
+export default Setup
diff --git a/src/views/email-exchange/administration/EditCalendarPermissions.js b/src/views/email-exchange/administration/EditCalendarPermissions.js
index 6eb03f3a9fc2..b19dc6718141 100644
--- a/src/views/email-exchange/administration/EditCalendarPermissions.js
+++ b/src/views/email-exchange/administration/EditCalendarPermissions.js
@@ -77,6 +77,12 @@ const EditCalendarPermission = () => {
   // this is dumb
   const formDisabled = queryError === true
 
+  const UsersMapped = users?.map((user) => ({
+    value: `${user.primarySmtpAddress}`,
+    name: `${user.displayName} - (${user.primarySmtpAddress})`,
+  }))
+  UsersMapped.unshift({ value: 'Default', name: 'Default' })
+
   return (
     <CCard className="page-card">
       {!queryError && (
@@ -115,10 +121,7 @@ const EditCalendarPermission = () => {
                                 <RFFSelectSearch
                                   label="Remove Access"
                                   disabled={formDisabled}
-                                  values={users?.map((user) => ({
-                                    value: `${user.primarySmtpAddress}`,
-                                    name: `${user.displayName} - (${user.primarySmtpAddress})`,
-                                  }))}
+                                  values={UsersMapped}
                                   placeholder={!usersIsFetching ? 'Select user' : 'Loading...'}
                                   name="RemoveAccess"
                                 />
@@ -128,10 +131,7 @@ const EditCalendarPermission = () => {
                                 <RFFSelectSearch
                                   label="Add Access"
                                   disabled={formDisabled}
-                                  values={users?.map((user) => ({
-                                    value: `${user.primarySmtpAddress}`,
-                                    name: `${user.displayName} - (${user.primarySmtpAddress})`,
-                                  }))}
+                                  values={UsersMapped}
                                   placeholder={!usersIsFetching ? 'Select user' : 'Loading...'}
                                   name="UserToGetPermissions"
                                 />
diff --git a/src/views/email-exchange/transport/AddTransportTemplate.js b/src/views/email-exchange/transport/AddTransportTemplate.js
new file mode 100644
index 000000000000..339ff4fd87d7
--- /dev/null
+++ b/src/views/email-exchange/transport/AddTransportTemplate.js
@@ -0,0 +1,61 @@
+import React from 'react'
+import { CButton, CCallout, CCol, CForm, CRow, CSpinner } from '@coreui/react'
+import { Form } from 'react-final-form'
+import { CippContentCard, CippPage } from 'src/components/layout'
+import { RFFCFormTextarea } from 'src/components/forms'
+import { useLazyGenericPostRequestQuery } from 'src/store/api/app'
+
+const TransportAddTemplate = () => {
+  const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
+
+  const handleSubmit = async (values) => {
+    // alert(JSON.stringify(values, null, 2))
+    // @todo hook this up
+    genericPostRequest({ path: '/api/AddTransportTemplate', values })
+  }
+
+  return (
+    <CippPage tenantSelector={false} title="Add Transport Rule Template">
+      <CippContentCard title="Template Details">
+        {postResults.isFetching && (
+          <CCallout color="info">
+            <CSpinner>Loading</CSpinner>
+          </CCallout>
+        )}
+        {postResults.isSuccess && <CCallout color="success">{postResults.data.Results}</CCallout>}
+        <Form
+          onSubmit={handleSubmit}
+          render={({ handleSubmit, submitting, values }) => {
+            return (
+              <CForm onSubmit={handleSubmit}>
+                <CRow>
+                  <CCol>
+                    <RFFCFormTextarea
+                      name="PowerShellCommand"
+                      label="New-TransportRule parameters"
+                      placeholder={'Enter the JSON parameters for your rule.'}
+                    />
+                  </CCol>
+                </CRow>
+                <CRow className="mb-3">
+                  <CCol>
+                    <CButton className="text-white" type="submit" disabled={submitting}>
+                      Add Template
+                    </CButton>
+                  </CCol>
+                </CRow>
+                {/*<CRow>*/}
+                {/* <CCol>*/}
+                {/*   <pre>{JSON.stringify(values, null, 2)}</pre>*/}
+                {/* </CCol>*/}
+                {/*</CRow>*/}
+              </CForm>
+            )
+          }}
+        />
+      </CippContentCard>
+    </CippPage>
+  )
+}
+
+export default TransportAddTemplate
diff --git a/src/views/email-exchange/transport/DeployTransport.js b/src/views/email-exchange/transport/DeployTransport.js
new file mode 100644
index 000000000000..e8498ffa0022
--- /dev/null
+++ b/src/views/email-exchange/transport/DeployTransport.js
@@ -0,0 +1,204 @@
+import React from 'react'
+import { CCol, CRow, CCallout, CSpinner } from '@coreui/react'
+import { Field, FormSpy } from 'react-final-form'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'
+import { CippWizard } from 'src/components/layout'
+import { WizardTableField } from 'src/components/tables'
+import PropTypes from 'prop-types'
+import { RFFCFormSelect, RFFCFormTextarea } from 'src/components/forms'
+import { useLazyGenericGetRequestQuery, useLazyGenericPostRequestQuery } from 'src/store/api/app'
+import { OnChange } from 'react-final-form-listeners'
+
+const Error = ({ name }) => (
+  <Field
+    name={name}
+    subscription={{ touched: true, error: true }}
+    render={({ meta: { touched, error } }) =>
+      touched && error ? (
+        <CCallout color="danger">
+          <FontAwesomeIcon icon={faExclamationTriangle} color="danger" />
+          {error}
+        </CCallout>
+      ) : null
+    }
+  />
+)
+
+Error.propTypes = {
+  name: PropTypes.string.isRequired,
+}
+
+const requiredArray = (value) => (value && value.length !== 0 ? undefined : 'Required')
+const AddPolicy = () => {
+  const [intuneGetRequest, intuneTemplates] = useLazyGenericGetRequestQuery()
+  const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
+
+  const handleSubmit = async (values) => {
+    values.selectedTenants.map(
+      (tenant) => (values[`Select_${tenant.defaultDomainName}`] = tenant.defaultDomainName),
+    )
+    values.TemplateType = values.Type
+    genericPostRequest({ path: '/api/AddTransportRule', values: values })
+  }
+  /* eslint-disable react/prop-types */
+  const WhenFieldChanges = ({ field, set }) => (
+    <Field name={set} subscription={{}}>
+      {(
+        // No subscription. We only use Field to get to the change function
+        { input: { onChange } },
+      ) => (
+        <FormSpy subscription={{}}>
+          {({ form }) => (
+            <OnChange name={field}>
+              {(value) => {
+                let template = intuneTemplates.data.filter(function (obj) {
+                  return obj.GUID === value
+                })
+                // console.log(template[0][set])
+                onChange(JSON.stringify(template[0]))
+              }}
+            </OnChange>
+          )}
+        </FormSpy>
+      )}
+    </Field>
+  )
+
+  const formValues = {
+    TemplateType: 'Admin',
+  }
+
+  return (
+    <CippWizard
+      initialValues={{ ...formValues }}
+      onSubmit={handleSubmit}
+      wizardTitle="Add Intune policy"
+    >
+      <CippWizard.Page
+        title="Tenant Choice"
+        description="Choose the tenants to create the policy for."
+      >
+        <center>
+          <h3 className="text-primary">Step 1</h3>
+          <h5 className="card-title mb-4">Choose tenants</h5>
+        </center>
+        <hr className="my-4" />
+        <Field name="selectedTenants" validate={requiredArray}>
+          {(props) => (
+            <WizardTableField
+              reportName="Add-MEM-Policy-Tenant-Selector"
+              keyField="defaultDomainName"
+              path="/api/ListTenants?AllTenantSelector=true"
+              columns={[
+                {
+                  name: 'Display Name',
+                  selector: (row) => row['displayName'],
+                  sortable: true,
+                  exportselector: 'displayName',
+                },
+                {
+                  name: 'Default Domain Name',
+                  selector: (row) => row['defaultDomainName'],
+                  sortable: true,
+                  exportselector: 'mail',
+                },
+              ]}
+              fieldProps={props}
+            />
+          )}
+        </Field>
+        <Error name="selectedTenants" />
+        <hr className="my-4" />
+      </CippWizard.Page>
+      <CippWizard.Page title="Select Options" description="Select which options you want to apply.">
+        <center>
+          <h3 className="text-primary">Step 2</h3>
+          <h5 className="card-title mb-4">
+            Enter the raw JSON for this policy, or select from a template. You can create templates
+            from existing policies.
+          </h5>
+        </center>
+        <hr className="my-4" />
+        <CRow>
+          <CCol md={12}>
+            {intuneTemplates.isUninitialized &&
+              intuneGetRequest({ path: 'api/ListTransportRulesTemplates' })}
+            {intuneTemplates.isSuccess && (
+              <RFFCFormSelect
+                name="TemplateList"
+                values={intuneTemplates.data?.map((template) => ({
+                  value: template.GUID,
+                  label: template.name,
+                }))}
+                placeholder="Select a template"
+                label="Please choose a template to apply, or enter the information manually."
+              />
+            )}
+          </CCol>
+        </CRow>
+        <CRow>
+          <CCol>
+            <RFFCFormTextarea
+              name="PowerShellCommand"
+              label="New-TransportRule parameters"
+              placeholder={
+                'Enter the JSON information to use as parameters, or select from a template'
+              }
+            />
+          </CCol>
+        </CRow>
+        <hr className="my-4" />
+        <WhenFieldChanges field="TemplateList" set="PowerShellCommand" />
+      </CippWizard.Page>
+      <CippWizard.Page title="Review and Confirm" description="Confirm the settings to apply">
+        <center>
+          <h3 className="text-primary">Step 3</h3>
+          <h5 className="card-title mb-4">Confirm and apply</h5>
+        </center>
+        <hr className="my-4" />
+        {!postResults.isSuccess && (
+          <FormSpy>
+            {(props) => {
+              /* eslint-disable react/prop-types */
+              return (
+                <>
+                  <CRow>
+                    <CCol md={3}></CCol>
+                    <CCol md={6}>
+                      <h5 className="mb-0">Selected Tenants</h5>
+                      <CCallout color="info">
+                        {props.values.selectedTenants.map((tenant, idx) => (
+                          <li key={idx}>
+                            {tenant.displayName}- {tenant.defaultDomainName}
+                          </li>
+                        ))}
+                      </CCallout>
+                      <h5 className="mb-0">Rule Settings</h5>
+                      <CCallout color="info">{props.values.PowerShellCommand}</CCallout>
+                    </CCol>
+                  </CRow>
+                </>
+              )
+            }}
+          </FormSpy>
+        )}
+        {postResults.isFetching && (
+          <CCallout color="info">
+            <CSpinner>Loading</CSpinner>
+          </CCallout>
+        )}
+        {postResults.isSuccess && (
+          <CCallout color="success">
+            {postResults.data.Results.map((message, idx) => {
+              return <li key={idx}>{message}</li>
+            })}
+          </CCallout>
+        )}
+        <hr className="my-4" />
+      </CippWizard.Page>
+    </CippWizard>
+  )
+}
+
+export default AddPolicy
diff --git a/src/views/email-exchange/transport/ListTransportTemplates.js b/src/views/email-exchange/transport/ListTransportTemplates.js
new file mode 100644
index 000000000000..43f1588fb15c
--- /dev/null
+++ b/src/views/email-exchange/transport/ListTransportTemplates.js
@@ -0,0 +1,108 @@
+import React, { useState } from 'react'
+import { useSelector } from 'react-redux'
+import { CippCodeBlock, CippOffcanvas } from 'src/components/utilities'
+import { CippDatatable } from 'src/components/tables'
+import { CCardBody, CButton, CCallout, CSpinner } from '@coreui/react'
+import { faEye, faTrash } from '@fortawesome/free-solid-svg-icons'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { useLazyGenericGetRequestQuery } from 'src/store/api/app'
+import { CippPage } from 'src/components/layout'
+import { ModalService } from 'src/components/utilities'
+
+const TransportListTemplates = () => {
+  const tenant = useSelector((state) => state.app.currentTenant)
+
+  const [ExecuteGetRequest, getResults] = useLazyGenericGetRequestQuery()
+  const Offcanvas = (row, rowIndex, formatExtraData) => {
+    const [ocVisible, setOCVisible] = useState(false)
+    const handleDeleteIntuneTemplate = (apiurl, message) => {
+      ModalService.confirm({
+        title: 'Confirm',
+        body: <div>{message}</div>,
+        onConfirm: () => ExecuteGetRequest({ path: apiurl }),
+        confirmLabel: 'Continue',
+        cancelLabel: 'Cancel',
+      })
+    }
+    return (
+      <>
+        <CButton size="sm" color="success" variant="ghost" onClick={() => setOCVisible(true)}>
+          <FontAwesomeIcon icon={faEye} />
+        </CButton>
+        <CButton
+          size="sm"
+          variant="ghost"
+          color="danger"
+          onClick={() =>
+            handleDeleteIntuneTemplate(
+              `/api/RemoveTransportRuleTemplate?ID=${row.GUID}`,
+              'Do you want to delete the template?',
+            )
+          }
+        >
+          <FontAwesomeIcon icon={faTrash} href="" />
+        </CButton>
+
+        <CippOffcanvas
+          title="Template JSON"
+          placement="end"
+          visible={ocVisible}
+          id={row.id}
+          hideFunction={() => setOCVisible(false)}
+        >
+          <CippCodeBlock language="json" code={JSON.stringify(row, null, 2)} />
+        </CippOffcanvas>
+      </>
+    )
+  }
+
+  const columns = [
+    {
+      name: 'Display Name',
+      selector: (row) => row['name'],
+      sortable: true,
+      exportSelector: 'name',
+    },
+    {
+      name: 'Description',
+      selector: (row) => row['Description'],
+      sortable: true,
+      exportSelector: 'Description',
+    },
+    {
+      name: 'GUID',
+      selector: (row) => row['GUID'],
+      sortable: true,
+      exportSelector: 'GUID',
+    },
+    {
+      name: 'Actions',
+      cell: Offcanvas,
+    },
+  ]
+
+  return (
+    <CippPage title="Available Transport Rule Templates" tenantSelector={false}>
+      <CCardBody>
+        {getResults.isFetching && (
+          <CCallout color="info">
+            <CSpinner>Loading</CSpinner>
+          </CCallout>
+        )}
+        {getResults.isSuccess && <CCallout color="info">{getResults.data?.Results}</CCallout>}
+        {getResults.isError && (
+          <CCallout color="danger">Could not connect to API: {getResults.error.message}</CCallout>
+        )}
+        <CippDatatable
+          keyField="id"
+          reportName={`${tenant?.defaultDomainName}-ListTransportRulesTemplates-List`}
+          path="/api/ListTransportRulesTemplates"
+          columns={columns}
+          params={{ TenantFilter: tenant?.defaultDomainName }}
+        />
+      </CCardBody>
+    </CippPage>
+  )
+}
+
+export default TransportListTemplates
diff --git a/src/views/email-exchange/transport/TransportRules.js b/src/views/email-exchange/transport/TransportRules.js
new file mode 100644
index 000000000000..c7a70ec088e9
--- /dev/null
+++ b/src/views/email-exchange/transport/TransportRules.js
@@ -0,0 +1,129 @@
+import { CButton } from '@coreui/react'
+import { faBan, faBook, faCheck, faEllipsisV, faTrash } from '@fortawesome/free-solid-svg-icons'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import React, { useState } from 'react'
+import { useSelector } from 'react-redux'
+import { CippPageList } from 'src/components/layout'
+import { CippActionsOffcanvas } from 'src/components/utilities'
+
+const Offcanvas = (row, rowIndex, formatExtraData) => {
+  const tenant = useSelector((state) => state.app.currentTenant)
+  const [ocVisible, setOCVisible] = useState(false)
+  //console.log(row)
+  return (
+    <>
+      <CButton size="sm" color="link" onClick={() => setOCVisible(true)}>
+        <FontAwesomeIcon icon={faEllipsisV} />
+      </CButton>
+      <CippActionsOffcanvas
+        title="User Information"
+        extendedInfo={[
+          { label: 'Created by', value: `${row.CreatedBy}` },
+          { label: 'Last edit by', value: `${row.LastModifiedBy}` },
+          { label: 'Description', value: `${row.Description}` },
+        ]}
+        actions={[
+          {
+            label: 'Create template based on rule',
+            color: 'info',
+            modal: true,
+            icon: <FontAwesomeIcon icon={faBook} className="me-2" />,
+            modalBody: row,
+            modalType: 'POST',
+            modalUrl: `/api/AddTransportTemplate`,
+            modalMessage: 'Are you sure you want to create a template based on this rule?',
+          },
+          {
+            label: 'Enable Rule',
+            color: 'info',
+            icon: <FontAwesomeIcon icon={faCheck} className="me-2" />,
+            modal: true,
+            modalUrl: `/api/EditTransportRule?State=Enable&TenantFilter=${tenant.defaultDomainName}&GUID=${row.Guid}`,
+            modalMessage: 'Are you sure you want to enable this rule?',
+          },
+          {
+            label: 'Disable Rule',
+            color: 'info',
+            icon: <FontAwesomeIcon icon={faBan} className="me-2" />,
+            modal: true,
+            modalUrl: `/api/EditTransportRule?State=Disable&TenantFilter=${tenant.defaultDomainName}&GUID=${row.Guid}`,
+            modalMessage: 'Are you sure you want to disable this rule?',
+          },
+          {
+            label: 'Delete Rule',
+            color: 'danger',
+            modal: true,
+            icon: <FontAwesomeIcon icon={faTrash} className="me-2" />,
+            modalUrl: `/api/RemoveTransportRule?TenantFilter=${tenant.defaultDomainName}&GUID=${row.Guid}`,
+            modalMessage: 'Are you sure you want to disable this rule?',
+          },
+        ]}
+        placement="end"
+        visible={ocVisible}
+        id={row.id}
+        hideFunction={() => setOCVisible(false)}
+      />
+    </>
+  )
+}
+
+const columns = [
+  {
+    name: 'Name',
+    selector: (row) => row['Name'],
+    sortable: true,
+    wrap: true,
+    exportSelector: 'Name',
+  },
+  {
+    name: 'State',
+    selector: (row) => row['State'],
+    sortable: true,
+    exportSelector: 'State',
+  },
+  {
+    name: 'Mode',
+    selector: (row) => row['Mode'],
+    sortable: true,
+    exportSelector: 'Mode',
+  },
+  {
+    name: 'Error Action',
+    selector: (row) => row['RuleErrorAction'],
+    sortable: true,
+    exportSelector: 'RuleErrorAction',
+  },
+  {
+    name: 'description',
+    selector: (row) => row['Description'],
+    omit: true,
+  },
+  {
+    name: 'GUID',
+    selector: (row) => row['Guid'],
+    omit: true,
+  },
+  {
+    name: 'Actions',
+    cell: Offcanvas,
+  },
+]
+
+const TransportRulesList = () => {
+  const tenant = useSelector((state) => state.app.currentTenant)
+
+  return (
+    <CippPageList
+      title="Transport Rules"
+      tenantSelector={true}
+      datatable={{
+        reportName: `${tenant?.defaultDomainName}-transport-rules-list`,
+        path: '/api/ListTransportRules',
+        params: { TenantFilter: tenant?.defaultDomainName },
+        columns,
+      }}
+    />
+  )
+}
+
+export default TransportRulesList
diff --git a/src/views/home/Home.js b/src/views/home/Home.js
index 02f3f3a004b3..8e5ebab36d88 100644
--- a/src/views/home/Home.js
+++ b/src/views/home/Home.js
@@ -9,7 +9,7 @@ import { Link } from 'react-router-dom'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 
 const Home = () => {
-  const { data: versions, isLoading } = useLoadVersionsQuery()
+  const { data: versions, isLoading, isSuccess: isSuccessVersion } = useLoadVersionsQuery()
   const { data: dashboard, isLoading: isLoadingDash, isSuccess: issuccessDash } = useLoadDashQuery()
   const tableColumns = [
     {
@@ -25,58 +25,72 @@ const Home = () => {
   ]
   return (
     <CippMasonry columns={4}>
-      <CippMasonryItem size="card">
-        <CippContentCard title="Next Run Standards" icon={faBook}>
-          <div>{!isLoadingDash ? dashboard.NextStandardsRun : <CSpinner size="sm" />}</div>
-        </CippContentCard>
-      </CippMasonryItem>
-      <CippMasonryItem size="card">
-        <CippContentCard title="Next Run BPA" icon={faBook}>
-          <div>{!isLoadingDash ? dashboard.NextBPARun : <CSpinner size="sm" />}</div>
-        </CippContentCard>
-      </CippMasonryItem>
-      <CippMasonryItem size="card">
-        <CippContentCard title="Queued Applications" icon={faBook}>
-          <div>{!isLoadingDash ? dashboard.queuedApps : <CSpinner size="sm" />}</div>
-        </CippContentCard>
-      </CippMasonryItem>
-      <CippMasonryItem size="card">
-        <CippContentCard title="Queued Standards" icon={faBook}>
-          <div> {!isLoadingDash ? dashboard.queuedStandards : <CSpinner size="sm" />}</div>
-        </CippContentCard>
-      </CippMasonryItem>
-      <CippMasonryItem size="card">
-        <CippContentCard title="Managed Tenants" icon={faBook}>
-          <div>{!isLoadingDash ? dashboard.tenantCount : <CSpinner size="sm" />}</div>
-          <br></br> Managed tenants
-        </CippContentCard>
-      </CippMasonryItem>
-      <CippMasonryItem size="card">
-        <CippContentCard title="Token refresh dates" icon={faBook}>
-          <div>
-            Refresh token: {!isLoadingDash ? dashboard.RefreshTokenDate : <CSpinner size="sm" />}
-          </div>
-          <br></br>
+      {issuccessDash && (
+        <>
+          <CippMasonryItem size="card">
+            <CippContentCard title="Next Run Standards" icon={faBook}>
+              <div>{!isLoadingDash ? dashboard.NextStandardsRun : <CSpinner size="sm" />}</div>
+            </CippContentCard>
+          </CippMasonryItem>
+          <CippMasonryItem size="card">
+            <CippContentCard title="Next Run BPA" icon={faBook}>
+              <div>{!isLoadingDash ? dashboard.NextBPARun : <CSpinner size="sm" />}</div>
+            </CippContentCard>
+          </CippMasonryItem>
+          <CippMasonryItem size="card">
+            <CippContentCard title="Queued Applications" icon={faBook}>
+              <div>{!isLoadingDash ? dashboard.queuedApps : <CSpinner size="sm" />}</div>
+            </CippContentCard>
+          </CippMasonryItem>
+          <CippMasonryItem size="card">
+            <CippContentCard title="Queued Standards" icon={faBook}>
+              <div> {!isLoadingDash ? dashboard.queuedStandards : <CSpinner size="sm" />}</div>
+            </CippContentCard>
+          </CippMasonryItem>
+          <CippMasonryItem size="card">
+            <CippContentCard title="Managed Tenants" icon={faBook}>
+              <div>{!isLoadingDash ? dashboard.tenantCount : <CSpinner size="sm" />}</div>
+              <br></br> Managed tenants
+            </CippContentCard>
+          </CippMasonryItem>
+          <CippMasonryItem size="card">
+            <CippContentCard title="Token refresh dates" icon={faBook}>
+              <div>
+                Refresh token:{' '}
+                {!isLoadingDash ? dashboard.RefreshTokenDate : <CSpinner size="sm" />}
+              </div>
+              <br></br>
 
-          <div>
-            Exchange Token: {!isLoadingDash ? dashboard.ExchangeTokenDate : <CSpinner size="sm" />}
-          </div>
-        </CippContentCard>
-      </CippMasonryItem>
-      <CippMasonryItem size="card">
-        <CippContentCard title="Version Frontend" icon={faBook}>
-          <StatusIcon type="negatedboolean" status={versions?.OutOfDateCIPP} />
-          <div>Latest: {!isLoading ? versions.RemoteCIPPVersion : <CSpinner size="sm" />}</div>
-          <div>Current: {!isLoading ? versions.LocalCIPPVersion : <CSpinner size="sm" />}</div>
-        </CippContentCard>
-      </CippMasonryItem>
-      <CippMasonryItem size="card">
-        <CippContentCard title="Version Backend" icon={faBook}>
-          <StatusIcon type="negatedboolean" status={versions?.OutOfDateCIPP} />
-          <div>Latest: {!isLoading ? versions?.RemoteCIPPAPIVersion : <CSpinner size="sm" />}</div>
-          <div>Current: {!isLoading ? versions?.LocalCIPPAPIVersion : <CSpinner size="sm" />}</div>
-        </CippContentCard>
-      </CippMasonryItem>
+              <div>
+                Exchange Token:{' '}
+                {!isLoadingDash ? dashboard.ExchangeTokenDate : <CSpinner size="sm" />}
+              </div>
+            </CippContentCard>
+          </CippMasonryItem>
+        </>
+      )}{' '}
+      {isSuccessVersion && (
+        <>
+          <CippMasonryItem size="card">
+            <CippContentCard title="Version Frontend" icon={faBook}>
+              <StatusIcon type="negatedboolean" status={versions.OutOfDateCIPP} />
+              <div>Latest: {!isLoading ? versions.RemoteCIPPVersion : <CSpinner size="sm" />}</div>
+              <div>Current: {!isLoading ? versions.LocalCIPPVersion : <CSpinner size="sm" />}</div>
+            </CippContentCard>
+          </CippMasonryItem>
+          <CippMasonryItem size="card">
+            <CippContentCard title="Version Backend" icon={faBook}>
+              <StatusIcon type="negatedboolean" status={versions.OutOfDateCIPPAPI} />
+              <div>
+                Latest: {!isLoading ? versions.RemoteCIPPAPIVersion : <CSpinner size="sm" />}
+              </div>
+              <div>
+                Current: {!isLoading ? versions.LocalCIPPAPIVersion : <CSpinner size="sm" />}
+              </div>
+            </CippContentCard>
+          </CippMasonryItem>
+        </>
+      )}
       <CippMasonryItem size="half">
         <CippContentCard title="Last logged items" icon={faBook}>
           {!isLoadingDash && issuccessDash && (
diff --git a/src/views/security/reports/ListAlerts.js b/src/views/security/reports/ListAlerts.js
index 5136cf7d9a17..78f946294b7d 100644
--- a/src/views/security/reports/ListAlerts.js
+++ b/src/views/security/reports/ListAlerts.js
@@ -74,13 +74,13 @@ const ListAlerts = () => {
           title="Alert Information"
           extendedInfo={extendedInfo}
           actions={[
-            {
-              label: 'View source alert in compliance center',
-              link: `${row.RawResult.sourceMaterials[0]}`,
-              icon: <FontAwesomeIcon icon={faEye} className="me-2" />,
-              external: true,
-              color: 'info',
-            },
+            // {
+            //   label: 'View source alert in compliance center',
+            //   link: `${row.RawResult.sourceMaterials[0]}`,
+            //   icon: <FontAwesomeIcon icon={faEye} className="me-2" />,
+            //   external: true,
+            //   color: 'info',
+            // },
             {
               label: 'Set status to In Progress',
               color: 'info',
diff --git a/src/views/tenant/administration/ConditionalAccess.js b/src/views/tenant/administration/ConditionalAccess.js
deleted file mode 100644
index 215fab252ceb..000000000000
--- a/src/views/tenant/administration/ConditionalAccess.js
+++ /dev/null
@@ -1,122 +0,0 @@
-import React from 'react'
-import { useSelector } from 'react-redux'
-import { CippPageList } from 'src/components/layout'
-
-const columns = [
-  {
-    name: 'Name',
-    selector: (row) => row['displayName'],
-    sortable: true,
-    wrap: true,
-    exportSelector: 'displayName',
-  },
-  {
-    name: 'State',
-    selector: (row) => row['state'],
-    sortable: true,
-    exportSelector: 'state',
-  },
-  {
-    name: 'Last Modified',
-    selector: (row) => row['modifiedDateTime'],
-    sortable: true,
-    exportSelector: 'modifiedDateTime',
-  },
-  {
-    name: 'Client App Types',
-    selector: (row) => row['clientAppTypes'],
-    sortable: true,
-    exportSelector: 'clientAppTypes',
-  },
-  {
-    name: 'Platform Inc',
-    selector: (row) => row['includePlatforms'],
-    sortable: true,
-    exportSelector: 'includePlatforms',
-  },
-  {
-    name: 'Platform Exc',
-    selector: (row) => row['excludePlatforms'],
-    sortable: true,
-    exportSelector: 'excludePlatforms',
-  },
-  {
-    name: 'Include Locations',
-    selector: (row) => row['includeLocations'],
-    sortable: true,
-    exportSelector: 'includeLocations',
-  },
-  {
-    name: 'Exclude Locations',
-    selector: (row) => row['excludeLocations'],
-    sortable: true,
-    exportSelector: 'excludeLocations',
-  },
-  {
-    name: 'Include Users',
-    selector: (row) => row['includeUsers'],
-    sortable: true,
-    exportSelector: 'includeUsers',
-  },
-  {
-    name: 'Exclude Users',
-    selector: (row) => row['excludeUsers'],
-    sortable: true,
-    exportSelector: 'excludeUsers',
-  },
-  {
-    name: 'Include Groups',
-    selector: (row) => row['includeGroups'],
-    sortable: true,
-    exportSelector: 'includeGroups',
-  },
-  {
-    name: 'Exclude Groups',
-    selector: (row) => row['excludeGroups'],
-    sortable: true,
-    exportSelector: 'excludeGroups',
-  },
-  {
-    name: 'Include Applications',
-    selector: (row) => row['includeApplications'],
-    sortable: true,
-    exportSelector: 'includeApplications',
-  },
-  {
-    name: 'Exclude Applications',
-    selector: (row) => row['excludeApplications'],
-    sortable: true,
-    exportSelector: 'excludeApplications',
-  },
-  {
-    name: 'Control Operator',
-    selector: (row) => row['grantControlsOperator'],
-    sortable: true,
-    exportSelector: 'grantControlsOperator',
-  },
-  {
-    name: 'Built-in Controls',
-    selector: (row) => row['builtInControls'],
-    sortable: true,
-    exportSelector: 'builtInControls',
-  },
-]
-
-const ConditionalAccessList = () => {
-  const tenant = useSelector((state) => state.app.currentTenant)
-
-  return (
-    <CippPageList
-      title="Conditional Access"
-      tenantSelector={true}
-      datatable={{
-        reportName: `${tenant?.defaultDomainName}-ConditionalAccess-List`,
-        path: '/api/ListConditionalAccessPolicies',
-        params: { TenantFilter: tenant?.defaultDomainName },
-        columns,
-      }}
-    />
-  )
-}
-
-export default ConditionalAccessList
diff --git a/src/views/tenant/administration/GraphExplorer.js b/src/views/tenant/administration/GraphExplorer.js
index 2b86c3cafc59..cd2694eba699 100644
--- a/src/views/tenant/administration/GraphExplorer.js
+++ b/src/views/tenant/administration/GraphExplorer.js
@@ -176,7 +176,7 @@ const GraphExplorer = () => {
                                 {
                                   label: 'Secure Score with Current Score and Max Score',
                                   value:
-                                    'security/secureScores?$top=1&$select=currentscore,maxscore,activeusercount,enabledservices',
+                                    'security/secureScores?$top=90&$select=currentscore,maxscore,activeusercount,enabledservices',
                                 },
                               ]}
                             />
diff --git a/src/views/tenant/administration/ServiceHealth.js b/src/views/tenant/administration/ServiceHealth.js
new file mode 100644
index 000000000000..18c0483b1a49
--- /dev/null
+++ b/src/views/tenant/administration/ServiceHealth.js
@@ -0,0 +1,39 @@
+import React from 'react'
+import { CippPageList } from 'src/components/layout'
+
+const columns = [
+  {
+    name: 'Tenant',
+    selector: (row) => row['TenantName'],
+    sortable: true,
+    exportSelector: 'TenantName',
+  },
+  {
+    name: 'Incidents Open',
+    selector: (row) => row['IncidentCount'],
+    sortable: true,
+    exportSelector: 'IncidentCount',
+  },
+  {
+    name: 'Advisories Open',
+    selector: (row) => row['AdvisoryCount'],
+    sortable: true,
+    exportSelector: 'AdvisoryCount',
+  },
+]
+
+const ServiceHealth = () => {
+  return (
+    <CippPageList
+      title="Service Health"
+      tenantSelector={false}
+      datatable={{
+        columns,
+        path: '/api/ListServiceHealth',
+        reportName: `Service-Health-Report`,
+      }}
+    />
+  )
+}
+
+export default ServiceHealth
diff --git a/src/views/tenant/conditional/AddCATemplate.js b/src/views/tenant/conditional/AddCATemplate.js
new file mode 100644
index 000000000000..542ac0987349
--- /dev/null
+++ b/src/views/tenant/conditional/AddCATemplate.js
@@ -0,0 +1,63 @@
+import React from 'react'
+import { CButton, CCallout, CCol, CForm, CRow, CSpinner } from '@coreui/react'
+import { Form } from 'react-final-form'
+import { CippContentCard, CippPage } from 'src/components/layout'
+import { RFFCFormTextarea } from 'src/components/forms'
+import { useLazyGenericPostRequestQuery } from 'src/store/api/app'
+import { validJson } from 'src/validators'
+
+const MEMAddPolicyTemplate = () => {
+  const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
+
+  const handleSubmit = async (values) => {
+    // alert(JSON.stringify(values, null, 2))
+    // @todo hook this up
+    genericPostRequest({ path: '/api/AddCATemplate', values })
+  }
+
+  return (
+    <CippPage tenantSelector={false} title="Add Conditional Access Template">
+      <CippContentCard title="Template Details">
+        {postResults.isFetching && (
+          <CCallout color="info">
+            <CSpinner>Loading</CSpinner>
+          </CCallout>
+        )}
+        {postResults.isSuccess && <CCallout color="success">{postResults.data.Results}</CCallout>}
+        <Form
+          onSubmit={handleSubmit}
+          render={({ handleSubmit, submitting, values }) => {
+            return (
+              <CForm onSubmit={handleSubmit}>
+                <CRow>
+                  <CCol>
+                    <RFFCFormTextarea
+                      name="Rawjson"
+                      label="Policy JSON information"
+                      placeholder="Enter RAW JSON Information, you can also convert existing CA policies to templates via the list policies menu"
+                      validate={validJson}
+                    />
+                  </CCol>
+                </CRow>
+                <CRow className="mb-3">
+                  <CCol>
+                    <CButton className="text-white" type="submit" disabled={submitting}>
+                      Add Template
+                    </CButton>
+                  </CCol>
+                </CRow>
+                {/*<CRow>*/}
+                {/* <CCol>*/}
+                {/*   <pre>{JSON.stringify(values, null, 2)}</pre>*/}
+                {/* </CCol>*/}
+                {/*</CRow>*/}
+              </CForm>
+            )
+          }}
+        />
+      </CippContentCard>
+    </CippPage>
+  )
+}
+
+export default MEMAddPolicyTemplate
diff --git a/src/views/tenant/conditional/ConditionalAccess.js b/src/views/tenant/conditional/ConditionalAccess.js
new file mode 100644
index 000000000000..e922f0638b61
--- /dev/null
+++ b/src/views/tenant/conditional/ConditionalAccess.js
@@ -0,0 +1,208 @@
+import { CButton } from '@coreui/react'
+import {
+  faBan,
+  faBook,
+  faBookReader,
+  faCheck,
+  faEllipsisV,
+  faTrash,
+} from '@fortawesome/free-solid-svg-icons'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import React, { useState } from 'react'
+import { useSelector } from 'react-redux'
+import { CippPageList } from 'src/components/layout'
+import { CippActionsOffcanvas } from 'src/components/utilities'
+const Offcanvas = (row, rowIndex, formatExtraData) => {
+  const tenant = useSelector((state) => state.app.currentTenant)
+  const [ocVisible, setOCVisible] = useState(false)
+  //console.log(row)
+  return (
+    <>
+      <CButton size="sm" color="link" onClick={() => setOCVisible(true)}>
+        <FontAwesomeIcon icon={faEllipsisV} />
+      </CButton>
+      <CippActionsOffcanvas
+        title="Rule Info"
+        extendedInfo={[
+          { label: 'Name', value: `${row.displayName}` },
+          { label: 'State', value: `${row.state}` },
+        ]}
+        actions={[
+          {
+            label: 'Create template based on rule',
+            color: 'info',
+            modal: true,
+            icon: <FontAwesomeIcon icon={faBook} className="me-2" />,
+            modalBody: JSON.parse(row.rawjson),
+            modalType: 'POST',
+            modalUrl: `/api/AddCATemplate`,
+            modalMessage: 'Are you sure you want to create a template based on this rule?',
+          },
+          {
+            label: 'Enable Rule',
+            color: 'info',
+            icon: <FontAwesomeIcon icon={faCheck} className="me-2" />,
+            modal: true,
+            modalUrl: `/api/EditCAPolicy?State=Enabled&TenantFilter=${tenant.defaultDomainName}&GUID=${row.id}`,
+            modalMessage: 'Are you sure you want to enable this rule?',
+          },
+          {
+            label: 'Disable Rule',
+            color: 'info',
+            icon: <FontAwesomeIcon icon={faBan} className="me-2" />,
+            modal: true,
+            modalUrl: `/api/EditCAPolicy?State=Disabled&TenantFilter=${tenant.defaultDomainName}&GUID=${row.id}`,
+            modalMessage: 'Are you sure you want to disable this rule?',
+          },
+          {
+            label: 'Set rule to report only',
+            color: 'info',
+            icon: <FontAwesomeIcon icon={faBookReader} className="me-2" />,
+            modal: true,
+            modalUrl: `/api/EditCAPolicy?State=enabledForReportingButNotEnforced&TenantFilter=${tenant.defaultDomainName}&GUID=${row.id}`,
+            modalMessage: 'Are you sure you want to disable this rule?',
+          },
+          {
+            label: 'Delete Rule',
+            color: 'danger',
+            modal: true,
+            icon: <FontAwesomeIcon icon={faTrash} className="me-2" />,
+            modalUrl: `/api/RemoveCAPolicy?TenantFilter=${tenant.defaultDomainName}&GUID=${row.id}`,
+            modalMessage: 'Are you sure you want to disable this rule?',
+          },
+        ]}
+        placement="end"
+        visible={ocVisible}
+        id={row.id}
+        hideFunction={() => setOCVisible(false)}
+      />
+    </>
+  )
+}
+const columns = [
+  {
+    name: 'Name',
+    selector: (row) => row['displayName'],
+    sortable: true,
+    wrap: true,
+    exportSelector: 'displayName',
+  },
+  {
+    name: 'State',
+    selector: (row) => row['state'],
+    sortable: true,
+    exportSelector: 'state',
+  },
+  {
+    name: 'Last Modified',
+    selector: (row) => row['modifiedDateTime'],
+    sortable: true,
+    exportSelector: 'modifiedDateTime',
+  },
+  {
+    name: 'Client App Types',
+    selector: (row) => row['clientAppTypes'],
+    sortable: true,
+    exportSelector: 'clientAppTypes',
+  },
+  {
+    name: 'Platform Inc',
+    selector: (row) => row['includePlatforms'],
+    sortable: true,
+    exportSelector: 'includePlatforms',
+  },
+  {
+    name: 'Platform Exc',
+    selector: (row) => row['excludePlatforms'],
+    sortable: true,
+    exportSelector: 'excludePlatforms',
+  },
+  {
+    name: 'Include Locations',
+    selector: (row) => row['includeLocations'],
+    sortable: true,
+    exportSelector: 'includeLocations',
+  },
+  {
+    name: 'Exclude Locations',
+    selector: (row) => row['excludeLocations'],
+    sortable: true,
+    exportSelector: 'excludeLocations',
+  },
+  {
+    name: 'Include Users',
+    selector: (row) => row['includeUsers'],
+    sortable: true,
+    exportSelector: 'includeUsers',
+  },
+  {
+    name: 'Exclude Users',
+    selector: (row) => row['excludeUsers'],
+    sortable: true,
+    exportSelector: 'excludeUsers',
+  },
+  {
+    name: 'Include Groups',
+    selector: (row) => row['includeGroups'],
+    sortable: true,
+    exportSelector: 'includeGroups',
+  },
+  {
+    name: 'Exclude Groups',
+    selector: (row) => row['excludeGroups'],
+    sortable: true,
+    exportSelector: 'excludeGroups',
+  },
+  {
+    name: 'Include Applications',
+    selector: (row) => row['includeApplications'],
+    sortable: true,
+    exportSelector: 'includeApplications',
+  },
+  {
+    name: 'Exclude Applications',
+    selector: (row) => row['excludeApplications'],
+    sortable: true,
+    exportSelector: 'excludeApplications',
+  },
+  {
+    name: 'Control Operator',
+    selector: (row) => row['grantControlsOperator'],
+    sortable: true,
+    exportSelector: 'grantControlsOperator',
+  },
+  {
+    name: 'Built-in Controls',
+    selector: (row) => row['builtInControls'],
+    sortable: true,
+    exportSelector: 'builtInControls',
+  },
+  {
+    name: 'rawjson',
+    selector: (row) => row['rawjson'],
+    omit: true,
+  },
+  {
+    name: 'Actions',
+    cell: Offcanvas,
+  },
+]
+
+const ConditionalAccessList = () => {
+  const tenant = useSelector((state) => state.app.currentTenant)
+
+  return (
+    <CippPageList
+      title="Conditional Access"
+      tenantSelector={true}
+      datatable={{
+        reportName: `${tenant?.defaultDomainName}-ConditionalAccess-List`,
+        path: '/api/ListConditionalAccessPolicies',
+        params: { TenantFilter: tenant?.defaultDomainName },
+        columns,
+      }}
+    />
+  )
+}
+
+export default ConditionalAccessList
diff --git a/src/views/tenant/conditional/DeployCA.js b/src/views/tenant/conditional/DeployCA.js
new file mode 100644
index 000000000000..e400f5bd4def
--- /dev/null
+++ b/src/views/tenant/conditional/DeployCA.js
@@ -0,0 +1,203 @@
+import React from 'react'
+import { CCol, CRow, CCallout, CSpinner } from '@coreui/react'
+import { Field, FormSpy } from 'react-final-form'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'
+import { CippWizard } from 'src/components/layout'
+import { WizardTableField } from 'src/components/tables'
+import PropTypes from 'prop-types'
+import { RFFCFormSelect, RFFCFormTextarea } from 'src/components/forms'
+import { useLazyGenericGetRequestQuery, useLazyGenericPostRequestQuery } from 'src/store/api/app'
+import { OnChange } from 'react-final-form-listeners'
+
+const Error = ({ name }) => (
+  <Field
+    name={name}
+    subscription={{ touched: true, error: true }}
+    render={({ meta: { touched, error } }) =>
+      touched && error ? (
+        <CCallout color="danger">
+          <FontAwesomeIcon icon={faExclamationTriangle} color="danger" />
+          {error}
+        </CCallout>
+      ) : null
+    }
+  />
+)
+
+Error.propTypes = {
+  name: PropTypes.string.isRequired,
+}
+
+const requiredArray = (value) => (value && value.length !== 0 ? undefined : 'Required')
+const AddPolicy = () => {
+  const [intuneGetRequest, intuneTemplates] = useLazyGenericGetRequestQuery()
+  const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
+
+  const handleSubmit = async (values) => {
+    values.selectedTenants.map(
+      (tenant) => (values[`Select_${tenant.defaultDomainName}`] = tenant.defaultDomainName),
+    )
+    values.TemplateType = values.Type
+    genericPostRequest({ path: '/api/AddCAPolicy', values: values })
+  }
+  /* eslint-disable react/prop-types */
+  const WhenFieldChanges = ({ field, set }) => (
+    <Field name={set} subscription={{}}>
+      {(
+        // No subscription. We only use Field to get to the change function
+        { input: { onChange } },
+      ) => (
+        <FormSpy subscription={{}}>
+          {({ form }) => (
+            <OnChange name={field}>
+              {(value) => {
+                let template = intuneTemplates.data.filter(function (obj) {
+                  return obj.GUID === value
+                })
+                // console.log(template[0][set])
+                onChange(JSON.stringify(template[0]))
+              }}
+            </OnChange>
+          )}
+        </FormSpy>
+      )}
+    </Field>
+  )
+
+  const formValues = {
+    TemplateType: 'Admin',
+  }
+
+  return (
+    <CippWizard
+      initialValues={{ ...formValues }}
+      onSubmit={handleSubmit}
+      wizardTitle="Add Intune policy"
+    >
+      <CippWizard.Page
+        title="Tenant Choice"
+        description="Choose the tenants to create the policy for."
+      >
+        <center>
+          <h3 className="text-primary">Step 1</h3>
+          <h5 className="card-title mb-4">Choose tenants</h5>
+        </center>
+        <hr className="my-4" />
+        <Field name="selectedTenants" validate={requiredArray}>
+          {(props) => (
+            <WizardTableField
+              reportName="Add-CA-Policy-Tenant-Selector"
+              keyField="defaultDomainName"
+              path="/api/ListTenants?AllTenantSelector=true"
+              columns={[
+                {
+                  name: 'Display Name',
+                  selector: (row) => row['displayName'],
+                  sortable: true,
+                  exportselector: 'displayName',
+                },
+                {
+                  name: 'Default Domain Name',
+                  selector: (row) => row['defaultDomainName'],
+                  sortable: true,
+                  exportselector: 'mail',
+                },
+              ]}
+              fieldProps={props}
+            />
+          )}
+        </Field>
+        <Error name="selectedTenants" />
+        <hr className="my-4" />
+      </CippWizard.Page>
+      <CippWizard.Page title="Select Options" description="Select which options you want to apply.">
+        <center>
+          <h3 className="text-primary">Step 2</h3>
+          <h5 className="card-title mb-4">
+            Enter the raw JSON for this policy, or select from a template. You can create templates
+            from existing policies.
+          </h5>
+        </center>
+        <hr className="my-4" />
+        <CRow>
+          <CCol md={12}>
+            {intuneTemplates.isUninitialized && intuneGetRequest({ path: 'api/ListCATemplates' })}
+            {intuneTemplates.isSuccess && (
+              <RFFCFormSelect
+                name="TemplateList"
+                values={intuneTemplates.data?.map((template) => ({
+                  value: template.GUID,
+                  label: template.displayName,
+                }))}
+                placeholder="Select a template"
+                label="Please choose a template to apply, or enter the information manually."
+              />
+            )}
+          </CCol>
+        </CRow>
+        <CRow>
+          <CCol>
+            <RFFCFormTextarea
+              name="rawjson"
+              label="Conditional Access Parameters"
+              placeholder={
+                'Enter the JSON information to use as parameters, or select from a template'
+              }
+            />
+          </CCol>
+        </CRow>
+        <hr className="my-4" />
+        <WhenFieldChanges field="TemplateList" set="rawjson" />
+      </CippWizard.Page>
+      <CippWizard.Page title="Review and Confirm" description="Confirm the settings to apply">
+        <center>
+          <h3 className="text-primary">Step 3</h3>
+          <h5 className="card-title mb-4">Confirm and apply</h5>
+        </center>
+        <hr className="my-4" />
+        {!postResults.isSuccess && (
+          <FormSpy>
+            {(props) => {
+              /* eslint-disable react/prop-types */
+              return (
+                <>
+                  <CRow>
+                    <CCol md={3}></CCol>
+                    <CCol md={6}>
+                      <h5 className="mb-0">Selected Tenants</h5>
+                      <CCallout color="info">
+                        {props.values.selectedTenants.map((tenant, idx) => (
+                          <li key={idx}>
+                            {tenant.displayName}- {tenant.defaultDomainName}
+                          </li>
+                        ))}
+                      </CCallout>
+                      <h5 className="mb-0">Rule Settings</h5>
+                      <CCallout color="info">{props.values.rawjson}</CCallout>
+                    </CCol>
+                  </CRow>
+                </>
+              )
+            }}
+          </FormSpy>
+        )}
+        {postResults.isFetching && (
+          <CCallout color="info">
+            <CSpinner>Loading</CSpinner>
+          </CCallout>
+        )}
+        {postResults.isSuccess && (
+          <CCallout color="success">
+            {postResults.data.Results.map((message, idx) => {
+              return <li key={idx}>{message}</li>
+            })}
+          </CCallout>
+        )}
+        <hr className="my-4" />
+      </CippWizard.Page>
+    </CippWizard>
+  )
+}
+
+export default AddPolicy
diff --git a/src/views/tenant/conditional/ListCATemplates.js b/src/views/tenant/conditional/ListCATemplates.js
new file mode 100644
index 000000000000..a57e4ec2c13b
--- /dev/null
+++ b/src/views/tenant/conditional/ListCATemplates.js
@@ -0,0 +1,104 @@
+import React, { useState } from 'react'
+import { useSelector } from 'react-redux'
+import { CippCodeBlock, CippOffcanvas } from 'src/components/utilities'
+import { CippDatatable } from 'src/components/tables'
+import { CCardBody, CButton, CCallout, CSpinner } from '@coreui/react'
+import { faEye, faTrash } from '@fortawesome/free-solid-svg-icons'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { useLazyGenericGetRequestQuery } from 'src/store/api/app'
+import { CippPage } from 'src/components/layout'
+import { ModalService } from 'src/components/utilities'
+
+//todo: expandable with RAWJson property.
+/* eslint-disable-next-line react/prop-types */
+
+const AutopilotListTemplates = () => {
+  const tenant = useSelector((state) => state.app.currentTenant)
+
+  const [ExecuteGetRequest, getResults] = useLazyGenericGetRequestQuery()
+  const Offcanvas = (row, rowIndex, formatExtraData) => {
+    const [ocVisible, setOCVisible] = useState(false)
+    const handleDeleteIntuneTemplate = (apiurl, message) => {
+      ModalService.confirm({
+        title: 'Confirm',
+        body: <div>{message}</div>,
+        onConfirm: () => ExecuteGetRequest({ path: apiurl }),
+        confirmLabel: 'Continue',
+        cancelLabel: 'Cancel',
+      })
+    }
+    return (
+      <>
+        <CButton size="sm" color="success" variant="ghost" onClick={() => setOCVisible(true)}>
+          <FontAwesomeIcon icon={faEye} />
+        </CButton>
+        <CButton
+          size="sm"
+          variant="ghost"
+          color="danger"
+          onClick={() =>
+            handleDeleteIntuneTemplate(
+              `/api/RemoveCATemplate?ID=${row.GUID}`,
+              'Do you want to delete the template?',
+            )
+          }
+        >
+          <FontAwesomeIcon icon={faTrash} href="" />
+        </CButton>
+        <CippOffcanvas
+          title="Template JSON"
+          placement="end"
+          visible={ocVisible}
+          id={row.id}
+          hideFunction={() => setOCVisible(false)}
+        >
+          <CippCodeBlock language="json" code={JSON.stringify(row, null, 2)} />
+        </CippOffcanvas>
+      </>
+    )
+  }
+
+  const columns = [
+    {
+      name: 'Display Name',
+      selector: (row) => row['displayName'],
+      sortable: true,
+      exportSelector: 'displayName',
+    },
+    {
+      name: 'GUID',
+      selector: (row) => row['GUID'],
+      omit: true,
+      exportSelector: 'GUID',
+    },
+    {
+      name: 'Actions',
+      cell: Offcanvas,
+    },
+  ]
+
+  return (
+    <CippPage title="Available Conditional Access Templates" tenantSelector={false}>
+      <CCardBody>
+        {getResults.isFetching && (
+          <CCallout color="info">
+            <CSpinner>Loading</CSpinner>
+          </CCallout>
+        )}
+        {getResults.isSuccess && <CCallout color="info">{getResults.data?.Results}</CCallout>}
+        {getResults.isError && (
+          <CCallout color="danger">Could not connect to API: {getResults.error.message}</CCallout>
+        )}
+        <CippDatatable
+          keyField="id"
+          reportName={`${tenant?.defaultDomainName}-CaTemplates-List`}
+          path="/api/ListCATemplates"
+          columns={columns}
+          params={{ TenantFilter: tenant?.defaultDomainName }}
+        />
+      </CCardBody>
+    </CippPage>
+  )
+}
+
+export default AutopilotListTemplates
diff --git a/src/views/tenant/standards/DomainsAnalyser.js b/src/views/tenant/standards/DomainsAnalyser.js
index 11d5ed26ee75..587b664292f3 100644
--- a/src/views/tenant/standards/DomainsAnalyser.js
+++ b/src/views/tenant/standards/DomainsAnalyser.js
@@ -105,19 +105,15 @@ const DomainsAnalyser = () => {
     },
     {
       name: 'SPF Pass Test',
-      selector: (row) => row['SPFPassTest'],
-      exportSelector: 'SPFPassTest',
+      selector: (row) => row['SPFPassAll'],
+      exportSelector: 'SPFPassAll',
       sortable: true,
       cell: (row, index, column) => {
         const cell = column.selector(row)
         if (cell === true) {
-          if (row.SPFPassAll === true) {
-            return <CellBadge color="success" label="SPF Pass" />
-          } else {
-            return <CellBadge color="danger" label="SPF Fail" />
-          }
+          return <CellBadge color="success" label="SPF Pass" />
         } else if (cell === false) {
-          return <CellBadge color="danger" label="SPF Missing Expected" />
+          return <CellBadge color="danger" label="SPF Fail" />
         }
         return <CellBadge color="info" label="No Data" />
       },
diff --git a/version_latest.txt b/version_latest.txt
index cc6612c36e05..9183195ace75 100644
--- a/version_latest.txt
+++ b/version_latest.txt
@@ -1 +1 @@
-2.3.0
\ No newline at end of file
+2.4.0
\ No newline at end of file