diff --git a/package-lock.json b/package-lock.json
index e73cde6..696baf7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,11 +9,14 @@
       "version": "0.1.0",
       "dependencies": {
         "@fission-codes/homestar": "^1.0.0",
+        "@fission-codes/ucan": "^0.0.1",
         "@oddjs/odd": "0.37.0",
         "@zerodevx/svelte-json-view": "^1.0.7",
         "chart.js": "^4.4.0",
         "clipboard-copy": "^4.0.1",
         "iso-base": "^2.0.1",
+        "iso-signatures": "^0.2.0",
+        "iso-web": "^0.3.1",
         "localforage": "^1.10.0",
         "marked": "^9.0.3",
         "multiformats": "^12.1.3",
@@ -971,6 +974,17 @@
         "@esbuild/win32-x64": "0.19.8"
       }
     },
+    "node_modules/@fission-codes/ucan": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/@fission-codes/ucan/-/ucan-0.0.1.tgz",
+      "integrity": "sha512-sW7e7a4uXYRc7DMKY8/JQBcNuEyq1cbOtueOuGWoy1Wfa2rSfWDRLUBV9NibFJK3jXrd9h23INOZMWcXOqMEPQ==",
+      "dependencies": {
+        "iso-base": "^2.0.1",
+        "iso-did": "^1.4.0",
+        "iso-signatures": "^0.2.0",
+        "multiformats": "^12.1.3"
+      }
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
@@ -1348,6 +1362,17 @@
         "multiformats": "^12.1.0"
       }
     },
+    "node_modules/@noble/ed25519": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@noble/ed25519/-/ed25519-2.0.0.tgz",
+      "integrity": "sha512-/extjhkwFupyopDrt80OMWKdLgP429qLZj+z6sYJz90rF2Iz0gjZh2ArMKPImUl13Kx+0EXI2hN9T/KJV0/Zng==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -1755,6 +1780,11 @@
       "integrity": "sha512-uTuEgFXMknpun//Jj6b1R8T8LiMi9fNpH+cnhZr4b7col2HHTMmjYfm/WOZ7nzjuGpk+oTrpHhePe1qlWtHWTA==",
       "dev": true
     },
+    "node_modules/@types/retry": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
+      "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow=="
+    },
     "node_modules/@types/sass": {
       "version": "1.45.0",
       "resolved": "https://registry.npmjs.org/@types/sass/-/sass-1.45.0.tgz",
@@ -3207,6 +3237,11 @@
       "integrity": "sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==",
       "dev": true
     },
+    "node_modules/did-resolver": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/did-resolver/-/did-resolver-4.1.0.tgz",
+      "integrity": "sha512-S6fWHvCXkZg2IhS4RcVHxwuyVejPR7c+a4Go0xbQ9ps5kILa8viiYQgrM4gfTyeTjJ0ekgJH9gk/BawTpmkbZA=="
+    },
     "node_modules/didyoumean": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
@@ -4145,6 +4180,11 @@
         "entities": "^4.4.0"
       }
     },
+    "node_modules/idb-keyval": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.1.tgz",
+      "integrity": "sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg=="
+    },
     "node_modules/ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -4545,6 +4585,17 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-network-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.0.1.tgz",
+      "integrity": "sha512-OwQXkwBJeESyhFw+OumbJVD58BFBJJI5OM5S1+eyrDKlgDZPX2XNT5gXS56GSD3NPbbwUuMlR1Q71SRp5SobuQ==",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -4620,6 +4671,50 @@
         "bigint-mod-arith": "^3.3.1"
       }
     },
+    "node_modules/iso-did": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/iso-did/-/iso-did-1.5.0.tgz",
+      "integrity": "sha512-SkMUONxelLV5yipdNaGUqe/1KiKu/pVTBJ46/HbwLtzm6IC2YuJ8E9w7DpwZsnh0G2AlJ+J7i/8ijcZCOp8DWw==",
+      "dependencies": {
+        "did-resolver": "^4.1.0",
+        "iso-base": "^2.0.1",
+        "iso-web": "^0.3.1",
+        "multiformats": "^13.0.0"
+      }
+    },
+    "node_modules/iso-did/node_modules/multiformats": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.0.0.tgz",
+      "integrity": "sha512-xiIB0p7EKmETm3wyKedOg/xuyQ18PoWwXCzzgpZAiDxL9ktl3XTh8AqoDT5kAqRg+DU48XAGPsUJL2Rn6Bx3Lw=="
+    },
+    "node_modules/iso-kv": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/iso-kv/-/iso-kv-0.2.0.tgz",
+      "integrity": "sha512-n4q64QQO6GPZSeJsTPsU6jHijyDgMb18RCcQ5t065S3p1ddktF1B8tlLhqbcIDqC8ORl77fs7KgTMJDvrccQ9w==",
+      "dependencies": {
+        "idb-keyval": "^6.2.1",
+        "kysely": "^0.26.3"
+      }
+    },
+    "node_modules/iso-signatures": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/iso-signatures/-/iso-signatures-0.2.0.tgz",
+      "integrity": "sha512-OfgejGIG7GiCwO5QhcjOTSUJx8Fk+oeWG9GTqAT7eBs4IxqAXCXUAUIRSf9FOr4d39R6y4480pCMz+Aht6/Fgg==",
+      "dependencies": {
+        "@noble/ed25519": "^2.0.0",
+        "iso-base": "^2.0.1",
+        "iso-did": "^1.4.0"
+      }
+    },
+    "node_modules/iso-web": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/iso-web/-/iso-web-0.3.1.tgz",
+      "integrity": "sha512-i63X/p7wHvdTLnA2QgWklDozFkAvOYnxAVmYrUV2M40jDLPFPE7G4utZc7b3SpX4TxQ5GpObn1Cpg7oOne9UNw==",
+      "dependencies": {
+        "iso-kv": "^0.2.0",
+        "p-retry": "^6.2.0"
+      }
+    },
     "node_modules/iso-websocket": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/iso-websocket/-/iso-websocket-0.1.6.tgz",
@@ -4873,6 +4968,14 @@
         "node": ">=6"
       }
     },
+    "node_modules/kysely": {
+      "version": "0.26.3",
+      "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.26.3.tgz",
+      "integrity": "sha512-yWSgGi9bY13b/W06DD2OCDDHQmq1kwTGYlQ4wpZkMOJqMGCstVCFIvxCCVG4KfY1/3G0MhDAcZsip/Lw8/vJWw==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/level": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/level/-/level-8.0.0.tgz",
@@ -5508,6 +5611,30 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/p-retry": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.0.tgz",
+      "integrity": "sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA==",
+      "dependencies": {
+        "@types/retry": "0.12.2",
+        "is-network-error": "^1.0.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=16.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-retry/node_modules/retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/p-timeout": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz",
@@ -8018,6 +8145,17 @@
         }
       }
     },
+    "@fission-codes/ucan": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/@fission-codes/ucan/-/ucan-0.0.1.tgz",
+      "integrity": "sha512-sW7e7a4uXYRc7DMKY8/JQBcNuEyq1cbOtueOuGWoy1Wfa2rSfWDRLUBV9NibFJK3jXrd9h23INOZMWcXOqMEPQ==",
+      "requires": {
+        "iso-base": "^2.0.1",
+        "iso-did": "^1.4.0",
+        "iso-signatures": "^0.2.0",
+        "multiformats": "^12.1.3"
+      }
+    },
     "@humanwhocodes/config-array": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
@@ -8300,6 +8438,11 @@
         "multiformats": "^12.1.0"
       }
     },
+    "@noble/ed25519": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@noble/ed25519/-/ed25519-2.0.0.tgz",
+      "integrity": "sha512-/extjhkwFupyopDrt80OMWKdLgP429qLZj+z6sYJz90rF2Iz0gjZh2ArMKPImUl13Kx+0EXI2hN9T/KJV0/Zng=="
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -8624,6 +8767,11 @@
       "integrity": "sha512-uTuEgFXMknpun//Jj6b1R8T8LiMi9fNpH+cnhZr4b7col2HHTMmjYfm/WOZ7nzjuGpk+oTrpHhePe1qlWtHWTA==",
       "dev": true
     },
+    "@types/retry": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
+      "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow=="
+    },
     "@types/sass": {
       "version": "1.45.0",
       "resolved": "https://registry.npmjs.org/@types/sass/-/sass-1.45.0.tgz",
@@ -9604,6 +9752,11 @@
       "integrity": "sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==",
       "dev": true
     },
+    "did-resolver": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/did-resolver/-/did-resolver-4.1.0.tgz",
+      "integrity": "sha512-S6fWHvCXkZg2IhS4RcVHxwuyVejPR7c+a4Go0xbQ9ps5kILa8viiYQgrM4gfTyeTjJ0ekgJH9gk/BawTpmkbZA=="
+    },
     "didyoumean": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
@@ -10297,6 +10450,11 @@
         "entities": "^4.4.0"
       }
     },
+    "idb-keyval": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.1.tgz",
+      "integrity": "sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg=="
+    },
     "ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -10570,6 +10728,11 @@
         "is-extglob": "^2.1.1"
       }
     },
+    "is-network-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.0.1.tgz",
+      "integrity": "sha512-OwQXkwBJeESyhFw+OumbJVD58BFBJJI5OM5S1+eyrDKlgDZPX2XNT5gXS56GSD3NPbbwUuMlR1Q71SRp5SobuQ=="
+    },
     "is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -10624,6 +10787,52 @@
         "bigint-mod-arith": "^3.3.1"
       }
     },
+    "iso-did": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/iso-did/-/iso-did-1.5.0.tgz",
+      "integrity": "sha512-SkMUONxelLV5yipdNaGUqe/1KiKu/pVTBJ46/HbwLtzm6IC2YuJ8E9w7DpwZsnh0G2AlJ+J7i/8ijcZCOp8DWw==",
+      "requires": {
+        "did-resolver": "^4.1.0",
+        "iso-base": "^2.0.1",
+        "iso-web": "^0.3.1",
+        "multiformats": "^13.0.0"
+      },
+      "dependencies": {
+        "multiformats": {
+          "version": "13.0.0",
+          "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.0.0.tgz",
+          "integrity": "sha512-xiIB0p7EKmETm3wyKedOg/xuyQ18PoWwXCzzgpZAiDxL9ktl3XTh8AqoDT5kAqRg+DU48XAGPsUJL2Rn6Bx3Lw=="
+        }
+      }
+    },
+    "iso-kv": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/iso-kv/-/iso-kv-0.2.0.tgz",
+      "integrity": "sha512-n4q64QQO6GPZSeJsTPsU6jHijyDgMb18RCcQ5t065S3p1ddktF1B8tlLhqbcIDqC8ORl77fs7KgTMJDvrccQ9w==",
+      "requires": {
+        "idb-keyval": "^6.2.1",
+        "kysely": "^0.26.3"
+      }
+    },
+    "iso-signatures": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/iso-signatures/-/iso-signatures-0.2.0.tgz",
+      "integrity": "sha512-OfgejGIG7GiCwO5QhcjOTSUJx8Fk+oeWG9GTqAT7eBs4IxqAXCXUAUIRSf9FOr4d39R6y4480pCMz+Aht6/Fgg==",
+      "requires": {
+        "@noble/ed25519": "^2.0.0",
+        "iso-base": "^2.0.1",
+        "iso-did": "^1.4.0"
+      }
+    },
+    "iso-web": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/iso-web/-/iso-web-0.3.1.tgz",
+      "integrity": "sha512-i63X/p7wHvdTLnA2QgWklDozFkAvOYnxAVmYrUV2M40jDLPFPE7G4utZc7b3SpX4TxQ5GpObn1Cpg7oOne9UNw==",
+      "requires": {
+        "iso-kv": "^0.2.0",
+        "p-retry": "^6.2.0"
+      }
+    },
     "iso-websocket": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/iso-websocket/-/iso-websocket-0.1.6.tgz",
@@ -10821,6 +11030,11 @@
       "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
       "dev": true
     },
+    "kysely": {
+      "version": "0.26.3",
+      "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.26.3.tgz",
+      "integrity": "sha512-yWSgGi9bY13b/W06DD2OCDDHQmq1kwTGYlQ4wpZkMOJqMGCstVCFIvxCCVG4KfY1/3G0MhDAcZsip/Lw8/vJWw=="
+    },
     "level": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/level/-/level-8.0.0.tgz",
@@ -11263,6 +11477,23 @@
         "p-timeout": "^5.0.2"
       }
     },
+    "p-retry": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.0.tgz",
+      "integrity": "sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA==",
+      "requires": {
+        "@types/retry": "0.12.2",
+        "is-network-error": "^1.0.0",
+        "retry": "^0.13.1"
+      },
+      "dependencies": {
+        "retry": {
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+          "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="
+        }
+      }
+    },
     "p-timeout": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.1.0.tgz",
diff --git a/package.json b/package.json
index dfe72d8..de0bcdd 100644
--- a/package.json
+++ b/package.json
@@ -58,11 +58,14 @@
   },
   "dependencies": {
     "@fission-codes/homestar": "^1.0.0",
+    "@fission-codes/ucan": "^0.0.1",
     "@oddjs/odd": "0.37.0",
     "@zerodevx/svelte-json-view": "^1.0.7",
     "chart.js": "^4.4.0",
     "clipboard-copy": "^4.0.1",
     "iso-base": "^2.0.1",
+    "iso-signatures": "^0.2.0",
+    "iso-web": "^0.3.1",
     "localforage": "^1.10.0",
     "marked": "^9.0.3",
     "multiformats": "^12.1.3",
diff --git a/src/components/auth/backup/AreYouSure.svelte b/src/components/auth/backup/AreYouSure.svelte
deleted file mode 100644
index 120bec8..0000000
--- a/src/components/auth/backup/AreYouSure.svelte
+++ /dev/null
@@ -1,45 +0,0 @@
-<script lang="ts">
-  import { goto } from '$app/navigation'
-
-  import { filesystemStore, sessionStore } from '$lib/stores'
-  import { setBackupStatus } from '$lib/auth/backup'
-
-  const skipBackup = () => {
-    setBackupStatus($filesystemStore, { created: false })
-
-    sessionStore.update(session => ({
-      ...session,
-      backupCreated: false
-    }))
-
-    goto('/')
-  }
-</script>
-
-<input type="checkbox" id="are-you-sure-modal" checked class="modal-toggle" />
-<div class="modal">
-  <div class="modal-box w-narrowModal relative text-center">
-    <div>
-      <h3 class="mb-8 text-base">Are you sure?</h3>
-
-      <p class="mb-7 text-left">
-        Without a backup device, if you lose this device or reset your browser,
-        you will not be able to recover your account data.
-      </p>
-
-      <button
-        class="btn btn-primary"
-        on:click={() => goto('/delegate-account')}
-      >
-        Connect a backup device
-      </button>
-      <span
-        class="text-error underline block mt-4 text-sm text-red-600 cursor-pointer"
-        on:click={skipBackup}
-        on:keypress={skipBackup}
-      >
-        YOLO&mdash;I'll risk just one device for now
-      </span>
-    </div>
-  </div>
-</div>
diff --git a/src/components/auth/backup/Backup.svelte b/src/components/auth/backup/Backup.svelte
deleted file mode 100644
index 0527306..0000000
--- a/src/components/auth/backup/Backup.svelte
+++ /dev/null
@@ -1,43 +0,0 @@
-<script lang="ts">
-  import { createEventDispatcher } from 'svelte'
-  import { goto } from '$app/navigation'
-
-  import { appName } from '$lib/app-info'
-  import type { BackupView } from '$lib/views'
-
-  const dispatch = createEventDispatcher()
-
-  const navigate = (view: BackupView) => {
-    dispatch('navigate', { view })
-  }
-</script>
-
-<input type="checkbox" id="backup-modal" checked class="modal-toggle" />
-<div class="modal">
-  <div class="modal-box w-narrowModal relative text-center">
-    <div id="backup-message" class="peer-checked:hidden">
-      <h3 class="mb-8 text-base">Backup your account</h3>
-      <p class="mb-5 text-left">
-        Your {appName} account & its data live only on your devices.
-      </p>
-
-      <p class="mb-8 text-left">
-        We highly recommend backing up your account on at least one additional
-        device.
-      </p>
-
-      <button
-        class="btn btn-primary"
-        on:click={() => goto('/delegate-account')}
-      >
-        Connect a backup device
-      </button>
-      <button
-        class="btn btn-xs btn-link text-sm underline mt-4"
-        on:click={() => navigate('are-you-sure')}
-      >
-        Skip for now
-      </button>
-    </div>
-  </div>
-</div>
diff --git a/src/components/auth/delegate-account/ConnectBackupDevice.svelte b/src/components/auth/delegate-account/ConnectBackupDevice.svelte
deleted file mode 100644
index 1b19879..0000000
--- a/src/components/auth/delegate-account/ConnectBackupDevice.svelte
+++ /dev/null
@@ -1,50 +0,0 @@
-<script lang="ts">
-  import { goto } from '$app/navigation'
-  import clipboardCopy from 'clipboard-copy'
-
-  import Share from '$components/icons/Share.svelte'
-  import { addNotification } from '$lib/notifications'
-
-  export let qrcode: HTMLOrSVGElement
-  export let connectionLink: string
-  export let backupCreated: boolean
-
-  const copyLink = async () => {
-    await clipboardCopy(connectionLink)
-    addNotification({ msg: 'Copied to clipboard', type: 'success' })
-  }
-</script>
-
-<input type="checkbox" id="backup-device-modal" checked class="modal-toggle" />
-<div class="modal">
-  <div class="modal-box w-narrowModal relative text-center">
-    <div>
-      <h3 class="mb-8 text-base">Connect a backup device</h3>
-      <div class="w-max m-auto mb-7 rounded-lg overflow-hidden">
-        {@html qrcode}
-      </div>
-      <p class="mb-7 text-left">
-        Scan this code on the new device, or share the connection link.
-      </p>
-      <button class="btn btn-outline" on:click={copyLink}>
-        <Share />
-        <span class="ml-2">Share connection link</span>
-      </button>
-      {#if !backupCreated}
-        <button
-          class="btn btn-xs btn-link text-sm font-normal underline mt-4"
-          on:click={() => goto('/backup?view=are-you-sure')}
-        >
-          Skip for now
-        </button>
-      {:else}
-        <a
-          class="btn btn-xs btn-link text-sm font-normal underline mt-4"
-          href="/"
-        >
-          Cancel
-        </a>
-      {/if}
-    </div>
-  </div>
-</div>
diff --git a/src/components/auth/delegate-account/DelegateAccount.svelte b/src/components/auth/delegate-account/DelegateAccount.svelte
deleted file mode 100644
index ff5d236..0000000
--- a/src/components/auth/delegate-account/DelegateAccount.svelte
+++ /dev/null
@@ -1,69 +0,0 @@
-<script lang="ts">
-  import { createEventDispatcher } from 'svelte'
-
-  export let pinInput: string
-  export let pinError: boolean
-
-  const dispatch = createEventDispatcher()
-
-  const cancelConnection = () => {
-    dispatch('cancel')
-  }
-
-  /**
-   * Auto submit the form when the pinInput is equal to the TARGET_PIN_LENGTH
-   */
-  const TARGET_PIN_LENGTH = 6
-  const checkPin = () => {
-    if (pinInput.length === TARGET_PIN_LENGTH) {
-      dispatch('checkpin')
-    } else {
-      pinError = false
-    }
-  }
-</script>
-
-<input
-  type="checkbox"
-  id="delegate-account-modal"
-  checked
-  class="modal-toggle"
-/>
-<div class="modal">
-  <div class="modal-box w-narrowModal relative text-center">
-    <div>
-      <h3 class="mb-8 text-base">
-        A new device would like to connect to your account
-      </h3>
-      <div class="mb-5">
-        <input
-          id="pin"
-          type="text"
-          class="input input-bordered w-full max-w-[197px] mb-2 rounded-full h-[68px] focus:outline-none font-mono text-deviceCode text-center tracking-[0.1em] font-light {pinError
-            ? '!text-red-500 !border-red-500'
-            : ''}"
-          maxlength="6"
-          bind:value={pinInput}
-          on:keyup={checkPin}
-        />
-        <label for="pin" class="label">
-          {#if !pinError}
-            <span class="label-text-alt">
-              Enter the connection code from that device to approve this
-              connection.
-            </span>
-          {:else}
-            <span class="label-text-alt text-error">
-              Entered pin does not match a pin from a known device.
-            </span>
-          {/if}
-        </label>
-      </div>
-      <div>
-        <button class="btn btn-outline w-full" on:click={cancelConnection}>
-          Cancel Request
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/src/components/auth/link-device/LinkDevice.svelte b/src/components/auth/link-device/LinkDevice.svelte
deleted file mode 100644
index ecebad1..0000000
--- a/src/components/auth/link-device/LinkDevice.svelte
+++ /dev/null
@@ -1,61 +0,0 @@
-<script lang="ts">
-  import { createEventDispatcher } from 'svelte'
-  import clipboardCopy from 'clipboard-copy'
-
-  import { appName } from '$lib/app-info'
-  import { addNotification } from '$lib/notifications'
-
-  export let pin: string
-
-  const dispatch = createEventDispatcher()
-
-  const cancelConnection = () => {
-    dispatch('cancel')
-  }
-
-  const copyCode = async () => {
-    await clipboardCopy(pin)
-    addNotification({ msg: 'Copied to clipboard', type: 'success' })
-  }
-</script>
-
-<input type="checkbox" id="my-modal-5" checked class="modal-toggle" />
-<div class="modal">
-  <div
-    class="modal-box w-narrowModal relative text-center dark:border-slate-600 dark:border"
-  >
-    <div class="grid grid-flow-row auto-rows-max gap-7">
-      <h3 class="text-base">Connect to {appName}</h3>
-      <div class="grid grid-flow-row auto-rows-max gap-4 justify-items-center">
-        {#if pin}
-          <span
-            on:click={copyCode}
-            on:keypress={copyCode}
-            class="btn text-base-100 hover:text-base-100 bg-base-content hover:bg-base-content border-0 btn-lg rounded-full text-deviceCode tracking-[.18em] w-3/4 cursor-pointer font-mono font-light"
-          >
-            {pin}
-          </span>
-        {/if}
-        <span class="text-sm text-left">
-          Enter this code on your connected device.
-        </span>
-        <div
-          class="grid grid-flow-col auto-cols-max gap-4 justify-center items-center text-slate-500"
-        >
-          <span
-            class="rounded-lg border-t-2 border-l-2 border-slate-600 dark:border-slate-50 w-4 h-4 block animate-spin"
-          />
-          Waiting for a response...
-        </div>
-      </div>
-      <div>
-        <button
-          class="btn btn-outline text-base mt-4"
-          on:click={cancelConnection}
-        >
-          Cancel Request
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/src/components/auth/recover/HasRecoveryKit.svelte b/src/components/auth/recover/HasRecoveryKit.svelte
deleted file mode 100644
index 1828927..0000000
--- a/src/components/auth/recover/HasRecoveryKit.svelte
+++ /dev/null
@@ -1,125 +0,0 @@
-<script lang="ts">
-  import * as uint8arrays from 'uint8arrays'
-
-  import { sessionStore } from '$lib/stores'
-  import {
-    RECOVERY_STATES,
-    USERNAME_STORAGE_KEY,
-    loadAccount,
-    prepareUsername
-  } from '$lib/auth/account'
-  import Check from '$components/icons/CheckIcon.svelte'
-  import RecoveryKitButton from './RecoveryKitButton.svelte'
-
-  let state = $sessionStore.session
-    ? RECOVERY_STATES.Done
-    : RECOVERY_STATES.Ready
-
-  /**
-   * Parse the user's `username` and `readKey` from the uploaded recovery kit and pass them into
-   * ODD to recover the user's account and populate the `session` and `filesystem` stores
-   * @param files
-   */
-  export const handleFileInput: (
-    files: FileList
-  ) => Promise<void> = async files => {
-    const reader = new FileReader()
-
-    reader.onload = async event => {
-      state = RECOVERY_STATES.Processing
-
-      try {
-        const {
-          authStrategy,
-          program: {
-            components: { crypto, reference, storage }
-          }
-        } = $sessionStore
-
-        const parts = (event.target.result as string)
-          .split('username: ')[1]
-          .split('key: ')
-
-        const readKey = uint8arrays.fromString(
-          // Trim any whitespace from the parsed readKey
-          parts[1].replace(/(\r\n|\n|\r)/gm, ''),
-          'base64pad'
-        )
-
-        // Trim any whitespace from the parsed username
-        const oldUsername = parts[0].replace(/(\r\n|\n|\r)/gm, '')
-        const hashedOldUsername = await prepareUsername(oldUsername)
-        const newRootDID = await $sessionStore.program.agentDID()
-
-        // Construct a new username using the old `trimmed` name and `newRootDID`
-        const newUsername = `${oldUsername.split('#')[0]}#${newRootDID}`
-        const hashedNewUsername = await prepareUsername(newUsername)
-
-        storage.setItem(USERNAME_STORAGE_KEY, newUsername)
-
-        // Recover user's file system
-        const { success } = await $sessionStore.program.fileSystem.recover({
-          newUsername: hashedNewUsername,
-          oldUsername: hashedOldUsername,
-          readKey
-        })
-        if (!success) {
-          throw new Error('Failed to recover file system')
-        }
-
-        // Load account data into sessionStore
-        await loadAccount(hashedNewUsername, newUsername)
-
-        state = RECOVERY_STATES.Done
-      } catch (error) {
-        console.error(error)
-        state = RECOVERY_STATES.Error
-      }
-    }
-
-    reader.onerror = error => {
-      console.error(error)
-      state = RECOVERY_STATES.Error
-    }
-
-    reader.readAsText(files[0])
-  }
-</script>
-
-<div
-  class="min-h-[calc(100vh-96px)] flex flex-col items-start justify-center max-w-[590px] m-auto gap-6 pb-5 text-sm"
->
-  <h1 class="text-xl">Recover your account</h1>
-
-  {#if state === RECOVERY_STATES.Done}
-    <h3 class="flex items-center gap-2 font-normal text-base text-green-600">
-      <Check /> Account recovered!
-    </h3>
-    <p>
-      Welcome back <strong>{$sessionStore.username.trimmed}.</strong>
-      We were able to successfully recover all of your private data.
-    </p>
-  {:else}
-    <p>
-      If you’ve lost access to all of your connected devices, you can use your
-      recovery kit to restore access to your private data.
-    </p>
-  {/if}
-
-  {#if state === RECOVERY_STATES.Error}
-    <p class="text-red-600">
-      We were unable to recover your account. Please double check that you
-      uploaded the correct file.
-    </p>
-  {/if}
-
-  <div class="flex flex-col gap-2">
-    <RecoveryKitButton {handleFileInput} {state} />
-
-    {#if state !== RECOVERY_STATES.Done}
-      <p class="text-xxs">
-        {`It should be a file named ODD-RecoveryKit-{yourUsername}.txt`}
-      </p>
-    {/if}
-  </div>
-</div>
diff --git a/src/components/auth/recover/RecoveryKitButton.svelte b/src/components/auth/recover/RecoveryKitButton.svelte
deleted file mode 100644
index d309866..0000000
--- a/src/components/auth/recover/RecoveryKitButton.svelte
+++ /dev/null
@@ -1,65 +0,0 @@
-<script lang="ts">
-  import { goto } from '$app/navigation'
-
-  import { RECOVERY_STATES } from '$lib/auth/account'
-  import RightArrow from '$components/icons/RightArrow.svelte'
-  import Upload from '$components/icons/Upload.svelte'
-
-  export let handleFileInput: (files: FileList) => Promise<void>
-  export let state: RECOVERY_STATES
-
-  // Handle files uploaded directly through the file input
-  let files: FileList
-  $: if (files) {
-    handleFileInput(files)
-  }
-
-  $: buttonData = {
-    [RECOVERY_STATES.Processing]: {
-      text: 'Processing recovery kit...',
-      props: {
-        disabled: state === RECOVERY_STATES.Processing,
-        $$on_click: () => {}
-      }
-    },
-    [RECOVERY_STATES.Done]: {
-      text: 'Continue to the app',
-      props: {
-        $$on_click: () => goto('/')
-      }
-    }
-  }
-</script>
-
-{#if state === RECOVERY_STATES.Ready || state === RECOVERY_STATES.Error}
-  <label
-    for="upload-recovery-kit"
-    class="btn btn-primary !btn-lg !h-[56px] !min-h-0 w-fit gap-2"
-  >
-    <Upload /> Upload your recovery kit
-  </label>
-  <input
-    bind:files
-    id="upload-recovery-kit"
-    type="file"
-    accept=".txt"
-    class="hidden"
-  />
-{:else}
-  {@const { $$on_click, ...props } = buttonData[state].props}
-  <button
-    class="btn btn-primary !btn-lg !h-[56px] !min-h-0 w-fit gap-2"
-    {...props}
-    on:click={$$on_click}
-  >
-    {#if state === RECOVERY_STATES.Processing}
-      <span
-        class="animate-spin ease-linear rounded-full border-2 border-t-2 border-t-orange-500 border-neutral-900 w-[16px] h-[16px] text-sm"
-      />
-    {/if}
-    {buttonData[state].text}
-    {#if state === RECOVERY_STATES.Done}
-      <RightArrow />
-    {/if}
-  </button>
-{/if}
diff --git a/src/components/auth/register/Register.svelte b/src/components/auth/register/Register.svelte
deleted file mode 100644
index 4b57c60..0000000
--- a/src/components/auth/register/Register.svelte
+++ /dev/null
@@ -1,190 +0,0 @@
-<script lang="ts">
-  import { get as getStore } from 'svelte/store'
-
-  import { sessionStore } from '$lib/stores'
-  import {
-    createDID,
-    prepareUsername,
-    register,
-    USERNAME_STORAGE_KEY
-  } from '$lib/auth/account'
-  import FilesystemActivity from '$components/common/FilesystemActivity.svelte'
-
-  let username: string = ''
-  let encodedUsername: string = ''
-  let usernameValid = true
-  let usernameAvailable = true
-  let registrationSuccess = true
-  let checkingUsername = false
-
-  let initializingFilesystem = false
-
-  const checkUsername = async (event: Event) => {
-    const { value } = event.target as HTMLInputElement
-    const {
-      program: {
-        components: { crypto, storage }
-      }
-    } = getStore(sessionStore)
-
-    username = value
-    checkingUsername = true
-
-    /**
-     * Create a new DID for the user, which will be appended to their username, concatenated
-     * via a `#`, hashed and encoded to ensure uniqueness
-     */
-    const did = await createDID(crypto)
-    const fullUsername = `${value}#${did}`
-    await storage.setItem(USERNAME_STORAGE_KEY, fullUsername)
-
-    encodedUsername = await prepareUsername(fullUsername)
-
-    checkingUsername = false
-  }
-
-  const registerUser = async (event: Event) => {
-    event.preventDefault()
-
-    if (checkingUsername) {
-      return
-    }
-
-    initializingFilesystem = true
-
-    registrationSuccess = await register(encodedUsername)
-
-    if (!registrationSuccess) initializingFilesystem = false
-  }
-
-  $: usernameApproved =
-    username.length > 0 &&
-    !checkingUsername &&
-    usernameValid &&
-    usernameAvailable
-  $: usernameError =
-    username.length > 0 &&
-    !checkingUsername &&
-    (!usernameValid || !usernameAvailable)
-
-  let existingAccount = false
-  const toggleExistingAccount = () => (existingAccount = !existingAccount)
-</script>
-
-{#if initializingFilesystem}
-  <FilesystemActivity activity="Initializing" />
-{:else}
-  <div
-    class="flex flex-col items-center justify-center gap-8 min-h-[calc(100vh-128px)] md:min-h-[calc(100vh-160px)] max-w-[352px] m-auto"
-  >
-    <h1 class="text-base">Connect this device</h1>
-
-    <!-- Registration Form -->
-    <form
-      on:submit={registerUser}
-      class="w-full p-6 rounded bg-base-content text-base-100"
-    >
-      <h2 class="mb-2 text-sm font-semibold">Choose a username</h2>
-      <div class="relative">
-        <input
-          id="registration"
-          type="text"
-          class="input input-bordered bg-neutral-50 !text-neutral-900 dark:border-neutral-900 rounded-lg focus:outline-none w-full px-3 block {usernameApproved
-            ? '!border-green-300'
-            : ''} {usernameError ? '!border-red-400' : ''}"
-          class:input-error={username.length !== 0 &&
-            (!usernameValid || !usernameAvailable)}
-          on:input={checkUsername}
-        />
-        {#if checkingUsername}
-          <span
-            class="rounded-lg border-t-2 border-l-2 border-base-content w-4 h-4 block absolute top-4 right-4 animate-spin"
-          />
-        {/if}
-      </div>
-
-      {#if !registrationSuccess}
-        <!-- Error when registration fails -->
-        <label for="registration" class="label">
-          <span class="text-xxs !p-0 text-error text-left">
-            There was an issue registering your account. Please try again.
-          </span>
-        </label>
-      {/if}
-
-      <div class="text-left mt-4">
-        <input
-          type="checkbox"
-          id="shared-computer"
-          class="peer checkbox checkbox-primary hover:border-base-100 rounded-lg border-2 border-base-100 transition-colors duration-250 ease-in-out inline-grid align-bottom checked:bg-base-100"
-        />
-        <!-- Warning when "This is a shared computer" is checked -->
-        <label
-          for="shared-computer"
-          class="cursor-pointer ml-1 text-sm grid-inline"
-        >
-          This is a public or shared computer
-        </label>
-        <label
-          for="registration"
-          class="label mt-4 !p-0 hidden peer-checked:block"
-        >
-          <span class="text-red-400 text-left">
-            In order to ensure the security of your private data, the ODD SDK
-            does not recommend creating an account from a public or shared
-            computer.
-          </span>
-        </label>
-      </div>
-
-      <div class="flex items-center mt-4">
-        <a
-          class="!h-[52px] btn btn-outline !text-neutral-900 !border-neutral-900 !bg-neutral-50"
-          href="/"
-        >
-          Cancel
-        </a>
-        <button
-          class="ml-2 !h-[52px] flex-1 btn btn-primary disabled:opacity-50 disabled:border-neutral-900 disabled:text-neutral-900"
-          disabled={username.length === 0 ||
-            !usernameValid ||
-            !usernameAvailable ||
-            checkingUsername}
-          type="submit"
-        >
-          Create your account
-        </button>
-      </div>
-    </form>
-
-    <!-- Existing Account -->
-    <div class="flex flex-col gap-5 w-full">
-      <button
-        class="btn btn-outline !h-[52px] w-full {existingAccount
-          ? '!bg-base-content !text-base-100 !border-base-content'
-          : ''}"
-        on:click={toggleExistingAccount}
-      >
-        I have an existing account
-      </button>
-      {#if existingAccount}
-        <div
-          class="flex flex-col gap-4 p-6 rounded bg-neutral-200 text-neutral-900"
-        >
-          <h3 class="text-sm text-center">
-            Which device are you connected on?
-          </h3>
-          <p>To connect your existing account, you'll need to:</p>
-          <ol class="pl-6 list-decimal">
-            <li>Find a device the account is already connected on</li>
-            <li>Navigate to your Account Settings</li>
-            <li>Click "Connect a new device"</li>
-          </ol>
-        </div>
-      {/if}
-    </div>
-
-    <!-- Recovery Link -->
-    <a href="/recover" class="underline">Recover an account</a>
-  </div>
-{/if}
diff --git a/src/components/auth/register/Welcome.svelte b/src/components/auth/register/Welcome.svelte
deleted file mode 100644
index 68e08e2..0000000
--- a/src/components/auth/register/Welcome.svelte
+++ /dev/null
@@ -1,39 +0,0 @@
-<script lang="ts">
-  import { appName } from '$lib/app-info'
-  import { sessionStore } from '$lib/stores'
-  import WelcomeCheckIcon from '$components/icons/WelcomeCheckIcon.svelte'
-</script>
-
-<input type="checkbox" id="link-device-modal" checked class="modal-toggle" />
-<div class="modal">
-  <div class="modal-box w-narrowModal relative text-center">
-    <div>
-      <h3 class="mb-14 text-base">
-        Welcome, {$sessionStore.username.trimmed}!
-      </h3>
-      <div class="flex justify-center mb-11 text-base-content">
-        <WelcomeCheckIcon />
-      </div>
-      <div>
-        <p class="mb-4 text-left">Your account has been created.</p>
-
-        <div class="mb-8 text-left">
-          <input type="checkbox" id="password-message" class="peer hidden" />
-          <label
-            class="text-blue-500 underline mb-8 hover:cursor-pointer peer-checked:hidden"
-            for="password-message"
-          >
-            Wait&mdash;what's my password?
-          </label>
-          <p class="hidden peer-checked:block">
-            You don't need a password! <br />
-            {appName} uses public key cryptography to authenticate you with this
-            device.
-          </p>
-        </div>
-
-        <a class="btn btn-primary" href="/backup">Continue</a>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/src/components/home/sign-up/Email.svelte b/src/components/home/sign-up/Email.svelte
index fc56afd..df8c4b6 100644
--- a/src/components/home/sign-up/Email.svelte
+++ b/src/components/home/sign-up/Email.svelte
@@ -12,6 +12,7 @@
   // Submit email to Fission server to register the account
   const handleSubmitEmail = async (event: Event) => {
     loading = true
+
     try {
       const formEl = event.target as HTMLFormElement
       const data = new FormData(formEl)
@@ -19,6 +20,20 @@
 
       posthog.capture('Email validation sent')
 
+      const response = await fetch(
+        'http://localhost:3000/api/v0/auth/email/verify',
+        {
+          method: 'POST',
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          },
+          body: JSON.stringify({ email: email.toString() })
+        }
+      )
+
+      console.log('Response', await response.text())
+
       dispatch('nextStep', { email })
 
       // addNotification({ msg: 'Account created!', type: 'success'})
@@ -26,6 +41,7 @@
       console.error(error)
       addNotification({ msg: 'Failed to register account', type: 'error' })
     }
+
     loading = false
   }
 </script>
diff --git a/src/components/home/sign-up/Pin.svelte b/src/components/home/sign-up/Pin.svelte
index b19b87e..5345be2 100644
--- a/src/components/home/sign-up/Pin.svelte
+++ b/src/components/home/sign-up/Pin.svelte
@@ -20,9 +20,10 @@
       const data = new FormData(formEl)
       const pin = data.get('pin')
 
+      // TODO: Is this correct? Should we perhaps only emit this on the next step?
       posthog.capture('Account created')
 
-      dispatch('nextStep', { pin })
+      dispatch('nextStep', { email, pin })
 
       // addNotification({ msg: 'Account created!', type: 'success' })
     } catch (error) {
@@ -34,7 +35,20 @@
   }
 
   const handleResendEmail = async () => {
-    addNotification({ msg: 'Email sent!', type: 'success' })
+    try {
+      await fetch('http://localhost:3000/api/v0/auth/email/verify', {
+        method: 'POST',
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ email: email.toString() })
+      })
+      addNotification({ msg: 'Email sent!', type: 'success' })
+    } catch (error) {
+      console.error('error')
+      addNotification({ msg: 'Failed to re-send email', type: 'error' })
+    }
   }
 </script>
 
diff --git a/src/components/home/sign-up/Username.svelte b/src/components/home/sign-up/Username.svelte
index 553b927..f0f1425 100644
--- a/src/components/home/sign-up/Username.svelte
+++ b/src/components/home/sign-up/Username.svelte
@@ -1,9 +1,20 @@
 <script lang="ts">
+  import { UCAN } from '@fission-codes/ucan'
+  import type { Capabilities } from '@fission-codes/ucan/dist/src/types'
+  import { RSASigner } from 'iso-signatures/signers/rsa'
+  import { DIDKey } from 'iso-did/key'
+  import localforage from 'localforage'
+
   import { addNotification } from '$lib/notifications'
+  import {
+    IDB_ACCOUNT_DID_LABEL,
+    IDB_ACCOUNT_ID_LABEL,
+    IDB_UCAN_LABEL
+  } from '$lib/session'
+  import { sessionStore } from '$lib/stores'
   import Input from '$components/form/Input.svelte'
   import StarSmall from '$components/icons/StarSmall.svelte'
   import { goto } from '$app/navigation'
-  import { sessionStore } from '$lib/stores'
 
   let loading = false
 
@@ -19,8 +30,60 @@
       const data = new FormData(formEl)
       const username = data.get('username')
 
-      // @ts-ignore-next-line
-      $sessionStore.username = username
+      // TODO(matheus23): Replace this with a proper DoH DNS
+      // lookup of _did.localhost once iso-web DoH stuff is exposed.
+      const serverDid = await (
+        await fetch('http://localhost:3000/api/v0/server-did')
+      ).text()
+
+      const audience = DIDKey.fromString(serverDid)
+
+      const idbPrivateKeyLabel = 'control-panel/v1/agent/signing-keypair'
+      // TODO: This is using an old version of iso-signatures, @fission-codes/stack needs to be updated
+      const principal = await RSASigner.generate()
+      // Persist/overwrite private key in IndexedDB
+      await localforage.setItem(idbPrivateKeyLabel, principal.export())
+
+      const ucan = await UCAN.create({
+        issuer: principal,
+        audience,
+        ttl: 60, // A rough estimate that accounts for clock drift
+        capabilities: ({
+          [principal.did.toString()]: { 'account/create': [{}] }
+        } as unknown) as Capabilities
+      })
+
+      console.log('Requesting with UCAN', ucan.toString())
+
+      const response = await fetch('http://localhost:3000/api/v0/account', {
+        method: 'POST',
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${ucan.toString()}`
+        },
+        body: JSON.stringify({
+          code: pin,
+          email,
+          username
+        })
+      })
+
+      // HTTP status code 201 CREATED
+      if (response.status != 201) {
+        throw new Error(await response.text())
+      }
+
+      // Now we have some info on the account & UCANs
+      const { account, ucans } = await response.json()
+
+      await localforage.setItem(IDB_ACCOUNT_DID_LABEL, account.did)
+      await localforage.setItem(IDB_ACCOUNT_ID_LABEL, account.id)
+      await localforage.setItem(IDB_UCAN_LABEL, ucans[0])
+
+      $sessionStore.username = username.toString()
+      $sessionStore.id = account.id
+
       goto('/onboarding/welcome')
     } catch (error) {
       console.error(error)
diff --git a/src/components/nav/Nav.svelte b/src/components/nav/Nav.svelte
index 3fff49a..5252371 100644
--- a/src/components/nav/Nav.svelte
+++ b/src/components/nav/Nav.svelte
@@ -60,7 +60,7 @@
     ? 'h-auto md:h-10 mt-auto'
     : 'h-10 md:fixed md:top-0 md:right-0 md:left-0 z-30'}"
 >
-  {#if $sessionStore.session}
+  {#if $sessionStore.username}
     <a
       href="/"
       class="{inFooter ? 'hidden md:inline-block' : ''} {$page.url.pathname ===
@@ -74,7 +74,7 @@
     </a>
   {/if}
 
-  {#if $sessionStore.session}
+  {#if $sessionStore.username}
     {#if !inFooter && screenSize < 768}
       {@const activeNavItem = navItems.find(({ isActive }) => isActive)}
       {#if activeNavItem}
diff --git a/src/components/settings/Avatar.svelte b/src/components/settings/Avatar.svelte
deleted file mode 100644
index c2b5475..0000000
--- a/src/components/settings/Avatar.svelte
+++ /dev/null
@@ -1,40 +0,0 @@
-<script lang="ts">
-  import { accountSettingsStore, sessionStore } from '$lib/stores'
-  import { getAvatarFromWNFS } from '$lib/account-settings'
-
-  export let size = 'large'
-
-  const sizeClasses =
-    size === 'large'
-      ? 'w-[88px] h-[88px] text-[40px]'
-      : 'w-[40px] h-[40px] text-sm'
-
-  const loaderSizeClasses =
-    size === 'large' ? 'w-[28px] h-[28px]' : 'w-[16px] h-[16px]'
-
-  getAvatarFromWNFS()
-</script>
-
-{#if $accountSettingsStore.avatar}
-  {#if $accountSettingsStore.loading}
-    <div
-      class="flex items-center justify-center object-cover rounded-full border-2 border-base-content {sizeClasses}"
-    >
-      <span
-        class="animate-spin ease-linear rounded-full border-2 border-t-2 border-t-orange-500 border-base-content {loaderSizeClasses}"
-      />
-    </div>
-  {:else}
-    <img
-      class="object-cover rounded-full border-2 border-base-content {sizeClasses}"
-      src={$accountSettingsStore.avatar.src}
-      alt="User Avatar"
-    />
-  {/if}
-{:else}
-  <div
-    class="flex items-center justify-center bg-base-content text-base-100 uppercase font-bold rounded-full {sizeClasses}"
-  >
-    {$sessionStore.username.trimmed[0]}
-  </div>
-{/if}
diff --git a/src/components/settings/AvatarUpload.svelte b/src/components/settings/AvatarUpload.svelte
deleted file mode 100644
index 0d52afc..0000000
--- a/src/components/settings/AvatarUpload.svelte
+++ /dev/null
@@ -1,39 +0,0 @@
-<script lang="ts">
-  import { getAvatarFromWNFS, uploadAvatarToWNFS } from '$lib/account-settings'
-  import Avatar from '$components/settings/Avatar.svelte'
-
-  /**
-   * Handle uploads made by interacting with the file input
-   */
-  const handleFileInput: (file: File) => Promise<void> = async file => {
-    await uploadAvatarToWNFS(file)
-
-    // Refetch avatar and update accountSettingsStore
-    await getAvatarFromWNFS()
-  }
-
-  // Handle a file uploaded directly through the file input
-  let files: FileList
-  $: if (files) {
-    const file = Array.from(files)[0]
-    handleFileInput(file)
-  }
-</script>
-
-<div>
-  <h3 class="text-lg mb-4">Avatar</h3>
-  <div class="flex items-center gap-4">
-    <Avatar />
-
-    <label for="upload-avatar" class="btn btn-primary btn-odd-purple-500">
-      Upload a new avatar
-    </label>
-    <input
-      bind:files
-      id="upload-avatar"
-      type="file"
-      accept="image/*"
-      class="hidden"
-    />
-  </div>
-</div>
diff --git a/src/components/settings/ConnectedDevices.svelte b/src/components/settings/ConnectedDevices.svelte
deleted file mode 100644
index ed01274..0000000
--- a/src/components/settings/ConnectedDevices.svelte
+++ /dev/null
@@ -1,20 +0,0 @@
-<script lang="ts">
-  import { goto } from '$app/navigation'
-
-  import { sessionStore } from '$lib/stores'
-</script>
-
-<div class="flex flex-col gap-4">
-  <h3 class="text-heading-lg">Connected devices</h3>
-  {#if $sessionStore.backupCreated}
-    <p>You have connected at least one other device.</p>
-  {:else}
-    <p>You have no other connected devices.</p>
-  {/if}
-  <button
-    class="btn btn-primary btn-odd-purple-500 !text-label-l"
-    on:click={() => goto('/delegate-account')}
-  >
-    Connect an additional device
-  </button>
-</div>
diff --git a/src/components/settings/RecoveryKit.svelte b/src/components/settings/RecoveryKit.svelte
deleted file mode 100644
index 392f3d4..0000000
--- a/src/components/settings/RecoveryKit.svelte
+++ /dev/null
@@ -1,27 +0,0 @@
-<script lang="ts">
-  import RecoveryKitModal from '$components/settings/RecoveryKitModal.svelte'
-
-  let modalOpen = false
-
-  const handleToggleModal = async () => (modalOpen = !modalOpen)
-</script>
-
-<div class="flex flex-col gap-4">
-  <h3 class="text-lg">Recovery Kit</h3>
-  <p>
-    Your recovery kit will restore access to your data in the event that you
-    lose access to all of your connected devices. We recommend you store your
-    kit in a safe place, separate from those devices.
-  </p>
-
-  <button
-    class="btn btn-odd-purple-500 btn-primary w-fit"
-    on:click={handleToggleModal}
-  >
-    Create your recovery kit
-  </button>
-</div>
-
-{#if modalOpen}
-  <RecoveryKitModal {handleToggleModal} />
-{/if}
diff --git a/src/components/settings/RecoveryKitModal.svelte b/src/components/settings/RecoveryKitModal.svelte
deleted file mode 100644
index 4eecbd4..0000000
--- a/src/components/settings/RecoveryKitModal.svelte
+++ /dev/null
@@ -1,87 +0,0 @@
-<script lang="ts">
-  import { sessionStore } from '$lib/stores'
-  import { generateRecoveryKit } from '$lib/account-settings'
-  import Download from '$components/icons/Download.svelte'
-
-  export let handleToggleModal: () => void
-  $: recoveryKit = null
-  $: downloadLinkRef = null
-  $: fileURL = null
-
-  const prepareRecoveryKitDownload = async () => {
-    recoveryKit = await generateRecoveryKit()
-
-    const data = new Blob([recoveryKit], { type: 'text/plain' })
-
-    // If we are replacing a previously generated file we need to
-    // manually revoke the object URL to avoid memory leaks.
-    if (fileURL !== null) {
-      window.URL.revokeObjectURL(fileURL)
-    }
-
-    fileURL = window.URL.createObjectURL(data)
-  }
-  const recoveryKitPromise = prepareRecoveryKitDownload()
-
-  $: if (downloadLinkRef && fileURL) {
-    downloadLinkRef.setAttribute(
-      'download',
-      `ODD-RecoveryKit-${$sessionStore.username.trimmed}.txt`
-    )
-
-    downloadLinkRef.href = fileURL
-  }
-</script>
-
-<input type="checkbox" id="recovery-kit-modal" checked class="modal-toggle" />
-<div class="modal !z-max">
-  <div
-    class="modal-box w-narrowModal sm:w-wideModal relative text-center sm:!pr-11 sm:!pb-11 sm:!pl-11"
-  >
-    <button
-      class="btn btn-xs btn-circle absolute right-2 top-2"
-      on:click={handleToggleModal}
-    >
-      ✕
-    </button>
-
-    <div>
-      {#await recoveryKitPromise}
-        <h3 class="mb-7 text-base">Creating your recovery kit...</h3>
-
-        <div class="flex items-center justify-center text-base-content">
-          <span
-            class="rounded-lg border-t-2 border-l-2 border-base-content w-4 h-4 inline-block animate-spin mr-2"
-          />
-        </div>
-      {:then}
-        <h3 class="mb-7 text-base">Your recovery kit has been created!</h3>
-
-        <div class="text-left mb-6">
-          <p class="mb-2">Please store it somewhere safe for two reasons:</p>
-          <ol class="list-decimal mb-2 pl-6">
-            <li>
-              <strong>It is powerful:</strong>
-              Anyone with this recovery kit will have access to all of your private
-              data.
-            </li>
-            <li>
-              <strong>It's your backup plan:</strong>
-              If you lose access to your connected devices, this kit will help you
-              recover your private data.
-            </li>
-          </ol>
-          <p>
-            So, keep it somewhere you keep things you don't want to lose or have
-            stolen.
-          </p>
-        </div>
-
-        <!-- svelte-ignore a11y-missing-attribute -->
-        <a class="btn btn-primary w-[227px] gap-2" bind:this={downloadLinkRef}>
-          <Download /> Download recovery kit
-        </a>
-      {/await}
-    </div>
-  </div>
-</div>
diff --git a/src/components/settings/TruncatedUsername.svelte b/src/components/settings/TruncatedUsername.svelte
deleted file mode 100644
index a64f279..0000000
--- a/src/components/settings/TruncatedUsername.svelte
+++ /dev/null
@@ -1,12 +0,0 @@
-<script lang="ts">
-  import { sessionStore } from '$lib/stores'
-
-  $: usernameParts = $sessionStore?.username?.full?.split('#')
-</script>
-
-{usernameParts[0]}
-<span class="text-neutral-500 -ml-[3px]">
-  #{usernameParts[1].substring(0, 12)}...{usernameParts[1].substring(
-    usernameParts[1].length - 5
-  )}
-</span>
diff --git a/src/components/settings/Username.svelte b/src/components/settings/Username.svelte
index 9af4055..2cbffbb 100644
--- a/src/components/settings/Username.svelte
+++ b/src/components/settings/Username.svelte
@@ -4,10 +4,9 @@
   import { sessionStore } from '$lib/stores'
   import { addNotification } from '$lib/notifications'
   import ClipboardIcon from '$components/icons/ClipboardIcon.svelte'
-  import TruncatedUsername from '$components/settings/TruncatedUsername.svelte'
 
   const handleCopyUsername = async (): Promise<void> => {
-    await clipboardCopy($sessionStore.username.full)
+    await clipboardCopy($sessionStore.username)
     addNotification({ msg: 'Copied to clipboard', type: 'success' })
   }
 </script>
@@ -16,7 +15,7 @@
   <h3 class="text-heading-lg mb-4">Username</h3>
   <div class="flex items-center">
     <p>
-      <TruncatedUsername />
+      {$sessionStore.username}
     </p>
     <button
       class="pl-2 hover:text-neutral-500 transition-colors"
diff --git a/src/lib/account-settings.ts b/src/lib/account-settings.ts
deleted file mode 100644
index d276654..0000000
--- a/src/lib/account-settings.ts
+++ /dev/null
@@ -1,250 +0,0 @@
-import { get as getStore } from 'svelte/store'
-import * as odd from '@oddjs/odd'
-import { retrieve } from '@oddjs/odd/common/root-key'
-import * as uint8arrays from 'uint8arrays'
-import type { CID } from 'multiformats/cid'
-import type { PuttableUnixTree, File as WNFile } from '@oddjs/odd/fs/types'
-import type { Metadata } from '@oddjs/odd/fs/metadata'
-
-import { accountSettingsStore, filesystemStore, sessionStore } from '$lib/stores'
-import { addNotification } from '$lib/notifications'
-import { fileToUint8Array } from './utils'
-
-export type Avatar = {
-  cid: string
-  ctime: number
-  name: string
-  size?: number
-  src: string
-}
-
-export type AccountSettings = {
-  avatar: Avatar
-  loading: boolean
-}
-interface AvatarFile extends PuttableUnixTree, WNFile {
-  cid: CID
-  content: Uint8Array
-  header: {
-    content: Uint8Array
-    metadata: Metadata
-  }
-}
-
-export const ACCOUNT_SETTINGS_DIR = odd.path.directory('private', 'settings')
-const AVATAR_DIR = odd.path.combine(ACCOUNT_SETTINGS_DIR, odd.path.directory('avatars'))
-const AVATAR_ARCHIVE_DIR = odd.path.combine(AVATAR_DIR, odd.path.directory('archive'))
-const AVATAR_FILE_NAME = 'avatar'
-const FILE_SIZE_LIMIT = 20
-
-/**
- * Move old avatar to the archive directory
- */
-const archiveOldAvatar = async (): Promise<void> => {
-  const fs = getStore(filesystemStore)
-
-  // Return if user has not uploaded an avatar yet
-  const avatarDirExists = await fs.exists(AVATAR_DIR)
-  if (!avatarDirExists) {
-    return
-  }
-
-  // Find the filename of the old avatar
-  const links = await fs.ls(AVATAR_DIR)
-  const oldAvatarFileName = Object.keys(links).find(key =>
-    key.includes(AVATAR_FILE_NAME)
-  )
-  const oldFileNameArray = oldAvatarFileName.split('.')[ 0 ]
-  const archiveFileName = `${oldFileNameArray[ 0 ]}-${Date.now()}.${oldFileNameArray[ 1 ]
-    }`
-
-  // Move old avatar to archive dir
-  const fromPath = odd.path.combine(AVATAR_DIR, odd.path.file(oldAvatarFileName))
-  const toPath = odd.path.combine(AVATAR_ARCHIVE_DIR, odd.path.file(archiveFileName))
-  await fs.mv(fromPath, toPath)
-
-  // Announce the changes to the server
-  await fs.publish()
-}
-
-/**
- * Get the Avatar from the user's WNFS and construct its `src`
- */
-export const getAvatarFromWNFS = async (): Promise<void> => {
-  try {
-    // Set loading: true on the accountSettingsStore
-    accountSettingsStore.update(store => ({ ...store, loading: true }))
-
-    const fs = getStore(filesystemStore)
-
-    // If the avatar dir doesn't exist, silently fail and let the UI handle it
-    const avatarDirExists = await fs.exists(AVATAR_DIR)
-    if (!avatarDirExists) {
-      accountSettingsStore.update(store => ({
-        ...store,
-        loading: false
-      }))
-      return
-    }
-
-    // Find the file that matches the AVATAR_FILE_NAME
-    const links = await fs.ls(AVATAR_DIR)
-    const avatarName = Object.keys(links).find(key =>
-      key.includes(AVATAR_FILE_NAME)
-    )
-
-    // If user has not uploaded an avatar, silently fail and let the UI handle it
-    if (!avatarName) {
-      accountSettingsStore.update(store => ({
-        ...store,
-        loading: false
-      }))
-      return
-    }
-
-    const file = await fs.get(odd.path.combine(AVATAR_DIR, odd.path.file(`${avatarName}`)))
-
-    // The CID for private files is currently located in `file.header.content`
-    const cid = (file as AvatarFile).header.content.toString()
-
-    // Create a base64 string to use as the image `src`
-    const src = `data:image/jpeg;base64, ${uint8arrays.toString(
-      (file as AvatarFile).content,
-      'base64'
-    )}`
-
-    const avatar = {
-      cid,
-      ctime: (file as AvatarFile).header.metadata.unixMeta.ctime,
-      name: avatarName,
-      src
-    }
-
-    // Push images to the accountSettingsStore
-    accountSettingsStore.update(store => ({
-      ...store,
-      avatar,
-      loading: false
-    }))
-  } catch (error) {
-    console.error(error)
-    accountSettingsStore.update(store => ({
-      ...store,
-      avatar: null,
-      loading: false
-    }))
-  }
-}
-
-/**
- * Upload an avatar image to the user's private WNFS
- * @param image
- */
-export const uploadAvatarToWNFS = async (image: File): Promise<void> => {
-  try {
-    // Set loading: true on the accountSettingsStore
-    accountSettingsStore.update(store => ({ ...store, loading: true }))
-
-    const fs = getStore(filesystemStore)
-
-    // Reject files over 20MB
-    const imageSizeInMB = image.size / (1024 * 1024)
-    if (imageSizeInMB > FILE_SIZE_LIMIT) {
-      throw new Error('Image can be no larger than 20MB')
-    }
-
-    // Archive old avatar
-    await archiveOldAvatar()
-
-    // Rename the file to `avatar.[extension]`
-    const updatedImage = new File(
-      [ image ],
-      `${AVATAR_FILE_NAME}.${image.name.split('.')[ 1 ]}`,
-      {
-        type: image.type
-      }
-    )
-
-    // Create a sub directory and add the avatar
-    await fs.write(
-      odd.path.combine(AVATAR_DIR, odd.path.file(updatedImage.name)),
-      await fileToUint8Array(updatedImage)
-    )
-
-    // Announce the changes to the server
-    await fs.publish()
-
-    addNotification({ msg: `Your avatar has been updated!`, type: 'success' })
-  } catch (error) {
-    addNotification({ msg: error.message, type: 'error' })
-    console.error(error)
-  }
-}
-
-export const generateRecoveryKit = async (): Promise<string> => {
-  const {
-    program: {
-      components: { crypto, reference }
-    },
-    username: {
-      full,
-      hashed,
-      trimmed,
-    }
-  } = getStore(sessionStore)
-
-  // Get the user's read-key and base64 encode it
-  const accountDID = await reference.didRoot.lookup(hashed)
-  const readKey = await retrieve({ crypto, accountDID })
-  const encodedReadKey = uint8arrays.toString(readKey, 'base64pad')
-
-  // Get today's date to display in the kit
-  const options: Intl.DateTimeFormatOptions = {
-    weekday: 'short',
-    year: 'numeric',
-    month: 'short',
-    day: 'numeric'
-  }
-  const date = new Date()
-
-  const content = `#     %@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%
-#   @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-# %@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%
-# @@@@@%     %@@@@@@%         %@@@@@@@%     %@@@@@
-# @@@@@       @@@@@%            @@@@@@       @@@@@
-# @@@@@%      @@@@@             %@@@@@      %@@@@@
-# @@@@@@%     @@@@@     %@@%     @@@@@     %@@@@@@
-# @@@@@@@     @@@@@    %@@@@%    @@@@@     @@@@@@@
-# @@@@@@@     @@@@%    @@@@@@    @@@@@     @@@@@@@
-# @@@@@@@    %@@@@     @@@@@@    @@@@@%    @@@@@@@
-# @@@@@@@    @@@@@     @@@@@@    %@@@@@    @@@@@@@
-# @@@@@@@    @@@@@@@@@@@@@@@@     @@@@@    @@@@@@@
-# @@@@@@@    %@@@@@@@@@@@@@@@     @@@@%    @@@@@@@
-# @@@@@@@     %@@%     @@@@@@     %@@%     @@@@@@@
-# @@@@@@@              @@@@@@              @@@@@@@
-# @@@@@@@%            %@@@@@@%            %@@@@@@@
-# @@@@@@@@@%        %@@@@@@@@@@%        %@@@@@@@@@
-# %@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%
-#   @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-#     %@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%
-#
-# This is your recovery kit. (It’s a yaml text file)
-#
-# Created for ${trimmed} on ${date.toLocaleDateString('en-US', options)}
-#
-# Store this somewhere safe.
-#
-# Anyone with this file will have read access to your private files.
-# Losing it means you won’t be able to recover your account
-# in case you lose access to all your linked devices.
-#
-# Our team will never ask you to share this file.
-#
-# To use this file, go to ${window.location.origin}/recover/
-# Learn how to customize this kit for your users: https://guide.fission.codes/
-
-username: ${full}
-key: ${encodedReadKey}`
-
-  return content
-}
diff --git a/src/lib/auth/account.ts b/src/lib/auth/account.ts
deleted file mode 100644
index 544fff2..0000000
--- a/src/lib/auth/account.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-import * as uint8arrays from 'uint8arrays'
-import { sha256 } from '@oddjs/odd/components/crypto/implementation/browser'
-import { publicKeyToDid } from '@oddjs/odd/did/transformers'
-import * as odd from '@oddjs/odd'
-import type { Crypto } from '@oddjs/odd'
-import type FileSystem from '@oddjs/odd/fs/index'
-import { get as getStore } from 'svelte/store'
-
-import { ACCOUNT_SETTINGS_DIR } from '$lib/account-settings'
-import { getBackupStatus } from '$lib/auth/backup'
-import { filesystemStore, sessionStore } from '$lib/stores'
-import { asyncDebounce } from '$lib/utils'
-import { WORKFLOWS_DIR } from '$lib/workflows'
-
-export const USERNAME_STORAGE_KEY = 'fullUsername'
-
-export enum RECOVERY_STATES {
-  Ready,
-  Processing,
-  Error,
-  Done
-}
-
-export const isUsernameValid = async (username: string): Promise<boolean> => {
-  const session = getStore(sessionStore)
-  return session.authStrategy.isUsernameValid(username)
-}
-
-const _isUsernameAvailable = async (
-  username: string
-) => {
-  const session = getStore(sessionStore)
-  return session.authStrategy.isUsernameAvailable(username)
-}
-
-const debouncedIsUsernameAvailable = asyncDebounce(
-  _isUsernameAvailable,
-  300
-)
-
-export const isUsernameAvailable = async (
-  username: string
-): Promise<boolean> => {
-  return debouncedIsUsernameAvailable(username)
-}
-
-export const createDID = async (crypto: Crypto.Implementation): Promise<string> => {
-  const pubKey = await crypto.keystore.publicExchangeKey()
-  const ksAlg = await crypto.keystore.getAlgorithm()
-
-  return publicKeyToDid(crypto, pubKey, ksAlg)
-}
-
-export const prepareUsername = async (username: string): Promise<string> => {
-  const normalizedUsername = username.normalize('NFD')
-  const hashedUsername = await sha256(
-    new TextEncoder().encode(normalizedUsername)
-  )
-
-  return uint8arrays
-    .toString(hashedUsername, 'base32')
-    .slice(0, 32)
-}
-
-export const register = async (hashedUsername: string): Promise<boolean> => {
-  const { authStrategy, program: { components: { storage } } } = getStore(sessionStore)
-
-  const { success } = await authStrategy.register({ username: hashedUsername })
-
-  if (!success) return success
-
-  const session = await authStrategy.session()
-  filesystemStore.set(session.fs)
-
-  // TODO Remove if only public and private directories are needed
-  await initializeFilesystem(session.fs)
-
-  const fullUsername = await storage.getItem(USERNAME_STORAGE_KEY) as string
-
-  sessionStore.update(state => ({
-    ...state,
-    username: {
-      full: fullUsername,
-      hashed: hashedUsername,
-      trimmed: fullUsername.split('#')[ 0 ]
-    },
-    session
-  }))
-
-  return success
-}
-
-/**
- * Create additional directories and files needed by the app
- *
- * @param fs FileSystem
- */
-const initializeFilesystem = async (fs: FileSystem): Promise<void> => {
-  await fs.mkdir(WORKFLOWS_DIR)
-  await fs.mkdir(ACCOUNT_SETTINGS_DIR)
-}
-
-export const loadAccount = async (hashedUsername: string, fullUsername: string): Promise<void> => {
-  const { authStrategy, program: { components: { storage } } } = getStore(sessionStore)
-  const session = await authStrategy.session()
-
-  filesystemStore.set(session.fs)
-
-  const backupStatus = await getBackupStatus(session.fs)
-
-  await storage.setItem(USERNAME_STORAGE_KEY, fullUsername)
-
-  sessionStore.update(state => ({
-    ...state,
-    username: {
-      full: fullUsername,
-      hashed: hashedUsername,
-      trimmed: fullUsername.split('#')[ 0 ],
-    },
-    session,
-    backupCreated: backupStatus.created
-  }))
-}
-
-export async function waitForDataRoot(username: string): Promise<void> {
-  const session = getStore(sessionStore)
-  const reference = session.program?.components.reference
-  const EMPTY_CID = 'Qmc5m94Gu7z62RC8waSKkZUrCCBJPyHbkpmGzEePxy2oXJ'
-
-  if (!reference) throw new Error('Program must be initialized to check for data root')
-
-  let dataRoot = await reference.dataRoot.lookup(username)
-
-  if (dataRoot.toString() !== EMPTY_CID) return
-
-  return new Promise((resolve) => {
-    const maxRetries = 50
-    let attempt = 0
-
-    const dataRootInterval = setInterval(async () => {
-      dataRoot = await reference.dataRoot.lookup(username)
-
-      if (dataRoot.toString() === EMPTY_CID && attempt < maxRetries) {
-        attempt++
-        return
-      }
-
-      clearInterval(dataRootInterval)
-      resolve()
-    }, 500)
-  })
-}
diff --git a/src/lib/auth/backup.ts b/src/lib/auth/backup.ts
deleted file mode 100644
index 7f4a729..0000000
--- a/src/lib/auth/backup.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import * as odd from '@oddjs/odd'
-import type FileSystem from '@oddjs/odd/fs/index'
-
-export type BackupStatus = { created: boolean } | null
-
-export const setBackupStatus = async (fs: FileSystem, status: BackupStatus): Promise<void> => {
-  const backupStatusPath = odd.path.file('private', 'backup-status.json')
-  await fs.write(backupStatusPath, new TextEncoder().encode(JSON.stringify(status)))
-  await fs.publish()
-}
-
-export const getBackupStatus = async (fs: FileSystem): Promise<BackupStatus> => {
-  const backupStatusPath = odd.path.file('private', 'backup-status.json')
-
-  if (await fs.exists(backupStatusPath)) {
-    const fileContent = await fs.read(backupStatusPath)
-
-    try {
-      return JSON.parse(
-        new TextDecoder().decode(fileContent)
-      ) as BackupStatus
-    } catch (err) {
-      console.warn(`Unable to load backup status: ${err.message || err}`)
-    }
-
-    return { created: false }
-  } else {
-    return { created: false }
-  }
-}
diff --git a/src/lib/auth/linking.ts b/src/lib/auth/linking.ts
deleted file mode 100644
index 83957ab..0000000
--- a/src/lib/auth/linking.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import type * as odd from '@oddjs/odd'
-import { get as getStore } from 'svelte/store'
-
-import { sessionStore } from '$lib/stores'
-
-
-export const createAccountLinkingConsumer = async (
-  username: string
-): Promise<odd.AccountLinkingConsumer> => {
-  const session = getStore(sessionStore)
-  if (session.authStrategy) return session.authStrategy.accountConsumer(username)
-
-  // Wait for program to be initialised
-  return new Promise((resolve) => {
-    sessionStore.subscribe(updatedState => {
-      if (!updatedState.authStrategy) return
-      const consumer = updatedState.authStrategy.accountConsumer(username)
-      resolve(consumer)
-    })
-  })
-}
-
-export const createAccountLinkingProducer = async (
-  username: string
-): Promise<odd.AccountLinkingProducer> => {
-  const session = getStore(sessionStore)
-  return session.authStrategy.accountProducer(username)
-}
diff --git a/src/lib/init.ts b/src/lib/init.ts
index ca01290..56cca6b 100644
--- a/src/lib/init.ts
+++ b/src/lib/init.ts
@@ -1,82 +1,92 @@
-import * as odd from '@oddjs/odd'
-import { dev } from '$app/environment'
+// import { UCAN } from '@fission-codes/ucan'
+// import type { Capabilities } from '@fission-codes/ucan/dist/src/types'
+// import { RSASigner } from 'iso-signatures/signers/rsa'
+// import { DIDKey } from 'iso-did/key'
+import localforage from 'localforage'
 
-import { filesystemStore, sessionStore } from './stores'
-import { getBackupStatus, type BackupStatus } from '$lib/auth/backup'
-import { USERNAME_STORAGE_KEY, createDID } from '$lib/auth/account'
-import { oddNamespace } from '$lib/app-info'
+import { IDB_ACCOUNT_DID_LABEL, IDB_ACCOUNT_ID_LABEL, IDB_UCAN_LABEL } from '$lib/session'
+import { sessionStore } from '$lib/stores'
 
 export const initialize = async (): Promise<void> => {
   try {
-    let backupStatus: BackupStatus = null
+    const accountDid = await localforage.getItem(IDB_ACCOUNT_DID_LABEL)
+    const accountId = await localforage.getItem(IDB_ACCOUNT_ID_LABEL) as number
+    const ucan = await localforage.getItem(IDB_UCAN_LABEL)
 
-    const program: odd.Program = await odd.program({
-      namespace: oddNamespace,
-      debug: dev
-    })
+    // If there is no save accountDid or ucan, there's no active session
+    if (!accountDid || !ucan) {
+      sessionStore.set({
+        id: null,
+        username: null,
+        loading: false
+      })
+      return
+    }
 
-    if (program.session) {
-      // Authed
-      backupStatus = await getBackupStatus(program.session.fs)
+    // const serverDid = await(
+    //   await fetch('http://localhost:3000/api/v0/server-did')
+    // ).text()
+    // const audience = DIDKey.fromString(serverDid)
 
-      let fullUsername = await program.components.storage.getItem(USERNAME_STORAGE_KEY) as string
+    // const idbPrivateKeyLabel = 'control-panel/v1/agent/signing-keypair'
 
-      // If the user is migrating from a version odd-app-template before https://github.com/oddsdk/odd-app-template/pull/97/files#diff-a180510e798b8f833ebfdbe691c5ec4a1095076980d3e2388de29c849b2b8361R44,
-      // their username won't contain a did, so we will need to manually append a DID and add it storage here
-      if (!fullUsername) {
-        const did = await createDID(program.components.crypto)
-        fullUsername = `${program.session.username}#${did}`
-        await program.components.storage.setItem(USERNAME_STORAGE_KEY, fullUsername)
-        window.location.reload()
-      }
+    // // TODO: This is using an old version of iso-signatures, @fission-codes/stack needs to be updated
+    // const principal = await RSASigner.generate()
 
-      sessionStore.set({
-        username: {
-          full: fullUsername,
-          hashed: program.session.username,
-          trimmed: fullUsername.split('#')[0],
-        },
-        session: program.session,
-        authStrategy: program.auth,
-        program,
-        loading: false,
-        backupCreated: backupStatus.created
-      })
+    // const keyPair = await localforage.getItem(idbPrivateKeyLabel)
 
-      filesystemStore.set(program.session.fs)
+    // const ucan = await UCAN.create({
+    //   issuer: principal,
+    //   audience,
+    //   ttl: 60, // A rough estimate that accounts for clock drift
+    //   capabilities: ({
+    //     [principal.did.toString()]: { 'capability/fetch': [{}] }
+    //   } as unknown) as Capabilities
+    // })
 
-    } else {
-      // Not authed
-      sessionStore.set({
-        username: null,
-        session: null,
-        authStrategy: program.auth,
-        program,
-        loading: false,
-        backupCreated: null
-      })
-    }
+    // const response = await fetch('http://localhost:3000/api/v0/capabilities', {
+    //   method: 'GET',
+    //   headers: {
+    //     Accept: 'application/json',
+    //     'Content-Type': 'application/json',
+    //     Authorization: `Bearer ${ucan.toString()}`
+    //   }
+    // })
 
-  } catch (error) {
-    console.error(error)
+    // const ucan = await UCAN.create({
+    //   issuer: DIDKey.fromString(accountDid),
+    //   audience,
+    //   ttl: 60, // A rough estimate that accounts for clock drift
+    //   capabilities: ({
+    //     [accountDid]: { 'account/info': [{}] }
+    //   } as unknown) as Capabilities
+    // })
 
-    switch (error) {
-      case odd.ProgramError.InsecureContext:
-        sessionStore.update(session => ({
-          ...session,
-          loading: false,
-          error: 'Insecure Context'
-        }))
-        break
+    const response = await fetch(
+      `http://localhost:3000/api/v0/account/${accountDid}`,
+      {
+        method: 'GET',
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${ucan.toString()}`
+        }
+      }
+    )
 
-      case odd.ProgramError.UnsupportedBrowser:
-        sessionStore.update(session => ({
-          ...session,
-          loading: false,
-          error: 'Unsupported Browser'
-        }))
-        break
-    }
+    const { username } = await response.json()
 
+    sessionStore.set({
+      id: accountId,
+      username,
+      loading: false,
+    })
+  } catch (error) {
+    sessionStore.set({
+      username: null,
+      loading: false,
+    })
+
+    console.error(error)
   }
 }
diff --git a/src/lib/session.ts b/src/lib/session.ts
index d6cb573..b9308c3 100644
--- a/src/lib/session.ts
+++ b/src/lib/session.ts
@@ -1,31 +1,11 @@
-import type * as odd from '@oddjs/odd'
-
-import { appName } from '$lib/app-info'
-
-type Username = {
-  full: string
-  hashed: string
-  trimmed: string
-}
-
 export type Session = {
-  username: Username
-  session: odd.Session | null
-  authStrategy: odd.AuthenticationStrategy | null
-  program: odd.Program
+  id?: number
+  username: string
   loading: boolean
-  backupCreated: boolean
-  error?: SessionError
 }
 
-type SessionError = 'Insecure Context' | 'Unsupported Browser'
+export const IDB_ACCOUNT_DID_LABEL = 'control-panel/v1/account/did'
 
-export const errorToMessage = (error: SessionError): string => {
-  switch (error) {
-    case 'Insecure Context':
-      return `${appName} requires a secure context (HTTPS)`
+export const IDB_ACCOUNT_ID_LABEL = 'control-panel/v1/account/id'
 
-    case 'Unsupported Browser':
-      return `Your browser does not support ${appName}`
-  }
-}
+export const IDB_UCAN_LABEL = 'control-panel/v1/ucan'
diff --git a/src/lib/stores.ts b/src/lib/stores.ts
index 50ba597..aa030f6 100644
--- a/src/lib/stores.ts
+++ b/src/lib/stores.ts
@@ -1,10 +1,8 @@
 import { writable } from 'svelte/store'
 import type { Writable } from 'svelte/store'
-import type FileSystem from '@oddjs/odd/fs/index'
 
 import type { Maybe } from '$lib'
 import { loadTheme } from '$lib/theme'
-import type { AccountSettings } from '$lib/account-settings'
 import type { Notification } from '$lib/notifications'
 import type { Session } from '$lib/session'
 import type { Theme } from '$lib/theme'
@@ -18,23 +16,13 @@ import workflows from '$routes/workflows/lib/workflow-mocks'
 export const themeStore: Writable<Theme> = writable(loadTheme())
 
 export const sessionStore: Writable<Session> = writable({
+  id: null,
   username: null,
-  session: null,
-  authStrategy: null,
-  program: null,
   loading: true,
-  backupCreated: null
 })
 
-export const filesystemStore: Writable<FileSystem | null> = writable(null)
-
 export const notificationStore: Writable<Notification[]> = writable([])
 
-export const accountSettingsStore: Writable<AccountSettings> = writable({
-  avatar: null,
-  loading: true,
-})
-
 export const functionsStore: Writable<FunctionsStore> = writable({
   loading: false,
   functions
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index a7246e3..11d44fa 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -10,10 +10,8 @@
     checkIPFSConnection
   } from '$lib/connections'
   import subscribNetworkEvents from '$lib/network'
-  import { addNotification } from '$lib/notifications'
   import { sessionStore, themeStore } from '$lib/stores'
   import { unsubscribeRPC } from '$lib/rpc'
-  import { errorToMessage } from '$lib/session'
   import { initialize } from '$lib/init'
   import DataWidget from '$components/common/DataWidget.svelte'
   import GlobalShortcutHandler from '$components/common/GlobalShortcutHandler.svelte'
@@ -30,20 +28,13 @@
   $: isActivity = $page.route.id === '/activity'
   let screenSize: number
 
-  const unsubscribeSessionStore = sessionStore.subscribe(session => {
-    if (session.error) {
-      const message = errorToMessage(session.error)
-      addNotification({ msg: message, type: 'error' })
-    }
-  })
-
   const init = async () => {
     await initialize()
 
     // Redirect to home if not logged in
     if (
-      window.location.href !== window.location.origin ||
-      (!window.location.href.includes('onboarding') && !$sessionStore.session)
+      window.location.href !== window.location.origin &&
+      !$sessionStore.username
     ) {
       goto('/')
     }
@@ -67,7 +58,6 @@
 
   onDestroy(() => {
     unsubscribeRPC()
-    unsubscribeSessionStore()
   })
 </script>
 
@@ -89,10 +79,12 @@
     <FullScreenLoadingSpinner />
   {:else}
     <div class="flex flex-col min-h-screen md:pt-10">
-      {#if isHome && screenSize >= 768}
-        <Nav {screenSize} />
-      {:else if !isHome}
-        <Nav {screenSize} />
+      {#if !$page.route.id.includes('onboarding')}
+        {#if isHome && screenSize >= 768}
+          <Nav {screenSize} />
+        {:else if !isHome}
+          <Nav {screenSize} />
+        {/if}
       {/if}
 
       <div
@@ -101,11 +93,11 @@
         <slot />
       </div>
 
-      {#if isHome && $sessionStore.session}
+      {#if isHome && $sessionStore.username}
         <Footer {screenSize} />
       {/if}
 
-      {#if $sessionStore.session}
+      {#if $sessionStore.username}
         <DataWidget />
         <GlobalShortcutHandler />
       {/if}
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 0464cec..3dee0d7 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -12,7 +12,7 @@
   })
 </script>
 
-{#if $sessionStore?.session}
+{#if $sessionStore?.username}
   <Authed />
 {:else}
   <Public />
diff --git a/src/routes/backup/+page.svelte b/src/routes/backup/+page.svelte
deleted file mode 100644
index f2a3056..0000000
--- a/src/routes/backup/+page.svelte
+++ /dev/null
@@ -1,20 +0,0 @@
-<script lang="ts">
-  import { page } from '$app/stores'
-
-  import { extractSearchParam } from '$lib/utils'
-  import type { BackupView } from '$lib/views'
-  import AreYouSure from '$components/auth/backup/AreYouSure.svelte'
-  import Backup from '$components/auth/backup/Backup.svelte'
-
-  let view = extractSearchParam($page.url, 'view') ?? 'backup'
-
-  const navigate = (event: CustomEvent<{ view: BackupView }>) => {
-    view = event.detail.view
-  }
-</script>
-
-{#if view === 'backup'}
-  <Backup on:navigate={navigate} />
-{:else if view === 'are-you-sure'}
-  <AreYouSure />
-{/if}
diff --git a/src/routes/delegate-account/+page.svelte b/src/routes/delegate-account/+page.svelte
deleted file mode 100644
index c9fa19d..0000000
--- a/src/routes/delegate-account/+page.svelte
+++ /dev/null
@@ -1,137 +0,0 @@
-<script lang="ts">
-  import { goto } from '$app/navigation'
-  import { onDestroy, onMount } from 'svelte'
-  import QRCode from 'qrcode-svg'
-
-  import { addNotification } from '$lib/notifications'
-  import { createAccountLinkingProducer } from '$lib/auth/linking'
-  import { filesystemStore, sessionStore, themeStore } from '$lib/stores'
-  import { getBackupStatus, setBackupStatus } from '$lib/auth/backup'
-  import ConnectBackupDevice from '$components/auth/delegate-account/ConnectBackupDevice.svelte'
-  import DelegateAccount from '$components/auth/delegate-account/DelegateAccount.svelte'
-
-  import type { DelegateAccountView } from '$lib/views'
-
-  let view: DelegateAccountView = 'connect-backup-device'
-
-  let connectionLink = null
-  let qrcode = null
-
-  let fs = null
-  let backupCreated = true
-
-  let pin: number[]
-  let pinInput = ''
-  let pinError = false
-  let confirmPin = () => {}
-  let rejectPin = () => {}
-
-  let unsubscribeFilesystemStore = () => {}
-  let unsubscribeSessionStore = () => {}
-
-  onMount(() => {
-    unsubscribeFilesystemStore = filesystemStore.subscribe(async val => {
-      fs = val
-
-      if (fs) {
-        const backupStatus = await getBackupStatus(fs)
-        backupCreated = backupStatus.created
-      }
-    })
-
-    unsubscribeSessionStore = sessionStore.subscribe(async val => {
-      const hashedUsername = val.username.hashed
-      const fullUsername = val.username.full
-
-      if (hashedUsername && fullUsername) {
-        const origin = window.location.origin
-
-        connectionLink = `${origin}/link-device?hashedUsername=${hashedUsername}&username=${encodeURIComponent(
-          fullUsername
-        )}`
-        qrcode = new QRCode({
-          content: connectionLink,
-          color: $themeStore.selectedTheme === 'light' ? '#171717' : '#FAFAFA',
-          background:
-            $themeStore.selectedTheme === 'light' ? '#FAFAFA' : '#171717',
-          padding: 0,
-          width: 250,
-          height: 250,
-          join: true
-        }).svg()
-
-        initAccountLinkingProducer(hashedUsername)
-      }
-    })
-  })
-
-  const initAccountLinkingProducer = async (username: string) => {
-    const accountLinkingProducer = await createAccountLinkingProducer(username)
-
-    accountLinkingProducer.on('challenge', detail => {
-      pin = detail.pin
-      confirmPin = detail.confirmPin
-      rejectPin = detail.rejectPin
-
-      view = 'delegate-account'
-    })
-
-    accountLinkingProducer.on('link', async ({ approved }) => {
-      if (approved) {
-        sessionStore.update(session => ({
-          ...session,
-          backupCreated: true
-        }))
-
-        if (fs) {
-          await setBackupStatus(fs, { created: true })
-
-          addNotification({
-            msg: "You've connected a backup device!",
-            type: 'success'
-          })
-          goto('/')
-        } else {
-          addNotification({
-            msg: 'Missing filesystem. Unable to create a backup device.',
-            type: 'error'
-          })
-        }
-      }
-    })
-  }
-
-  const checkPin = () => {
-    if (pin.join('') === pinInput) {
-      confirmPin()
-    } else {
-      pinError = true
-    }
-  }
-
-  const cancelConnection = () => {
-    rejectPin()
-
-    addNotification({
-      msg: 'The connection attempt was cancelled',
-      type: 'info'
-    })
-    goto('/')
-  }
-
-  onDestroy(() => {
-    unsubscribeFilesystemStore()
-    unsubscribeSessionStore()
-  })
-</script>
-
-{#if view === 'connect-backup-device'}
-  <ConnectBackupDevice {qrcode} {connectionLink} {backupCreated} />
-{:else if view === 'delegate-account'}
-  <DelegateAccount
-    bind:pinInput
-    bind:pinError
-    on:cancel={cancelConnection}
-    on:checkpin={checkPin}
-  />
-{/if}
diff --git a/src/routes/link-device/+page.svelte b/src/routes/link-device/+page.svelte
deleted file mode 100644
index d31ea81..0000000
--- a/src/routes/link-device/+page.svelte
+++ /dev/null
@@ -1,74 +0,0 @@
-<script lang="ts">
-  import type * as odd from '@oddjs/odd'
-  import { goto } from '$app/navigation'
-  import { page } from '$app/stores'
-
-  import { addNotification } from '$lib/notifications'
-  import { createAccountLinkingConsumer } from '$lib/auth/linking'
-  import { loadAccount } from '$lib/auth/account'
-  import { sessionStore } from '$lib/stores'
-  import { waitForDataRoot } from '$lib/auth/account'
-  import type { LinkDeviceView } from '$lib/views'
-  import FilesystemActivity from '$components/common/FilesystemActivity.svelte'
-  import LinkDevice from '$components/auth/link-device/LinkDevice.svelte'
-  import { extractSearchParam } from '$lib/utils'
-
-  let view: LinkDeviceView = 'link-device'
-
-  let accountLinkingConsumer: odd.AccountLinkingConsumer
-  let displayPin: string = ''
-
-  const hashedUsername = extractSearchParam($page.url, 'hashedUsername')
-  const fullUsername = decodeURIComponent(
-    extractSearchParam($page.url, 'username')
-  )
-
-  const initAccountLinkingConsumer = async () => {
-    accountLinkingConsumer = await createAccountLinkingConsumer(hashedUsername)
-
-    accountLinkingConsumer.on('challenge', ({ pin }) => {
-      displayPin = pin.join('')
-    })
-
-    accountLinkingConsumer.on('link', async ({ approved }) => {
-      if (approved) {
-        view = 'load-filesystem'
-
-        // See https://github.com/oddsdk/ts-odd/issues/529
-        await waitForDataRoot(hashedUsername)
-        await loadAccount(hashedUsername, fullUsername)
-
-        addNotification({ msg: "You're now connected!", type: 'success' })
-        goto('/')
-      } else {
-        addNotification({
-          msg: 'The connection attempt was cancelled',
-          type: 'info'
-        })
-        goto('/')
-      }
-    })
-  }
-
-  const cancelConnection = async () => {
-    addNotification({
-      msg: 'The connection attempt was cancelled',
-      type: 'info'
-    })
-
-    await accountLinkingConsumer?.cancel()
-    goto('/')
-  }
-
-  if (!$sessionStore.session) {
-    initAccountLinkingConsumer()
-  }
-</script>
-
-<input type="checkbox" id="my-modal-5" checked class="modal-toggle" />
-
-{#if view === 'link-device'}
-  <LinkDevice pin={displayPin} on:cancel={cancelConnection} />
-{:else if view === 'load-filesystem'}
-  <FilesystemActivity activity="Loading" />
-{/if}
diff --git a/src/routes/onboarding/details/+page.svelte b/src/routes/onboarding/details/+page.svelte
index e347821..c50d57a 100644
--- a/src/routes/onboarding/details/+page.svelte
+++ b/src/routes/onboarding/details/+page.svelte
@@ -2,6 +2,7 @@
   import { goto } from '$app/navigation'
 
   import { addNotification } from '$lib/notifications'
+  import { sessionStore } from '$lib/stores'
   import Input from '$components/form/Input.svelte'
   import StarMedium from '$components/icons/StarMedium.svelte'
   import StarSmall from '$components/icons/StarSmall.svelte'
@@ -90,7 +91,7 @@
 </script>
 
 <div class="">
-  <div class="flex flex-row items-center mb-8">
+  <div class="flex flex-row items-center justify-between mb-8">
     <div
       class="flex flex-row items-center justify-center gap-1 py-3 px-4 rounded-[88px] bg-base-200"
     >
@@ -99,6 +100,10 @@
       <StarSmall colour="#CCCCE3" />
       <StarSmall colour="#CCCCE3" />
     </div>
+
+    <p class="w-[120px] font-mono text-code-m text-right uppercase">
+      Onboarding member #{$sessionStore.id}
+    </p>
   </div>
 
   <form
diff --git a/src/routes/onboarding/discord/+page.svelte b/src/routes/onboarding/discord/+page.svelte
index d54d5d1..ef22310 100644
--- a/src/routes/onboarding/discord/+page.svelte
+++ b/src/routes/onboarding/discord/+page.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
+  import { sessionStore } from '$lib/stores'
   import StarMedium from '$components/icons/StarMedium.svelte'
   import StarSmall from '$components/icons/StarSmall.svelte'
 </script>
 
 <div class="flex flex-col gap-4 md:gap-12 min-h-[calc(100vh-88px)]">
   <div class="">
-    <div class="flex flex-row items-center mb-8">
+    <div class="flex flex-row items-center justify-between mb-8">
       <div
         class="flex flex-row items-center justify-center gap-1 py-3 px-4 rounded-[88px] bg-base-200"
       >
@@ -14,6 +15,10 @@
         <StarMedium />
         <StarSmall colour="#CCCCE3" />
       </div>
+
+      <p class="w-[120px] font-mono text-code-m text-right uppercase">
+        Onboarding member #{$sessionStore.id}
+      </p>
     </div>
 
     <div
diff --git a/src/routes/onboarding/nav/+page.svelte b/src/routes/onboarding/nav/+page.svelte
index 4452afc..e5d54ce 100644
--- a/src/routes/onboarding/nav/+page.svelte
+++ b/src/routes/onboarding/nav/+page.svelte
@@ -14,7 +14,7 @@
   }
 </script>
 
-<div class="flex flex-row items-center mb-8">
+<div class="flex flex-row items-center justify-between mb-8">
   <div
     class="flex flex-row items-center justify-center gap-1 py-3 px-4 rounded-[88px] bg-base-200"
   >
@@ -23,6 +23,10 @@
     <StarSmall colour="#32334A" />
     <StarMedium />
   </div>
+
+  <p class="w-[120px] font-mono text-code-m text-right uppercase">
+    Onboarding member #{$sessionStore.id}
+  </p>
 </div>
 
 <div class="flex flex-col gap-24 md:gap-12">
diff --git a/src/routes/onboarding/welcome/+page.svelte b/src/routes/onboarding/welcome/+page.svelte
index f364102..cbff89e 100644
--- a/src/routes/onboarding/welcome/+page.svelte
+++ b/src/routes/onboarding/welcome/+page.svelte
@@ -13,7 +13,7 @@
 </script>
 
 <div class="">
-  <div class="flex flex-row items-center md:mr-auto mb-8">
+  <div class="flex flex-row items-center justify-between md:mr-auto mb-8">
     <div
       class="flex flex-row items-center justify-center gap-1 py-3 px-4 rounded-[88px] bg-base-200"
     >
@@ -22,6 +22,10 @@
       <StarSmall colour="#CCCCE3" />
       <StarSmall colour="#CCCCE3" />
     </div>
+
+    <p class="w-[120px] font-mono text-code-m text-right uppercase">
+      Onboarding member #{$sessionStore.id}
+    </p>
   </div>
 
   <div class="flex flex-col gap-6 text-body-lg w-full max-w-[576px] m-auto">
@@ -35,7 +39,9 @@
     </h1>
 
     <p>
-      You’re network <strong class="font-bold">member #89</strong>
+      You’re network <strong class="font-bold">
+        member #{$sessionStore.id}
+      </strong>
       .
     </p>
     <p>
diff --git a/src/routes/recover/+page.svelte b/src/routes/recover/+page.svelte
deleted file mode 100644
index 7d312ef..0000000
--- a/src/routes/recover/+page.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-<script lang="ts">
-  import HasRecoveryKit from '$components/auth/recover/HasRecoveryKit.svelte'
-</script>
-
-<HasRecoveryKit />
diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte
deleted file mode 100644
index ed44f12..0000000
--- a/src/routes/register/+page.svelte
+++ /dev/null
@@ -1,12 +0,0 @@
-<script lang="ts">
-  import { sessionStore } from '$lib/stores'
-
-  import Register from '$components/auth/register/Register.svelte'
-  import Welcome from '$components/auth/register/Welcome.svelte'
-</script>
-
-{#if $sessionStore.session}
-  <Welcome />
-{:else}
-  <Register />
-{/if}
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index f1e3530..90b3766 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -3,15 +3,12 @@
   import { fly } from 'svelte/transition'
 
   import { sessionStore } from '$lib/stores'
-  // import AvatarUpload from '$components/settings/AvatarUpload.svelte'
-  import ConnectedDevices from '$components/settings/ConnectedDevices.svelte'
   import NodeInfo from '$components/settings/NodeInfo.svelte'
-  // import RecoveryKit from '$components/settings/RecoveryKit.svelte'
   import ThemePreferences from '$components/settings/ThemePreferences.svelte'
   import Username from '$components/settings/Username.svelte'
 </script>
 
-{#if $sessionStore.session}
+{#if $sessionStore.username}
   <div
     in:fly={{
       y: 20,
@@ -21,17 +18,11 @@
     class="flex flex-col items-start max-w-[800px] m-auto gap-10 pb-28 text-sm"
   >
     <div class="flex flex-col items-start justify-center gap-6">
-      <!-- <AvatarUpload /> -->
-
       <NodeInfo />
 
       <Username />
 
       <ThemePreferences />
-
-      <ConnectedDevices />
-
-      <!-- <RecoveryKit /> -->
     </div>
   </div>
 {:else}
diff --git a/src/routes/workflows/components/WorkflowBuilder.svelte b/src/routes/workflows/components/WorkflowBuilder.svelte
index 9594fe0..b75742d 100644
--- a/src/routes/workflows/components/WorkflowBuilder.svelte
+++ b/src/routes/workflows/components/WorkflowBuilder.svelte
@@ -40,7 +40,7 @@
   const handleCloseBuilder = () => (showBuilder = false)
 
   // Save all workflows to the user's WNFS
-  const pushWorkflowsToWNFS = async () => {
+  const pushWorkflowsToIDB = async () => {
     const clonedWorkflows = JSON.parse(
       JSON.stringify($workflowsStore.workflows)
     )
@@ -163,7 +163,7 @@
         savedImage: $workflowsStore.builder.savedImage
       })
 
-      await pushWorkflowsToWNFS()
+      await pushWorkflowsToIDB()
 
       saving = false
 
@@ -205,7 +205,7 @@
   }
 
   // Handle keyboard shortcuts for workflow builder
-  const handleKeyUp = async (event: KeyboardEvent): void => {
+  const handleKeyUp = async (event: KeyboardEvent): Promise<void> => {
     const tagName = (event?.target as HTMLElement).tagName.toLowerCase()
     const key = event.key