From 53375fd74616cb9a4bf9faa1f7e80321b091fb50 Mon Sep 17 00:00:00 2001
From: zkldi <ktchidev@gmail.com>
Date: Mon, 13 Sep 2021 10:39:29 +0100
Subject: [PATCH] Folder Update

---
 client/package.json                           |   3 +-
 client/pnpm-lock.yaml                         | 981 ++----------------
 client/src/app/pages/ForgotPasswordPage.tsx   |  99 +-
 client/src/app/pages/LandingPage.tsx          | 147 +++
 client/src/app/pages/ResetPasswordPage.tsx    |  76 +-
 .../app/pages/dashboard/misc/CreditsPage.tsx  |  13 +-
 .../pages/dashboard/users/UserGamesPage.tsx   |  69 +-
 .../app/pages/dashboard/users/UserPage.tsx    |   3 -
 .../games/_game/_playtype/AchievablesPage.tsx |  18 +
 .../games/_game/_playtype/ScoresPage.tsx      |  87 +-
 .../_game/_playtype/UGPTSettingsPage.tsx      |  48 +-
 .../_playtype/folders/FolderSelectPage.tsx    | 241 +++++
 .../_playtype/folders/FolderTablePage.tsx     | 372 +++++++
 .../_playtype/folders/FoldersMainPage.tsx     |  54 +
 client/src/app/routes/AppRoutes.tsx           |  13 +-
 client/src/app/routes/UserRoutes.tsx          |  16 +-
 client/src/components/charts/ChartTooltip.tsx |  30 +
 .../src/components/layout/footer/Footer.tsx   |   2 +-
 .../src/components/layout/header/Header.tsx   |  32 +-
 .../components/layout/header/SearchBar.tsx    | 110 +-
 client/src/components/layout/page/Card.tsx    |   6 +-
 client/src/components/nav/Navbar.tsx          |  13 +-
 .../tables/components/MiniTable.tsx           |  25 +-
 .../dropdowns/GenericSessionDropdown.tsx      |  35 +-
 .../tables/sessions/GenericSessionTable.tsx   |   4 +-
 client/src/components/user/UGPTHeader.tsx     |  21 +-
 .../src/components/user/UGPTRankingData.tsx   |   2 +-
 .../src/components/user/UGPTStatShowcase.tsx  |   2 +-
 client/src/components/util/ApiError.tsx       |   6 +
 .../util/DropdownToggleOverride.tsx           |   3 +-
 .../util/MainPageTitleContainer.tsx           |  14 +
 client/src/components/util/ProgressBar.tsx    |  32 +
 .../src/components/util/SelectLinkButton.tsx  |  26 +
 client/src/components/util/SiteWordmark.tsx   |   4 +-
 client/src/components/util/useUGPTBase.tsx    |  15 +
 client/src/index.tsx                          |   2 -
 client/src/lib/config.ts                      |   3 +
 client/src/types/api-returns.ts               |  21 +
 client/src/util/charts.ts                     |   8 +
 client/src/util/misc.ts                       |  44 +-
 client/src/util/routing.ts                    |  19 +
 client/src/util/site.ts                       |  14 +
 client/src/util/splashes.ts                   |   6 +
 43 files changed, 1638 insertions(+), 1101 deletions(-)
 create mode 100644 client/src/app/pages/LandingPage.tsx
 create mode 100644 client/src/app/pages/dashboard/users/games/_game/_playtype/AchievablesPage.tsx
 create mode 100644 client/src/app/pages/dashboard/users/games/_game/_playtype/folders/FolderSelectPage.tsx
 create mode 100644 client/src/app/pages/dashboard/users/games/_game/_playtype/folders/FolderTablePage.tsx
 create mode 100644 client/src/app/pages/dashboard/users/games/_game/_playtype/folders/FoldersMainPage.tsx
 create mode 100644 client/src/components/util/ApiError.tsx
 create mode 100644 client/src/components/util/MainPageTitleContainer.tsx
 create mode 100644 client/src/components/util/ProgressBar.tsx
 create mode 100644 client/src/components/util/SelectLinkButton.tsx
 create mode 100644 client/src/components/util/useUGPTBase.tsx
 create mode 100644 client/src/util/charts.ts
 create mode 100644 client/src/util/routing.ts
 create mode 100644 client/src/util/site.ts

diff --git a/client/package.json b/client/package.json
index a5d02e6e1..9f550c353 100644
--- a/client/package.json
+++ b/client/package.json
@@ -30,6 +30,7 @@
 		"@material-ui/lab": "4.0.0-alpha.53",
 		"@material-ui/pickers": "3.2.10",
 		"@material-ui/styles": "4.9.14",
+		"@nivo/bar": "^0.73.1",
 		"@nivo/calendar": "^0.73.0",
 		"@nivo/core": "^0.73.0",
 		"@nivo/line": "^0.73.0",
@@ -74,7 +75,7 @@
 		"resolve": "1.12.0",
 		"resolve-url-loader": "3.1.0",
 		"socicon": "3.0.5",
-		"tachi-common": "0.2.4"
+		"tachi-common": "0.2.9"
 	},
 	"devDependencies": {
 		"@types/humanize-duration": "3.25.1",
diff --git a/client/pnpm-lock.yaml b/client/pnpm-lock.yaml
index 8d8be6fb4..113b39dc7 100644
--- a/client/pnpm-lock.yaml
+++ b/client/pnpm-lock.yaml
@@ -7,6 +7,7 @@ specifiers:
   '@material-ui/lab': 4.0.0-alpha.53
   '@material-ui/pickers': 3.2.10
   '@material-ui/styles': 4.9.14
+  '@nivo/bar': ^0.73.1
   '@nivo/calendar': ^0.73.0
   '@nivo/core': ^0.73.0
   '@nivo/line': ^0.73.0
@@ -76,7 +77,7 @@ specifiers:
   serve: 11.2.0
   socicon: 3.0.5
   style-loader: 1.0.0
-  tachi-common: 0.2.4
+  tachi-common: 0.2.9
   terser-webpack-plugin: 1.4.1
   ts-pnp: 1.1.4
   typescript: 4.3.5
@@ -96,6 +97,7 @@ dependencies:
   '@material-ui/lab': 4.0.0-alpha.53_8bb0520645aedca703428ea178087ad5
   '@material-ui/pickers': 3.2.10_4fa5c60765d5b5398d6f5e53bd1f8f7d
   '@material-ui/styles': 4.9.14_47cbb7f80549068c6fc0f244709343f3
+  '@nivo/bar': 0.73.1_959e4c52067596a24a1566afe9b21267
   '@nivo/calendar': 0.73.0_959e4c52067596a24a1566afe9b21267
   '@nivo/core': 0.73.0_react-dom@16.12.0+react@17.0.2
   '@nivo/line': 0.73.0_959e4c52067596a24a1566afe9b21267
@@ -140,7 +142,7 @@ dependencies:
   resolve: 1.12.0
   resolve-url-loader: 3.1.0
   socicon: 3.0.5
-  tachi-common: 0.2.4_typescript@4.3.5
+  tachi-common: 0.2.9
 
 devDependencies:
   '@types/humanize-duration': 3.25.1
@@ -2325,22 +2327,6 @@ packages:
     resolution: {integrity: sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==}
     dev: true
 
-  /@istanbuljs/load-nyc-config/1.1.0:
-    resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      camelcase: 5.3.1
-      find-up: 4.1.0
-      get-package-type: 0.1.0
-      js-yaml: 3.14.1
-      resolve-from: 5.0.0
-    dev: false
-
-  /@istanbuljs/schema/0.1.3:
-    resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
-    engines: {node: '>=8'}
-    dev: false
-
   /@material-ui/core/4.9.14_47cbb7f80549068c6fc0f244709343f3:
     resolution: {integrity: sha512-71oYrOpInx5honJ9GzZlygPjmsFhn7Bui61/SWLJsPTkMnfvuZfU3qVqlEHjXyDsnZ+uKmLAIdsrOYnphJxxXw==}
     engines: {node: '>=8.0.0'}
@@ -2549,6 +2535,30 @@ packages:
       - react-dom
     dev: false
 
+  /@nivo/bar/0.73.1_959e4c52067596a24a1566afe9b21267:
+    resolution: {integrity: sha512-sBltCxCEgFV7kErW4K14OSUjsU1cmYAWWvKoelVI1NTJ0MWhH/Z4UVip6+Zk7/TOzdZntT0x3SE6cAc9Ov7rxg==}
+    peerDependencies:
+      '@nivo/core': 0.73.0
+      react: '>= 16.14.0 < 18.0.0'
+    dependencies:
+      '@nivo/annotations': 0.73.0_959e4c52067596a24a1566afe9b21267
+      '@nivo/axes': 0.73.0_959e4c52067596a24a1566afe9b21267
+      '@nivo/colors': 0.73.0_@nivo+core@0.73.0+react@17.0.2
+      '@nivo/core': 0.73.0_react-dom@16.12.0+react@17.0.2
+      '@nivo/legends': 0.73.0_@nivo+core@0.73.0+react@17.0.2
+      '@nivo/recompose': 0.73.0_react@17.0.2
+      '@nivo/scales': 0.73.0
+      '@nivo/tooltip': 0.73.0_959e4c52067596a24a1566afe9b21267
+      '@react-spring/web': 9.2.4_react-dom@16.12.0+react@17.0.2
+      d3-scale: 3.3.0
+      d3-shape: 1.3.7
+      lodash: 4.17.21
+      react: 17.0.2
+    transitivePeerDependencies:
+      - prop-types
+      - react-dom
+    dev: false
+
   /@nivo/calendar/0.73.0_959e4c52067596a24a1566afe9b21267:
     resolution: {integrity: sha512-loqJ16g8IgHJ4zf60ZaWhOE4NuMayG9TYZxHpjb77PKR7Zo/uu0CaWBOfh2fbv+9LbtsD1og1RllGzG80/IAGA==}
     peerDependencies:
@@ -2906,10 +2916,11 @@ packages:
       '@babel/runtime': 7.15.3
     dev: false
 
-  /@types/bson/4.0.5:
-    resolution: {integrity: sha512-vVLwMUqhYJSQ/WKcE60eFqcyuWse5fGH+NMAXHuKrUAPoryq3ATxk5o4bgYNtg5aOM4APVg7Hnb3ASqUYG0PKg==}
+  /@types/bson/4.2.0:
+    resolution: {integrity: sha512-ELCPqAdroMdcuxqwMgUpifQyRoTpyYCNr1V9xKyF40VsBobsj+BbWNRvwGchMgBPGqkw655ypkjj2MEF5ywVwg==}
+    deprecated: This is a stub types definition. bson provides its own type definitions, so you do not need this installed.
     dependencies:
-      '@types/node': 16.0.0
+      bson: 4.5.1
     dev: false
 
   /@types/debug/4.1.7:
@@ -2961,7 +2972,7 @@ packages:
   /@types/mongodb/3.6.20:
     resolution: {integrity: sha512-WcdpPJCakFzcWWD9juKoZbRtQxKIMYF/JIAM4JrNHrMcnJL6/a2NWjXxW7fo9hxboxxkg+icff8d7+WIEvKgYQ==}
     dependencies:
-      '@types/bson': 4.0.5
+      '@types/bson': 4.2.0
       '@types/node': 16.0.0
     dev: false
 
@@ -3360,14 +3371,6 @@ packages:
       regex-parser: 2.2.10
     dev: false
 
-  /aggregate-error/3.1.0:
-    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
-    engines: {node: '>=8'}
-    dependencies:
-      clean-stack: 2.2.0
-      indent-string: 4.0.0
-    dev: false
-
   /ajv-errors/1.0.1_ajv@6.12.6:
     resolution: {integrity: sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==}
     peerDependencies:
@@ -3445,6 +3448,7 @@ packages:
   /ansi-regex/3.0.0:
     resolution: {integrity: sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=}
     engines: {node: '>=4'}
+    dev: true
 
   /ansi-regex/4.1.0:
     resolution: {integrity: sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==}
@@ -3454,6 +3458,7 @@ packages:
   /ansi-regex/5.0.0:
     resolution: {integrity: sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==}
     engines: {node: '>=8'}
+    dev: true
 
   /ansi-styles/2.2.1:
     resolution: {integrity: sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=}
@@ -3471,6 +3476,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       color-convert: 2.0.1
+    dev: true
 
   /anymatch/2.0.0:
     resolution: {integrity: sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==}
@@ -3497,13 +3503,6 @@ packages:
       svg.select.js: 3.0.1
     dev: false
 
-  /append-transform/2.0.0:
-    resolution: {integrity: sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==}
-    engines: {node: '>=8'}
-    dependencies:
-      default-require-extensions: 3.0.0
-    dev: false
-
   /aproba/1.2.0:
     resolution: {integrity: sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==}
     dev: true
@@ -3512,10 +3511,6 @@ packages:
     resolution: {integrity: sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==}
     dev: true
 
-  /archy/1.0.0:
-    resolution: {integrity: sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=}
-    dev: false
-
   /arg/2.0.0:
     resolution: {integrity: sha512-XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w==}
     dev: true
@@ -3607,17 +3602,6 @@ packages:
       safer-buffer: 2.1.2
     dev: true
 
-  /asn1/0.2.4:
-    resolution: {integrity: sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==}
-    dependencies:
-      safer-buffer: 2.1.2
-    dev: false
-
-  /assert-plus/1.0.0:
-    resolution: {integrity: sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=}
-    engines: {node: '>=0.8'}
-    dev: false
-
   /assert/1.4.1:
     resolution: {integrity: sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=}
     dependencies:
@@ -3645,21 +3629,12 @@ packages:
     resolution: {integrity: sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==}
     dev: true
 
-  /async-hook-domain/2.0.3:
-    resolution: {integrity: sha512-MadiLLDEZRZzZwcm0dgS+K99qXZ4H2saAUwUgwzFulbAkXrKi3AX5FvWS3FFTQtLMwrqcGqAJe6o12KrObejQA==}
-    engines: {node: '>=10'}
-    dev: false
-
   /async/2.6.3:
     resolution: {integrity: sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==}
     dependencies:
       lodash: 4.17.21
     dev: true
 
-  /asynckit/0.4.0:
-    resolution: {integrity: sha1-x57Zf380y48robyXkLzDZkdLS3k=}
-    dev: false
-
   /atob/2.1.2:
     resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
     engines: {node: '>= 4.5.0'}
@@ -3678,14 +3653,6 @@ packages:
       postcss-value-parser: 4.1.0
     dev: false
 
-  /aws-sign2/0.7.0:
-    resolution: {integrity: sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=}
-    dev: false
-
-  /aws4/1.11.0:
-    resolution: {integrity: sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==}
-    dev: false
-
   /babel-code-frame/6.26.0:
     resolution: {integrity: sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=}
     dependencies:
@@ -3842,18 +3809,11 @@ packages:
 
   /base64-js/1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
-    dev: true
 
   /batch/0.6.1:
     resolution: {integrity: sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=}
     dev: true
 
-  /bcrypt-pbkdf/1.0.2:
-    resolution: {integrity: sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=}
-    dependencies:
-      tweetnacl: 0.14.5
-    dev: false
-
   /big-integer/1.6.48:
     resolution: {integrity: sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==}
     engines: {node: '>=0.6'}
@@ -3870,11 +3830,7 @@ packages:
   /binary-extensions/2.2.0:
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
     engines: {node: '>=8'}
-
-  /bind-obj-methods/3.0.0:
-    resolution: {integrity: sha512-nLEaaz3/sEzNSyPWRsN9HNsqwk1AUyECtGj+XwGdIi3xABnEqecvXtIJ0wehQXuuER5uZ/5fTs2usONgYjG+iw==}
-    engines: {node: '>=10'}
-    dev: false
+    dev: true
 
   /bindings/1.5.0:
     resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
@@ -3979,6 +3935,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       fill-range: 7.0.1
+    dev: true
 
   /broadcast-channel/3.7.0:
     resolution: {integrity: sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==}
@@ -4077,6 +4034,13 @@ packages:
     engines: {node: '>=0.6.19'}
     dev: false
 
+  /bson/4.5.1:
+    resolution: {integrity: sha512-XqFP74pbTVLyLy5KFxVfTUyRrC1mgOlmu/iXHfXqfCKT59jyP9lwbotGfbN59cHBRbJSamZNkrSopjv+N0SqAA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      buffer: 5.7.1
+    dev: false
+
   /buffer-from/1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
@@ -4096,6 +4060,13 @@ packages:
       isarray: 1.0.0
     dev: true
 
+  /buffer/5.7.1:
+    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+    dependencies:
+      base64-js: 1.5.1
+      ieee754: 1.2.1
+    dev: false
+
   /builtin-status-codes/3.0.0:
     resolution: {integrity: sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=}
     dev: true
@@ -4145,16 +4116,6 @@ packages:
       unset-value: 1.0.0
     dev: true
 
-  /caching-transform/4.0.0:
-    resolution: {integrity: sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==}
-    engines: {node: '>=8'}
-    dependencies:
-      hasha: 5.2.2
-      make-dir: 3.1.0
-      package-hash: 4.0.0
-      write-file-atomic: 3.0.3
-    dev: false
-
   /call-bind/1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
@@ -4222,10 +4183,6 @@ packages:
     engines: {node: '>=4'}
     dev: false
 
-  /caseless/0.12.0:
-    resolution: {integrity: sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=}
-    dev: false
-
   /chalk/1.1.3:
     resolution: {integrity: sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=}
     engines: {node: '>=0.10.0'}
@@ -4310,6 +4267,7 @@ packages:
       readdirp: 3.6.0
     optionalDependencies:
       fsevents: 2.3.2
+    dev: true
 
   /chownr/1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
@@ -4348,11 +4306,6 @@ packages:
       source-map: 0.6.1
     dev: false
 
-  /clean-stack/2.2.0:
-    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
-    engines: {node: '>=6'}
-    dev: false
-
   /cli-boxes/1.0.0:
     resolution: {integrity: sha1-T6kXw+WclKAEzWH47lCdplFocUM=}
     engines: {node: '>=0.10.0'}
@@ -4383,6 +4336,7 @@ packages:
       string-width: 2.1.1
       strip-ansi: 4.0.0
       wrap-ansi: 2.1.0
+    dev: true
 
   /cliui/5.0.0:
     resolution: {integrity: sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==}
@@ -4392,14 +4346,6 @@ packages:
       wrap-ansi: 5.1.0
     dev: true
 
-  /cliui/6.0.0:
-    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
-    dependencies:
-      string-width: 4.2.2
-      strip-ansi: 6.0.0
-      wrap-ansi: 6.2.0
-    dev: false
-
   /clone-deep/0.2.4:
     resolution: {integrity: sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=}
     engines: {node: '>=0.10.0'}
@@ -4436,6 +4382,7 @@ packages:
   /code-point-at/1.1.0:
     resolution: {integrity: sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=}
     engines: {node: '>=0.10.0'}
+    dev: true
 
   /collection-visit/1.0.0:
     resolution: {integrity: sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=}
@@ -4455,6 +4402,7 @@ packages:
     engines: {node: '>=7.0.0'}
     dependencies:
       color-name: 1.1.4
+    dev: true
 
   /color-name/1.1.3:
     resolution: {integrity: sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=}
@@ -4468,11 +4416,6 @@ packages:
       color-name: 1.1.4
       simple-swizzle: 0.2.2
 
-  /color-support/1.1.3:
-    resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==}
-    hasBin: true
-    dev: false
-
   /color/3.2.1:
     resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==}
     dependencies:
@@ -4487,13 +4430,6 @@ packages:
     engines: {node: '>=0.1.90'}
     dev: true
 
-  /combined-stream/1.0.8:
-    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
-    engines: {node: '>= 0.8'}
-    dependencies:
-      delayed-stream: 1.0.0
-    dev: false
-
   /comma-separated-tokens/2.0.2:
     resolution: {integrity: sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg==}
     dev: false
@@ -4699,18 +4635,6 @@ packages:
       yaml: 1.10.2
     dev: false
 
-  /coveralls/3.1.1:
-    resolution: {integrity: sha512-+dxnG2NHncSD1NrqbSM3dn/lE57O6Qf/koe9+I7c+wzkqRmEvcp0kgJdxKInzYzkICKkFMZsX3Vct3++tsF9ww==}
-    engines: {node: '>=6'}
-    hasBin: true
-    dependencies:
-      js-yaml: 3.14.1
-      lcov-parse: 1.0.0
-      log-driver: 1.2.7
-      minimist: 1.2.5
-      request: 2.88.2
-    dev: false
-
   /create-ecdh/4.0.4:
     resolution: {integrity: sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==}
     dependencies:
@@ -4765,6 +4689,7 @@ packages:
       path-key: 3.1.1
       shebang-command: 2.0.0
       which: 2.0.2
+    dev: true
 
   /crypto-browserify/3.12.0:
     resolution: {integrity: sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==}
@@ -5086,13 +5011,6 @@ packages:
       d3-array: 2.12.1
     dev: false
 
-  /dashdash/1.14.1:
-    resolution: {integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=}
-    engines: {node: '>=0.10'}
-    dependencies:
-      assert-plus: 1.0.0
-    dev: false
-
   /debug/2.6.9:
     resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
     dependencies:
@@ -5132,6 +5050,7 @@ packages:
   /decamelize/1.2.0:
     resolution: {integrity: sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=}
     engines: {node: '>=0.10.0'}
+    dev: true
 
   /decamelize/2.0.0:
     resolution: {integrity: sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==}
@@ -5182,13 +5101,6 @@ packages:
       ip-regex: 2.1.0
     dev: true
 
-  /default-require-extensions/3.0.0:
-    resolution: {integrity: sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==}
-    engines: {node: '>=8'}
-    dependencies:
-      strip-bom: 4.0.0
-    dev: false
-
   /define-properties/1.1.3:
     resolution: {integrity: sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==}
     engines: {node: '>= 0.4'}
@@ -5233,11 +5145,6 @@ packages:
     resolution: {integrity: sha512-WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag==}
     dev: false
 
-  /delayed-stream/1.0.0:
-    resolution: {integrity: sha1-3zrhmayt+31ECqrgsp4icrJOxhk=}
-    engines: {node: '>=0.4.0'}
-    dev: false
-
   /denque/1.5.1:
     resolution: {integrity: sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==}
     engines: {node: '>=0.10'}
@@ -5281,11 +5188,6 @@ packages:
       debug: 2.6.9
     dev: true
 
-  /diff/4.0.2:
-    resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
-    engines: {node: '>=0.3.1'}
-    dev: false
-
   /diffie-hellman/5.0.3:
     resolution: {integrity: sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==}
     dependencies:
@@ -5434,13 +5336,6 @@ packages:
       stream-shift: 1.0.1
     dev: true
 
-  /ecc-jsbn/0.1.2:
-    resolution: {integrity: sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=}
-    dependencies:
-      jsbn: 0.1.1
-      safer-buffer: 2.1.2
-    dev: false
-
   /ee-first/1.1.1:
     resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=}
     dev: true
@@ -5466,6 +5361,7 @@ packages:
 
   /emoji-regex/8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+    dev: true
 
   /emojis-list/2.1.0:
     resolution: {integrity: sha1-TapNnbAPmBmIDHn6RXrlsJof04k=}
@@ -5564,10 +5460,6 @@ packages:
       next-tick: 1.0.0
     dev: false
 
-  /es6-error/4.1.1:
-    resolution: {integrity: sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==}
-    dev: false
-
   /es6-iterator/2.0.3:
     resolution: {integrity: sha1-p96IkUGgWpSwhUQDstCg+/qY87c=}
     dependencies:
@@ -5616,11 +5508,6 @@ packages:
     resolution: {integrity: sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=}
     engines: {node: '>=0.8.0'}
 
-  /escape-string-regexp/2.0.0:
-    resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
-    engines: {node: '>=8'}
-    dev: false
-
   /escape-string-regexp/4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
@@ -5861,10 +5748,6 @@ packages:
     resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
     dev: true
 
-  /events-to-array/1.1.2:
-    resolution: {integrity: sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y=}
-    dev: false
-
   /events/3.3.0:
     resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
     engines: {node: '>=0.8.x'}
@@ -6027,11 +5910,6 @@ packages:
       to-regex: 3.0.2
     dev: true
 
-  /extsprintf/1.3.0:
-    resolution: {integrity: sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=}
-    engines: {'0': node >=0.6.0}
-    dev: false
-
   /fast-deep-equal/2.0.1:
     resolution: {integrity: sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=}
     dev: true
@@ -6153,6 +6031,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       to-regex-range: 5.0.1
+    dev: true
 
   /finalhandler/1.1.2:
     resolution: {integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==}
@@ -6175,15 +6054,6 @@ packages:
       make-dir: 2.1.0
       pkg-dir: 3.0.0
 
-  /find-cache-dir/3.3.2:
-    resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==}
-    engines: {node: '>=8'}
-    dependencies:
-      commondir: 1.0.1
-      make-dir: 3.1.0
-      pkg-dir: 4.2.0
-    dev: false
-
   /find-up/2.1.0:
     resolution: {integrity: sha1-RdG35QbHF93UgndaK3eSCjwMV6c=}
     engines: {node: '>=4'}
@@ -6197,18 +6067,6 @@ packages:
     dependencies:
       locate-path: 3.0.0
 
-  /find-up/4.1.0:
-    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
-    engines: {node: '>=8'}
-    dependencies:
-      locate-path: 5.0.0
-      path-exists: 4.0.0
-    dev: false
-
-  /findit/2.0.0:
-    resolution: {integrity: sha1-ZQnwEmr0wXhVHPqZOU4DLhOk1W4=}
-    dev: false
-
   /findup-sync/3.0.0:
     resolution: {integrity: sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==}
     engines: {node: '>= 0.10'}
@@ -6280,18 +6138,6 @@ packages:
       for-in: 1.0.2
     dev: false
 
-  /foreground-child/2.0.0:
-    resolution: {integrity: sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==}
-    engines: {node: '>=8.0.0'}
-    dependencies:
-      cross-spawn: 7.0.3
-      signal-exit: 3.0.3
-    dev: false
-
-  /forever-agent/0.6.1:
-    resolution: {integrity: sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=}
-    dev: false
-
   /fork-ts-checker-webpack-plugin/1.5.0:
     resolution: {integrity: sha512-zEhg7Hz+KhZlBhILYpXy+Beu96gwvkROWJiTXOCyOOMMrdBIRPvsBpBqgTI4jfJGrJXcqGwJR8zsBGDmzY0jsA==}
     engines: {node: '>=6.11.5', yarn: '>=1.0.0'}
@@ -6306,15 +6152,6 @@ packages:
       worker-rpc: 0.1.1
     dev: true
 
-  /form-data/2.3.3:
-    resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
-    engines: {node: '>= 0.12'}
-    dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.32
-    dev: false
-
   /formik/2.2.9_react@17.0.2:
     resolution: {integrity: sha512-LQLcISMmf1r5at4/gyJigGn0gOwFbeEAlji+N9InZF6LIMXnFNkO42sCI8Jt84YZggpD4cPWObAZaxpEFtSzNA==}
     peerDependencies:
@@ -6354,14 +6191,6 @@ packages:
       readable-stream: 2.3.7
     dev: true
 
-  /fromentries/1.3.2:
-    resolution: {integrity: sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==}
-    dev: false
-
-  /fs-exists-cached/1.0.0:
-    resolution: {integrity: sha1-zyVVTKBQ3EmuZla0HeQiWJidy84=}
-    dev: false
-
   /fs-extra/4.0.3:
     resolution: {integrity: sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==}
     dependencies:
@@ -6406,15 +6235,12 @@ packages:
     resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
+    dev: true
     optional: true
 
   /function-bind/1.1.1:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
 
-  /function-loop/2.0.1:
-    resolution: {integrity: sha512-ktIR+O6i/4h+j/ZhZJNdzeI4i9lEPeEK6UPR2EVyTVBqOwcU3Za9xYKLH64ZR9HmcROyRrOkizNyjjtWJzDDkQ==}
-    dev: false
-
   /functional-red-black-tree/1.0.1:
     resolution: {integrity: sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=}
     dev: true
@@ -6431,6 +6257,7 @@ packages:
   /get-caller-file/2.0.5:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
+    dev: true
 
   /get-intrinsic/1.1.1:
     resolution: {integrity: sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==}
@@ -6443,11 +6270,6 @@ packages:
     resolution: {integrity: sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==}
     dev: true
 
-  /get-package-type/0.1.0:
-    resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
-    engines: {node: '>=8.0.0'}
-    dev: false
-
   /get-stream/3.0.0:
     resolution: {integrity: sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=}
     engines: {node: '>=4'}
@@ -6465,12 +6287,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /getpass/0.1.7:
-    resolution: {integrity: sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=}
-    dependencies:
-      assert-plus: 1.0.0
-    dev: false
-
   /glob-parent/3.1.0:
     resolution: {integrity: sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=}
     dependencies:
@@ -6483,6 +6299,7 @@ packages:
     engines: {node: '>= 6'}
     dependencies:
       is-glob: 4.0.1
+    dev: true
 
   /glob-to-regexp/0.3.0:
     resolution: {integrity: sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=}
@@ -6603,20 +6420,6 @@ packages:
     resolution: {integrity: sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==}
     dev: true
 
-  /har-schema/2.0.0:
-    resolution: {integrity: sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=}
-    engines: {node: '>=4'}
-    dev: false
-
-  /har-validator/5.1.5:
-    resolution: {integrity: sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==}
-    engines: {node: '>=6'}
-    deprecated: this library is no longer supported
-    dependencies:
-      ajv: 6.12.6
-      har-schema: 2.0.0
-    dev: false
-
   /has-ansi/2.0.0:
     resolution: {integrity: sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=}
     engines: {node: '>=0.10.0'}
@@ -6639,6 +6442,7 @@ packages:
   /has-flag/4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
     engines: {node: '>=8'}
+    dev: true
 
   /has-symbols/1.0.2:
     resolution: {integrity: sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==}
@@ -6703,14 +6507,6 @@ packages:
       minimalistic-assert: 1.0.1
     dev: true
 
-  /hasha/5.2.2:
-    resolution: {integrity: sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      is-stream: 2.0.1
-      type-fest: 0.8.1
-    dev: false
-
   /he/1.2.0:
     resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
     hasBin: true
@@ -6774,10 +6570,6 @@ packages:
     resolution: {integrity: sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==}
     dev: true
 
-  /html-escaper/2.0.2:
-    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
-    dev: false
-
   /html-minifier-terser/5.1.1:
     resolution: {integrity: sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==}
     engines: {node: '>=6'}
@@ -6882,15 +6674,6 @@ packages:
       - debug
     dev: true
 
-  /http-signature/1.2.0:
-    resolution: {integrity: sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=}
-    engines: {node: '>=0.8', npm: '>=1.3.7'}
-    dependencies:
-      assert-plus: 1.0.0
-      jsprim: 1.4.1
-      sshpk: 1.16.1
-    dev: false
-
   /https-browserify/1.0.0:
     resolution: {integrity: sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=}
     dev: true
@@ -6923,7 +6706,6 @@ packages:
 
   /ieee754/1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
-    dev: true
 
   /iferr/0.1.5:
     resolution: {integrity: sha1-xg7taebY/bazEEofy8ocGS3FtQE=}
@@ -6975,23 +6757,6 @@ packages:
       resolve-from: 3.0.0
     dev: false
 
-  /import-jsx/4.0.0:
-    resolution: {integrity: sha512-CnjJ2BZFJzbFDmYG5S47xPQjMlSbZLyLJuG4znzL4TdPtJBxHtFP1xVmR+EYX4synFSldiY3B6m00XkPM3zVnA==}
-    engines: {node: '>=10'}
-    dependencies:
-      '@babel/core': 7.15.0
-      '@babel/plugin-proposal-object-rest-spread': 7.14.7_@babel+core@7.15.0
-      '@babel/plugin-transform-destructuring': 7.14.7_@babel+core@7.15.0
-      '@babel/plugin-transform-react-jsx': 7.14.9_@babel+core@7.15.0
-      caller-path: 2.0.0
-      find-cache-dir: 3.3.2
-      make-dir: 3.1.0
-      resolve-from: 3.0.0
-      rimraf: 3.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /import-local/2.0.0:
     resolution: {integrity: sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==}
     engines: {node: '>=6'}
@@ -7004,11 +6769,7 @@ packages:
   /imurmurhash/0.1.4:
     resolution: {integrity: sha1-khi5srkoojixPcT7a21XbyMUU+o=}
     engines: {node: '>=0.8.19'}
-
-  /indent-string/4.0.0:
-    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
-    engines: {node: '>=8'}
-    dev: false
+    dev: true
 
   /indexes-of/1.0.1:
     resolution: {integrity: sha1-8w9xbI4r00bHtn0985FVZqfAVgc=}
@@ -7170,6 +6931,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       binary-extensions: 2.2.0
+    dev: true
 
   /is-boolean-object/1.1.2:
     resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
@@ -7265,20 +7027,24 @@ packages:
   /is-extglob/2.1.1:
     resolution: {integrity: sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=}
     engines: {node: '>=0.10.0'}
+    dev: true
 
   /is-fullwidth-code-point/1.0.0:
     resolution: {integrity: sha1-754xOG8DGn8NZDr4L95QxFfvAMs=}
     engines: {node: '>=0.10.0'}
     dependencies:
       number-is-nan: 1.0.1
+    dev: true
 
   /is-fullwidth-code-point/2.0.0:
     resolution: {integrity: sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=}
     engines: {node: '>=4'}
+    dev: true
 
   /is-fullwidth-code-point/3.0.0:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
+    dev: true
 
   /is-glob/3.1.0:
     resolution: {integrity: sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=}
@@ -7292,6 +7058,7 @@ packages:
     engines: {node: '>=0.10.0'}
     dependencies:
       is-extglob: 2.1.1
+    dev: true
 
   /is-hexadecimal/2.0.0:
     resolution: {integrity: sha512-vGOtYkiaxwIiR0+Ng/zNId+ZZehGfINwTzdrDqc6iubbnQWhnPuYymOzOKUDqa2cSl59yHnEh2h6MvRLQsyNug==}
@@ -7321,6 +7088,7 @@ packages:
   /is-number/7.0.0:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
+    dev: true
 
   /is-obj/1.0.1:
     resolution: {integrity: sha1-PkcprB9f3gJc19g6iW2rn09n2w8=}
@@ -7391,11 +7159,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-stream/2.0.1:
-    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
-    engines: {node: '>=8'}
-    dev: false
-
   /is-string/1.0.7:
     resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
     engines: {node: '>= 0.4'}
@@ -7408,13 +7171,10 @@ packages:
     dependencies:
       has-symbols: 1.0.2
 
-  /is-typedarray/1.0.0:
-    resolution: {integrity: sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=}
-    dev: false
-
   /is-windows/1.0.2:
     resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
     engines: {node: '>=0.10.0'}
+    dev: true
 
   /is-wsl/1.1.0:
     resolution: {integrity: sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=}
@@ -7429,6 +7189,7 @@ packages:
 
   /isexe/2.0.0:
     resolution: {integrity: sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=}
+    dev: true
 
   /isobject/2.1.0:
     resolution: {integrity: sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=}
@@ -7441,82 +7202,6 @@ packages:
     resolution: {integrity: sha1-TkMekrEalzFjaqH5yNHMvP2reN8=}
     engines: {node: '>=0.10.0'}
 
-  /isstream/0.1.2:
-    resolution: {integrity: sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=}
-    dev: false
-
-  /istanbul-lib-coverage/3.0.0:
-    resolution: {integrity: sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==}
-    engines: {node: '>=8'}
-    dev: false
-
-  /istanbul-lib-hook/3.0.0:
-    resolution: {integrity: sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      append-transform: 2.0.0
-    dev: false
-
-  /istanbul-lib-instrument/4.0.3:
-    resolution: {integrity: sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@babel/core': 7.15.0
-      '@istanbuljs/schema': 0.1.3
-      istanbul-lib-coverage: 3.0.0
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /istanbul-lib-processinfo/2.0.2:
-    resolution: {integrity: sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==}
-    engines: {node: '>=8'}
-    dependencies:
-      archy: 1.0.0
-      cross-spawn: 7.0.3
-      istanbul-lib-coverage: 3.0.0
-      make-dir: 3.1.0
-      p-map: 3.0.0
-      rimraf: 3.0.2
-      uuid: 3.4.0
-    dev: false
-
-  /istanbul-lib-report/3.0.0:
-    resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==}
-    engines: {node: '>=8'}
-    dependencies:
-      istanbul-lib-coverage: 3.0.0
-      make-dir: 3.1.0
-      supports-color: 7.2.0
-    dev: false
-
-  /istanbul-lib-source-maps/4.0.0:
-    resolution: {integrity: sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==}
-    engines: {node: '>=8'}
-    dependencies:
-      debug: 4.3.2
-      istanbul-lib-coverage: 3.0.0
-      source-map: 0.6.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /istanbul-reports/3.0.2:
-    resolution: {integrity: sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==}
-    engines: {node: '>=8'}
-    dependencies:
-      html-escaper: 2.0.2
-      istanbul-lib-report: 3.0.0
-    dev: false
-
-  /jackspeak/1.4.0:
-    resolution: {integrity: sha512-VDcSunT+wcccoG46FtzuBAyQKlzhHjli4q31e1fIHGOsRspqNUFjVzGb+7eIFDlTvqLygxapDHPHS0ouT2o/tw==}
-    engines: {node: '>=8'}
-    dependencies:
-      cliui: 4.1.0
-    dev: false
-
   /joycon/3.0.1:
     resolution: {integrity: sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA==}
     engines: {node: '>=10'}
@@ -7544,10 +7229,6 @@ packages:
       argparse: 1.0.10
       esprima: 4.0.1
 
-  /jsbn/0.1.1:
-    resolution: {integrity: sha1-peZUwuWi3rXyAdls77yoDA7y9RM=}
-    dev: false
-
   /jsesc/0.5.0:
     resolution: {integrity: sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=}
     hasBin: true
@@ -7573,10 +7254,6 @@ packages:
     resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
     dev: true
 
-  /json-schema/0.2.3:
-    resolution: {integrity: sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=}
-    dev: false
-
   /json-stable-stringify-without-jsonify/1.0.1:
     resolution: {integrity: sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=}
     dev: true
@@ -7587,10 +7264,6 @@ packages:
       jsonify: 0.0.0
     dev: true
 
-  /json-stringify-safe/5.0.1:
-    resolution: {integrity: sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=}
-    dev: false
-
   /json3/3.3.3:
     resolution: {integrity: sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==}
     dev: true
@@ -7617,16 +7290,6 @@ packages:
     resolution: {integrity: sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=}
     dev: true
 
-  /jsprim/1.4.1:
-    resolution: {integrity: sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=}
-    engines: {'0': node >=0.6.0}
-    dependencies:
-      assert-plus: 1.0.0
-      extsprintf: 1.3.0
-      json-schema: 0.2.3
-      verror: 1.10.0
-    dev: false
-
   /jss-plugin-camel-case/10.7.1:
     resolution: {integrity: sha512-+ioIyWvmAfgDCWXsQcW1NMnLBvRinOVFkSYJUgewQ6TynOcSj5F1bSU23B7z0p1iqK0PPHIU62xY1iNJD33WGA==}
     dependencies:
@@ -7760,11 +7423,6 @@ packages:
       invert-kv: 2.0.0
     dev: true
 
-  /lcov-parse/1.0.0:
-    resolution: {integrity: sha1-6w1GtUER68VhrLTECO+TY73I9+A=}
-    hasBin: true
-    dev: false
-
   /leven/3.1.0:
     resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
     engines: {node: '>=6'}
@@ -7785,26 +7443,6 @@ packages:
       type-check: 0.4.0
     dev: true
 
-  /libtap/1.1.1:
-    resolution: {integrity: sha512-Fye8fh1+G7E8qqmjQaY+pXGxy7HM0S6bqCCJFLa16+g2jODBByxbJFDpjbDNF69wfRVyvJ+foLZc1WTIv7dx+g==}
-    engines: {node: '>=10'}
-    dependencies:
-      async-hook-domain: 2.0.3
-      bind-obj-methods: 3.0.0
-      diff: 4.0.2
-      function-loop: 2.0.1
-      minipass: 3.1.3
-      own-or: 1.0.0
-      own-or-env: 1.0.1
-      signal-exit: 3.0.3
-      stack-utils: 2.0.3
-      tap-parser: 10.1.0
-      tap-yaml: 1.0.0
-      tcompare: 5.0.6
-      trivial-deferred: 1.0.1
-      yapool: 1.0.0
-    dev: false
-
   /lines-and-columns/1.1.6:
     resolution: {integrity: sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=}
     dev: false
@@ -7864,13 +7502,6 @@ packages:
       p-locate: 3.0.0
       path-exists: 3.0.0
 
-  /locate-path/5.0.0:
-    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
-    engines: {node: '>=8'}
-    dependencies:
-      p-locate: 4.1.0
-    dev: false
-
   /lodash-es/4.17.21:
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
@@ -7887,10 +7518,6 @@ packages:
     resolution: {integrity: sha1-gteb/zCmfEAF/9XiUVMArZyk168=}
     dev: false
 
-  /lodash.flattendeep/4.4.0:
-    resolution: {integrity: sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=}
-    dev: false
-
   /lodash.memoize/4.1.2:
     resolution: {integrity: sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=}
 
@@ -7921,11 +7548,6 @@ packages:
   /lodash/4.17.21:
     resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
 
-  /log-driver/1.2.7:
-    resolution: {integrity: sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==}
-    engines: {node: '>=0.8.6'}
-    dev: false
-
   /loglevel/1.7.1:
     resolution: {integrity: sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==}
     engines: {node: '>= 0.6.0'}
@@ -7974,13 +7596,6 @@ packages:
       pify: 4.0.1
       semver: 5.7.1
 
-  /make-dir/3.1.0:
-    resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
-    engines: {node: '>=8'}
-    dependencies:
-      semver: 6.3.0
-    dev: false
-
   /mamacro/0.0.3:
     resolution: {integrity: sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==}
     dev: true
@@ -8342,6 +7957,7 @@ packages:
   /mime-db/1.49.0:
     resolution: {integrity: sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==}
     engines: {node: '>= 0.6'}
+    dev: true
 
   /mime-types/2.1.18:
     resolution: {integrity: sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==}
@@ -8355,6 +7971,7 @@ packages:
     engines: {node: '>= 0.6'}
     dependencies:
       mime-db: 1.49.0
+    dev: true
 
   /mime/1.6.0:
     resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==}
@@ -8431,13 +8048,6 @@ packages:
   /minimist/1.2.5:
     resolution: {integrity: sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==}
 
-  /minipass/3.1.3:
-    resolution: {integrity: sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==}
-    engines: {node: '>=8'}
-    dependencies:
-      yallist: 4.0.0
-    dev: false
-
   /mississippi/3.0.0:
     resolution: {integrity: sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==}
     engines: {node: '>=4.0.0'}
@@ -8476,14 +8086,8 @@ packages:
     dependencies:
       minimist: 1.2.5
 
-  /mkdirp/1.0.4:
-    resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
-    engines: {node: '>=10'}
-    hasBin: true
-    dev: false
-
-  /mongodb/3.6.11:
-    resolution: {integrity: sha512-4Y4lTFHDHZZdgMaHmojtNAlqkvddX2QQBEN0K//GzxhGwlI9tZ9R0vhbjr1Decw+TF7qK0ZLjQT292XgHRRQgw==}
+  /mongodb/3.7.0:
+    resolution: {integrity: sha512-JOAYjT9WYeRFkIP6XtDidAr3qvpfLRJhT2iokRWWH0tgqCQr9kmSfOJBZ3Ry0E5A3EqKxVPVhN3MV8Gn03o7pA==}
     engines: {node: '>=4'}
     peerDependencies:
       aws4: '*'
@@ -8544,7 +8148,7 @@ packages:
     dependencies:
       '@types/mongodb': 3.6.20
       debug: 4.3.2
-      mongodb: 3.6.11
+      mongodb: 3.7.0
       monk-middleware-cast-ids: 0.2.1
       monk-middleware-fields: 0.2.0
       monk-middleware-handle-callback: 0.2.2
@@ -8699,13 +8303,6 @@ packages:
       vm-browserify: 1.1.2
     dev: true
 
-  /node-preload/0.2.1:
-    resolution: {integrity: sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      process-on-spawn: 1.0.0
-    dev: false
-
   /node-releases/1.1.75:
     resolution: {integrity: sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==}
 
@@ -8780,46 +8377,7 @@ packages:
   /number-is-nan/1.0.1:
     resolution: {integrity: sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=}
     engines: {node: '>=0.10.0'}
-
-  /nyc/15.1.0:
-    resolution: {integrity: sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==}
-    engines: {node: '>=8.9'}
-    hasBin: true
-    dependencies:
-      '@istanbuljs/load-nyc-config': 1.1.0
-      '@istanbuljs/schema': 0.1.3
-      caching-transform: 4.0.0
-      convert-source-map: 1.8.0
-      decamelize: 1.2.0
-      find-cache-dir: 3.3.2
-      find-up: 4.1.0
-      foreground-child: 2.0.0
-      get-package-type: 0.1.0
-      glob: 7.1.7
-      istanbul-lib-coverage: 3.0.0
-      istanbul-lib-hook: 3.0.0
-      istanbul-lib-instrument: 4.0.3
-      istanbul-lib-processinfo: 2.0.2
-      istanbul-lib-report: 3.0.0
-      istanbul-lib-source-maps: 4.0.0
-      istanbul-reports: 3.0.2
-      make-dir: 3.1.0
-      node-preload: 0.2.1
-      p-map: 3.0.0
-      process-on-spawn: 1.0.0
-      resolve-from: 5.0.0
-      rimraf: 3.0.2
-      signal-exit: 3.0.3
-      spawn-wrap: 2.0.0
-      test-exclude: 6.0.0
-      yargs: 15.4.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /oauth-sign/0.9.0:
-    resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
-    dev: false
+    dev: true
 
   /object-assign/4.1.1:
     resolution: {integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=}
@@ -8951,11 +8509,6 @@ packages:
       is-wsl: 1.1.0
     dev: true
 
-  /opener/1.5.2:
-    resolution: {integrity: sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==}
-    hasBin: true
-    dev: false
-
   /opn/5.5.0:
     resolution: {integrity: sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==}
     engines: {node: '>=4'}
@@ -9016,16 +8569,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /own-or-env/1.0.1:
-    resolution: {integrity: sha512-y8qULRbRAlL6x2+M0vIe7jJbJx/kmUTzYonRAa2ayesR2qWLswninkVyeJe4x3IEXhdgoNodzjQRKAoEs6Fmrw==}
-    dependencies:
-      own-or: 1.0.0
-    dev: false
-
-  /own-or/1.0.0:
-    resolution: {integrity: sha1-Tod/vtqaLsgAD7wLyuOWRe6L+Nw=}
-    dev: false
-
   /p-defer/1.0.0:
     resolution: {integrity: sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=}
     engines: {node: '>=4'}
@@ -9067,25 +8610,11 @@ packages:
     dependencies:
       p-limit: 2.3.0
 
-  /p-locate/4.1.0:
-    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
-    engines: {node: '>=8'}
-    dependencies:
-      p-limit: 2.3.0
-    dev: false
-
   /p-map/1.2.0:
     resolution: {integrity: sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==}
     engines: {node: '>=4'}
     dev: true
 
-  /p-map/3.0.0:
-    resolution: {integrity: sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      aggregate-error: 3.1.0
-    dev: false
-
   /p-try/1.0.0:
     resolution: {integrity: sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=}
     engines: {node: '>=4'}
@@ -9095,16 +8624,6 @@ packages:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
 
-  /package-hash/4.0.0:
-    resolution: {integrity: sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      graceful-fs: 4.2.8
-      hasha: 5.2.2
-      lodash.flattendeep: 4.4.0
-      release-zalgo: 1.0.0
-    dev: false
-
   /pako/1.0.11:
     resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
     dev: true
@@ -9202,11 +8721,6 @@ packages:
     resolution: {integrity: sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=}
     engines: {node: '>=4'}
 
-  /path-exists/4.0.0:
-    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
-    engines: {node: '>=8'}
-    dev: false
-
   /path-is-absolute/1.0.1:
     resolution: {integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18=}
     engines: {node: '>=0.10.0'}
@@ -9223,6 +8737,7 @@ packages:
   /path-key/3.1.1:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
     engines: {node: '>=8'}
+    dev: true
 
   /path-parse/1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
@@ -9318,13 +8833,6 @@ packages:
     dependencies:
       find-up: 3.0.0
 
-  /pkg-dir/4.2.0:
-    resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      find-up: 4.1.0
-    dev: false
-
   /pkg-up/2.0.0:
     resolution: {integrity: sha1-yBmscoBZpGHKscOImivjxJoATX8=}
     engines: {node: '>=4'}
@@ -10032,13 +9540,6 @@ packages:
   /process-nextick-args/2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
 
-  /process-on-spawn/1.0.0:
-    resolution: {integrity: sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==}
-    engines: {node: '>=8'}
-    dependencies:
-      fromentries: 1.3.2
-    dev: false
-
   /process/0.11.10:
     resolution: {integrity: sha1-czIwDoQBYb2j5podHZGn1LwW8YI=}
     engines: {node: '>= 0.6.0'}
@@ -10090,10 +9591,6 @@ packages:
     resolution: {integrity: sha1-8FKijacOYYkX7wqKw0wa5aaChrM=}
     dev: true
 
-  /psl/1.8.0:
-    resolution: {integrity: sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==}
-    dev: false
-
   /public-encrypt/4.0.3:
     resolution: {integrity: sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==}
     dependencies:
@@ -10143,11 +9640,6 @@ packages:
     resolution: {integrity: sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=}
     engines: {node: '>=0.6.0', teleport: '>=0.2.0'}
 
-  /qs/6.5.2:
-    resolution: {integrity: sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==}
-    engines: {node: '>=0.6'}
-    dev: false
-
   /qs/6.7.0:
     resolution: {integrity: sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==}
     engines: {node: '>=0.6'}
@@ -10490,15 +9982,6 @@ packages:
       react-dom: 16.12.0_react@17.0.2
     dev: false
 
-  /react/16.14.0:
-    resolution: {integrity: sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      loose-envify: 1.4.0
-      object-assign: 4.1.1
-      prop-types: 15.7.2
-    dev: false
-
   /react/17.0.2:
     resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==}
     engines: {node: '>=0.10.0'}
@@ -10567,6 +10050,7 @@ packages:
     engines: {node: '>=8.10.0'}
     dependencies:
       picomatch: 2.3.0
+    dev: true
 
   /recursive-readdir/2.2.2:
     resolution: {integrity: sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==}
@@ -10666,13 +10150,6 @@ packages:
     engines: {node: '>= 0.10'}
     dev: false
 
-  /release-zalgo/1.0.0:
-    resolution: {integrity: sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=}
-    engines: {node: '>=4'}
-    dependencies:
-      es6-error: 4.1.1
-    dev: false
-
   /remark-parse/10.0.0:
     resolution: {integrity: sha512-07ei47p2Xl7Bqbn9H2VYQYirnAFJPwdMuypdozWsSbnmrkgA2e2sZLZdnDNrrsxR4onmIzH/J6KXqKxCuqHtPQ==}
     dependencies:
@@ -10720,33 +10197,6 @@ packages:
     engines: {node: '>=0.10'}
     dev: true
 
-  /request/2.88.2:
-    resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==}
-    engines: {node: '>= 6'}
-    deprecated: request has been deprecated, see https://github.com/request/request/issues/3142
-    dependencies:
-      aws-sign2: 0.7.0
-      aws4: 1.11.0
-      caseless: 0.12.0
-      combined-stream: 1.0.8
-      extend: 3.0.2
-      forever-agent: 0.6.1
-      form-data: 2.3.3
-      har-validator: 5.1.5
-      http-signature: 1.2.0
-      is-typedarray: 1.0.0
-      isstream: 0.1.2
-      json-stringify-safe: 5.0.1
-      mime-types: 2.1.32
-      oauth-sign: 0.9.0
-      performance-now: 2.1.0
-      qs: 6.5.2
-      safe-buffer: 5.2.1
-      tough-cookie: 2.5.0
-      tunnel-agent: 0.6.0
-      uuid: 3.4.0
-    dev: false
-
   /require-at/1.0.6:
     resolution: {integrity: sha512-7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g==}
     engines: {node: '>=4'}
@@ -10755,6 +10205,7 @@ packages:
   /require-directory/2.1.1:
     resolution: {integrity: sha1-jGStX9MNqxyXbiNE/+f3kqam30I=}
     engines: {node: '>=0.10.0'}
+    dev: true
 
   /require-from-string/2.0.2:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
@@ -10767,6 +10218,7 @@ packages:
 
   /require-main-filename/2.0.0:
     resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
+    dev: true
 
   /requires-port/1.0.0:
     resolution: {integrity: sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=}
@@ -10799,11 +10251,6 @@ packages:
     resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
     engines: {node: '>=4'}
 
-  /resolve-from/5.0.0:
-    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
-    engines: {node: '>=8'}
-    dev: false
-
   /resolve-pathname/3.0.0:
     resolution: {integrity: sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==}
     dev: false
@@ -10953,6 +10400,7 @@ packages:
 
   /safer-buffer/2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
+    dev: true
 
   /saslprep/1.0.3:
     resolution: {integrity: sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==}
@@ -11119,6 +10567,7 @@ packages:
 
   /set-blocking/2.0.0:
     resolution: {integrity: sha1-BF+XgtARrppoA93TgrJDkrPYkPc=}
+    dev: true
 
   /set-value/2.0.1:
     resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
@@ -11179,6 +10628,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       shebang-regex: 3.0.0
+    dev: true
 
   /shebang-regex/1.0.0:
     resolution: {integrity: sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=}
@@ -11188,6 +10638,7 @@ packages:
   /shebang-regex/3.0.0:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
+    dev: true
 
   /shell-quote/1.7.2:
     resolution: {integrity: sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==}
@@ -11202,6 +10653,7 @@ packages:
 
   /signal-exit/3.0.3:
     resolution: {integrity: sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==}
+    dev: true
 
   /simple-swizzle/0.2.2:
     resolution: {integrity: sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=}
@@ -11342,18 +10794,6 @@ packages:
     dev: false
     optional: true
 
-  /spawn-wrap/2.0.0:
-    resolution: {integrity: sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==}
-    engines: {node: '>=8'}
-    dependencies:
-      foreground-child: 2.0.0
-      is-windows: 1.0.2
-      make-dir: 3.1.0
-      rimraf: 3.0.2
-      signal-exit: 3.0.3
-      which: 2.0.2
-    dev: false
-
   /spdx-correct/3.1.1:
     resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==}
     dependencies:
@@ -11412,22 +10852,6 @@ packages:
   /sprintf-js/1.0.3:
     resolution: {integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=}
 
-  /sshpk/1.16.1:
-    resolution: {integrity: sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
-    dependencies:
-      asn1: 0.2.4
-      assert-plus: 1.0.0
-      bcrypt-pbkdf: 1.0.2
-      dashdash: 1.14.1
-      ecc-jsbn: 0.1.2
-      getpass: 0.1.7
-      jsbn: 0.1.1
-      safer-buffer: 2.1.2
-      tweetnacl: 0.14.5
-    dev: false
-
   /ssri/6.0.2:
     resolution: {integrity: sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==}
     dependencies:
@@ -11437,13 +10861,6 @@ packages:
   /stable/0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
 
-  /stack-utils/2.0.3:
-    resolution: {integrity: sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==}
-    engines: {node: '>=10'}
-    dependencies:
-      escape-string-regexp: 2.0.0
-    dev: false
-
   /static-extend/0.1.2:
     resolution: {integrity: sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=}
     engines: {node: '>=0.10.0'}
@@ -11497,6 +10914,7 @@ packages:
       code-point-at: 1.1.0
       is-fullwidth-code-point: 1.0.0
       strip-ansi: 3.0.1
+    dev: true
 
   /string-width/2.1.1:
     resolution: {integrity: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==}
@@ -11504,6 +10922,7 @@ packages:
     dependencies:
       is-fullwidth-code-point: 2.0.0
       strip-ansi: 4.0.0
+    dev: true
 
   /string-width/3.1.0:
     resolution: {integrity: sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==}
@@ -11521,6 +10940,7 @@ packages:
       emoji-regex: 8.0.0
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.0
+    dev: true
 
   /string.prototype.trimend/1.0.4:
     resolution: {integrity: sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==}
@@ -11569,6 +10989,7 @@ packages:
     engines: {node: '>=4'}
     dependencies:
       ansi-regex: 3.0.0
+    dev: true
 
   /strip-ansi/5.2.0:
     resolution: {integrity: sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==}
@@ -11582,17 +11003,13 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       ansi-regex: 5.0.0
+    dev: true
 
   /strip-bom/3.0.0:
     resolution: {integrity: sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=}
     engines: {node: '>=4'}
     dev: true
 
-  /strip-bom/4.0.0:
-    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
-    engines: {node: '>=8'}
-    dev: false
-
   /strip-comments/1.0.2:
     resolution: {integrity: sha512-kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw==}
     engines: {node: '>=4'}
@@ -11670,6 +11087,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       has-flag: 4.0.0
+    dev: true
 
   /svg-parser/2.0.4:
     resolution: {integrity: sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==}
@@ -11760,106 +11178,20 @@ packages:
       strip-ansi: 6.0.0
     dev: true
 
-  /tachi-common/0.2.4_typescript@4.3.5:
-    resolution: {integrity: sha512-5Q6c0qGhQyPKKiCg+BvuYbt9k5q/B1c3aBNR3KaX+aEKSQ8ZbuYTcKPKnQlDccjDfcGNj2OAmELx3oHz4UJdGA==}
+  /tachi-common/0.2.9:
+    resolution: {integrity: sha512-Z7oEv5OorOSB9VBJALzM3yaKxBUWNQGSJihLz923CNX5Wndi1L84LlLYgYXOZ5JrrnUFsSK374kaeODd3X/nEQ==}
     dependencies:
       monk: 7.3.4
-      tap: 15.0.9_typescript@4.3.5
     transitivePeerDependencies:
       - aws4
       - bson-ext
-      - flow-remove-types
       - kerberos
       - mongodb-client-encryption
       - mongodb-extjson
       - snappy
       - supports-color
-      - ts-node
-      - typescript
     dev: false
 
-  /tap-mocha-reporter/5.0.1:
-    resolution: {integrity: sha512-1knFWOwd4khx/7uSEnUeaP9IPW3w+sqTgJMhrwah6t46nZ8P25atOKAjSvVDsT67lOPu0nfdOqUwoyKn+3E5pA==}
-    engines: {node: '>= 8'}
-    hasBin: true
-    dependencies:
-      color-support: 1.1.3
-      debug: 4.3.2
-      diff: 4.0.2
-      escape-string-regexp: 2.0.0
-      glob: 7.1.7
-      tap-parser: 10.1.0
-      tap-yaml: 1.0.0
-      unicode-length: 2.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /tap-parser/10.1.0:
-    resolution: {integrity: sha512-FujQeciDaOiOvaIVGS1Rpb0v4R6XkOjvWCWowlz5oKuhPkEJ8U6pxgqt38xuzYhPt8dWEnfHn2jqpZdJEkW7pA==}
-    engines: {node: '>= 8'}
-    hasBin: true
-    dependencies:
-      events-to-array: 1.1.2
-      minipass: 3.1.3
-      tap-yaml: 1.0.0
-    dev: false
-
-  /tap-yaml/1.0.0:
-    resolution: {integrity: sha512-Rxbx4EnrWkYk0/ztcm5u3/VznbyFJpyXO12dDBHKWiDVxy7O2Qw6MRrwO5H6Ww0U5YhRY/4C/VzWmFPhBQc4qQ==}
-    dependencies:
-      yaml: 1.10.2
-    dev: false
-
-  /tap/15.0.9_typescript@4.3.5:
-    resolution: {integrity: sha512-bqY5SxEqYKRd37PIUfKBf9HMs/hklyl/fGXkuStr9rYTIGa0/icpSLsm6IVOmx2qT0/TliPNJ6OvS5kddJYHdg==}
-    engines: {node: '>=10'}
-    hasBin: true
-    peerDependencies:
-      flow-remove-types: '>=2.112.0'
-      ts-node: '>=8.5.2'
-      typescript: '>=3.7.2'
-    peerDependenciesMeta:
-      flow-remove-types:
-        optional: true
-      ts-node:
-        optional: true
-      typescript:
-        optional: true
-    dependencies:
-      chokidar: 3.5.2
-      coveralls: 3.1.1
-      findit: 2.0.0
-      foreground-child: 2.0.0
-      fs-exists-cached: 1.0.0
-      glob: 7.1.7
-      import-jsx: 4.0.0
-      isexe: 2.0.0
-      istanbul-lib-processinfo: 2.0.2
-      jackspeak: 1.4.0
-      libtap: 1.1.1
-      minipass: 3.1.3
-      mkdirp: 1.0.4
-      nyc: 15.1.0
-      opener: 1.5.2
-      react: 16.14.0
-      rimraf: 3.0.2
-      signal-exit: 3.0.3
-      source-map-support: 0.5.19
-      tap-mocha-reporter: 5.0.1
-      tap-parser: 10.1.0
-      tap-yaml: 1.0.0
-      tcompare: 5.0.6
-      typescript: 4.3.5
-      which: 2.0.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-    bundledDependencies:
-      - ink
-      - treport
-      - '@types/react'
-
   /tapable/1.1.3:
     resolution: {integrity: sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==}
     engines: {node: '>=6'}
@@ -11869,13 +11201,6 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /tcompare/5.0.6:
-    resolution: {integrity: sha512-OvO7omN/wkdsKzmOqr3sQFfLbghs/2X5mwSkcfgRiXZshfPnTsAs3IRf1RixR/Pff26qG/r9ogcZMpV0YdeGXg==}
-    engines: {node: '>=10'}
-    dependencies:
-      diff: 4.0.2
-    dev: false
-
   /term-size/1.2.0:
     resolution: {integrity: sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=}
     engines: {node: '>=4'}
@@ -11910,15 +11235,6 @@ packages:
       source-map: 0.6.1
       source-map-support: 0.5.19
 
-  /test-exclude/6.0.0:
-    resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
-    engines: {node: '>=8'}
-    dependencies:
-      '@istanbuljs/schema': 0.1.3
-      glob: 7.1.7
-      minimatch: 3.0.4
-    dev: false
-
   /text-table/0.2.0:
     resolution: {integrity: sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=}
     dev: true
@@ -11992,6 +11308,7 @@ packages:
     engines: {node: '>=8.0'}
     dependencies:
       is-number: 7.0.0
+    dev: true
 
   /to-regex/3.0.2:
     resolution: {integrity: sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==}
@@ -12008,18 +11325,6 @@ packages:
     engines: {node: '>=0.6'}
     dev: true
 
-  /tough-cookie/2.5.0:
-    resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
-    engines: {node: '>=0.8'}
-    dependencies:
-      psl: 1.8.0
-      punycode: 2.1.1
-    dev: false
-
-  /trivial-deferred/1.0.1:
-    resolution: {integrity: sha1-N21NKdlR1jaKb3oK6FwvTV4GWPM=}
-    dev: false
-
   /trough/2.0.2:
     resolution: {integrity: sha512-FnHq5sTMxC0sk957wHDzRnemFnNBvt/gSY99HzK8F7UP5WAbvP70yX5bd7CjEQkN+TjdxwI7g7lJ6podqrG2/w==}
     dev: false
@@ -12064,16 +11369,6 @@ packages:
     resolution: {integrity: sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=}
     dev: true
 
-  /tunnel-agent/0.6.0:
-    resolution: {integrity: sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=}
-    dependencies:
-      safe-buffer: 5.2.1
-    dev: false
-
-  /tweetnacl/0.14.5:
-    resolution: {integrity: sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=}
-    dev: false
-
   /type-check/0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
@@ -12086,11 +11381,6 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /type-fest/0.8.1:
-    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
-    engines: {node: '>=8'}
-    dev: false
-
   /type-fest/1.4.0:
     resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==}
     engines: {node: '>=10'}
@@ -12112,12 +11402,6 @@ packages:
     resolution: {integrity: sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==}
     dev: false
 
-  /typedarray-to-buffer/3.1.5:
-    resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
-    dependencies:
-      is-typedarray: 1.0.0
-    dev: false
-
   /typedarray/0.0.6:
     resolution: {integrity: sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=}
     dev: true
@@ -12153,13 +11437,6 @@ packages:
     engines: {node: '>=4'}
     dev: false
 
-  /unicode-length/2.0.2:
-    resolution: {integrity: sha512-Ph/j1VbS3/r77nhoY2WU0GWGjVYOHL3xpKp0y/Eq2e5r0mT/6b649vm7KFO6RdAdrZkYLdxphYVgvODxPB+Ebg==}
-    dependencies:
-      punycode: 2.1.1
-      strip-ansi: 3.0.1
-    dev: false
-
   /unicode-match-property-ecmascript/1.0.4:
     resolution: {integrity: sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==}
     engines: {node: '>=4'}
@@ -12393,6 +11670,7 @@ packages:
     resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==}
     deprecated: Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.
     hasBin: true
+    dev: true
 
   /v8-compile-cache/2.0.3:
     resolution: {integrity: sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==}
@@ -12421,15 +11699,6 @@ packages:
   /vendors/1.0.4:
     resolution: {integrity: sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==}
 
-  /verror/1.10.0:
-    resolution: {integrity: sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=}
-    engines: {'0': node >=0.6.0}
-    dependencies:
-      assert-plus: 1.0.0
-      core-util-is: 1.0.2
-      extsprintf: 1.3.0
-    dev: false
-
   /vfile-message/3.0.2:
     resolution: {integrity: sha512-UUjZYIOg9lDRwwiBAuezLIsu9KlXntdxwG+nXnjuQAHvBpcX3x0eN8h+I7TkY5nkCXj+cWVp4ZqebtGBvok8ww==}
     dependencies:
@@ -12677,6 +11946,7 @@ packages:
 
   /which-module/2.0.0:
     resolution: {integrity: sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=}
+    dev: true
 
   /which/1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
@@ -12691,6 +11961,7 @@ packages:
     hasBin: true
     dependencies:
       isexe: 2.0.0
+    dev: true
 
   /widest-line/2.0.1:
     resolution: {integrity: sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==}
@@ -12846,6 +12117,7 @@ packages:
     dependencies:
       string-width: 1.0.2
       strip-ansi: 3.0.1
+    dev: true
 
   /wrap-ansi/5.1.0:
     resolution: {integrity: sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==}
@@ -12856,27 +12128,9 @@ packages:
       strip-ansi: 5.2.0
     dev: true
 
-  /wrap-ansi/6.2.0:
-    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
-    engines: {node: '>=8'}
-    dependencies:
-      ansi-styles: 4.3.0
-      string-width: 4.2.2
-      strip-ansi: 6.0.0
-    dev: false
-
   /wrappy/1.0.2:
     resolution: {integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=}
 
-  /write-file-atomic/3.0.3:
-    resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==}
-    dependencies:
-      imurmurhash: 0.1.4
-      is-typedarray: 1.0.0
-      signal-exit: 3.0.3
-      typedarray-to-buffer: 3.1.5
-    dev: false
-
   /xregexp/4.0.0:
     resolution: {integrity: sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==}
     dev: true
@@ -12888,6 +12142,7 @@ packages:
 
   /y18n/4.0.3:
     resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
+    dev: true
 
   /yallist/2.1.2:
     resolution: {integrity: sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=}
@@ -12899,16 +12154,13 @@ packages:
 
   /yallist/4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
+    dev: true
 
   /yaml/1.10.2:
     resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
     engines: {node: '>= 6'}
     dev: false
 
-  /yapool/1.0.0:
-    resolution: {integrity: sha1-9pPymjFbUNmp2iZGp6ZkXJaYW2o=}
-    dev: false
-
   /yargs-parser/10.1.0:
     resolution: {integrity: sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==}
     dependencies:
@@ -12922,14 +12174,6 @@ packages:
       decamelize: 1.2.0
     dev: true
 
-  /yargs-parser/18.1.3:
-    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
-    engines: {node: '>=6'}
-    dependencies:
-      camelcase: 5.3.1
-      decamelize: 1.2.0
-    dev: false
-
   /yargs/12.0.2:
     resolution: {integrity: sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==}
     dependencies:
@@ -12977,20 +12221,3 @@ packages:
       y18n: 4.0.3
       yargs-parser: 13.1.2
     dev: true
-
-  /yargs/15.4.1:
-    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
-    engines: {node: '>=8'}
-    dependencies:
-      cliui: 6.0.0
-      decamelize: 1.2.0
-      find-up: 4.1.0
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      require-main-filename: 2.0.0
-      set-blocking: 2.0.0
-      string-width: 4.2.2
-      which-module: 2.0.0
-      y18n: 4.0.3
-      yargs-parser: 18.1.3
-    dev: false
diff --git a/client/src/app/pages/ForgotPasswordPage.tsx b/client/src/app/pages/ForgotPasswordPage.tsx
index a2eef7b0d..55892b92a 100644
--- a/client/src/app/pages/ForgotPasswordPage.tsx
+++ b/client/src/app/pages/ForgotPasswordPage.tsx
@@ -3,46 +3,83 @@ import SiteWordmark from "components/util/SiteWordmark";
 import { Form, Col, Button } from "react-bootstrap";
 import React, { useState } from "react";
 import { Link, useHistory } from "react-router-dom";
+import { APIFetchV1 } from "util/api";
+import MainPageTitleContainer from "components/util/MainPageTitleContainer";
 
 export default function ForgotPasswordPage() {
 	const [email, setEmail] = useState("");
 	const history = useHistory();
+	const [hasResetPassword, setHasResetPassword] = useState(false);
 
 	return (
 		<CenterPage>
 			<Col lg="6">
-				<SiteWordmark />
-				<div className="text-center mb-10 mb-lg-20">
-					<h3 className="font-size-h1">Forgot Password</h3>
-					<span className="font-weight-bold text-dark-50">
-						Hey, it happens to all of us.
-					</span>
-				</div>
-				<Form>
-					<Form.Group>
-						<Form.Label>Email Address</Form.Label>
-						<Form.Control
-							type="email"
-							value={email}
-							onChange={e => setEmail(e.target.value)}
-						/>
-					</Form.Group>
-					<Form.Group className="justify-content-center d-flex pt-4">
-						<span
-							onClick={() => history.goBack()}
-							tabIndex={4}
-							className="mr-auto btn btn-outline-danger"
+				<MainPageTitleContainer
+					title="Forgot Password"
+					desc="Hey, it happens to all of us :P"
+				/>
+				{hasResetPassword ? (
+					<div>
+						All good! An email has been sent to {email} IF an account exists with that
+						email.
+						<br />
+						<Link to="/">Go home.</Link>
+					</div>
+				) : (
+					<>
+						<Form
+							onSubmit={async e => {
+								e.preventDefault();
+
+								const res = await APIFetchV1(
+									"/auth/forgot-password",
+									{
+										method: "POST",
+										headers: {
+											"Content-Type": "application/json",
+										},
+										body: JSON.stringify({ email }),
+									},
+									true,
+									true
+								);
+
+								if (res.success) {
+									setTimeout(() => setHasResetPassword(true), 300);
+								}
+							}}
 						>
-							Back
-						</span>
-						<Button tabIndex={3} type="submit" className="ml-auto">
-							Send Reset Link
-						</Button>
-					</Form.Group>
-				</Form>
-				<Link to="/screwed">
-					I signed up with a fake email, how can I recover my account?
-				</Link>
+							<Form.Group>
+								<Form.Label>Email Address</Form.Label>
+								<Form.Control
+									type="email"
+									value={email}
+									onChange={e => setEmail(e.target.value)}
+								/>
+							</Form.Group>
+							<Form.Group className="justify-content-center d-flex pt-4">
+								<span
+									onClick={() => history.goBack()}
+									tabIndex={4}
+									className="mr-auto btn btn-outline-danger"
+								>
+									Back
+								</span>
+								<Button
+									tabIndex={3}
+									type="submit"
+									className="ml-auto"
+									disabled={email === ""}
+								>
+									Send Reset Link
+								</Button>
+							</Form.Group>
+						</Form>
+						<Link to="/screwed">
+							I signed up with a fake email, how can I recover my account?
+						</Link>
+					</>
+				)}
 			</Col>
 		</CenterPage>
 	);
diff --git a/client/src/app/pages/LandingPage.tsx b/client/src/app/pages/LandingPage.tsx
new file mode 100644
index 000000000..f50e02ed4
--- /dev/null
+++ b/client/src/app/pages/LandingPage.tsx
@@ -0,0 +1,147 @@
+import { Footer } from "components/layout/footer/Footer";
+import { Header } from "components/layout/header/Header";
+import { HeaderMobile } from "components/layout/header/HeaderMobile";
+import Divider from "components/util/Divider";
+import LinkButton from "components/util/LinkButton";
+import { TachiConfig } from "lib/config";
+import React from "react";
+import { ToServerURL } from "util/api";
+import { toAbsoluteUrl } from "_metronic/_helpers";
+
+// This page is currently unused,
+// It's alright, but hey, we could do more.
+export default function LandingPage() {
+	return (
+		<>
+			<HeaderMobile />
+			<Header />
+			<div className="landing-page" id="kt_content">
+				<section id="hero" className="hero">
+					<div
+						className="hero-bg-image"
+						style={{
+							backgroundImage: `url(${ToServerURL("/cdn/splashes/default.png")})`,
+						}}
+					/>
+					<div
+						className="hero-bg-fader"
+						style={{
+							backgroundImage: `url(${ToServerURL("/cdn/misc/overlay.png")})`,
+						}}
+					/>
+					<div className="hero-content-wrapper">
+						<div className="row">
+							<div className="col-12 col-lg-8 offset-lg-2 d-flex align-items-center">
+								<div className="row justify-content-center text-center">
+									<div className="col-12 mb-8">
+										<div className="d-none d-lg-block">
+											<img
+												src={toAbsoluteUrl(
+													"/media/logos/logo-wordmark.png"
+												)}
+												alt={TachiConfig.name}
+												width="30%"
+											/>
+										</div>
+										<div className="d-block d-lg-none">
+											<img
+												src={toAbsoluteUrl(
+													"/media/logos/logo-wordmark.png"
+												)}
+												alt={TachiConfig.name}
+												width="80%"
+											/>
+										</div>
+									</div>
+									<div className="col-12">
+										<h3 className="display-3">
+											A <b>Supercharged</b> Score Tracker
+										</h3>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</section>
+				<Divider className="mt-8 mb-16" />
+				<section id="features" className="features">
+					<div className="container">
+						<div className="row">
+							<FeatureContainer
+								tagline="No More Spreadsheets."
+								description={`${TachiConfig.name} analyses your scores for you, showing all the statistics you'll ever want to see.`}
+							>
+								<FeatureImage
+									alt="Picture of scores."
+									src={ToServerURL("/cdn/hero/scores.png")}
+								/>
+							</FeatureContainer>
+							<FeatureContainer
+								leftAlign={false}
+								tagline="Features You'll Actually Use."
+								description={`${TachiConfig.name} implements the features rhythm gamers already talk about. Break your scores down into sessions, Track goals in real time, break down your folder averages - it's all there!`}
+							>
+								foo
+							</FeatureContainer>
+							<FeatureContainer
+								tagline="All Your Scores."
+								description={`${TachiConfig.name} supports a bunch of your favourite games, and integrates with many existing services to make sure no score is lost to the void.`}
+							>
+								foo
+							</FeatureContainer>
+							<div
+								className="col-12 text-center"
+								style={{ paddingTop: 100, height: 250 }}
+							>
+								But hey, this all sounds a bit formal. Let's be honest, if you're a
+								rhythm gamer, you probably don't need to be sold on this like it's a
+								startup :P.
+								<br />
+								<LinkButton to="/register" className="mt-4 btn-outline-primary">
+									Register?
+								</LinkButton>
+							</div>
+						</div>
+					</div>
+				</section>
+			</div>
+			<Footer />
+		</>
+	);
+}
+
+function FeatureContainer({
+	tagline,
+	description,
+	children,
+	leftAlign = true,
+}: {
+	tagline: string;
+	description: string;
+	children: React.ReactChild;
+	leftAlign?: boolean;
+}) {
+	return (
+		<div className="col-12 mb-16">
+			<div className="row">
+				{leftAlign && (
+					<div className="col-12 col-lg-6 align-self-center">
+						<h1 className="display-4">{tagline}</h1>
+						<h5>{description}</h5>
+					</div>
+				)}
+				<div className="col-12 d-none d-lg-block col-lg-6 text-center">{children}</div>
+				{!leftAlign && (
+					<div className="col-12 col-lg-6 text-right">
+						<h1 className="display-4">{tagline}</h1>
+						<h5>{description}</h5>
+					</div>
+				)}
+			</div>
+		</div>
+	);
+}
+
+function FeatureImage({ src, alt }: { src: string; alt: string }) {
+	return <img src={src} alt={alt} />;
+}
diff --git a/client/src/app/pages/ResetPasswordPage.tsx b/client/src/app/pages/ResetPasswordPage.tsx
index b3552d3d2..b1480d49c 100644
--- a/client/src/app/pages/ResetPasswordPage.tsx
+++ b/client/src/app/pages/ResetPasswordPage.tsx
@@ -1,5 +1,77 @@
-import React from "react";
+import CenterPage from "components/util/CenterPage";
+import MainPageTitleContainer from "components/util/MainPageTitleContainer";
+import React, { useState } from "react";
+import { Button, Form } from "react-bootstrap";
+import { APIFetchV1 } from "util/api";
+import { ShortDelayify } from "util/misc";
+import { ErrorPage } from "./ErrorPage";
 
 export default function ResetPasswordPage() {
-	return <div></div>;
+	const code = new URLSearchParams(window.location.search).get("code");
+	const [password, setPassword] = useState("");
+	const [confirmPass, setConfirmPass] = useState("");
+
+	if (!code) {
+		return <ErrorPage statusCode={400} />;
+	}
+
+	return (
+		<CenterPage>
+			<MainPageTitleContainer
+				title="Reset Password"
+				desc="Pick something you'll remember this time :)"
+			/>
+			<Form
+				onSubmit={async e => {
+					e.preventDefault();
+
+					const res = await APIFetchV1(
+						"/auth/reset-password",
+						{
+							method: "POST",
+							headers: {
+								"Content-Type": "application/json",
+							},
+							body: JSON.stringify({ code, password }),
+						},
+						true,
+						true
+					);
+
+					if (res.success) {
+						ShortDelayify(() => (window.location.href = "/"));
+					}
+				}}
+			>
+				<Form.Group>
+					<Form.Label>New Password</Form.Label>
+					<Form.Control
+						value={password}
+						onChange={e => setPassword(e.target.value)}
+						isValid={password.length >= 8}
+						type="password"
+					/>
+				</Form.Group>
+				<Form.Group>
+					<Form.Label>Confirm</Form.Label>
+					<Form.Control
+						value={confirmPass}
+						onChange={e => setConfirmPass(e.target.value)}
+						isValid={password === confirmPass}
+						type="password"
+					/>
+				</Form.Group>
+				<Form.Group className="justify-content-center d-flex pt-4">
+					<Button
+						tabIndex={3}
+						type="submit"
+						className="ml-auto"
+						disabled={!(password === confirmPass && password.length >= 8)}
+					>
+						Reset Password
+					</Button>
+				</Form.Group>
+			</Form>
+		</CenterPage>
+	);
 }
diff --git a/client/src/app/pages/dashboard/misc/CreditsPage.tsx b/client/src/app/pages/dashboard/misc/CreditsPage.tsx
index 06a2ec87d..9e9f49bc0 100644
--- a/client/src/app/pages/dashboard/misc/CreditsPage.tsx
+++ b/client/src/app/pages/dashboard/misc/CreditsPage.tsx
@@ -107,6 +107,10 @@ export default function CreditsPage() {
 						{a("APIs, Massive Dev Support", "Have you tried Elixir?")}:{" "}
 						<strong>haste</strong>
 					</li>
+					<li>
+						{a("Tachi-Bot Work", "oooOoooo you want to use redux oooo")}:{" "}
+						<strong>pfych</strong>
+					</li>
 					<li>
 						{a("Chunitachi", "CHUNITHM Black Magic")}: <strong>tomatosoup</strong>
 					</li>
@@ -146,8 +150,8 @@ export default function CreditsPage() {
 						<ExternalLink href="https://pnpm.io">PNPM</ExternalLink>
 						<br />
 						<small>
-							PNPM is a monumental improvement over NPM and Yarn. I cannot recommend
-							it highly enough.
+							PNPM is a monumental improvement over NPM. I cannot recommend it highly
+							enough.
 						</small>
 					</li>
 					<li>
@@ -180,6 +184,11 @@ export default function CreditsPage() {
 							one guy.
 						</small>
 					</li>
+					<li>
+						<ExternalLink href="https://nivo.rocks">Nivo</ExternalLink>
+						<br />
+						<small>Nivo is the best graphing library ever made. That's it.</small>
+					</li>
 				</ul>
 			</div>
 			<span className="text-muted" style={{ fontSize: "0.2rem" }}>
diff --git a/client/src/app/pages/dashboard/users/UserGamesPage.tsx b/client/src/app/pages/dashboard/users/UserGamesPage.tsx
index a69c1763d..794d90a31 100644
--- a/client/src/app/pages/dashboard/users/UserGamesPage.tsx
+++ b/client/src/app/pages/dashboard/users/UserGamesPage.tsx
@@ -15,6 +15,7 @@ import LinkButton from "components/util/LinkButton";
 import { UGSWithRankingData } from "types/api-returns";
 import RankingData, { LazyRankingData } from "components/user/UGPTRankingData";
 import ReferToUser from "components/util/ReferToUser";
+import { GetSortedGPTs } from "util/site";
 
 interface Props {
 	reqUser: PublicUserDocument;
@@ -44,29 +45,7 @@ export default function UserGamesPage({ reqUser }: Props) {
 			>
 				{ugs =>
 					ugs.length ? (
-						ugs.map((e, i) => {
-							// uses modulo to determine whether we're on the
-							// last row or not
-							// to do sizing like [12] or [6][6] instead of [3][3][3]
-							let mdSize = "6";
-							let lgSize = "4";
-							if (ugs.length - i <= ugs.length % 3) {
-								lgSize = (12 / (ugs.length % 3)).toString();
-							}
-
-							if (ugs.length - i <= ugs.length % 2) {
-								mdSize = (12 / (ugs.length % 2)).toString();
-							}
-
-							return (
-								<div
-									className={`col-12 col-md-${mdSize} col-lg-${lgSize}`}
-									key={`${e.game}:${e.playtype}`}
-								>
-									<GameStatContainer ugs={e} reqUser={reqUser} />
-								</div>
-							);
-						})
+						<GamesInfo ugs={ugs} reqUser={reqUser} />
 					) : (
 						<div className="col-12 text-center">
 							<Muted>
@@ -80,6 +59,50 @@ export default function UserGamesPage({ reqUser }: Props) {
 	);
 }
 
+function GamesInfo({ ugs, reqUser }: { ugs: UserGameStats[]; reqUser: PublicUserDocument }) {
+	const gpts = GetSortedGPTs();
+
+	const ugsMap = new Map();
+
+	for (const u of ugs) {
+		ugsMap.set(`${u.game}:${u.playtype}`, u);
+	}
+
+	return (
+		<>
+			{gpts.map(({ game, playtype }, i) => {
+				const e = ugsMap.get(`${game}:${playtype}`);
+
+				if (!e) {
+					return <></>;
+				}
+
+				// uses modulo to determine whether we're on the
+				// last row or not
+				// to do sizing like [12] or [6][6] instead of [3][3][3]
+				let mdSize = "6";
+				let lgSize = "4";
+				if (ugs.length - i <= ugs.length % 3) {
+					lgSize = (12 / (ugs.length % 3)).toString();
+				}
+
+				if (ugs.length - i <= ugs.length % 2) {
+					mdSize = (12 / (ugs.length % 2)).toString();
+				}
+
+				return (
+					<div
+						className={`col-12 col-md-${mdSize} col-lg-${lgSize}`}
+						key={`${e.game}:${e.playtype}`}
+					>
+						<GameStatContainer ugs={e} reqUser={reqUser} />
+					</div>
+				);
+			})}
+		</>
+	);
+}
+
 function GameStatContainer({ ugs, reqUser }: { ugs: UGSWithRankingData } & Props) {
 	return (
 		<Card
diff --git a/client/src/app/pages/dashboard/users/UserPage.tsx b/client/src/app/pages/dashboard/users/UserPage.tsx
index 7d88b8909..0cc267696 100644
--- a/client/src/app/pages/dashboard/users/UserPage.tsx
+++ b/client/src/app/pages/dashboard/users/UserPage.tsx
@@ -27,7 +27,6 @@ function AboutMeCard({ reqUser }: Props) {
 	const [content, setContent] = useState(reqUser.about);
 
 	async function SubmitNewAboutMe() {
-		console.log(content);
 		const res = await APIFetchV1(
 			`/users/${user!.id}`,
 			{
@@ -91,8 +90,6 @@ function AboutMeCard({ reqUser }: Props) {
 		}
 	}
 
-	console.log(content);
-
 	return (
 		<Card header="About Me" footer={footer}>
 			{editMode && (
diff --git a/client/src/app/pages/dashboard/users/games/_game/_playtype/AchievablesPage.tsx b/client/src/app/pages/dashboard/users/games/_game/_playtype/AchievablesPage.tsx
new file mode 100644
index 000000000..b5c07d1ed
--- /dev/null
+++ b/client/src/app/pages/dashboard/users/games/_game/_playtype/AchievablesPage.tsx
@@ -0,0 +1,18 @@
+import useSetSubheader from "components/layout/header/useSetSubheader";
+import React from "react";
+import { FormatGame, GetGameConfig, PublicUserDocument } from "tachi-common";
+import { GamePT } from "types/react";
+
+type Props = { reqUser: PublicUserDocument } & GamePT;
+
+export default function FoldersPage({ reqUser, game, playtype }: Props) {
+	const gameConfig = GetGameConfig(game);
+
+	useSetSubheader(
+		["Users", reqUser.username, "Games", gameConfig.name, playtype, "Achievables"],
+		[reqUser, game, playtype],
+		`${reqUser.username}'s ${FormatGame(game, playtype)} Goals & Milestones`
+	);
+
+	return <div></div>;
+}
diff --git a/client/src/app/pages/dashboard/users/games/_game/_playtype/ScoresPage.tsx b/client/src/app/pages/dashboard/users/games/_game/_playtype/ScoresPage.tsx
index 8e9b429dc..69bb61e32 100644
--- a/client/src/app/pages/dashboard/users/games/_game/_playtype/ScoresPage.tsx
+++ b/client/src/app/pages/dashboard/users/games/_game/_playtype/ScoresPage.tsx
@@ -21,12 +21,12 @@ import { GamePT, SetState } from "types/react";
 import { APIFetchV1 } from "util/api";
 import LoadingWrapper from "components/util/LoadingWrapper";
 import Icon from "components/util/Icon";
-import SelectButton from "components/util/SelectButton";
+import SelectLinkButton from "components/util/SelectLinkButton";
 import PBTable from "components/tables/pbs/PBTable";
 import ScoreTable from "components/tables/scores/ScoreTable";
 import useScoreRatingAlg from "components/util/useScoreRatingAlg";
-import { Alert } from "react-bootstrap";
-import { Link } from "react-router-dom";
+import useUGPTBase from "components/util/useUGPTBase";
+import { Switch, Route } from "react-router-dom";
 
 export default function ScoresPage({
 	reqUser,
@@ -35,8 +35,6 @@ export default function ScoresPage({
 }: {
 	reqUser: PublicUserDocument;
 } & GamePT) {
-	const [scoreSet, setScoreSet] = useState<"recent" | "best" | "all" | "playcount">("best");
-
 	const gameConfig = GetGameConfig(game);
 	const gptConfig = GetGamePTConfig(game, playtype);
 
@@ -50,59 +48,66 @@ export default function ScoresPage({
 		`${reqUser.username}'s ${FormatGame(game, playtype)} Scores`
 	);
 
+	const base = useUGPTBase({ reqUser, game, playtype });
+
 	return (
 		<div className="row">
 			<div className="col-12 text-center">
 				<div className="btn-group mb-4">
-					<SelectButton id="best" setValue={setScoreSet} value={scoreSet}>
+					<SelectLinkButton to={`${base}/scores`}>
 						<Icon type="trophy" />
 						Best PBs
-					</SelectButton>
-					<SelectButton id="recent" setValue={setScoreSet} value={scoreSet}>
+					</SelectLinkButton>
+					<SelectLinkButton to={`${base}/scores/history`}>
 						<Icon type="history" />
 						Recent Scores
-					</SelectButton>
-					<SelectButton id="playcount" setValue={setScoreSet} value={scoreSet}>
+					</SelectLinkButton>
+					<SelectLinkButton to={`${base}/scores/most-played`}>
 						<Icon type="mortar-pestle" />
 						Most Played
-					</SelectButton>
-					<SelectButton id="all" setValue={setScoreSet} value={scoreSet}>
+					</SelectLinkButton>
+					<SelectLinkButton to={`${base}/scores/all`}>
 						<Icon type="database" />
 						All PBs
-					</SelectButton>
+					</SelectLinkButton>
 				</div>
 			</div>
 			<div className="col-12 mt-4">
-				{scoreSet === "best" ? (
-					<>
+				<Switch>
+					<Route exact path="/dashboard/users/:userID/games/:game/:playtype/scores">
+						<>
+							<PBsOverview
+								url={`/users/${reqUser.id}/games/${game}/${playtype}/pbs/best?alg=${alg}`}
+								{...{ reqUser, game, playtype, alg }}
+							/>
+							{gptConfig.scoreRatingAlgs.length > 1 && (
+								<AlgSelector {...{ alg, setAlg, gptConfig }} />
+							)}
+						</>
+					</Route>
+					<Route path="/dashboard/users/:userID/games/:game/:playtype/scores/history">
+						<ScoresOverview {...{ reqUser, game, playtype }} />
+					</Route>
+					<Route path="/dashboard/users/:userID/games/:game/:playtype/scores/all">
 						<PBsOverview
-							url={`/users/${reqUser.id}/games/${game}/${playtype}/pbs/best?alg=${alg}`}
-							{...{ reqUser, game, playtype, alg }}
+							url={`/users/${reqUser.id}/games/${game}/${playtype}/pbs/all`}
+							reqUser={reqUser}
+							game={game}
+							playtype={playtype}
+							indexCol={false}
 						/>
-						{gptConfig.scoreRatingAlgs.length > 1 && (
-							<AlgSelector {...{ alg, setAlg, gptConfig }} />
-						)}
-					</>
-				) : scoreSet === "recent" ? (
-					<ScoresOverview {...{ reqUser, game, playtype }} />
-				) : scoreSet === "all" ? (
-					<PBsOverview
-						url={`/users/${reqUser.id}/games/${game}/${playtype}/pbs/all`}
-						reqUser={reqUser}
-						game={game}
-						playtype={playtype}
-						indexCol={false}
-					/>
-				) : (
-					<PBsOverview
-						url={`/users/${reqUser.id}/games/${game}/${playtype}/most-played`}
-						reqUser={reqUser}
-						game={game}
-						playtype={playtype}
-						indexCol
-						showPlaycount
-					/>
-				)}
+					</Route>
+					<Route path="/dashboard/users/:userID/games/:game/:playtype/scores/most-played">
+						<PBsOverview
+							url={`/users/${reqUser.id}/games/${game}/${playtype}/most-played`}
+							reqUser={reqUser}
+							game={game}
+							playtype={playtype}
+							indexCol
+							showPlaycount
+						/>
+					</Route>
+				</Switch>
 			</div>
 		</div>
 	);
diff --git a/client/src/app/pages/dashboard/users/games/_game/_playtype/UGPTSettingsPage.tsx b/client/src/app/pages/dashboard/users/games/_game/_playtype/UGPTSettingsPage.tsx
index c43e90035..5aabe3b13 100644
--- a/client/src/app/pages/dashboard/users/games/_game/_playtype/UGPTSettingsPage.tsx
+++ b/client/src/app/pages/dashboard/users/games/_game/_playtype/UGPTSettingsPage.tsx
@@ -8,7 +8,7 @@ import SelectButton from "components/util/SelectButton";
 import { UGPTSettingsContext } from "context/UGPTSettingsContext";
 import deepmerge from "deepmerge";
 import { useFormik } from "formik";
-import React, { useContext, useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import { Button, Form } from "react-bootstrap";
 import {
 	FormatGame,
@@ -165,6 +165,29 @@ function ShowcaseForm({ reqUser, game, playtype }: Props) {
 	const [stats, setStats] = useState(settings!.preferences.stats);
 	const [show, setShow] = useState(false);
 
+	const SaveChanges = async () => {
+		await APIFetchV1(
+			`/users/${reqUser.id}/games/${game}/${playtype}/showcase`,
+			{
+				method: "PUT",
+				body: JSON.stringify(stats),
+				headers: { "Content-Type": "application/json" },
+			},
+			true,
+			true
+		);
+	};
+
+	const [isFirstPaint, setIsFirstPaint] = useState(true);
+
+	useEffect(() => {
+		if (isFirstPaint) {
+			setIsFirstPaint(false);
+		} else {
+			SaveChanges();
+		}
+	}, [stats]);
+
 	return (
 		<div className="row">
 			{stats.length < 6 && (
@@ -177,32 +200,15 @@ function ShowcaseForm({ reqUser, game, playtype }: Props) {
 				</div>
 			)}
 			<RenderCurrentStats {...{ reqUser, game, playtype, stats, setStats }} />
-			<div className="col-12 d-flex justify-content-center mt-4">
-				<Button
-					variant="success"
-					onClick={async () => {
-						await APIFetchV1(
-							`/users/${reqUser.id}/games/${game}/${playtype}/showcase`,
-							{
-								method: "PUT",
-								body: JSON.stringify(stats),
-								headers: { "Content-Type": "application/json" },
-							},
-							true,
-							true
-						);
-					}}
-				>
-					Save Changes
-				</Button>
-			</div>
 			<UGPTStatCreator
 				game={game}
 				playtype={playtype}
 				show={show}
 				setShow={setShow}
 				reqUser={reqUser}
-				onCreate={stat => setStats([...stats, stat])}
+				onCreate={stat => {
+					setStats([...stats, stat]);
+				}}
 			/>
 		</div>
 	);
diff --git a/client/src/app/pages/dashboard/users/games/_game/_playtype/folders/FolderSelectPage.tsx b/client/src/app/pages/dashboard/users/games/_game/_playtype/folders/FolderSelectPage.tsx
new file mode 100644
index 000000000..854ab230a
--- /dev/null
+++ b/client/src/app/pages/dashboard/users/games/_game/_playtype/folders/FolderSelectPage.tsx
@@ -0,0 +1,241 @@
+import { ResponsiveBar } from "@nivo/bar";
+import { BarChartTooltip } from "components/charts/ChartTooltip";
+import Card from "components/layout/page/Card";
+import MiniTable from "components/tables/components/MiniTable";
+import DebounceSearch from "components/util/DebounceSearch";
+import Divider from "components/util/Divider";
+import Icon from "components/util/Icon";
+import LinkButton from "components/util/LinkButton";
+import Loading from "components/util/Loading";
+import Muted from "components/util/Muted";
+import useApiQuery from "components/util/query/useApiQuery";
+import SelectButton from "components/util/SelectButton";
+import useUGPTBase from "components/util/useUGPTBase";
+import React, { useState, useMemo } from "react";
+import { FolderDocument, GetGamePTConfig, integer, PublicUserDocument } from "tachi-common";
+import { UGPTFolderSearch, FolderStatsInfo } from "types/api-returns";
+import { GamePT } from "types/react";
+import { ChangeOpacity } from "util/color-opacity";
+import { TACHI_CHART_THEME } from "util/constants/chart-theme";
+import { Reverse, StepFromToMax, PercentFrom } from "util/misc";
+
+type Props = { reqUser: PublicUserDocument } & GamePT;
+
+export default function FoldersSearch({ reqUser, game, playtype }: Props) {
+	const [search, setSearch] = useState("");
+
+	const params = useMemo(() => new URLSearchParams({ search }), [search]);
+
+	const { data, isLoading, error } = useApiQuery<UGPTFolderSearch>(
+		`/users/${reqUser.id}/games/${game}/${playtype}/folders?${params.toString()}`
+	);
+
+	let body = <></>;
+
+	if (error) {
+		body = <>{error.description}</>;
+	} else if (isLoading || !data) {
+		body = <Loading />;
+	} else {
+		const statMap = new Map();
+
+		for (const stat of data.stats) {
+			statMap.set(stat.folderID, stat);
+		}
+
+		body = (
+			<>
+				{data.folders.length === 0 && (
+					<div className="col-12 text-center">Found nothin'.</div>
+				)}
+				{data.folders.map(e => (
+					<FolderInfoComponent
+						key={e.folderID}
+						folder={e}
+						folderStats={statMap.get(e.folderID)!}
+						game={game}
+						playtype={playtype}
+						reqUser={reqUser}
+					/>
+				))}
+			</>
+		);
+	}
+
+	return (
+		<>
+			<div className="col-12">
+				<DebounceSearch
+					className="form-control-lg"
+					setSearch={setSearch}
+					placeholder="Search all Folders..."
+				/>
+			</div>
+			<div className="col-12 mt-8">
+				<div className="row">{search !== "" && body}</div>
+			</div>
+		</>
+	);
+}
+
+function FolderInfoComponent({
+	reqUser,
+	game,
+	playtype,
+	folderStats,
+	folder,
+}: Props & { folder: FolderDocument; folderStats: FolderStatsInfo }) {
+	const gptConfig = GetGamePTConfig(game, playtype);
+
+	const [elements, setElements] = useState<"grade" | "lamp">(gptConfig.scoreBucket);
+
+	const base = useUGPTBase({ reqUser, game, playtype });
+
+	const dataset = useMemo(() => {
+		if (elements === "grade") {
+			return (
+				<DistributionTable
+					colours={gptConfig.gradeColours}
+					keys={Reverse(gptConfig.grades)}
+					values={folderStats.grades}
+					max={folderStats.chartCount}
+				/>
+			);
+		}
+
+		return (
+			<DistributionTable
+				colours={gptConfig.lampColours}
+				keys={Reverse(gptConfig.lamps)}
+				values={folderStats.lamps}
+				max={folderStats.chartCount}
+			/>
+		);
+	}, [elements]);
+
+	return (
+		<div className="col-12 col-lg-6 mb-4">
+			<Card
+				header={folder.title}
+				footer={
+					<div className="w-100 d-flex justify-content-center">
+						<LinkButton
+							to={`${base}/folders/${folder.folderID}`}
+							className="btn-outline-info"
+						>
+							View
+						</LinkButton>
+					</div>
+				}
+			>
+				<div className="row text-center">
+					<div className="col-12">
+						<div className="btn-group">
+							<SelectButton value={elements} setValue={setElements} id="grade">
+								<Icon type="sort-alpha-up" />
+								Grades
+							</SelectButton>
+							<SelectButton value={elements} setValue={setElements} id="lamp">
+								<Icon type="lightbulb" />
+								Lamps
+							</SelectButton>
+						</div>
+						<Divider className="my-4" />
+						{dataset}
+					</div>
+				</div>
+			</Card>
+		</div>
+	);
+}
+
+function DistributionTable<T extends string>({
+	keys,
+	values,
+	colours,
+	max,
+}: {
+	keys: T[];
+	values: Record<T, integer>;
+	colours: Record<T, string>;
+	max: integer;
+}) {
+	const cumulativeValues: Record<T, integer> = {} as Record<T, integer>;
+
+	let total = 0;
+	for (const k of keys) {
+		total += values[k] ?? 0;
+		cumulativeValues[k] = total;
+	}
+
+	return (
+		<MiniTable headers={["Value", "Count (Total)", "Thermometer"]}>
+			{keys.map((k, i) => (
+				<tr key={k}>
+					<td style={{ backgroundColor: ChangeOpacity(colours[k], 0.15) }}>{k}</td>
+					<td>
+						{values[k] ?? 0} <Muted>({cumulativeValues[k]})</Muted>
+					</td>
+					{i === 0 && (
+						<FolderThermometer
+							keys={keys}
+							values={values}
+							max={max}
+							colours={colours}
+						/>
+					)}
+				</tr>
+			))}
+		</MiniTable>
+	);
+}
+
+function FolderThermometer<T extends string>({
+	keys,
+	values,
+	max,
+	colours,
+}: {
+	keys: T[];
+	values: Record<T, integer>;
+	colours: Record<T, string>;
+	max: integer;
+}) {
+	return (
+		<td rowSpan={keys.length} style={{ width: 200, height: 40 * keys.length }}>
+			<ResponsiveBar
+				keys={Reverse(keys)}
+				data={[Object.assign({ id: "" }, values)]}
+				theme={Object.assign({}, TACHI_CHART_THEME, { background: "#1c1c1c" })}
+				// @ts-expect-error temp
+				colors={k => ChangeOpacity(colours[k.id], 0.5)}
+				// @ts-expect-error Keys are appended with "." for some reason.
+				borderColor={k => colours[k.data.id]}
+				labelTextColor="black"
+				labelSkipHeight={12}
+				maxValue={max}
+				padding={0.33}
+				borderWidth={1}
+				valueScale={{ type: "linear" }}
+				axisRight={{
+					tickSize: 5,
+					tickPadding: 5,
+					tickValues: StepFromToMax(max),
+				}}
+				margin={{ right: 50, bottom: 10, top: 20 }}
+				tooltip={d => (
+					<BarChartTooltip
+						point={d}
+						renderFn={d => (
+							<div className="w-100 text-center">
+								{d.label}
+								{d.value} ({PercentFrom(d.value, max)})
+							</div>
+						)}
+					/>
+				)}
+				motionConfig="stiff"
+			/>
+		</td>
+	);
+}
diff --git a/client/src/app/pages/dashboard/users/games/_game/_playtype/folders/FolderTablePage.tsx b/client/src/app/pages/dashboard/users/games/_game/_playtype/folders/FolderTablePage.tsx
new file mode 100644
index 000000000..10c1572e7
--- /dev/null
+++ b/client/src/app/pages/dashboard/users/games/_game/_playtype/folders/FolderTablePage.tsx
@@ -0,0 +1,372 @@
+import { ResponsiveBar } from "@nivo/bar";
+import { BarChartTooltip } from "components/charts/ChartTooltip";
+import Card from "components/layout/page/Card";
+import TachiTable from "components/tables/components/TachiTable";
+import ApiError from "components/util/ApiError";
+import Divider from "components/util/Divider";
+import Icon from "components/util/Icon";
+import LinkButton from "components/util/LinkButton";
+import Loading from "components/util/Loading";
+import Muted from "components/util/Muted";
+import useApiQuery from "components/util/query/useApiQuery";
+import SelectButton from "components/util/SelectButton";
+import React, { useEffect, useMemo, useState } from "react";
+import { Form, InputGroup } from "react-bootstrap";
+import { Link } from "react-router-dom";
+import {
+	FolderDocument,
+	Game,
+	GamePTConfig,
+	GetGamePTConfig,
+	PublicUserDocument,
+	TableDocument,
+} from "tachi-common";
+import { FolderStatsInfo, UGPTTableReturns } from "types/api-returns";
+import { Playtype } from "types/tachi";
+import { DEFAULT_BAR_PROPS } from "util/charts";
+import { ChangeOpacity } from "util/color-opacity";
+import { Reverse } from "util/misc";
+import { NumericSOV, StrSOV } from "util/sorts";
+
+interface Props {
+	reqUser: PublicUserDocument;
+	game: Game;
+	playtype: Playtype;
+}
+
+export default function FolderTablePage({ reqUser, game, playtype }: Props) {
+	const { data, isLoading, error } = useApiQuery<TableDocument[]>(
+		`/games/${game}/${playtype}/tables`
+	);
+
+	const [tableID, setTableID] = useState("");
+	const [tableMap, setTableMap] = useState(new Map());
+
+	const table = useMemo(() => tableMap.get(tableID), [tableID, tableMap]);
+
+	useEffect(() => {
+		if (data) {
+			const newMap = new Map();
+			for (const table of data) {
+				newMap.set(table.tableID, table);
+			}
+			setTableMap(newMap);
+			setTableID(data[0].tableID);
+		}
+	}, [data]);
+
+	if (isLoading || !data) {
+		return <Loading />;
+	}
+
+	if (error) {
+		return <ApiError error={error} />;
+	}
+
+	return (
+		<>
+			<InputGroup>
+				<InputGroup.Prepend>
+					<InputGroup.Text>Table</InputGroup.Text>
+				</InputGroup.Prepend>
+				<Form.Control
+					as="select"
+					size="lg"
+					value={tableID}
+					onChange={e => setTableID(e.target.value)}
+				>
+					{data.map(e => (
+						<option key={e.tableID} value={e.tableID}>
+							{e.title}
+						</option>
+					))}
+				</Form.Control>
+			</InputGroup>
+			<Divider className="my-4" />
+			{table && <TableFolderViewer {...{ reqUser, game, playtype, table }} />}
+		</>
+	);
+}
+
+interface UGPTFolderStats {
+	folder: FolderDocument;
+	stats: FolderStatsInfo;
+}
+
+function TableFolderViewer({ reqUser, game, playtype, table }: Props & { table: TableDocument }) {
+	const { data, isLoading, error } = useApiQuery<UGPTTableReturns>(
+		`/users/${reqUser.id}/games/${game}/${playtype}/tables/${table.tableID}`
+	);
+
+	const [dataMap, setDataMap] = useState<Map<string, UGPTFolderStats>>(new Map());
+	const [hasLoadedFolderMap, setHasLoadedFolderMap] = useState(false);
+
+	useEffect(() => {
+		if (data) {
+			const statMap = new Map();
+			for (const stat of data.stats) {
+				statMap.set(stat.folderID, stat);
+			}
+
+			const newMap = new Map();
+			for (const folder of data.folders) {
+				const stats = statMap.get(folder.folderID)!;
+				newMap.set(folder.folderID, { folder, stats });
+			}
+			setDataMap(newMap);
+			setHasLoadedFolderMap(true);
+		}
+	}, [data]);
+
+	if (isLoading || !data || !hasLoadedFolderMap) {
+		return <Loading />;
+	}
+
+	if (error) {
+		return <ApiError error={error} />;
+	}
+
+	return (
+		<>
+			<TableBarChart table={table} dataMap={dataMap} />
+			<Divider className="my-4" />
+			<TableFolderTable
+				reqUser={reqUser}
+				game={game}
+				playtype={playtype}
+				table={table}
+				dataMap={dataMap}
+			/>
+		</>
+	);
+}
+
+function TableFolderTable({
+	table,
+	dataMap,
+	reqUser,
+	game,
+	playtype,
+}: {
+	table: TableDocument;
+	dataMap: Map<string, UGPTFolderStats>;
+} & Props) {
+	const dataset = useMemo(() => {
+		const arr = [];
+		for (const folder of table.folders) {
+			const data = dataMap.get(folder);
+
+			if (!data) {
+				continue;
+			}
+
+			arr.push(data);
+		}
+
+		return arr;
+	}, [dataMap, table]);
+
+	return (
+		<TachiTable
+			dataset={dataset}
+			headers={[
+				["Folder", "Folder", StrSOV(x => x.folder.title)],
+				["Chart Count", "Charts", NumericSOV(x => x.stats.chartCount)],
+				["Buttons", "Buttons"],
+			]}
+			entryName="Folders"
+			searchFunctions={{
+				name: x => x.folder.title,
+				title: x => x.folder.title,
+				charts: x => x.stats.chartCount,
+			}}
+			rowFunction={data => (
+				<tr>
+					<td>{data.folder.title}</td>
+					<td>{data.stats.chartCount}</td>
+					<td>
+						<LinkButton
+							to={`/dashboard/users/${reqUser.username}/games/${game}/${playtype}/folders/${data.folder.folderID}`}
+							className="btn-info"
+						>
+							View Breakdown
+						</LinkButton>
+					</td>
+				</tr>
+			)}
+		/>
+	);
+}
+
+function TableBarChart({
+	table,
+	dataMap,
+}: {
+	table: TableDocument;
+	dataMap: Map<string, UGPTFolderStats>;
+}) {
+	const gptConfig = GetGamePTConfig(table.game, table.playtype);
+
+	const [mode, setMode] = useState<"grades" | "lamps">(
+		gptConfig.scoreBucket === "grade" ? "grades" : "lamps"
+	);
+
+	const colours = useMemo(() => {
+		if (mode === "grades") {
+			return gptConfig.gradeColours;
+		}
+
+		return gptConfig.lampColours;
+	}, [mode]);
+
+	const dataset = useMemo(() => {
+		const arr = [];
+
+		for (const folderID of table.folders) {
+			const data = dataMap.get(folderID)!;
+
+			if (!data) {
+				continue;
+			}
+
+			const realData = {
+				__chartCount: data.stats.chartCount,
+			};
+
+			// this is a series of stupid hacks and i dont really care.
+			for (const key in data.stats[mode]) {
+				// @ts-expect-error stupid key stuff
+				realData[key] = (100 * data.stats[mode][key]) / data.stats.chartCount;
+				// @ts-expect-error stupid key stuff
+				realData[`${key}-count`] = data.stats[mode][key];
+			}
+
+			arr.push({
+				folder: data.folder.title,
+				...realData,
+			});
+		}
+
+		return arr.reverse();
+	}, [dataMap, mode]);
+
+	console.log(dataset);
+
+	return (
+		<Card header="Overview">
+			<div className="row">
+				<div className="col-12 d-flex justify-content-center">
+					<div className="btn-group">
+						<SelectButton value={mode} setValue={setMode} id="grades">
+							<Icon type="sort-alpha-up" />
+							Grades
+						</SelectButton>
+						<SelectButton value={mode} setValue={setMode} id="lamps">
+							<Icon type="lightbulb" />
+							Lamps
+						</SelectButton>
+					</div>
+				</div>
+				<div className="col-12">
+					<Divider className="my-4" />
+				</div>
+
+				<div className="col-12">
+					<div
+						style={{
+							height: dataset.length * 40,
+						}}
+					>
+						{/* This hack is necessary because otherwise
+						nivo gets caught in a render loop
+						and dies */}
+						{mode === "grades" ? (
+							<OverviewBarChart
+								key="grade"
+								gptConfig={gptConfig}
+								mode={mode}
+								dataset={dataset}
+								colours={colours}
+							/>
+						) : (
+							<OverviewBarChart
+								key="lamp"
+								gptConfig={gptConfig}
+								mode={mode}
+								dataset={dataset}
+								colours={colours}
+							/>
+						)}
+					</div>
+				</div>
+			</div>
+		</Card>
+	);
+}
+
+function OverviewBarChart({
+	gptConfig,
+	mode,
+	dataset,
+	colours,
+}: {
+	gptConfig: GamePTConfig;
+	mode: "grades" | "lamps";
+	dataset: any;
+	colours: any;
+}) {
+	const longestTitle = useMemo(
+		() =>
+			dataset.map((e: any) => e.folder).sort(NumericSOV<string>(x => x.length, true))[0] ?? 0,
+		[dataset]
+	);
+
+	console.log(longestTitle);
+
+	return (
+		<ResponsiveBar
+			indexBy="folder"
+			tooltip={d => (
+				<BarChartTooltip
+					point={d}
+					renderFn={d => (
+						<div className="w-100 text-center">
+							{d.label}
+							<br />
+							{d.formattedValue}
+							<br />
+							<Muted>
+								({(d.data as any)[`${d.id}-count`] ?? 0} /{" "}
+								{/* @ts-expect-error cba */}
+								{d.data.__chartCount})
+							</Muted>
+						</div>
+					)}
+				/>
+			)}
+			keys={Reverse(gptConfig[mode])}
+			colors={k => ChangeOpacity(colours[k.id], 0.5)}
+			borderColor={k => colours[k.data.id]}
+			borderWidth={1}
+			data={dataset}
+			minValue={0}
+			maxValue={100}
+			valueFormat={v => `${v.toFixed(2)}%`}
+			margin={{ left: 10 + longestTitle.length * 10, bottom: 50, top: 20, right: 20 }}
+			layout="horizontal"
+			axisBottom={{
+				tickSize: 5,
+				tickPadding: 5,
+				tickRotation: 0,
+				legendPosition: "middle",
+				legendOffset: 32,
+				format: v => `${v}%`,
+			}}
+			enableGridX
+			enableGridY={false}
+			{...DEFAULT_BAR_PROPS}
+			labelSkipWidth={40}
+			labelSkipHeight={undefined}
+		/>
+	);
+}
diff --git a/client/src/app/pages/dashboard/users/games/_game/_playtype/folders/FoldersMainPage.tsx b/client/src/app/pages/dashboard/users/games/_game/_playtype/folders/FoldersMainPage.tsx
new file mode 100644
index 000000000..317eb2b12
--- /dev/null
+++ b/client/src/app/pages/dashboard/users/games/_game/_playtype/folders/FoldersMainPage.tsx
@@ -0,0 +1,54 @@
+import useSetSubheader from "components/layout/header/useSetSubheader";
+import Icon from "components/util/Icon";
+import SelectLinkButton from "components/util/SelectLinkButton";
+import useUGPTBase from "components/util/useUGPTBase";
+import React from "react";
+import { Route, Switch } from "react-router-dom";
+import { FormatGame, GetGameConfig, PublicUserDocument } from "tachi-common";
+import { GamePT } from "types/react";
+import FolderSelectPage from "./FolderSelectPage";
+import FolderTablePage from "./FolderTablePage";
+
+type Props = { reqUser: PublicUserDocument } & GamePT;
+
+export default function FoldersMainPage({ reqUser, game, playtype }: Props) {
+	const gameConfig = GetGameConfig(game);
+
+	useSetSubheader(
+		["Users", reqUser.username, "Games", gameConfig.name, playtype, "Folders"],
+		[reqUser, game, playtype],
+		`${reqUser.username}'s ${FormatGame(game, playtype)} Folders`
+	);
+
+	const base = useUGPTBase({ reqUser, game, playtype });
+
+	return (
+		<div className="row">
+			<div className="col-12 text-center">
+				<div className="btn-group mb-4">
+					<SelectLinkButton to={`${base}/folders`}>
+						<Icon type="table" />
+						Table View
+					</SelectLinkButton>
+					<SelectLinkButton to={`${base}/folders/search`}>
+						<Icon type="search" />
+						Folder Select
+					</SelectLinkButton>
+				</div>
+			</div>
+			<div className="col-12">
+				<Switch>
+					<Route exact path="/dashboard/users/:userID/games/:game/:playtype/folders">
+						<FolderTablePage {...{ reqUser, game, playtype }} />
+					</Route>
+					<Route
+						exact
+						path="/dashboard/users/:userID/games/:game/:playtype/folders/search"
+					>
+						<FolderSelectPage {...{ reqUser, game, playtype }} />
+					</Route>
+				</Switch>
+			</div>
+		</div>
+	);
+}
diff --git a/client/src/app/routes/AppRoutes.tsx b/client/src/app/routes/AppRoutes.tsx
index a00171d63..6ccb77fc2 100644
--- a/client/src/app/routes/AppRoutes.tsx
+++ b/client/src/app/routes/AppRoutes.tsx
@@ -8,6 +8,8 @@ import RegisterPage from "app/pages/RegisterPage";
 import ForgotPasswordPage from "app/pages/ForgotPasswordPage";
 import ResetPasswordPage from "app/pages/ResetPasswordPage";
 import CenterPage from "components/util/CenterPage";
+import { ClientConfig } from "lib/config";
+import MainPageTitleContainer from "components/util/MainPageTitleContainer";
 
 /**
  * Core Routes for Tachi-Client.
@@ -20,10 +22,12 @@ export function Routes() {
 
 	return (
 		<Switch>
-			<Redirect exact from="/" to="/dashboard" />
+			<Route exact path="/">
+				{!user && ClientConfig.MANDATE_LOGIN ? <LoginPage /> : <Redirect to="/dashboard" />}
+			</Route>
 
 			<Route path="/dashboard">
-				<DashboardRoutes />
+				{!user && ClientConfig.MANDATE_LOGIN ? <LoginPage /> : <DashboardRoutes />}
 			</Route>
 
 			<Route exact path="/login">
@@ -43,7 +47,10 @@ export function Routes() {
 					<Redirect to="/dashboard" />
 				) : (
 					<CenterPage>
-						<b>You can't.</b> I specifically said not to do this!
+						<MainPageTitleContainer
+							title="You can't."
+							desc="If you signed up with a fake email, you're now locked out of this account. Nice one."
+						/>
 						<span
 							onClick={() => history.goBack()}
 							tabIndex={4}
diff --git a/client/src/app/routes/UserRoutes.tsx b/client/src/app/routes/UserRoutes.tsx
index 07d03b300..7547176b9 100644
--- a/client/src/app/routes/UserRoutes.tsx
+++ b/client/src/app/routes/UserRoutes.tsx
@@ -1,4 +1,6 @@
 import PlaytypeSelect from "app/pages/dashboard/games/_game/PlaytypeSelect";
+import AchievablesPage from "app/pages/dashboard/users/games/_game/_playtype/AchievablesPage";
+import FoldersMainPage from "app/pages/dashboard/users/games/_game/_playtype/folders/FoldersMainPage";
 import LeaderboardsPage from "app/pages/dashboard/users/games/_game/_playtype/LeaderboardsPage";
 import OverviewPage from "app/pages/dashboard/users/games/_game/_playtype/OverviewPage";
 import SessionsPage from "app/pages/dashboard/users/games/_game/_playtype/SessionsPage";
@@ -19,12 +21,12 @@ import React, { useContext, useEffect } from "react";
 import { useQuery } from "react-query";
 import { Redirect, Route, Switch, useParams } from "react-router-dom";
 import {
+	FormatGame,
 	Game,
 	GetGameConfig,
 	PublicUserDocument,
-	UserGameStats,
 	UGPTSettings,
-	FormatGame,
+	UserGameStats,
 } from "tachi-common";
 import { UGPTStatsReturn } from "types/api-returns";
 import { APIFetchV1, APIFetchV1Return, ToAPIURL } from "util/api";
@@ -167,8 +169,6 @@ function UserGamePlaytypeRoutes({ reqUser, game }: { reqUser: PublicUserDocument
 					throw settingsRes;
 				}
 
-				console.log(settingsRes.body);
-
 				setSettings(settingsRes.body);
 			}
 		})();
@@ -226,17 +226,17 @@ function UserGamePlaytypeRoutes({ reqUser, game }: { reqUser: PublicUserDocument
 				<Route exact path="/dashboard/users/:userID/games/:game/:playtype">
 					<OverviewPage reqUser={reqUser} game={game} playtype={playtype} />
 				</Route>
-				<Route exact path="/dashboard/users/:userID/games/:game/:playtype/scores">
+				<Route path="/dashboard/users/:userID/games/:game/:playtype/scores">
 					<ScoresPage reqUser={reqUser} game={game} playtype={playtype} />
 				</Route>
-				<Route exact path="/dashboard/users/:userID/games/:game/:playtype/folders">
-					<div>foo</div>
+				<Route path="/dashboard/users/:userID/games/:game/:playtype/folders">
+					<FoldersMainPage reqUser={reqUser} game={game} playtype={playtype} />
 				</Route>
 				<Route exact path="/dashboard/users/:userID/games/:game/:playtype/sessions">
 					<SessionsPage reqUser={reqUser} game={game} playtype={playtype} />
 				</Route>
 				<Route exact path="/dashboard/users/:userID/games/:game/:playtype/achievables">
-					<div>goalsandmilestones</div>
+					<AchievablesPage reqUser={reqUser} game={game} playtype={playtype} />
 				</Route>
 				<Route exact path="/dashboard/users/:userID/games/:game/:playtype/leaderboard">
 					<LeaderboardsPage reqUser={reqUser} game={game} playtype={playtype} />
diff --git a/client/src/components/charts/ChartTooltip.tsx b/client/src/components/charts/ChartTooltip.tsx
index 826567482..3b6820680 100644
--- a/client/src/components/charts/ChartTooltip.tsx
+++ b/client/src/components/charts/ChartTooltip.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { PointTooltipProps } from "@nivo/line";
+import { BarTooltipProps } from "@nivo/bar";
 
 const defaultRenderFn = (point: PointTooltipProps["point"]) => (
 	<div>
@@ -28,3 +29,32 @@ export default function ChartTooltip({
 		</div>
 	);
 }
+
+const defaultBarRenderFn = (data: BarTooltipProps<unknown>) => (
+	<div>
+		{data.label} {data.value}
+	</div>
+);
+
+export function BarChartTooltip({
+	renderFn = defaultBarRenderFn,
+	point,
+}: {
+	point: BarTooltipProps<unknown>;
+	renderFn?: (p: BarTooltipProps<unknown>) => JSX.Element;
+}) {
+	return (
+		<div
+			className="chart-tooltip d-flex align-items-center justify-content-center"
+			style={{
+				padding: "1rem",
+				backgroundColor: "#131313",
+				borderRadius: "1px 1px 1px 1px",
+				boxShadow: "0px 0px 5px 0px black",
+				width: 200,
+			}}
+		>
+			{renderFn(point)}
+		</div>
+	);
+}
diff --git a/client/src/components/layout/footer/Footer.tsx b/client/src/components/layout/footer/Footer.tsx
index 32c2df277..fce155621 100644
--- a/client/src/components/layout/footer/Footer.tsx
+++ b/client/src/components/layout/footer/Footer.tsx
@@ -33,7 +33,7 @@ export function Footer() {
 							Discord
 						</a>
 						<a
-							href="https://github.com/zkldi/tachi-server"
+							href="https://github.com/TeamNewGuys/tachi-server"
 							target="_blank"
 							rel="noopener noreferrer"
 							className="nav-link px-3"
diff --git a/client/src/components/layout/header/Header.tsx b/client/src/components/layout/header/Header.tsx
index b1fe0a25d..04037ddfc 100644
--- a/client/src/components/layout/header/Header.tsx
+++ b/client/src/components/layout/header/Header.tsx
@@ -6,26 +6,24 @@ import { HeaderMenu } from "./HeaderMenu";
 
 export function Header() {
 	return (
-		<>
-			<div className="header header-fixed" id="kt_header">
-				<div className="container d-flex align-items-stretch justify-content-between">
-					<div className="d-flex align-items-stretch mr-3">
-						<div className="header-logo">
-							<Link to="/">
-								<img
-									className="logo-default max-h-40px"
-									alt="Logo"
-									src={toAbsoluteUrl("/media/logos/logo-mark.png")}
-								/>
-							</Link>
-						</div>
-
-						<HeaderMenu />
+		<div className="header header-fixed" id="kt_header">
+			<div className="container d-flex align-items-stretch justify-content-between">
+				<div className="d-flex align-items-stretch mr-3">
+					<div className="header-logo">
+						<Link to="/">
+							<img
+								className="logo-default max-h-40px"
+								alt="Logo"
+								src={toAbsoluteUrl("/media/logos/logo-mark.png")}
+							/>
+						</Link>
 					</div>
 
-					<Topbar />
+					<HeaderMenu />
 				</div>
+
+				<Topbar />
 			</div>
-		</>
+		</div>
 	);
 }
diff --git a/client/src/components/layout/header/SearchBar.tsx b/client/src/components/layout/header/SearchBar.tsx
index 57e0d3b79..6a91776e6 100644
--- a/client/src/components/layout/header/SearchBar.tsx
+++ b/client/src/components/layout/header/SearchBar.tsx
@@ -1,12 +1,22 @@
-import React, { useEffect, useRef, useState } from "react";
-import { SongDocument, Game, GetGameConfig, integer, PublicUserDocument } from "tachi-common";
+import React, { useEffect, useMemo, useRef, useState } from "react";
+import {
+	SongDocument,
+	Game,
+	GetGameConfig,
+	integer,
+	PublicUserDocument,
+	FormatGame,
+} from "tachi-common";
 import { APIFetchV1 } from "util/api";
-import { toAbsoluteUrl } from "_metronic/_helpers";
-import { JustChildren } from "types/react";
-import { Link } from "react-router-dom";
+import { GamePT, JustChildren } from "types/react";
+import { Link, useLocation } from "react-router-dom";
 import Divider from "components/util/Divider";
-import { NO_OP, PREVENT_DEFAULT } from "util/misc";
+import { PREVENT_DEFAULT } from "util/misc";
 import Loading from "components/util/Loading";
+import { Playtype } from "types/tachi";
+import { TachiConfig } from "lib/config";
+import Icon from "components/util/Icon";
+import QuickTooltip from "../misc/QuickTooltip";
 
 interface SearchReturns {
 	users: PublicUserDocument[];
@@ -29,6 +39,44 @@ function SearchResult({
 	);
 }
 
+function GPTSearchResult({
+	user,
+	game,
+	playtype,
+	tabIndex,
+}: {
+	user: PublicUserDocument;
+	tabIndex: integer;
+} & GamePT) {
+	const currentLoc = window.location.href.split(`games/${game}/${playtype}`)[1];
+
+	return (
+		<div className="d-flex flex-column ml-3 mt-2 mb-2">
+			<strong>
+				<Link to={`/dashboard/users/${user.username}`}>{user.username}</Link>
+				<Link
+					className="float-right gentle-link mr-4"
+					tabIndex={tabIndex}
+					to={`/dashboard/users/${user.username}/games/${game}/${playtype}${currentLoc}`}
+					style={{
+						fontWeight: "lighter",
+					}}
+				>
+					<QuickTooltip
+						text={`Go to ${user.username}'s ${FormatGame(
+							game,
+							playtype
+						)} profile, if they have one.`}
+					>
+						<Icon type="exchange-alt" />
+					</QuickTooltip>
+				</Link>
+			</strong>
+			<span className="font-size-sm font-weight-bold text-muted">{user.status}</span>
+		</div>
+	);
+}
+
 function SearchResults({ results }: { results: SearchReturns }) {
 	if (!results.users.length && !results.songs.length) {
 		return (
@@ -38,6 +86,22 @@ function SearchResults({ results }: { results: SearchReturns }) {
 		);
 	}
 
+	// useParams doesn't do what i think it does, so...
+	// here's a hack.
+	const params = useLocation<{ game?: Game; playtype?: Playtype }>();
+
+	const { game, playtype } = useMemo(() => {
+		const regexp = `/games/(${TachiConfig.supportedGames.join("|")})/[^/]*/?`;
+
+		if (params.pathname.match(new RegExp(regexp, "u"))) {
+			const hack = params.pathname.split("/games/")[1].split("/");
+
+			return { game: hack[0] as Game, playtype: hack[1] as Playtype };
+		}
+
+		return { game: null, playtype: null };
+	}, [params.pathname]);
+
 	return (
 		<div className="quick-search-result">
 			{results?.users.length ? (
@@ -46,18 +110,28 @@ function SearchResults({ results }: { results: SearchReturns }) {
 						Users
 					</div>
 					<div>
-						{results.users.map(u => (
-							<SearchResult
-								key={u.id}
-								link={`/dashboard/users/${u.username}`}
-								tabIndex={0}
-							>
-								<strong>{u.username}</strong>
-								<span className="font-size-sm font-weight-bold text-muted">
-									{u.status}
-								</span>
-							</SearchResult>
-						))}
+						{results.users.map(u =>
+							game && playtype ? (
+								<GPTSearchResult
+									key={u.id}
+									game={game}
+									playtype={playtype}
+									tabIndex={0}
+									user={u}
+								/>
+							) : (
+								<SearchResult
+									key={u.id}
+									link={`/dashboard/users/${u.username}`}
+									tabIndex={0}
+								>
+									<strong>{u.username}</strong>
+									<span className="font-size-sm font-weight-bold text-muted">
+										{u.status}
+									</span>
+								</SearchResult>
+							)
+						)}
 					</div>
 					<Divider className="mt-2 mb-4" />
 				</>
diff --git a/client/src/components/layout/page/Card.tsx b/client/src/components/layout/page/Card.tsx
index 045340c60..7d288b726 100644
--- a/client/src/components/layout/page/Card.tsx
+++ b/client/src/components/layout/page/Card.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { CSSProperties } from "react";
 import { JustChildren } from "types/react";
 
 export default function Card({
@@ -6,13 +6,15 @@ export default function Card({
 	children,
 	footer,
 	className,
+	style,
 }: {
 	header: JSX.Element | string;
 	footer?: JSX.Element | string;
 	className?: string;
+	style?: CSSProperties;
 } & JustChildren) {
 	return (
-		<div className={`card card-custom ${className}`}>
+		<div className={`card card-custom ${className ? className : ""}`} style={style}>
 			<div className="card-header">
 				{typeof header === "string" ? (
 					<h3 className="text-center mb-0">{header}</h3>
diff --git a/client/src/components/nav/Navbar.tsx b/client/src/components/nav/Navbar.tsx
index a26fd8e43..bb0e9ca46 100644
--- a/client/src/components/nav/Navbar.tsx
+++ b/client/src/components/nav/Navbar.tsx
@@ -17,13 +17,16 @@ export default function Navbar({ children }: { children: JSX.Element[] }) {
 	const value = useMemo(() => {
 		const loc = location.pathname.split(/([#?]|\/$)/u)[0];
 
-		const x = links.indexOf(loc);
-
-		if (x === -1) {
-			return 0;
+		let lidx = 0;
+		for (let i = 0; i < links.length; i++) {
+			const link = links[i];
+			if (loc.startsWith(link)) {
+				lidx = i;
+				// break; THIS IS DELIBERATE TO AVOID / matching everything
+			}
 		}
 
-		return x;
+		return lidx;
 	}, [location]);
 
 	return (
diff --git a/client/src/components/tables/components/MiniTable.tsx b/client/src/components/tables/components/MiniTable.tsx
index 34a73c515..ee2080045 100644
--- a/client/src/components/tables/components/MiniTable.tsx
+++ b/client/src/components/tables/components/MiniTable.tsx
@@ -8,20 +8,25 @@ export default function MiniTable({
 	children,
 	headers,
 	colSpan = 1,
-}: { className?: string; headers: string[]; colSpan?: integer | integer[] } & JustChildren) {
+}: { className?: string; headers?: string[]; colSpan?: integer | integer[] } & JustChildren) {
 	return (
 		<table
 			className={`table table-hover table-striped table-vertical-center text-center ${className}`}
 		>
-			<thead>
-				<tr>
-					{headers.map((e, i) => (
-						<th colSpan={Array.isArray(colSpan) ? colSpan[i] : colSpan} key={nanoid()}>
-							{e}
-						</th>
-					))}
-				</tr>
-			</thead>
+			{headers && (
+				<thead>
+					<tr>
+						{headers.map((e, i) => (
+							<th
+								colSpan={Array.isArray(colSpan) ? colSpan[i] : colSpan}
+								key={nanoid()}
+							>
+								{e}
+							</th>
+						))}
+					</tr>
+				</thead>
+			)}
 			<tbody>{children}</tbody>
 		</table>
 	);
diff --git a/client/src/components/tables/dropdowns/GenericSessionDropdown.tsx b/client/src/components/tables/dropdowns/GenericSessionDropdown.tsx
index e7e3b2e27..b371d3717 100644
--- a/client/src/components/tables/dropdowns/GenericSessionDropdown.tsx
+++ b/client/src/components/tables/dropdowns/GenericSessionDropdown.tsx
@@ -34,6 +34,7 @@ import ScoreCell from "../cells/ScoreCell";
 import deepmerge from "deepmerge";
 import HasDevModeOn from "components/util/HasDevModeOn";
 import LampCell from "../cells/LampCell";
+import BMSDifficultyCell from "../cells/BMSDifficultyCell";
 
 export default function GenericSessionDropdown({ data }: { data: SessionDataset[0] }) {
 	const { isLoading, error, data: sessionData } = useQuery(
@@ -49,7 +50,7 @@ export default function GenericSessionDropdown({ data }: { data: SessionDataset[
 		}
 	);
 
-	const [view, setView] = useState<"raises" | "highlights" | "graphs" | "debug">("graphs");
+	const [view, setView] = useState<"raises" | "debug">("raises");
 
 	if (error) {
 		return <>{(error as Error).message}</>;
@@ -71,18 +72,10 @@ export default function GenericSessionDropdown({ data }: { data: SessionDataset[
 		<DropdownStructure
 			buttons={
 				<>
-					<SelectButton setValue={setView} value={view} id="graphs">
-						<Icon type="chart-area" />
-						Graphs
-					</SelectButton>
 					<SelectButton setValue={setView} value={view} id="raises">
 						<Icon type="receipt" />
 						Raises
 					</SelectButton>
-					<SelectButton setValue={setView} value={view} id="highlights">
-						<Icon type="star" />
-						Highlights
-					</SelectButton>
 					<HasDevModeOn>
 						<SelectButton setValue={setView} value={view} id="debug">
 							<Icon type="bug" />
@@ -101,15 +94,20 @@ function SessionRaiseBreakdown({ sessionData }: { sessionData: SpecificSessionRe
 	const game = sessionData.session.game;
 	const playtype = sessionData.session.playtype;
 
-	const gptConfig = GetGamePTConfig(game, playtype);
+	// todo infer default table
+	// const gptConfig = GetGamePTConfig(game, playtype);
 
 	const [chartIDs, setChartIDs] = useState<string[] | null>([]);
-	const [tableID, setTableID] = useState<string>("levels");
+	const [tableID, setTableID] = useState<string | null>(null);
 	const [tableFolders, setTableFolders] = useState<FolderDocument[]>([]);
 	const [folder, setFolder] = useState<FolderDocument | null>(null);
 	const [filter, setFilter] = useState<"folder" | "all" | "highlighted">("all");
 
 	useEffect(() => {
+		if (!tableID) {
+			return;
+		}
+
 		APIFetchV1(`/games/${game}/${playtype}/tables/${tableID}`).then(r => {
 			if (!r.success) {
 				throw new Error(r.description);
@@ -148,6 +146,12 @@ function SessionRaiseBreakdown({ sessionData }: { sessionData: SpecificSessionRe
 		return res.body;
 	});
 
+	useEffect(() => {
+		if (tableID === null && (data?.length ?? 0) > 0) {
+			setTableID(data![0].tableID);
+		}
+	}, [data]);
+
 	if (error) {
 		return <>{(error as Error).message}</>;
 	}
@@ -184,7 +188,6 @@ function SessionRaiseBreakdown({ sessionData }: { sessionData: SpecificSessionRe
 							<div className="col-6">
 								<select
 									className="form-control"
-									value={tableID}
 									onChange={e => setTableID(e.target.value)}
 								>
 									{data.map(e => (
@@ -428,7 +431,13 @@ function ElementStatTable({
 				return (
 					<>
 						<TitleCell chart={chart} game={game} song={song} />
-						<DifficultyCell chart={chart} game={game} />
+						{game !== "bms" ? (
+							<DifficultyCell chart={chart} game={game} />
+						) : (
+							<BMSDifficultyCell
+								chart={chart as ChartDocument<"bms:7K" | "bms:14K">}
+							/>
+						)}
 						{preScoreCell}
 						<td>⟶</td>
 						{type === "grade" ? (
diff --git a/client/src/components/tables/sessions/GenericSessionTable.tsx b/client/src/components/tables/sessions/GenericSessionTable.tsx
index dd2e05f25..a36d0b2a0 100644
--- a/client/src/components/tables/sessions/GenericSessionTable.tsx
+++ b/client/src/components/tables/sessions/GenericSessionTable.tsx
@@ -11,6 +11,7 @@ import {
 } from "tachi-common";
 import { Playtype } from "types/tachi";
 import { GetPBs } from "util/data";
+import { UppercaseFirst } from "util/misc";
 import { NumericSOV, StrSOV } from "util/sorts";
 import { FormatDuration, FormatTime, MillisToSince } from "util/time";
 import IndexCell from "../cells/IndexCell";
@@ -41,7 +42,7 @@ export default function GenericSessionTable({
 	const headers: Header<SessionDataset[0]>[] = [
 		["Name", "Name", StrSOV(x => x.name)],
 		["Scores", "Scores", NumericSOV(x => x.scoreInfo.length)],
-		[alg, alg, NumericSOV(x => x.calculatedData[alg] ?? 0)],
+		[UppercaseFirst(alg), UppercaseFirst(alg), NumericSOV(x => x.calculatedData[alg] ?? 0)],
 		["Duration", "Dur.", NumericSOV(x => x.timeEnded - x.timeStarted)],
 		["Timestamp", "Timestamp", NumericSOV(x => x.timeStarted)],
 	];
@@ -81,6 +82,7 @@ export default function GenericSessionTable({
 				pbRate: x => GetPBs(x.scoreInfo).length / x.scoreInfo.length,
 				duration: x => (x.timeEnded - x.timeStarted) / (1000 * 60),
 				timestamp: x => x.timeStarted,
+				[alg]: x => x.calculatedData[alg] ?? 0,
 			}}
 			rowFunction={s => <Row data={s} key={s.sessionID} rating={alg} indexCol={indexCol} />}
 		/>
diff --git a/client/src/components/user/UGPTHeader.tsx b/client/src/components/user/UGPTHeader.tsx
index 3a262d5bd..44b9467cd 100644
--- a/client/src/components/user/UGPTHeader.tsx
+++ b/client/src/components/user/UGPTHeader.tsx
@@ -1,27 +1,16 @@
 import MiniTable from "components/tables/components/MiniTable";
 import Divider from "components/util/Divider";
 import React from "react";
-import {
-	Game,
-	ScoreCalculatedDataLookup,
-	GetGamePTConfig,
-	IDStrings,
-	PublicUserDocument,
-	FormatGame,
-} from "tachi-common";
+import { Game, GetGamePTConfig, PublicUserDocument } from "tachi-common";
 import { UGPTStatsReturn } from "types/api-returns";
 import { Playtype } from "types/tachi";
 import { MillisToSince } from "util/time";
 import ProfilePicture from "./ProfilePicture";
 import Navbar from "components/nav/Navbar";
 import NavItem from "components/nav/NavItem";
-import ClassBadge from "components/game/ClassBadge";
-import { FormatGPTRating, UppercaseFirst } from "util/misc";
 import ProfileBadges from "./ProfileBadges";
-import { GameClassSets } from "tachi-common/js/game-classes";
 import UGPTRatingsTable from "./UGPTStatsOverview";
 import RankingData from "./UGPTRankingData";
-import { useProfileRatingAlg } from "components/util/useScoreRatingAlg";
 
 export function UGPTHeaderBody({
 	reqUser,
@@ -53,7 +42,7 @@ export function UGPTHeaderBody({
 			<div className="col-12 col-md-6 col-lg-3">
 				<MiniTable className="table-sm text-center" headers={["Player Info"]} colSpan={2}>
 					<tr>
-						<td>Playcount</td>
+						<td>Scores</td>
 						<td>{stats.totalScores}</td>
 					</tr>
 					<tr>
@@ -114,7 +103,11 @@ export function UGPTBottomNav({
 	];
 
 	if (isRequestedUser) {
-		navItems.push(<NavItem to={`${baseUrl}/settings`}>Settings</NavItem>);
+		navItems.push(
+			<NavItem key="settings" to={`${baseUrl}/settings`}>
+				Settings
+			</NavItem>
+		);
 	}
 
 	return (
diff --git a/client/src/components/user/UGPTRankingData.tsx b/client/src/components/user/UGPTRankingData.tsx
index ef6645284..58374db0a 100644
--- a/client/src/components/user/UGPTRankingData.tsx
+++ b/client/src/components/user/UGPTRankingData.tsx
@@ -19,7 +19,7 @@ export default function RankingData({
 
 		if (key !== alg) {
 			extendData.push(
-				<div className="col-12">
+				<div key={key} className="col-12">
 					<small className="text-muted">
 						{key}: #{rankingData[key].ranking}/{rankingData[key].outOf}
 					</small>
diff --git a/client/src/components/user/UGPTStatShowcase.tsx b/client/src/components/user/UGPTStatShowcase.tsx
index 37ff3d1c4..f67a151f7 100644
--- a/client/src/components/user/UGPTStatShowcase.tsx
+++ b/client/src/components/user/UGPTStatShowcase.tsx
@@ -293,7 +293,7 @@ function StatDelta({
 	return (
 		<div className={`mt-2 text-${colour}`}>
 			<span>
-				You: {formattedV2} ({v2 > v1 ? `+${d}` : d})
+				You: {formattedV2} ({v2 > v1 ? `+${d}` : v2 === v1 ? `±${d}` : d})
 			</span>
 		</div>
 	);
diff --git a/client/src/components/util/ApiError.tsx b/client/src/components/util/ApiError.tsx
new file mode 100644
index 000000000..83b5b58d5
--- /dev/null
+++ b/client/src/components/util/ApiError.tsx
@@ -0,0 +1,6 @@
+import React from "react";
+import { UnsuccessfulAPIFetchResponse } from "util/api";
+
+export default function ApiError({ error }: { error: UnsuccessfulAPIFetchResponse }) {
+	return <div>An error has occured: {error.description}</div>;
+}
diff --git a/client/src/components/util/DropdownToggleOverride.tsx b/client/src/components/util/DropdownToggleOverride.tsx
index 87881f71e..4449789ef 100644
--- a/client/src/components/util/DropdownToggleOverride.tsx
+++ b/client/src/components/util/DropdownToggleOverride.tsx
@@ -1,6 +1,5 @@
 /* eslint-disable react/prop-types */
 import React, { forwardRef } from "react";
-import { SetState } from "types/react";
 
 // todo: understand this file - it was leveraged from metronic and uses something weird.
 // it exists because we need to override reactbootstraps default of adding btn btn-primary to dropdowns
@@ -16,10 +15,12 @@ const DropdownTopbarItemToggler = forwardRef((props, ref) => (
 			props.onClick(e);
 		}}
 	>
+		{/* @ts-expect-error see todo */}
 		{props.children}
 	</div>
 ));
 
+/* @ts-expect-error see todo */
 DropdownTopbarItemToggler.displayName = "DropdownTopbarItemToggler";
 
 export default DropdownTopbarItemToggler;
diff --git a/client/src/components/util/MainPageTitleContainer.tsx b/client/src/components/util/MainPageTitleContainer.tsx
new file mode 100644
index 000000000..e099c9b36
--- /dev/null
+++ b/client/src/components/util/MainPageTitleContainer.tsx
@@ -0,0 +1,14 @@
+import React from "react";
+import SiteWordmark from "./SiteWordmark";
+
+export default function MainPageTitleContainer({ title, desc }: { title: string; desc: string }) {
+	return (
+		<>
+			<SiteWordmark />
+			<div className="text-center mb-10 mb-lg-20">
+				<h3 className="font-size-h1">{title}</h3>
+				<span className="font-weight-bold text-dark-50">{desc}</span>
+			</div>
+		</>
+	);
+}
diff --git a/client/src/components/util/ProgressBar.tsx b/client/src/components/util/ProgressBar.tsx
new file mode 100644
index 000000000..a432ed382
--- /dev/null
+++ b/client/src/components/util/ProgressBar.tsx
@@ -0,0 +1,32 @@
+import React, { CSSProperties } from "react";
+import { integer } from "tachi-common";
+
+export default function CustomProgressBar({
+	animated,
+	striped,
+	style,
+	max = 100,
+	now = 0,
+}: {
+	animated?: boolean;
+	striped?: boolean;
+	style?: CSSProperties;
+	max?: integer;
+	now?: integer;
+}) {
+	return (
+		<div className="progress">
+			<div
+				className={`progress-bar${animated ? " progress-bar-animated" : ""}${
+					striped ? " progress-bar-striped" : ""
+				}`}
+				style={Object.assign(
+					{
+						width: `${(now / max) * 100}%`,
+					},
+					style
+				)}
+			/>
+		</div>
+	);
+}
diff --git a/client/src/components/util/SelectLinkButton.tsx b/client/src/components/util/SelectLinkButton.tsx
new file mode 100644
index 000000000..35f77b1c1
--- /dev/null
+++ b/client/src/components/util/SelectLinkButton.tsx
@@ -0,0 +1,26 @@
+import React from "react";
+import { Button } from "react-bootstrap";
+import { ButtonVariant } from "react-bootstrap/esm/types";
+import { JustChildren, SetState } from "types/react";
+import { DoesMatchRoute } from "util/routing";
+import LinkButton from "./LinkButton";
+
+export default function SelectLinkButton({
+	children,
+	onVariant = "primary",
+	offVariant = "outline-secondary",
+	to,
+}: {
+	onVariant?: ButtonVariant;
+	offVariant?: ButtonVariant;
+	to: string;
+} & JustChildren) {
+	return (
+		<LinkButton
+			to={to}
+			className={`btn-${DoesMatchRoute(window.location.href, to) ? onVariant : offVariant}`}
+		>
+			{children}
+		</LinkButton>
+	);
+}
diff --git a/client/src/components/util/SiteWordmark.tsx b/client/src/components/util/SiteWordmark.tsx
index fe161f124..0fab55aca 100644
--- a/client/src/components/util/SiteWordmark.tsx
+++ b/client/src/components/util/SiteWordmark.tsx
@@ -2,13 +2,13 @@ import { TachiConfig } from "lib/config";
 import React from "react";
 import { toAbsoluteUrl } from "_metronic/_helpers";
 
-export default function SiteWordmark() {
+export default function SiteWordmark({ width = "256px" }) {
 	return (
 		<div className="text-center mb-10 mb-lg-10">
 			<img
 				src={toAbsoluteUrl("/media/logos/logo-wordmark.png")}
 				alt={TachiConfig.name}
-				width="256px"
+				width={width}
 			/>
 		</div>
 	);
diff --git a/client/src/components/util/useUGPTBase.tsx b/client/src/components/util/useUGPTBase.tsx
new file mode 100644
index 000000000..52d4be7c5
--- /dev/null
+++ b/client/src/components/util/useUGPTBase.tsx
@@ -0,0 +1,15 @@
+import { useMemo } from "react";
+import { PublicUserDocument } from "tachi-common";
+import { GamePT } from "types/react";
+
+export default function useUGPTBase({
+	reqUser,
+	game,
+	playtype,
+}: { reqUser: PublicUserDocument } & GamePT) {
+	return useMemo(() => `/dashboard/users/${reqUser.username}/games/${game}/${playtype}`, [
+		reqUser,
+		game,
+		playtype,
+	]);
+}
diff --git a/client/src/index.tsx b/client/src/index.tsx
index a67dc7653..5a55ef780 100644
--- a/client/src/index.tsx
+++ b/client/src/index.tsx
@@ -14,8 +14,6 @@ import "./_metronic/_assets/plugins/flaticon2/flaticon.css";
 
 const { PUBLIC_URL } = process.env;
 
-console.log(process.env);
-
 // if (!PUBLIC_URL) {
 // 	throw new Error(
 // 		`No PUBLIC_URL was defined in environment. Have you forgot to set it in a .env file?`
diff --git a/client/src/lib/config.ts b/client/src/lib/config.ts
index e47a150d1..082760d03 100644
--- a/client/src/lib/config.ts
+++ b/client/src/lib/config.ts
@@ -30,3 +30,6 @@ if (mode === "ktchi") {
 
 export const TachiConfig = conf;
 export const ColourConfig = colourConf;
+export const ClientConfig = {
+	MANDATE_LOGIN: !!process.env.REACT_APP_MANDATE_LOGIN,
+};
diff --git a/client/src/types/api-returns.ts b/client/src/types/api-returns.ts
index 28f68a5d6..70c69884c 100644
--- a/client/src/types/api-returns.ts
+++ b/client/src/types/api-returns.ts
@@ -14,6 +14,9 @@ import {
 	SongDocument,
 	PBScoreDocument,
 	UGSRatingsLookup,
+	Grades,
+	Lamps,
+	TableDocument,
 } from "tachi-common";
 
 export interface UGPTStatsReturn<I extends IDStrings = IDStrings> {
@@ -93,3 +96,21 @@ export interface SongChartsSearch<I extends IDStrings = IDStrings> {
 	songs: SongDocument<IDStringToGame[I]>[];
 	charts: ChartDocument<I>[];
 }
+
+export interface FolderStatsInfo<I extends IDStrings = IDStrings> {
+	grades: Record<Grades[I], integer>;
+	lamps: Record<Lamps[I], integer>;
+	folderID: string;
+	chartCount: integer;
+}
+
+export interface UGPTFolderSearch {
+	folders: FolderDocument[];
+	stats: FolderStatsInfo[];
+}
+
+export interface UGPTTableReturns {
+	folders: FolderDocument[];
+	stats: FolderStatsInfo[];
+	table: TableDocument;
+}
diff --git a/client/src/util/charts.ts b/client/src/util/charts.ts
new file mode 100644
index 000000000..42ad5e645
--- /dev/null
+++ b/client/src/util/charts.ts
@@ -0,0 +1,8 @@
+import { TACHI_CHART_THEME } from "./constants/chart-theme";
+
+export const DEFAULT_BAR_PROPS = {
+	labelTextColor: "black",
+	labelSkipHeight: 12,
+	theme: TACHI_CHART_THEME,
+	motionConfig: "stiff",
+};
diff --git a/client/src/util/misc.ts b/client/src/util/misc.ts
index 1f46f5ee4..dc8fa12d3 100644
--- a/client/src/util/misc.ts
+++ b/client/src/util/misc.ts
@@ -1,5 +1,5 @@
 import { Playtype } from "types/tachi";
-import { GetGamePTConfig, Game, ScoreCalculatedDataLookup, IDStrings } from "tachi-common";
+import { GetGamePTConfig, Game, ScoreCalculatedDataLookup, IDStrings, integer } from "tachi-common";
 
 export function RFA<T>(arr: T[]): T {
 	return arr[Math.floor(Math.random() * arr.length)];
@@ -67,9 +67,51 @@ export function DelayedPageReload(delay = 300) {
 	setTimeout(() => window.location.reload(), delay);
 }
 
+export function ShortDelayify(fn: () => void, delay = 300) {
+	setTimeout(fn, delay);
+}
+
 export const FetchJSONBody = (json: unknown) => ({
 	headers: {
 		"Content-Type": "application/json",
 	},
 	body: JSON.stringify(json),
 });
+
+// https://github.com/sindresorhus/escape-string-regexp/blob/main/index.js
+// the developer of this has migrated everything to Force ES6 style modules,
+// which really really messes with a lot of the ecosystem.
+// shim.
+
+export function EscapeStringRegexp(string: string) {
+	if (typeof string !== "string") {
+		throw new TypeError("Expected a string");
+	}
+
+	// Escape characters with special meaning either inside or outside character sets.
+	// Use a simple backslash escape when it's always valid, and a `\xnn` escape when the simpler form would be disallowed by Unicode patterns' stricter grammar.
+	return string.replace(/[|\\{}()[\]^$+*?.]/gu, "\\$&").replace(/-/gu, "\\x2d");
+}
+
+export function Reverse<T>(arr: T[]): T[] {
+	return arr.slice(0).reverse();
+}
+
+export function PercentFrom(num: number, denom: number) {
+	return `${((100 * num) / denom).toFixed(2)}%`;
+}
+
+export function StepFromToMax(max: integer, step: integer = 50) {
+	const arr = [];
+
+	for (let i = 0; i < max; i += step) {
+		if (max - i < 5) {
+			// skip adding things like 500 -> 505(max) as it looks bad.
+			break;
+		}
+		arr.push(i);
+	}
+
+	arr.push(max);
+	return arr;
+}
diff --git a/client/src/util/routing.ts b/client/src/util/routing.ts
new file mode 100644
index 000000000..c75f10794
--- /dev/null
+++ b/client/src/util/routing.ts
@@ -0,0 +1,19 @@
+import { EscapeStringRegexp } from "./misc";
+
+export function DoesMatchRoute(str: string, route: string) {
+	const comps = EscapeStringRegexp(route).split("/");
+
+	let regexStr = "";
+	for (const comp of comps) {
+		if (comp.startsWith(":")) {
+			regexStr += "[^/]*/";
+		} else {
+			regexStr += `${comp}/`;
+		}
+	}
+
+	regexStr += "?$";
+
+	const regex = new RegExp(regexStr, "u");
+	return !!str.match(regex);
+}
diff --git a/client/src/util/site.ts b/client/src/util/site.ts
new file mode 100644
index 000000000..7607ec434
--- /dev/null
+++ b/client/src/util/site.ts
@@ -0,0 +1,14 @@
+import { TachiConfig } from "lib/config";
+import { GetGameConfig } from "tachi-common";
+
+export function GetSortedGPTs() {
+	const arr = [];
+	for (const game of TachiConfig.supportedGames) {
+		const gameConfig = GetGameConfig(game);
+		for (const playtype of gameConfig.validPlaytypes) {
+			arr.push({ game, playtype });
+		}
+	}
+
+	return arr;
+}
diff --git a/client/src/util/splashes.ts b/client/src/util/splashes.ts
index 12ebe5075..e893c9f08 100644
--- a/client/src/util/splashes.ts
+++ b/client/src/util/splashes.ts
@@ -57,6 +57,12 @@ export const loggedInSplashes = [
 	"through ivy - out middle",
 	"The graphics. That's what it's really about.",
 	"you could be playing mario galaxy right now",
+	"...When yours just crashes?",
+	"My Beautiful Score Tracking Fantasy",
+	"The Supercharged Score Tracker.",
+	"Play ULTRAKILL.",
+	"A Cutting-Edge Score Tracker (heh).",
+	"Winnipeg is a warm, nice place to live.",
 ];
 
 // Stuff that's bad for the kids, you know?