diff --git a/bun.lockb b/bun.lockb
index 634ca645f..dcdaec92b 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/packages/varuna/package.json b/packages/varuna/package.json
new file mode 100644
index 000000000..837eda1cd
--- /dev/null
+++ b/packages/varuna/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "varuna",
+  "type": "module",
+  "main": "src/index.ts",
+  "dependencies": {
+    "react": "^18.3.1"
+  }
+}
diff --git a/packages/varuna/src/index.ts b/packages/varuna/src/index.ts
new file mode 100644
index 000000000..2d077cafc
--- /dev/null
+++ b/packages/varuna/src/index.ts
@@ -0,0 +1,55 @@
+import { produce } from 'immer';
+import { merge } from 'lodash-es';
+import { useEffect, useState } from 'react';
+
+export class Varuna<Type> {
+  private listeners = new Set<(state: Type) => void>();
+  public initial: Type;
+
+  constructor(
+    public state: Type,
+    persistence?: string,
+  ) {
+    if (persistence) {
+      const dehydrated = localStorage.getItem(persistence);
+
+      if (dehydrated) {
+        const rehydrated = JSON.parse(dehydrated) as unknown;
+        this.state = merge(this.state, rehydrated);
+      }
+    }
+
+    this.initial = this.state;
+  }
+
+  private dispatch() {
+    const state = this.state;
+    this.listeners.forEach((callback) => callback(state));
+  }
+
+  on<Slice>(slicer: (state: Type) => Slice, callback: (state: Slice) => void) {
+    const last = slicer(this.state);
+
+    function listener(state: Type) {
+      const next = slicer(state);
+      if (next !== last) callback(next);
+    }
+
+    this.listeners.add(listener);
+
+    return () => {
+      this.listeners.delete(listener);
+    };
+  }
+
+  mutate(mutator: (state: Type) => void) {
+    this.state = produce(this.state, mutator);
+    this.dispatch();
+  }
+
+  use<Slice>(slicer: (state: Type) => Slice) {
+    const [slice, setSlice] = useState(slicer(this.state));
+    useEffect(() => this.on(slicer, setSlice), []);
+    return slice;
+  }
+}
diff --git a/packages/varuna/tsconfig.json b/packages/varuna/tsconfig.json
new file mode 100644
index 000000000..4082f16a5
--- /dev/null
+++ b/packages/varuna/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/packages/website/package.json b/packages/website/package.json
index 782764a2c..c6dcff2ab 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -13,6 +13,7 @@
     "@astrolib/seo": "^1.0.0-beta.8",
     "@blitzkit/core": "workspace:*",
     "@blitzkit/i18n": "workspace:*",
+    "varuna": "workspace:*",
     "@fontsource/inter": "^5.2.5",
     "@nanostores/persistent": "^0.10.2",
     "@nanostores/react": "^0.7.3",
diff --git a/packages/website/src/components/TierList/Controls/index.tsx b/packages/website/src/components/TierList/Controls/index.tsx
index 7b629f341..fd1cd56e3 100644
--- a/packages/website/src/components/TierList/Controls/index.tsx
+++ b/packages/website/src/components/TierList/Controls/index.tsx
@@ -1,11 +1,10 @@
 import { ReloadIcon } from '@radix-ui/react-icons';
 import { Button, Flex } from '@radix-ui/themes';
 import { useLocale } from '../../../hooks/useLocale';
-import { TierList, tierListInitialState } from '../../../stores/tierList';
+import { TierList } from '../../../stores/tierList';
 import { Share } from './components/Share';
 
 export function TierListControls() {
-  const mutateTierList = TierList.useMutation();
   const { strings } = useLocale();
 
   return (
@@ -13,8 +12,8 @@ export function TierListControls() {
       <Button
         color="red"
         onClick={() => {
-          mutateTierList((draft) => {
-            Object.assign(draft, tierListInitialState);
+          TierList.mutate((draft) => {
+            Object.assign(draft, TierList.initial);
           });
         }}
       >
diff --git a/packages/website/src/components/TierList/Row/components/Header.tsx b/packages/website/src/components/TierList/Row/components/Header.tsx
index d9b78b7ac..c41632323 100644
--- a/packages/website/src/components/TierList/Row/components/Header.tsx
+++ b/packages/website/src/components/TierList/Row/components/Header.tsx
@@ -26,7 +26,6 @@ export function Header({ index }: HeaderProps) {
   const rowStyle = tierListRows[index];
   const name = TierList.use((state) => state.rows[index].name);
   const input = useRef<HTMLInputElement>(null);
-  const mutateTierList = TierList.useMutation();
   const [open, setOpen] = useState(false);
 
   return (
@@ -67,9 +66,8 @@ export function Header({ index }: HeaderProps) {
               onBlur={() => {
                 if (!input.current) return;
 
-                mutateTierList((draft) => {
+                TierList.mutate((draft) => {
                   if (!input.current) return;
-
                   draft.rows[index].name = input.current.value;
                 });
 
diff --git a/packages/website/src/components/TierList/Tile.tsx b/packages/website/src/components/TierList/Tile.tsx
index c569f19b6..a5fc0b7f7 100644
--- a/packages/website/src/components/TierList/Tile.tsx
+++ b/packages/website/src/components/TierList/Tile.tsx
@@ -25,7 +25,6 @@ type TierListTileProps = {
 
 export function TierListTile(props: TierListTileProps) {
   const card = useRef<HTMLDivElement>(null);
-  const mutateTierList = TierList.useMutation();
   const lastPosition = useRef({ x: 0, y: 0 });
   const handlePointerDown = useCallback(
     (event: ReactPointerEvent<HTMLSpanElement>) => {
@@ -48,7 +47,7 @@ export function TierListTile(props: TierListTileProps) {
       window.addEventListener('pointermove', handlePointerMove);
       window.addEventListener('pointerup', handlePointerUp);
 
-      mutateTierList((draft) => {
+      TierList.mutate((draft) => {
         draft.dragging = true;
       });
     },
@@ -104,7 +103,7 @@ export function TierListTile(props: TierListTileProps) {
 
         const tileIndex = Number(tile.dataset.tileIndex);
 
-        mutateTierList((draft) => {
+        TierList.mutate((draft) => {
           draft.dragging = false;
           draft.rows.forEach((row) => {
             row.tanks = row.tanks.filter((tankId) => tankId !== props.tank.id);
@@ -118,7 +117,7 @@ export function TierListTile(props: TierListTileProps) {
         break rowLoop;
       }
 
-      mutateTierList((draft) => {
+      TierList.mutate((draft) => {
         draft.dragging = false;
         draft.rows.forEach((row) => {
           row.tanks = row.tanks.filter((tankId) => tankId !== props.tank.id);
@@ -133,7 +132,7 @@ export function TierListTile(props: TierListTileProps) {
     }
 
     if (!wasPlaced) {
-      mutateTierList((draft) => {
+      TierList.mutate((draft) => {
         draft.dragging = false;
         draft.rows.forEach((row) => {
           row.tanks = row.tanks.filter((tankId) => tankId !== props.tank.id);
diff --git a/packages/website/src/components/TierList/URLManager.tsx b/packages/website/src/components/TierList/URLManager.tsx
index cf8d2bbd3..f861b535c 100644
--- a/packages/website/src/components/TierList/URLManager.tsx
+++ b/packages/website/src/components/TierList/URLManager.tsx
@@ -7,7 +7,6 @@ const tankDefinitions = await awaitableTankDefinitions;
 
 export function URLManager() {
   const rows = TierList.use((state) => state.rows);
-  const mutateTierList = TierList.useMutation();
 
   useEffect(() => {
     const params = new URLSearchParams(window.location.search);
@@ -20,7 +19,7 @@ export function URLManager() {
           .map(Number)
           .filter((id) => id in tankDefinitions.tanks);
 
-        mutateTierList((draft) => {
+        TierList.mutate((draft) => {
           draft.rows[index].tanks = values;
         });
       }
diff --git a/packages/website/src/pages/[...locale]/tier-list/_index.tsx b/packages/website/src/pages/[...locale]/tier-list/_index.tsx
index 050077a76..d5ff92235 100644
--- a/packages/website/src/pages/[...locale]/tier-list/_index.tsx
+++ b/packages/website/src/pages/[...locale]/tier-list/_index.tsx
@@ -9,16 +9,13 @@ import {
   type LocaleAcceptorProps,
 } from '../../../hooks/useLocale';
 import { TankopediaPersistent } from '../../../stores/tankopediaPersistent';
-import { TierList } from '../../../stores/tierList';
 
 export function Page({ locale }: LocaleAcceptorProps) {
   return (
     <LocaleProvider locale={locale}>
-      <TierList.Provider>
-        <TankopediaPersistent.Provider>
-          <Content />
-        </TankopediaPersistent.Provider>
-      </TierList.Provider>
+      <TankopediaPersistent.Provider>
+        <Content />
+      </TankopediaPersistent.Provider>
     </LocaleProvider>
   );
 }
diff --git a/packages/website/src/stores/tierList.ts b/packages/website/src/stores/tierList.ts
index 872dd00c8..d0eaed7dd 100644
--- a/packages/website/src/stores/tierList.ts
+++ b/packages/website/src/stores/tierList.ts
@@ -1,8 +1,6 @@
 import { enableMapSet } from 'immer';
-import { create } from 'zustand';
-import { subscribeWithSelector } from 'zustand/middleware';
+import { Varuna } from 'varuna';
 import { tierListRows } from '../components/TierList/Table/constants';
-import { createContextualStore } from '../core/zustand/createContextualStore';
 
 export interface TierList {
   dragging: boolean;
@@ -10,19 +8,10 @@ export interface TierList {
   placedTanks: Set<number>;
 }
 
-enableMapSet();
-
-export const tierListInitialState: TierList = {
+export const TierList = new Varuna<TierList>({
   dragging: false,
-  rows: tierListRows.map((row) => ({
-    name: row.name,
-    tanks: [],
-  })),
+  rows: tierListRows.map((row) => ({ name: row.name, tanks: [] })),
   placedTanks: new Set(),
-};
+});
 
-export const TierList = createContextualStore(() =>
-  create<TierList>()(
-    subscribeWithSelector<TierList>(() => tierListInitialState),
-  ),
-);
+enableMapSet();