diff --git a/client/package.json b/client/package.json
index 624c668a9..c3e9e7f97 100644
--- a/client/package.json
+++ b/client/package.json
@@ -86,7 +86,7 @@
 		"resolve": "1.12.0",
 		"resolve-url-loader": "3.1.0",
 		"socicon": "3.0.5",
-		"tachi-common": "0.4.23"
+		"tachi-common": "0.5.5"
 	},
 	"devDependencies": {
 		"@types/humanize-duration": "3.25.1",
diff --git a/client/pnpm-lock.yaml b/client/pnpm-lock.yaml
index 5991fea67..0d5f2cabe 100644
--- a/client/pnpm-lock.yaml
+++ b/client/pnpm-lock.yaml
@@ -88,7 +88,7 @@ specifiers:
   serve: 11.2.0
   socicon: 3.0.5
   style-loader: 1.0.0
-  tachi-common: 0.4.23
+  tachi-common: 0.5.5
   terser-webpack-plugin: 1.4.1
   ts-pnp: 1.1.4
   typescript: 4.3.5
@@ -164,7 +164,7 @@ dependencies:
   resolve: 1.12.0
   resolve-url-loader: 3.1.0
   socicon: 3.0.5
-  tachi-common: 0.4.23
+  tachi-common: 0.5.5
 
 devDependencies:
   '@types/humanize-duration': 3.25.1
@@ -11491,8 +11491,8 @@ packages:
       strip-ansi: 6.0.0
     dev: true
 
-  /tachi-common/0.4.23:
-    resolution: {integrity: sha512-MlE2wY9XfNTiZoKJ+7utDdO/ItV3eb8KLEkOPXZMn+sqQbrJd0WSIM1j9vecdYUWG02+3NJf6awmud0Q6upgPA==}
+  /tachi-common/0.5.5:
+    resolution: {integrity: sha512-LFKK+3xhlDQJ07yUij2/H+0cPiHXoXKdFQyR8X1ZNSjsluZoWncR9Rkqwhxlt/WeFBaGyLjkYkpdMkRYZMLVUg==}
     dependencies:
       monk: 7.3.4
     transitivePeerDependencies:
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 20b2ef33d..f36823b3f 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
@@ -178,19 +178,38 @@ function PreferencesForm({ reqUser, game, playtype }: Props) {
 				</Form.Text>
 			</Form.Group>
 			{game === "iidx" && (
-				<Form.Group>
-					<Form.Check
-						type="checkbox"
-						id="gameSpecific.display2DXTra"
-						name="gameSpecific.display2DXTra"
-						checked={formik.values.gameSpecific.display2DXTra}
-						onChange={formik.handleChange}
-						label="Display 2DX-tra Charts"
-					/>
-					<Form.Text className="text-muted">
-						Display 2DX-tra charts on the song page.
-					</Form.Text>
-				</Form.Group>
+				<>
+					<Form.Group>
+						<Form.Check
+							type="checkbox"
+							id="gameSpecific.display2DXTra"
+							name="gameSpecific.display2DXTra"
+							checked={formik.values.gameSpecific.display2DXTra}
+							onChange={formik.handleChange}
+							label="Display 2DX-tra Charts"
+						/>
+						<Form.Text className="text-muted">
+							Display 2DX-tra charts on the song page.
+						</Form.Text>
+					</Form.Group>
+					<Form.Group>
+						<Form.Label>BPI Target</Form.Label>
+						<Form.Control
+							type="number"
+							id="gameSpecific.bpiTarget"
+							name="gameSpecific.bpiTarget"
+							value={formik.values.gameSpecific.bpiTarget}
+							min={0}
+							max={100}
+							step={10}
+							onChange={formik.handleChange}
+						/>
+						<Form.Text className="text-muted">
+							Set yourself a BPI target. {TachiConfig.name} will show how far away you
+							are from it in the UI!
+						</Form.Text>
+					</Form.Group>
+				</>
 			)}
 			<div className="row justify-content-center">
 				<Button type="submit" variant="success">
diff --git a/client/src/components/tables/headers/GameHeaders.tsx b/client/src/components/tables/headers/GameHeaders.tsx
index 47c2ed81a..b04184b7d 100644
--- a/client/src/components/tables/headers/GameHeaders.tsx
+++ b/client/src/components/tables/headers/GameHeaders.tsx
@@ -81,6 +81,7 @@ export function GetGPTCoreHeaders<Dataset extends FolderDataset | PBDataset | Sc
 			];
 		case "iidx":
 		case "bms":
+		case "pms":
 			return [
 				ScoreHeader,
 				[
diff --git a/client/src/components/user/UGPTRankingData.tsx b/client/src/components/user/UGPTRankingData.tsx
index ccdbd1985..696e0d0f0 100644
--- a/client/src/components/user/UGPTRankingData.tsx
+++ b/client/src/components/user/UGPTRankingData.tsx
@@ -1,5 +1,6 @@
 import { useProfileRatingAlg } from "components/util/useScoreRatingAlg";
 import React from "react";
+import { Link } from "react-router-dom";
 import { IDStrings, integer, UGSRatingsLookup } from "tachi-common";
 import { GamePT } from "types/react";
 import { UppercaseFirst } from "util/misc";
@@ -35,7 +36,12 @@ export default function RankingData({
 				<h4>Ranking{extendData.length ? ` (${UppercaseFirst(alg)})` : ""}</h4>
 			</div>
 			<div className="col-12">
-				<strong className="display-4">#{rankingData[alg].ranking}</strong>
+				<Link
+					to={`/dashboard/games/${game}/${playtype}/leaderboards`}
+					className="gentle-link"
+				>
+					<strong className="display-4">#{rankingData[alg].ranking}</strong>
+				</Link>
 				<span className="text-muted">/{rankingData[alg].outOf}</span>
 			</div>
 			{extendData}
diff --git a/client/src/util/scales.ts b/client/src/util/scales.ts
index 5e51aa55b..3c2def0cc 100644
--- a/client/src/util/scales.ts
+++ b/client/src/util/scales.ts
@@ -3,6 +3,7 @@ import { Game } from "tachi-common";
 const scales: Record<Game, number> = {
 	iidx: 2,
 	bms: 2,
+	pms: 2,
 	chunithm: 5,
 	ddr: 1,
 	gitadora: 1,
diff --git a/client/src/util/tierlist.ts b/client/src/util/tierlist.ts
index ab87d58b9..dc0580de4 100644
--- a/client/src/util/tierlist.ts
+++ b/client/src/util/tierlist.ts
@@ -16,6 +16,14 @@ const ScaleNameAchievedFns: ScaleAchievedFns = {
 		"sgl-EC": k => k.scoreData.lampIndex >= IIDX_LAMPS.EASY_CLEAR,
 		"sgl-HC": k => k.scoreData.lampIndex >= IIDX_LAMPS.HARD_CLEAR,
 	},
+	"pms:Controller": {
+		"sgl-EC": k => k.scoreData.lampIndex >= IIDX_LAMPS.EASY_CLEAR,
+		"sgl-HC": k => k.scoreData.lampIndex >= IIDX_LAMPS.HARD_CLEAR,
+	},
+	"pms:Keyboard": {
+		"sgl-EC": k => k.scoreData.lampIndex >= IIDX_LAMPS.EASY_CLEAR,
+		"sgl-HC": k => k.scoreData.lampIndex >= IIDX_LAMPS.HARD_CLEAR,
+	},
 	"chunithm:Single": {},
 	"ddr:DP": {},
 	"ddr:SP": {},