diff --git a/infrastructure/eid-wallet/package.json b/infrastructure/eid-wallet/package.json
index 1d6b402a..fcdf04d0 100644
--- a/infrastructure/eid-wallet/package.json
+++ b/infrastructure/eid-wallet/package.json
@@ -21,6 +21,7 @@
     "dependencies": {
         "@hugeicons/core-free-icons": "^1.0.13",
         "@hugeicons/svelte": "^1.0.2",
+        "@ngneat/falso": "^7.3.0",
         "@tailwindcss/container-queries": "^0.1.1",
         "@tauri-apps/api": "^2",
         "@tauri-apps/plugin-barcode-scanner": "^2.2.0",
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/.gitignore b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/.gitignore
deleted file mode 100644
index 26d33521..00000000
--- a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/AndroidProjectSystem.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/AndroidProjectSystem.xml
deleted file mode 100644
index 4a53bee8..00000000
--- a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/AndroidProjectSystem.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidProjectSystem">
-    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/appInsightsSettings.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/appInsightsSettings.xml
deleted file mode 100644
index 6bbe2aee..00000000
--- a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/appInsightsSettings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AppInsightsSettings">
-    <option name="selectedTabId" value="Android Vitals" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/deploymentTargetSelector.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/deploymentTargetSelector.xml
index a24fc0d8..b268ef36 100644
--- a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/deploymentTargetSelector.xml
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/deploymentTargetSelector.xml
@@ -4,14 +4,6 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-05-02T03:58:53.422245180Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/home/gourav/.android/avd/Pixel_3a_API_34.avd" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/gradle.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/gradle.xml
index 1b7f23c6..ea507115 100644
--- a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/gradle.xml
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/gradle.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
@@ -20,10 +19,10 @@
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
-            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-6f17d22bba15001f/tauri-2.3.1/mobile/android" />
-            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-6f17d22bba15001f/tauri-plugin-barcode-scanner-2.2.0/android" />
-            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-6f17d22bba15001f/tauri-plugin-biometric-2.2.0/android" />
-            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-6f17d22bba15001f/tauri-plugin-opener-2.2.6/android" />
+            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/tauri-2.3.1/mobile/android" />
+            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/tauri-plugin-barcode-scanner-2.2.0/android" />
+            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/tauri-plugin-biometric-2.2.0/android" />
+            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/tauri-plugin-opener-2.2.6/android" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/buildSrc" />
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/misc.xml b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/misc.xml
index b2c751a3..74dd639e 100644
--- a/infrastructure/eid-wallet/src-tauri/gen/android/.idea/misc.xml
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/app/.gitignore b/infrastructure/eid-wallet/src-tauri/gen/android/app/.gitignore
index e3e4a05e..26e38ec7 100644
--- a/infrastructure/eid-wallet/src-tauri/gen/android/app/.gitignore
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/app/.gitignore
@@ -1,4 +1,4 @@
-/src/main/java/com/eid_wallet/app/generated
+/src/main/java/io/tanglelabs/metastate/eid_wallet/generated
 /src/main/jniLibs/**/*.so
 /src/main/assets/tauri.conf.json
 /tauri.build.gradle.kts
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/app/build.gradle.kts b/infrastructure/eid-wallet/src-tauri/gen/android/app/build.gradle.kts
index 0b72c31a..84245a45 100644
--- a/infrastructure/eid-wallet/src-tauri/gen/android/app/build.gradle.kts
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/app/build.gradle.kts
@@ -15,14 +15,14 @@ val tauriProperties = Properties().apply {
 
 android {
     compileSdk = 34
-    namespace = "com.eid_wallet.app"
+    namespace = "io.tanglelabs.metastate.eid_wallet"
     defaultConfig {
         manifestPlaceholders["usesCleartextTraffic"] = "false"
-        applicationId = "com.eid_wallet.app"
+        applicationId = "io.tanglelabs.metastate.eid_wallet"
         minSdk = 24
         targetSdk = 34
         versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
-        versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")    
+        versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
     }
     buildTypes {
         getByName("debug") {
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/MainActivity.kt b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/MainActivity.kt
deleted file mode 100644
index f4ab22c6..00000000
--- a/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/MainActivity.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.eid_wallet.app
-
-class MainActivity : TauriActivity()
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/Ipc.kt b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/Ipc.kt
new file mode 100644
index 00000000..8e030f8e
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/Ipc.kt
@@ -0,0 +1,33 @@
+/* THIS FILE IS AUTO-GENERATED. DO NOT MODIFY!! */
+
+// Copyright 2020-2023 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+@file:Suppress("unused")
+
+package com.eid_wallet.app
+
+import android.webkit.*
+
+class Ipc(val webViewClient: RustWebViewClient) {
+    @JavascriptInterface
+    fun postMessage(message: String?) {
+        message?.let {m ->
+            // we're not using WebView::getUrl() here because it needs to be executed on the main thread
+            // and it would slow down the Ipc
+            // so instead we track the current URL on the webview client
+            this.ipc(webViewClient.currentUrl, m)
+        }
+    }
+
+    companion object {
+        init {
+            System.loadLibrary("eid_wallet_lib")
+        }
+    }
+
+    private external fun ipc(url: String, message: String)
+
+    
+}
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/Logger.kt b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/Logger.kt
new file mode 100644
index 00000000..0494c0e0
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/Logger.kt
@@ -0,0 +1,89 @@
+/* THIS FILE IS AUTO-GENERATED. DO NOT MODIFY!! */
+
+// Copyright 2020-2023 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+@file:Suppress("unused", "MemberVisibilityCanBePrivate")
+
+package com.eid_wallet.app
+
+// taken from https://github.com/ionic-team/capacitor/blob/6658bca41e78239347e458175b14ca8bd5c1d6e8/android/capacitor/src/main/java/com/getcapacitor/Logger.java
+
+import android.text.TextUtils
+import android.util.Log
+
+class Logger {
+  companion object {
+    private const val LOG_TAG_CORE = "Tauri"
+
+    fun tags(vararg subtags: String): String {
+      return if (subtags.isNotEmpty()) {
+        LOG_TAG_CORE + "/" + TextUtils.join("/", subtags)
+      } else LOG_TAG_CORE
+    }
+
+    fun verbose(message: String) {
+      verbose(LOG_TAG_CORE, message)
+    }
+
+    private fun verbose(tag: String, message: String) {
+      if (!shouldLog()) {
+        return
+      }
+      Log.v(tag, message)
+    }
+
+    fun debug(message: String) {
+      debug(LOG_TAG_CORE, message)
+    }
+
+    fun debug(tag: String, message: String) {
+      if (!shouldLog()) {
+        return
+      }
+      Log.d(tag, message)
+    }
+
+    fun info(message: String) {
+      info(LOG_TAG_CORE, message)
+    }
+
+    fun info(tag: String, message: String) {
+      if (!shouldLog()) {
+        return
+      }
+      Log.i(tag, message)
+    }
+
+    fun warn(message: String) {
+      warn(LOG_TAG_CORE, message)
+    }
+
+    fun warn(tag: String, message: String) {
+      if (!shouldLog()) {
+        return
+      }
+      Log.w(tag, message)
+    }
+
+    fun error(message: String) {
+      error(LOG_TAG_CORE, message, null)
+    }
+
+    fun error(message: String, e: Throwable?) {
+      error(LOG_TAG_CORE, message, e)
+    }
+
+    fun error(tag: String, message: String, e: Throwable?) {
+      if (!shouldLog()) {
+        return
+      }
+      Log.e(tag, message, e)
+    }
+
+    private fun shouldLog(): Boolean {
+      return BuildConfig.DEBUG
+    }
+  }
+}
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/PermissionHelper.kt b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/PermissionHelper.kt
new file mode 100644
index 00000000..824b2b25
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/PermissionHelper.kt
@@ -0,0 +1,117 @@
+/* THIS FILE IS AUTO-GENERATED. DO NOT MODIFY!! */
+
+// Copyright 2020-2023 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+package com.eid_wallet.app
+
+// taken from https://github.com/ionic-team/capacitor/blob/6658bca41e78239347e458175b14ca8bd5c1d6e8/android/capacitor/src/main/java/com/getcapacitor/PermissionHelper.java
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import androidx.core.app.ActivityCompat
+import java.util.ArrayList
+
+object PermissionHelper {
+  /**
+   * Checks if a list of given permissions are all granted by the user
+   *
+   * @param permissions Permissions to check.
+   * @return True if all permissions are granted, false if at least one is not.
+   */
+  fun hasPermissions(context: Context?, permissions: Array<String>): Boolean {
+    for (perm in permissions) {
+      if (ActivityCompat.checkSelfPermission(
+          context!!,
+          perm
+        ) != PackageManager.PERMISSION_GRANTED
+      ) {
+        return false
+      }
+    }
+    return true
+  }
+
+  /**
+   * Check whether the given permission has been defined in the AndroidManifest.xml
+   *
+   * @param permission A permission to check.
+   * @return True if the permission has been defined in the Manifest, false if not.
+   */
+  fun hasDefinedPermission(context: Context, permission: String): Boolean {
+    var hasPermission = false
+    val requestedPermissions = getManifestPermissions(context)
+    if (!requestedPermissions.isNullOrEmpty()) {
+      val requestedPermissionsList = listOf(*requestedPermissions)
+      val requestedPermissionsArrayList = ArrayList(requestedPermissionsList)
+      if (requestedPermissionsArrayList.contains(permission)) {
+        hasPermission = true
+      }
+    }
+    return hasPermission
+  }
+
+  /**
+   * Check whether all of the given permissions have been defined in the AndroidManifest.xml
+   * @param context the app context
+   * @param permissions a list of permissions
+   * @return true only if all permissions are defined in the AndroidManifest.xml
+   */
+  fun hasDefinedPermissions(context: Context, permissions: Array<String>): Boolean {
+    for (permission in permissions) {
+      if (!hasDefinedPermission(context, permission)) {
+        return false
+      }
+    }
+    return true
+  }
+
+  /**
+   * Get the permissions defined in AndroidManifest.xml
+   *
+   * @return The permissions defined in AndroidManifest.xml
+   */
+  private fun getManifestPermissions(context: Context): Array<String>? {
+    var requestedPermissions: Array<String>? = null
+    try {
+      val pm = context.packageManager
+      val packageInfo = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        pm.getPackageInfo(context.packageName, PackageManager.PackageInfoFlags.of(PackageManager.GET_PERMISSIONS.toLong()))
+      } else {
+        @Suppress("DEPRECATION")
+        pm.getPackageInfo(context.packageName, PackageManager.GET_PERMISSIONS)
+      }
+      if (packageInfo != null) {
+        requestedPermissions = packageInfo.requestedPermissions
+      }
+    } catch (_: Exception) {
+    }
+    return requestedPermissions
+  }
+
+  /**
+   * Given a list of permissions, return a new list with the ones not present in AndroidManifest.xml
+   *
+   * @param neededPermissions The permissions needed.
+   * @return The permissions not present in AndroidManifest.xml
+   */
+  fun getUndefinedPermissions(context: Context, neededPermissions: Array<String?>): Array<String?> {
+    val undefinedPermissions = ArrayList<String?>()
+    val requestedPermissions = getManifestPermissions(context)
+    if (!requestedPermissions.isNullOrEmpty()) {
+      val requestedPermissionsList = listOf(*requestedPermissions)
+      val requestedPermissionsArrayList = ArrayList(requestedPermissionsList)
+      for (permission in neededPermissions) {
+        if (!requestedPermissionsArrayList.contains(permission)) {
+          undefinedPermissions.add(permission)
+        }
+      }
+      var undefinedPermissionArray = arrayOfNulls<String>(undefinedPermissions.size)
+      undefinedPermissionArray = undefinedPermissions.toArray(undefinedPermissionArray)
+      return undefinedPermissionArray
+    }
+    return neededPermissions
+  }
+}
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/RustWebChromeClient.kt b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/RustWebChromeClient.kt
new file mode 100644
index 00000000..ab675a11
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/RustWebChromeClient.kt
@@ -0,0 +1,495 @@
+/* THIS FILE IS AUTO-GENERATED. DO NOT MODIFY!! */
+
+// Copyright 2020-2023 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+@file:Suppress("ObsoleteSdkInt", "RedundantOverride", "QueryPermissionsNeeded", "SimpleDateFormat")
+
+package com.eid_wallet.app
+
+// taken from https://github.com/ionic-team/capacitor/blob/6658bca41e78239347e458175b14ca8bd5c1d6e8/android/capacitor/src/main/java/com/getcapacitor/BridgeWebChromeClient.java
+
+import android.Manifest
+import android.app.Activity
+import android.app.AlertDialog
+import android.content.ActivityNotFoundException
+import android.content.DialogInterface
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.provider.MediaStore
+import android.view.View
+import android.webkit.*
+import android.widget.EditText
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultCallback
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.FileProvider
+import java.io.File
+import java.io.IOException
+import java.text.SimpleDateFormat
+import java.util.*
+
+class RustWebChromeClient(appActivity: WryActivity) : WebChromeClient() {
+  private interface PermissionListener {
+    fun onPermissionSelect(isGranted: Boolean?)
+  }
+
+  private interface ActivityResultListener {
+    fun onActivityResult(result: ActivityResult?)
+  }
+
+  private val activity: WryActivity
+  private var permissionLauncher: ActivityResultLauncher<Array<String>>
+  private var activityLauncher: ActivityResultLauncher<Intent>
+  private var permissionListener: PermissionListener? = null
+  private var activityListener: ActivityResultListener? = null
+
+  init {
+    activity = appActivity
+    val permissionCallback =
+      ActivityResultCallback { isGranted: Map<String, Boolean> ->
+        if (permissionListener != null) {
+          var granted = true
+          for ((_, value) in isGranted) {
+            if (!value) granted = false
+          }
+          permissionListener!!.onPermissionSelect(granted)
+        }
+      }
+    permissionLauncher =
+      activity.registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions(), permissionCallback)
+    activityLauncher = activity.registerForActivityResult(
+      ActivityResultContracts.StartActivityForResult()
+    ) { result ->
+      if (activityListener != null) {
+        activityListener!!.onActivityResult(result)
+      }
+    }
+  }
+
+  /**
+   * Render web content in `view`.
+   *
+   * Both this method and [.onHideCustomView] are required for
+   * rendering web content in full screen.
+   *
+   * @see [](https://developer.android.com/reference/android/webkit/WebChromeClient.onShowCustomView
+  ) */
+  override fun onShowCustomView(view: View, callback: CustomViewCallback) {
+    callback.onCustomViewHidden()
+    super.onShowCustomView(view, callback)
+  }
+
+  /**
+   * Render web content in the original Web View again.
+   *
+   * Do not remove this method--@see #onShowCustomView(View, CustomViewCallback).
+   */
+  override fun onHideCustomView() {
+    super.onHideCustomView()
+  }
+
+  override fun onPermissionRequest(request: PermissionRequest) {
+    val isRequestPermissionRequired = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+    val permissionList: MutableList<String> = ArrayList()
+    if (listOf(*request.resources).contains("android.webkit.resource.VIDEO_CAPTURE")) {
+      permissionList.add(Manifest.permission.CAMERA)
+    }
+    if (listOf(*request.resources).contains("android.webkit.resource.AUDIO_CAPTURE")) {
+      permissionList.add(Manifest.permission.MODIFY_AUDIO_SETTINGS)
+      permissionList.add(Manifest.permission.RECORD_AUDIO)
+    }
+    if (permissionList.isNotEmpty() && isRequestPermissionRequired) {
+      val permissions = permissionList.toTypedArray()
+      permissionListener = object : PermissionListener {
+        override fun onPermissionSelect(isGranted: Boolean?) {
+          if (isGranted == true) {
+            request.grant(request.resources)
+          } else {
+            request.deny()
+          }
+        }
+      }
+      permissionLauncher.launch(permissions)
+    } else {
+      request.grant(request.resources)
+    }
+  }
+
+  /**
+   * Show the browser alert modal
+   * @param view
+   * @param url
+   * @param message
+   * @param result
+   * @return
+   */
+  override fun onJsAlert(view: WebView, url: String, message: String, result: JsResult): Boolean {
+    if (activity.isFinishing) {
+      return true
+    }
+    val builder = AlertDialog.Builder(view.context)
+    builder
+      .setMessage(message)
+      .setPositiveButton(
+        "OK"
+      ) { dialog: DialogInterface, _: Int ->
+        dialog.dismiss()
+        result.confirm()
+      }
+      .setOnCancelListener { dialog: DialogInterface ->
+        dialog.dismiss()
+        result.cancel()
+      }
+    val dialog = builder.create()
+    dialog.show()
+    return true
+  }
+
+  /**
+   * Show the browser confirm modal
+   * @param view
+   * @param url
+   * @param message
+   * @param result
+   * @return
+   */
+  override fun onJsConfirm(view: WebView, url: String, message: String, result: JsResult): Boolean {
+    if (activity.isFinishing) {
+      return true
+    }
+    val builder = AlertDialog.Builder(view.context)
+    builder
+      .setMessage(message)
+      .setPositiveButton(
+        "OK"
+      ) { dialog: DialogInterface, _: Int ->
+        dialog.dismiss()
+        result.confirm()
+      }
+      .setNegativeButton(
+        "Cancel"
+      ) { dialog: DialogInterface, _: Int ->
+        dialog.dismiss()
+        result.cancel()
+      }
+      .setOnCancelListener { dialog: DialogInterface ->
+        dialog.dismiss()
+        result.cancel()
+      }
+    val dialog = builder.create()
+    dialog.show()
+    return true
+  }
+
+  /**
+   * Show the browser prompt modal
+   * @param view
+   * @param url
+   * @param message
+   * @param defaultValue
+   * @param result
+   * @return
+   */
+  override fun onJsPrompt(
+    view: WebView,
+    url: String,
+    message: String,
+    defaultValue: String,
+    result: JsPromptResult
+  ): Boolean {
+    if (activity.isFinishing) {
+      return true
+    }
+    val builder = AlertDialog.Builder(view.context)
+    val input = EditText(view.context)
+    builder
+      .setMessage(message)
+      .setView(input)
+      .setPositiveButton(
+        "OK"
+      ) { dialog: DialogInterface, _: Int ->
+        dialog.dismiss()
+        val inputText1 = input.text.toString().trim { it <= ' ' }
+        result.confirm(inputText1)
+      }
+      .setNegativeButton(
+        "Cancel"
+      ) { dialog: DialogInterface, _: Int ->
+        dialog.dismiss()
+        result.cancel()
+      }
+      .setOnCancelListener { dialog: DialogInterface ->
+        dialog.dismiss()
+        result.cancel()
+      }
+    val dialog = builder.create()
+    dialog.show()
+    return true
+  }
+
+  /**
+   * Handle the browser geolocation permission prompt
+   * @param origin
+   * @param callback
+   */
+  override fun onGeolocationPermissionsShowPrompt(
+    origin: String,
+    callback: GeolocationPermissions.Callback
+  ) {
+    super.onGeolocationPermissionsShowPrompt(origin, callback)
+    Logger.debug("onGeolocationPermissionsShowPrompt: DOING IT HERE FOR ORIGIN: $origin")
+    val geoPermissions =
+      arrayOf(Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION)
+    if (!PermissionHelper.hasPermissions(activity, geoPermissions)) {
+      permissionListener = object : PermissionListener {
+        override fun onPermissionSelect(isGranted: Boolean?) {
+          if (isGranted == true) {
+            callback.invoke(origin, true, false)
+          } else {
+            val coarsePermission =
+              arrayOf(Manifest.permission.ACCESS_COARSE_LOCATION)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
+              PermissionHelper.hasPermissions(activity, coarsePermission)
+            ) {
+              callback.invoke(origin, true, false)
+            } else {
+              callback.invoke(origin, false, false)
+            }
+          }
+        }
+      }
+      permissionLauncher.launch(geoPermissions)
+    } else {
+      // permission is already granted
+      callback.invoke(origin, true, false)
+      Logger.debug("onGeolocationPermissionsShowPrompt: has required permission")
+    }
+  }
+
+  override fun onShowFileChooser(
+    webView: WebView,
+    filePathCallback: ValueCallback<Array<Uri?>?>,
+    fileChooserParams: FileChooserParams
+  ): Boolean {
+    val acceptTypes = listOf(*fileChooserParams.acceptTypes)
+    val captureEnabled = fileChooserParams.isCaptureEnabled
+    val capturePhoto = captureEnabled && acceptTypes.contains("image/*")
+    val captureVideo = captureEnabled && acceptTypes.contains("video/*")
+    if (capturePhoto || captureVideo) {
+      if (isMediaCaptureSupported) {
+        showMediaCaptureOrFilePicker(filePathCallback, fileChooserParams, captureVideo)
+      } else {
+        permissionListener = object : PermissionListener {
+          override fun onPermissionSelect(isGranted: Boolean?) {
+            if (isGranted == true) {
+              showMediaCaptureOrFilePicker(filePathCallback, fileChooserParams, captureVideo)
+            } else {
+              Logger.warn(Logger.tags("FileChooser"), "Camera permission not granted")
+              filePathCallback.onReceiveValue(null)
+            }
+          }
+        }
+        val camPermission = arrayOf(Manifest.permission.CAMERA)
+        permissionLauncher.launch(camPermission)
+      }
+    } else {
+      showFilePicker(filePathCallback, fileChooserParams)
+    }
+    return true
+  }
+
+  private val isMediaCaptureSupported: Boolean
+    get() {
+      val permissions = arrayOf(Manifest.permission.CAMERA)
+      return PermissionHelper.hasPermissions(activity, permissions) ||
+        !PermissionHelper.hasDefinedPermission(activity, Manifest.permission.CAMERA)
+    }
+
+  private fun showMediaCaptureOrFilePicker(
+    filePathCallback: ValueCallback<Array<Uri?>?>,
+    fileChooserParams: FileChooserParams,
+    isVideo: Boolean
+  ) {
+    val isVideoCaptureSupported = true
+    val shown = if (isVideo && isVideoCaptureSupported) {
+      showVideoCapturePicker(filePathCallback)
+    } else {
+      showImageCapturePicker(filePathCallback)
+    }
+    if (!shown) {
+      Logger.warn(
+        Logger.tags("FileChooser"),
+        "Media capture intent could not be launched. Falling back to default file picker."
+      )
+      showFilePicker(filePathCallback, fileChooserParams)
+    }
+  }
+
+  private fun showImageCapturePicker(filePathCallback: ValueCallback<Array<Uri?>?>): Boolean {
+    val takePictureIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
+    if (takePictureIntent.resolveActivity(activity.packageManager) == null) {
+      return false
+    }
+    val imageFileUri: Uri = try {
+      createImageFileUri()
+    } catch (ex: Exception) {
+      Logger.error("Unable to create temporary media capture file: " + ex.message)
+      return false
+    }
+    takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, imageFileUri)
+    activityListener = object : ActivityResultListener {
+      override fun onActivityResult(result: ActivityResult?) {
+        var res: Array<Uri?>? = null
+        if (result?.resultCode == Activity.RESULT_OK) {
+          res = arrayOf(imageFileUri)
+        }
+        filePathCallback.onReceiveValue(res)
+      }
+    }
+    activityLauncher.launch(takePictureIntent)
+    return true
+  }
+
+  private fun showVideoCapturePicker(filePathCallback: ValueCallback<Array<Uri?>?>): Boolean {
+    val takeVideoIntent = Intent(MediaStore.ACTION_VIDEO_CAPTURE)
+    if (takeVideoIntent.resolveActivity(activity.packageManager) == null) {
+      return false
+    }
+    activityListener = object : ActivityResultListener {
+      override fun onActivityResult(result: ActivityResult?) {
+        var res: Array<Uri?>? = null
+        if (result?.resultCode == Activity.RESULT_OK) {
+          res = arrayOf(result.data!!.data)
+        }
+        filePathCallback.onReceiveValue(res)
+      }
+    }
+    activityLauncher.launch(takeVideoIntent)
+    return true
+  }
+
+  private fun showFilePicker(
+    filePathCallback: ValueCallback<Array<Uri?>?>,
+    fileChooserParams: FileChooserParams
+  ) {
+    val intent = fileChooserParams.createIntent()
+    if (fileChooserParams.mode == FileChooserParams.MODE_OPEN_MULTIPLE) {
+      intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true)
+    }
+    if (fileChooserParams.acceptTypes.size > 1 || intent.type!!.startsWith(".")) {
+      val validTypes = getValidTypes(fileChooserParams.acceptTypes)
+      intent.putExtra(Intent.EXTRA_MIME_TYPES, validTypes)
+      if (intent.type!!.startsWith(".")) {
+        intent.type = validTypes[0]
+      }
+    }
+    try {
+      activityListener = object : ActivityResultListener {
+        override fun onActivityResult(result: ActivityResult?) {
+          val res: Array<Uri?>?
+          val resultIntent = result?.data
+          if (result?.resultCode == Activity.RESULT_OK && resultIntent!!.clipData != null) {
+            val numFiles = resultIntent.clipData!!.itemCount
+            res = arrayOfNulls(numFiles)
+            for (i in 0 until numFiles) {
+              res[i] = resultIntent.clipData!!.getItemAt(i).uri
+            }
+          } else {
+            res = FileChooserParams.parseResult(
+              result?.resultCode ?: 0,
+              resultIntent
+            )
+          }
+          filePathCallback.onReceiveValue(res)
+        }
+      }
+      activityLauncher.launch(intent)
+    } catch (e: ActivityNotFoundException) {
+      filePathCallback.onReceiveValue(null)
+    }
+  }
+
+  private fun getValidTypes(currentTypes: Array<String>): Array<String> {
+    val validTypes: MutableList<String> = ArrayList()
+    val mtm = MimeTypeMap.getSingleton()
+    for (mime in currentTypes) {
+      if (mime.startsWith(".")) {
+        val extension = mime.substring(1)
+        val extensionMime = mtm.getMimeTypeFromExtension(extension)
+        if (extensionMime != null && !validTypes.contains(extensionMime)) {
+          validTypes.add(extensionMime)
+        }
+      } else if (!validTypes.contains(mime)) {
+        validTypes.add(mime)
+      }
+    }
+    val validObj: Array<Any> = validTypes.toTypedArray()
+    return Arrays.copyOf(
+      validObj, validObj.size,
+      Array<String>::class.java
+    )
+  }
+
+  override fun onConsoleMessage(consoleMessage: ConsoleMessage): Boolean {
+    val tag: String = Logger.tags("Console")
+    if (consoleMessage.message() != null && isValidMsg(consoleMessage.message())) {
+      val msg = String.format(
+        "File: %s - Line %d - Msg: %s",
+        consoleMessage.sourceId(),
+        consoleMessage.lineNumber(),
+        consoleMessage.message()
+      )
+      val level = consoleMessage.messageLevel().name
+      if ("ERROR".equals(level, ignoreCase = true)) {
+        Logger.error(tag, msg, null)
+      } else if ("WARNING".equals(level, ignoreCase = true)) {
+        Logger.warn(tag, msg)
+      } else if ("TIP".equals(level, ignoreCase = true)) {
+        Logger.debug(tag, msg)
+      } else {
+        Logger.info(tag, msg)
+      }
+    }
+    return true
+  }
+
+  private fun isValidMsg(msg: String): Boolean {
+    return !(msg.contains("%cresult %c") ||
+      msg.contains("%cnative %c") ||
+      msg.equals("[object Object]", ignoreCase = true) ||
+      msg.equals("console.groupEnd", ignoreCase = true))
+  }
+
+  @Throws(IOException::class)
+  private fun createImageFileUri(): Uri {
+    val photoFile = createImageFile(activity)
+    return FileProvider.getUriForFile(
+      activity,
+      activity.packageName.toString() + ".fileprovider",
+      photoFile
+    )
+  }
+
+  @Throws(IOException::class)
+  private fun createImageFile(activity: Activity): File {
+    // Create an image file name
+    val timeStamp = SimpleDateFormat("yyyyMMdd_HHmmss").format(Date())
+    val imageFileName = "JPEG_" + timeStamp + "_"
+    val storageDir = activity.getExternalFilesDir(Environment.DIRECTORY_PICTURES)
+    return File.createTempFile(imageFileName, ".jpg", storageDir)
+  }
+
+  override fun onReceivedTitle(
+      view: WebView,
+      title: String
+  ) {
+    handleReceivedTitle(view, title)
+  }
+
+  private external fun handleReceivedTitle(webview: WebView, title: String)
+}
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/RustWebView.kt b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/RustWebView.kt
new file mode 100644
index 00000000..d51e077a
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/RustWebView.kt
@@ -0,0 +1,101 @@
+/* THIS FILE IS AUTO-GENERATED. DO NOT MODIFY!! */
+
+// Copyright 2020-2023 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+@file:Suppress("unused", "SetJavaScriptEnabled")
+
+package com.eid_wallet.app
+
+import android.annotation.SuppressLint
+import android.webkit.*
+import android.content.Context
+import androidx.webkit.WebViewCompat
+import androidx.webkit.WebViewFeature
+import kotlin.collections.Map
+
+@SuppressLint("RestrictedApi")
+class RustWebView(context: Context, val initScripts: Array<String>, val id: String): WebView(context) {
+    val isDocumentStartScriptEnabled: Boolean
+
+    init {
+        settings.javaScriptEnabled = true
+        settings.domStorageEnabled = true
+        settings.setGeolocationEnabled(true)
+        settings.databaseEnabled = true
+        settings.mediaPlaybackRequiresUserGesture = false
+        settings.javaScriptCanOpenWindowsAutomatically = true
+
+        if (WebViewFeature.isFeatureSupported(WebViewFeature.DOCUMENT_START_SCRIPT)) {
+            isDocumentStartScriptEnabled = true
+            for (script in initScripts) {
+                WebViewCompat.addDocumentStartJavaScript(this, script, setOf("*"));
+            }
+        } else {
+          isDocumentStartScriptEnabled = false
+        }
+
+        
+    }
+
+    fun loadUrlMainThread(url: String) {
+        post {
+          loadUrl(url)
+        }
+    }
+
+    fun loadUrlMainThread(url: String, additionalHttpHeaders: Map<String, String>) {
+        post {
+          loadUrl(url, additionalHttpHeaders)
+        }
+    }
+
+    override fun loadUrl(url: String) {
+        if (!shouldOverride(url)) {
+            super.loadUrl(url);
+        }
+    }
+
+    override fun loadUrl(url: String, additionalHttpHeaders: Map<String, String>) {
+        if (!shouldOverride(url)) {
+            super.loadUrl(url, additionalHttpHeaders);
+        }
+    }
+
+    fun loadHTMLMainThread(html: String) {
+        post {
+          super.loadData(html, "text/html", null)
+        }
+    }
+
+    fun evalScript(id: Int, script: String) {
+        post {
+            super.evaluateJavascript(script) { result ->
+                onEval(id, result)
+            }
+        }
+    }
+
+    fun clearAllBrowsingData() {
+        try {
+            super.getContext().deleteDatabase("webviewCache.db")
+            super.getContext().deleteDatabase("webview.db")
+            super.clearCache(true)
+            super.clearHistory()
+            super.clearFormData()
+        } catch (ex: Exception) {
+            Logger.error("Unable to create temporary media capture file: " + ex.message)
+        }
+    }
+
+    fun getCookies(url: String): String {
+        val cookieManager = CookieManager.getInstance()
+        return cookieManager.getCookie(url)
+    }
+
+    private external fun shouldOverride(url: String): Boolean
+    private external fun onEval(id: Int, result: String)
+
+    
+}
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/RustWebViewClient.kt b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/RustWebViewClient.kt
new file mode 100644
index 00000000..5d262951
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/RustWebViewClient.kt
@@ -0,0 +1,107 @@
+/* THIS FILE IS AUTO-GENERATED. DO NOT MODIFY!! */
+
+// Copyright 2020-2023 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+package com.eid_wallet.app
+
+import android.net.Uri
+import android.webkit.*
+import android.content.Context
+import android.graphics.Bitmap
+import android.os.Handler
+import android.os.Looper
+import androidx.webkit.WebViewAssetLoader
+
+class RustWebViewClient(context: Context): WebViewClient() {
+    private val interceptedState = mutableMapOf<String, Boolean>()
+    var currentUrl: String = "about:blank"
+    private var lastInterceptedUrl: Uri? = null
+    private var pendingUrlRedirect: String? = null
+
+    private val assetLoader = WebViewAssetLoader.Builder()
+        .setDomain(assetLoaderDomain())
+        .addPathHandler("/", WebViewAssetLoader.AssetsPathHandler(context))
+        .build()
+
+    override fun shouldInterceptRequest(
+        view: WebView,
+        request: WebResourceRequest
+    ): WebResourceResponse? {
+        pendingUrlRedirect?.let {
+            Handler(Looper.getMainLooper()).post {
+              view.loadUrl(it)
+            }
+            pendingUrlRedirect = null
+            return null
+        }
+
+        lastInterceptedUrl = request.url
+        return if (withAssetLoader()) {
+            assetLoader.shouldInterceptRequest(request.url)
+        } else {
+            val rustWebview = view as RustWebView;
+            val response = handleRequest(rustWebview.id, request, rustWebview.isDocumentStartScriptEnabled)
+            interceptedState[request.url.toString()] = response != null
+            return response
+        }
+    }
+
+    override fun shouldOverrideUrlLoading(
+        view: WebView,
+        request: WebResourceRequest
+    ): Boolean {
+        return shouldOverride(request.url.toString())
+    }
+
+    override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) {
+        currentUrl = url
+        if (interceptedState[url] == false) {
+            val webView = view as RustWebView
+            for (script in webView.initScripts) {
+                view.evaluateJavascript(script, null)
+            }
+        }
+        return onPageLoading(url)
+    }
+
+    override fun onPageFinished(view: WebView, url: String) {
+        onPageLoaded(url)
+    }
+
+    override fun onReceivedError(
+        view: WebView,
+        request: WebResourceRequest,
+        error: WebResourceError
+    ) {
+        // we get a net::ERR_CONNECTION_REFUSED when an external URL redirects to a custom protocol
+        // e.g. oauth flow, because shouldInterceptRequest is not called on redirects
+        // so we must force retry here with loadUrl() to get a chance of the custom protocol to kick in
+        if (error.errorCode == ERROR_CONNECT && request.isForMainFrame && request.url != lastInterceptedUrl) {
+            // prevent the default error page from showing
+            view.stopLoading()
+            // without this initial loadUrl the app is stuck
+            view.loadUrl(request.url.toString())
+            // ensure the URL is actually loaded - for some reason there's a race condition and we need to call loadUrl() again later
+            pendingUrlRedirect = request.url.toString()
+        } else {
+            super.onReceivedError(view, request, error)
+        }
+    }
+
+    companion object {
+        init {
+            System.loadLibrary("eid_wallet_lib")
+        }
+    }
+
+    private external fun assetLoaderDomain(): String
+    private external fun withAssetLoader(): Boolean
+    private external fun handleRequest(webviewId: String, request: WebResourceRequest, isDocumentStartScriptEnabled: Boolean): WebResourceResponse?
+    private external fun shouldOverride(url: String): Boolean
+    private external fun onPageLoading(url: String)
+    private external fun onPageLoaded(url: String)
+
+    
+}
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/TauriActivity.kt b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/TauriActivity.kt
new file mode 100644
index 00000000..e067eb0c
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/TauriActivity.kt
@@ -0,0 +1,30 @@
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+/* THIS FILE IS AUTO-GENERATED. DO NOT MODIFY!! */
+
+package com.eid_wallet.app
+
+import android.os.Bundle
+import android.content.Intent
+import app.tauri.plugin.PluginManager
+
+abstract class TauriActivity : WryActivity() {
+  var pluginManager: PluginManager = PluginManager(this)
+
+  override fun onNewIntent(intent: Intent) {
+    super.onNewIntent(intent)
+    pluginManager.onNewIntent(intent)
+  }
+
+  override fun onResume() {
+    super.onResume()
+    pluginManager.onResume()
+  }
+
+  override fun onPause() {
+    super.onPause()
+    pluginManager.onPause()
+  }
+}
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/WryActivity.kt b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/WryActivity.kt
new file mode 100644
index 00000000..027bd951
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/WryActivity.kt
@@ -0,0 +1,136 @@
+/* THIS FILE IS AUTO-GENERATED. DO NOT MODIFY!! */
+
+// Copyright 2020-2023 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+package com.eid_wallet.app
+
+import com.eid_wallet.app.RustWebView
+import android.annotation.SuppressLint
+import android.os.Build
+import android.os.Bundle
+import android.webkit.WebView
+import android.view.KeyEvent
+import androidx.appcompat.app.AppCompatActivity
+
+abstract class WryActivity : AppCompatActivity() {
+    private lateinit var mWebView: RustWebView
+
+    open fun onWebViewCreate(webView: WebView) { }
+
+    fun setWebView(webView: RustWebView) {
+        mWebView = webView
+        onWebViewCreate(webView)
+    }
+
+    val version: String
+        @SuppressLint("WebViewApiAvailability", "ObsoleteSdkInt")
+        get() {
+            // Check getCurrentWebViewPackage() directly if above Android 8
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                return WebView.getCurrentWebViewPackage()?.versionName ?: ""
+            }
+
+            // Otherwise manually check WebView versions
+            var webViewPackage = "com.google.android.webview"
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+              webViewPackage = "com.android.chrome"
+            }
+            try {
+                @Suppress("DEPRECATION")
+                val info = packageManager.getPackageInfo(webViewPackage, 0)
+                return info.versionName.toString()
+            } catch (ex: Exception) {
+                Logger.warn("Unable to get package info for '$webViewPackage'$ex")
+            }
+
+            try {
+                @Suppress("DEPRECATION")
+                val info = packageManager.getPackageInfo("com.android.webview", 0)
+                return info.versionName.toString()
+            } catch (ex: Exception) {
+                Logger.warn("Unable to get package info for 'com.android.webview'$ex")
+            }
+
+            // Could not detect any webview, return empty string
+            return ""
+        }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        create(this)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        start()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        resume()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        pause()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        stop()
+    }
+
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        super.onWindowFocusChanged(hasFocus)
+        focus(hasFocus)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        save()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        destroy()
+        onActivityDestroy()
+    }
+
+    override fun onLowMemory() {
+        super.onLowMemory()
+        memory()
+    }
+
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+        if (keyCode == KeyEvent.KEYCODE_BACK && mWebView.canGoBack()) {
+            mWebView.goBack()
+            return true
+        }
+        return super.onKeyDown(keyCode, event)
+    }
+
+    fun getAppClass(name: String): Class<*> {
+        return Class.forName(name)
+    }
+
+    companion object {
+        init {
+            System.loadLibrary("eid_wallet_lib")
+        }
+    }
+
+    private external fun create(activity: WryActivity)
+    private external fun start()
+    private external fun resume()
+    private external fun pause()
+    private external fun stop()
+    private external fun save()
+    private external fun destroy()
+    private external fun onActivityDestroy()
+    private external fun memory()
+    private external fun focus(focus: Boolean)
+
+    
+}
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/proguard-wry.pro b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/proguard-wry.pro
new file mode 100644
index 00000000..3c1c28b7
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/com/eid_wallet/app/generated/proguard-wry.pro
@@ -0,0 +1,35 @@
+# THIS FILE IS AUTO-GENERATED. DO NOT MODIFY!!
+
+# Copyright 2020-2023 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+-keep class com.eid_wallet.app.* {
+  native <methods>;
+}
+
+-keep class com.eid_wallet.app.WryActivity {
+  public <init>(...);
+
+  void setWebView(com.eid_wallet.app.RustWebView);
+  java.lang.Class getAppClass(...);
+  java.lang.String getVersion();
+}
+
+-keep class com.eid_wallet.app.Ipc {
+  public <init>(...);
+
+  @android.webkit.JavascriptInterface public <methods>;
+}
+
+-keep class com.eid_wallet.app.RustWebView {
+  public <init>(...);
+
+  void loadUrlMainThread(...);
+  void loadHTMLMainThread(...);
+  void evalScript(...);
+}
+
+-keep class com.eid_wallet.app.RustWebChromeClient,com.eid_wallet.app.RustWebViewClient {
+  public <init>(...);
+}
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/io/tanglelabs/metastate/eid_wallet/MainActivity.kt b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/io/tanglelabs/metastate/eid_wallet/MainActivity.kt
new file mode 100644
index 00000000..66c258a9
--- /dev/null
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/java/io/tanglelabs/metastate/eid_wallet/MainActivity.kt
@@ -0,0 +1,3 @@
+package io.tanglelabs.metastate.eid_wallet
+
+class MainActivity : TauriActivity()
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/res/values/strings.xml b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/res/values/strings.xml
index 111ad08e..0883f3b1 100644
--- a/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/res/values/strings.xml
+++ b/infrastructure/eid-wallet/src-tauri/gen/android/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <resources>
-    <string name="app_name">eid-wallet</string>
-    <string name="main_activity_title">eid-wallet</string>
+    <string name="app_name">eID Wallet</string>
+    <string name="main_activity_title">eID Wallet</string>
 </resources>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/buildSrc/src/main/java/com/eid_wallet/app/kotlin/BuildTask.kt b/infrastructure/eid-wallet/src-tauri/gen/android/buildSrc/src/main/java/io/tanglelabs/metastate/eid_wallet/kotlin/BuildTask.kt
similarity index 100%
rename from infrastructure/eid-wallet/src-tauri/gen/android/buildSrc/src/main/java/com/eid_wallet/app/kotlin/BuildTask.kt
rename to infrastructure/eid-wallet/src-tauri/gen/android/buildSrc/src/main/java/io/tanglelabs/metastate/eid_wallet/kotlin/BuildTask.kt
diff --git a/infrastructure/eid-wallet/src-tauri/gen/android/buildSrc/src/main/java/com/eid_wallet/app/kotlin/RustPlugin.kt b/infrastructure/eid-wallet/src-tauri/gen/android/buildSrc/src/main/java/io/tanglelabs/metastate/eid_wallet/kotlin/RustPlugin.kt
similarity index 100%
rename from infrastructure/eid-wallet/src-tauri/gen/android/buildSrc/src/main/java/com/eid_wallet/app/kotlin/RustPlugin.kt
rename to infrastructure/eid-wallet/src-tauri/gen/android/buildSrc/src/main/java/io/tanglelabs/metastate/eid_wallet/kotlin/RustPlugin.kt
diff --git a/infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.pbxproj b/infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.pbxproj
index 7512db49..e63075f2 100644
--- a/infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.pbxproj
+++ b/infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 56;
+	objectVersion = 63;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -32,7 +32,9 @@
 		6694E9EC8CE5328251C3F669 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		673F0CB787E12AAB4660FE44 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		6DACB922029A0F360BDBD599 /* eid-wallet_iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "eid-wallet_iOS.entitlements"; sourceTree = "<group>"; };
-		754F6FBE80C64C6326B8E0D5 /* eid-wallet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "eid-wallet.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		754F6FBE80C64C6326B8E0D5 /* eID Wallet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "eID Wallet.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		9AEEDA12A7D9D6BF575FC67A /* errors.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = errors.rs; sourceTree = "<group>"; };
+		ADFAC2203FBFFDFF207BC8FE /* mod.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = mod.rs; sourceTree = "<group>"; };
 		C636AF063138DEFB3E6A6052 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = assets; sourceTree = SOURCE_ROOT; };
 		D515D2306077569F964CC0DF /* main.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
 		DC24C9E28ECAF90D40C14313 /* lib.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = lib.rs; sourceTree = "<group>"; };
@@ -64,11 +66,19 @@
 		0D0DAFCCB1F1630FE5DF02CB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				754F6FBE80C64C6326B8E0D5 /* eid-wallet.app */,
+				754F6FBE80C64C6326B8E0D5 /* eID Wallet.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
+		1D4383173E1210A2E9FDFF04 /* funcs */ = {
+			isa = PBXGroup;
+			children = (
+				ADFAC2203FBFFDFF207BC8FE /* mod.rs */,
+			);
+			path = funcs;
+			sourceTree = "<group>";
+		};
 		1E772D6A351CCE2327B74186 /* eid-wallet_iOS */ = {
 			isa = PBXGroup;
 			children = (
@@ -96,8 +106,10 @@
 		61D5698478D645257706C604 /* src */ = {
 			isa = PBXGroup;
 			children = (
+				9AEEDA12A7D9D6BF575FC67A /* errors.rs */,
 				DC24C9E28ECAF90D40C14313 /* lib.rs */,
 				40ABD3C35AA06E16DA39304E /* main.rs */,
+				1D4383173E1210A2E9FDFF04 /* funcs */,
 			);
 			name = src;
 			path = ../../src;
@@ -167,8 +179,10 @@
 			dependencies = (
 			);
 			name = "eid-wallet_iOS";
+			packageProductDependencies = (
+			);
 			productName = "eid-wallet_iOS";
-			productReference = 754F6FBE80C64C6326B8E0D5 /* eid-wallet.app */;
+			productReference = 754F6FBE80C64C6326B8E0D5 /* eID Wallet.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -189,6 +203,7 @@
 				en,
 			);
 			mainGroup = 234EEFFEA1E82BEEC00B358A;
+			minimizedProjectReferenceProxies = 1;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
@@ -227,11 +242,10 @@
 			outputPaths = (
 				"$(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a",
 				"$(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a",
-				"$(SRCROOT)/Externals/arm64-sim/${CONFIGURATION}/libapp.a",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "pnpm tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths \"${FRAMEWORK_SEARCH_PATHS:?}\" --header-search-paths \"${HEADER_SEARCH_PATHS:?}\" --gcc-preprocessor-definitions \"${GCC_PREPROCESSOR_DEFINITIONS:-}\" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}";
+			shellScript = "[ -s \"$NVM_DIR/nvm.sh\" ] && \\. \"$NVM_DIR/nvm.sh\"\npnpm tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths \"${FRAMEWORK_SEARCH_PATHS:?}\" --header-search-paths \"${HEADER_SEARCH_PATHS:?}\" --gcc-preprocessor-definitions \"${GCC_PREPROCESSOR_DEFINITIONS:-}\" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -370,17 +384,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				ARCHS = (
-					arm64,
-					"arm64-sim",
-				);
+				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = 3FS4B734X5;
+				CURRENT_PROJECT_VERSION = 0.1.0.0;
+				DEVELOPMENT_TEAM = "HZ7MLR7Q46";
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\".\"",
@@ -390,13 +401,6 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION)",
-					"$(SDKROOT)/usr/lib/swift",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
-				);
 				"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION)",
@@ -411,11 +415,12 @@
 					"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
 					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.eid-wallet.app;
-				PRODUCT_NAME = "eid-wallet";
+				MARKETING_VERSION = 0.1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = io.tanglelabs.metastate.eid-wallet;
+				PRODUCT_NAME = "eID Wallet";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "arm64  arm64-sim";
+				VALID_ARCHS = arm64;
 			};
 			name = release;
 		};
@@ -423,17 +428,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				ARCHS = (
-					arm64,
-					"arm64-sim",
-				);
+				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = 3FS4B734X5;
+				CURRENT_PROJECT_VERSION = 0.1.0.0;
+				DEVELOPMENT_TEAM = "HZ7MLR7Q46";
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\".\"",
@@ -443,13 +445,6 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION)",
-					"$(SDKROOT)/usr/lib/swift",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
-				);
 				"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION)",
@@ -464,11 +459,12 @@
 					"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
 					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.eid-wallet.app;
-				PRODUCT_NAME = "eid-wallet";
+				MARKETING_VERSION = 0.1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = io.tanglelabs.metastate.eid-wallet;
+				PRODUCT_NAME = "eID Wallet";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "arm64  arm64-sim";
+				VALID_ARCHS = arm64;
 			};
 			name = debug;
 		};
diff --git a/infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/xcshareddata/xcschemes/eid-wallet_iOS.xcscheme b/infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/xcshareddata/xcschemes/eid-wallet_iOS.xcscheme
index cc03c9c2..2db1e379 100644
--- a/infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/xcshareddata/xcschemes/eid-wallet_iOS.xcscheme
+++ b/infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/xcshareddata/xcschemes/eid-wallet_iOS.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "6595F7B25D907151021EDDEB"
-               BuildableName = "eid-wallet.app"
+               BuildableName = "eID Wallet.app"
                BlueprintName = "eid-wallet_iOS"
                ReferencedContainer = "container:eid-wallet.xcodeproj">
             </BuildableReference>
@@ -31,7 +31,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "6595F7B25D907151021EDDEB"
-            BuildableName = "eid-wallet.app"
+            BuildableName = "eID Wallet.app"
             BlueprintName = "eid-wallet_iOS"
             ReferencedContainer = "container:eid-wallet.xcodeproj">
          </BuildableReference>
@@ -66,7 +66,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "6595F7B25D907151021EDDEB"
-            BuildableName = "eid-wallet.app"
+            BuildableName = "eID Wallet.app"
             BlueprintName = "eid-wallet_iOS"
             ReferencedContainer = "container:eid-wallet.xcodeproj">
          </BuildableReference>
@@ -95,7 +95,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "6595F7B25D907151021EDDEB"
-            BuildableName = "eid-wallet.app"
+            BuildableName = "eID Wallet.app"
             BlueprintName = "eid-wallet_iOS"
             ReferencedContainer = "container:eid-wallet.xcodeproj">
          </BuildableReference>
diff --git a/infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet_iOS/Info.plist b/infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet_iOS/Info.plist
index eb0c6606..b91aa9fe 100644
--- a/infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet_iOS/Info.plist
+++ b/infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet_iOS/Info.plist
@@ -20,6 +20,10 @@
 	<string>0.1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>Read QR codes</string>
+	<key>NSFaceIDUsageDescription</key>
+	<string>Authenticate with biometric</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -40,9 +44,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>NSFaceIDUsageDescription</key>
-	<string>Authenticate with biometric</string>
-	<key>NSCameraUsageDescription</key>
-	<string>Read QR codes</string>
 </dict>
 </plist>
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/gen/apple/project.yml b/infrastructure/eid-wallet/src-tauri/gen/apple/project.yml
index ccbe64bb..a04dda6d 100644
--- a/infrastructure/eid-wallet/src-tauri/gen/apple/project.yml
+++ b/infrastructure/eid-wallet/src-tauri/gen/apple/project.yml
@@ -1,6 +1,6 @@
 name: eid-wallet
 options:
-  bundleIdPrefix: com.eid-wallet.app
+  bundleIdPrefix: io.tanglelabs.metastate.eid-wallet
   deploymentTarget:
     iOS: 13.0
 fileGroups: [../../src]
@@ -10,8 +10,9 @@ configs:
 settingGroups:
   app:
     base:
-      PRODUCT_NAME: eid-wallet
-      PRODUCT_BUNDLE_IDENTIFIER: com.eid-wallet.app
+      PRODUCT_NAME: eID Wallet
+      PRODUCT_BUNDLE_IDENTIFIER: io.tanglelabs.metastate.eid-wallet
+      DEVELOPMENT_TEAM: HZ7MLR7Q46
 targetTemplates:
   app:
     type: application
@@ -62,14 +63,12 @@ targets:
     settings:
       base:
         ENABLE_BITCODE: false
-        ARCHS: [arm64, arm64-sim]
-        VALID_ARCHS: arm64  arm64-sim 
+        ARCHS: [arm64]
+        VALID_ARCHS: arm64 
         LIBRARY_SEARCH_PATHS[arch=x86_64]: $(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
         LIBRARY_SEARCH_PATHS[arch=arm64]: $(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
-        LIBRARY_SEARCH_PATHS[arch=arm64-sim]: $(inherited) $(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
         ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: true
-        EXCLUDED_ARCHS[sdk=iphonesimulator*]: arm64
-        EXCLUDED_ARCHS[sdk=iphoneos*]: arm64-sim x86_64
+        EXCLUDED_ARCHS[sdk=iphoneos*]: x86_64
       groups: [app]
     dependencies:
       - framework: libapp.a
@@ -87,5 +86,4 @@ targets:
         basedOnDependencyAnalysis: false
         outputFiles:
           - $(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a
-          - $(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a
-          - $(SRCROOT)/Externals/arm64-sim/${CONFIGURATION}/libapp.a
\ No newline at end of file
+          - $(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a
\ No newline at end of file
diff --git a/infrastructure/eid-wallet/src-tauri/tauri.conf.json b/infrastructure/eid-wallet/src-tauri/tauri.conf.json
index 3b0ce118..59e9d81e 100644
--- a/infrastructure/eid-wallet/src-tauri/tauri.conf.json
+++ b/infrastructure/eid-wallet/src-tauri/tauri.conf.json
@@ -1,36 +1,41 @@
 {
-  "$schema": "https://schema.tauri.app/config/2",
-  "productName": "eid-wallet",
-  "version": "0.1.0",
-  "identifier": "com.eid-wallet.app",
-  "build": {
-    "beforeDevCommand": "pnpm dev",
-    "devUrl": "http://localhost:1420",
-    "beforeBuildCommand": "pnpm build",
-    "frontendDist": "../build"
-  },
-  "app": {
-    "windows": [
-      {
-        "title": "eid-wallet",
-        "width": 800,
-        "height": 600
-      }
-    ],
-    "security": {
-      "capabilities": ["mobile-capability"],
-      "csp": null
+    "$schema": "https://schema.tauri.app/config/2",
+    "productName": "eID Wallet",
+    "version": "0.1.0",
+    "identifier": "io.tanglelabs.metastate.eid-wallet",
+    "build": {
+        "beforeDevCommand": "pnpm dev",
+        "devUrl": "http://localhost:1420",
+        "beforeBuildCommand": "npm run build",
+        "frontendDist": "../build"
+    },
+    "app": {
+        "windows": [
+            {
+                "title": "eid-wallet",
+                "width": 800,
+                "height": 600
+            }
+        ],
+        "security": {
+            "capabilities": [
+                "mobile-capability"
+            ],
+            "csp": null
+        }
+    },
+    "bundle": {
+        "active": true,
+        "targets": "all",
+        "icon": [
+            "icons/32x32.png",
+            "icons/128x128.png",
+            "icons/128x128@2x.png",
+            "icons/icon.icns",
+            "icons/icon.ico"
+        ],
+        "iOS": {
+            "developmentTeam": "HZ7MLR7Q46"
+        }
     }
-  },
-  "bundle": {
-    "active": true,
-    "targets": "all",
-    "icon": [
-      "icons/32x32.png",
-      "icons/128x128.png",
-      "icons/128x128@2x.png",
-      "icons/icon.icns",
-      "icons/icon.ico"
-    ]
-  }
 }
diff --git a/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte
index 3d1b5daf..061dce43 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/onboarding/+page.svelte
@@ -1,49 +1,194 @@
 <script lang="ts">
-import { goto } from "$app/navigation";
-import { Hero } from "$lib/fragments";
-import { ButtonAction, Drawer } from "$lib/ui";
+    import { goto } from "$app/navigation";
+    import { Hero } from "$lib/fragments";
+    import { ButtonAction, Drawer } from "$lib/ui";
+    import { getContext, onMount } from "svelte";
+    import { GlobalState } from "$lib/global";
+    import axios from "axios";
+    import { v4 as uuidv4 } from "uuid";
+    import {
+        PUBLIC_PROVISIONER_URL,
+        PUBLIC_REGISTRY_URL,
+    } from "$env/static/public";
+    import { capitalize } from "$lib/utils";
+    import * as falso from "@ngneat/falso";
+    import { Shadow } from "svelte-loading-spinners";
 
-let isPaneOpen = $state(false);
+    let isPaneOpen = $state(false);
+    let preVerified = $state(false);
+    let loading = $state(false);
+    let verificationId = $state("");
 
-const handleGetStarted = async () => {
-    //get started functionality
-    isPaneOpen = true;
-};
+    const handleGetStarted = async () => {
+        //get started functionality
+        isPaneOpen = true;
+        preVerified = false;
+    };
 
-const handleNext = async () => {
-    //handle next functionlity
-    goto("/verify");
-};
+    const handlePreVerified = () => {
+        isPaneOpen = true;
+        preVerified = true;
+    };
+
+    function generatePassportNumber() {
+        const letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        const randomLetters = () =>
+            letters.charAt(Math.floor(Math.random() * letters.length)) +
+            letters.charAt(Math.floor(Math.random() * letters.length));
+        const randomDigits = () =>
+            String(Math.floor(1000000 + Math.random() * 9000000)); // 7 digits
+
+        return randomLetters() + randomDigits();
+    }
+
+    const handleNext = async () => {
+        //handle next functionlity
+        goto("/verify");
+    };
+
+    let globalState: GlobalState;
+    let handleContinue: () => Promise<void> | void;
+
+    onMount(() => {
+        globalState = getContext<() => GlobalState>("globalState")();
+        // handle verification logic + sec user data in the store
+
+        handleContinue = async () => {
+            loading = true;
+            const tenYearsLater = new Date();
+            tenYearsLater.setFullYear(tenYearsLater.getFullYear() + 10);
+            globalState.userController.user = {
+                name: capitalize(
+                    `${falso.randFirstName()} ${falso.randLastName()}`,
+                ),
+                "Date of Birth": new Date().toDateString(),
+                "ID submitted": "Passport - " + falso.randCountryCode(),
+                "Passport Number": generatePassportNumber(),
+            };
+            globalState.userController.document = {
+                "Valid From": new Date(Date.now()).toDateString(),
+                "Valid Until": tenYearsLater.toDateString(),
+                "Verified On": new Date().toDateString(),
+            };
+            const {
+                data: { token: registryEntropy },
+            } = await axios.get(
+                new URL("/entropy", PUBLIC_REGISTRY_URL).toString(),
+            );
+            const { data } = await axios.post(
+                new URL("/provision", PUBLIC_PROVISIONER_URL).toString(),
+                {
+                    registryEntropy,
+                    namespace: uuidv4(),
+                    verificationId,
+                },
+            );
+            if (data.success === true) {
+                globalState.vaultController.vault = {
+                    uri: data.uri,
+                    ename: data.w3id,
+                };
+            }
+            setTimeout(() => {
+                goto("/register");
+            }, 10_000);
+        };
+    });
 </script>
 
-<main class="h-[100dsvh] pt-[3svh] px-[5vw] pb-[4.5svh] flex flex-col justify-between">
+<main
+    class="h-[100dsvh] pt-[3svh] px-[5vw] pb-[4.5svh] flex flex-col justify-between"
+>
     <article class="flex justify-center">
-        <img class="w-[88vw] h-[39svh]" src="/images/Onboarding.svg" alt="Infographic card">
+        <img
+            class="w-[88vw] h-[39svh]"
+            src="/images/Onboarding.svg"
+            alt="Infographic card"
+        />
     </article>
     <section>
         <Hero
-        subtitle="Store your IDs, verify instantly with QR codes, and manage your digital identity with ease."
-        class="mb-4"
-        titleClasses="text-[42px]/[1.1] font-medium"
+            subtitle="Store your IDs, verify instantly with QR codes, and manage your digital identity with ease."
+            class="mb-4"
+            titleClasses="text-[42px]/[1.1] font-medium"
         >
-            Your <br>
-            Digital Identity,
-            Secured
+            Your <br />
+            Digital Identity, Secured
         </Hero>
     </section>
     <section>
-        <p class="max-w-[300px] mx-[auto] text-center small text-black-500">By continuing you agree to our <a href="/" class="text-primary underline underline-offset-5">Terms & Conditions </a> and <a href="/" class="text-primary underline underline-offset-5">privacy policy.</a></p>
+        <p class="max-w-[300px] mx-[auto] text-center small text-black-500">
+            By continuing you agree to our <a
+                href="/"
+                class="text-primary underline underline-offset-5"
+                >Terms & Conditions
+            </a>
+            and
+            <a href="/" class="text-primary underline underline-offset-5"
+                >privacy policy.</a
+            >
+        </p>
         <div class="flex justify-center whitespace-nowrap mt-[2svh]">
-            <ButtonAction class="w-full" callback={handleGetStarted}>Get Started</ButtonAction>
+            <ButtonAction class="w-full" callback={handleGetStarted}
+                >Get Started</ButtonAction
+            >
         </div>
+
+        <p class="mt-5">
+            Already have a pre-verification code? <button
+                onclick={handlePreVerified}
+                class="text-primary-500">click here</button
+            >
+        </p>
     </section>
 </main>
 
-<Drawer bind:isPaneOpen>
-    <img src="/images/GetStarted.svg" alt="get-started">
+<Drawer bind:preVerified>
     <h4 class="mt-[2.3svh] mb-[0.5svh]">Welcome to Web 3 Data Spaces</h4>
-    <p class="text-black-700">Your eName is more than a name—it's your unique digital passport. One constant identifier that travels with you across the internet, connecting your real-world self to the digital universe.</p>
-    <div class="flex justify-center whitespace-nowrap my-[2.3svh]">
-        <ButtonAction class="w-full" callback={handleNext}>Next</ButtonAction>
-    </div>
-</Drawer>
\ No newline at end of file
+    <p class="text-black-700">
+        Your eName is more than a name—it's your unique digital passport. One
+        constant identifier that travels with you across the internet,
+        connecting your real-world self to the digital universe.
+    </p>
+</Drawer>
+
+<Drawer bind:isPaneOpen>
+    <img src="/images/GetStarted.svg" alt="get-started" />
+    {#if loading}
+        <div class="my-20">
+            <div
+                class="align-center flex w-full flex-col items-center justify-center gap-6"
+            >
+                <Shadow size={40} color="rgb(142, 82, 255);" />
+                <h3>Generating your eName</h3>
+            </div>
+        </div>
+    {:else if preVerified}
+        <h4 class="mt-[2.3svh] mb-[0.5svh]">Welcome to Web 3 Data Spaces</h4>
+        <p class="text-black-700">Enter Verification Code</p>
+        <input
+            type="text"
+            bind:value={verificationId}
+            class="border-1 border-gray-200 w-full rounded-md font-medium my-2 py-2
+            px-2"
+        />
+        <div class="flex justify-center whitespace-nowrap my-[2.3svh]">
+            <ButtonAction class="w-full" callback={handleContinue}
+                >Next</ButtonAction
+            >
+        </div>
+    {:else}
+        <h4 class="mt-[2.3svh] mb-[0.5svh]">Welcome to Web 3 Data Spaces</h4>
+        <p class="text-black-700">
+            Your eName is more than a name—it's your unique digital passport.
+            One constant identifier that travels with you across the internet,
+            connecting your real-world self to the digital universe.
+        </p>
+        <div class="flex justify-center whitespace-nowrap my-[2.3svh]">
+            <ButtonAction class="w-full" callback={handleNext}
+                >Next</ButtonAction
+            >
+        </div>
+    {/if}
+</Drawer>
+
diff --git a/infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
index 7327f714..c6cd3b11 100644
--- a/infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
+++ b/infrastructure/eid-wallet/src/routes/(auth)/verify/+page.svelte
@@ -1,113 +1,123 @@
 <script lang="ts">
-import { goto } from "$app/navigation";
-import { Hero } from "$lib/fragments";
-import { GlobalState } from "$lib/global";
-import { ButtonAction } from "$lib/ui";
-import { getContext, onMount } from "svelte";
-import { capitalize } from "$lib/utils";
-import Drawer from "$lib/ui/Drawer/Drawer.svelte";
-import axios from "axios";
-import { v4 as uuidv4 } from "uuid";
-import {
-    PUBLIC_PROVISIONER_URL,
-    PUBLIC_REGISTRY_URL,
-} from "$env/static/public";
-import { DocFront, verificaitonId, verifStep, status, reason } from "./store";
-import Passport from "./steps/passport.svelte";
-import Selfie from "./steps/selfie.svelte";
-import { load } from "@tauri-apps/plugin-store";
-import { Shadow } from "svelte-loading-spinners";
+    import { goto } from "$app/navigation";
+    import { Hero } from "$lib/fragments";
+    import { GlobalState } from "$lib/global";
+    import { ButtonAction } from "$lib/ui";
+    import { getContext, onMount } from "svelte";
+    import { capitalize } from "$lib/utils";
+    import Drawer from "$lib/ui/Drawer/Drawer.svelte";
+    import axios from "axios";
+    import { v4 as uuidv4 } from "uuid";
+    import {
+        PUBLIC_PROVISIONER_URL,
+        PUBLIC_REGISTRY_URL,
+    } from "$env/static/public";
+    import {
+        DocFront,
+        verificaitonId,
+        verifStep,
+        status,
+        reason,
+        Selfie as SelfiePic,
+    } from "./store";
+    import Passport from "./steps/passport.svelte";
+    import Selfie from "./steps/selfie.svelte";
+    import { Shadow } from "svelte-loading-spinners";
 
-let globalState: GlobalState | undefined = $state(undefined);
-let showVeriffModal = $state(false);
-let person: Record<string, unknown>;
-let document: Record<string, unknown>;
-let loading = $state(false);
+    let globalState: GlobalState | undefined = $state(undefined);
+    let showVeriffModal = $state(false);
+    let person: Record<string, unknown>;
+    let document: Record<string, unknown>;
+    let loading = $state(false);
 
-async function handleVerification() {
-    const { data } = await axios.post(
-        new URL("/verification", PUBLIC_PROVISIONER_URL).toString(),
-    );
-    verificaitonId.set(data.id);
-    showVeriffModal = true;
-    watchEventStream(data.id);
-}
+    async function handleVerification() {
+        const { data } = await axios.post(
+            new URL("/verification", PUBLIC_PROVISIONER_URL).toString(),
+        );
+        verificaitonId.set(data.id);
+        showVeriffModal = true;
+        watchEventStream(data.id);
+    }
 
-function watchEventStream(id: string) {
-    const sseUrl = new URL(
-        `/verification/sessions/${id}`,
-        PUBLIC_PROVISIONER_URL,
-    ).toString();
-    const eventSource = new EventSource(sseUrl);
+    function watchEventStream(id: string) {
+        const sseUrl = new URL(
+            `/verification/sessions/${id}`,
+            PUBLIC_PROVISIONER_URL,
+        ).toString();
+        const eventSource = new EventSource(sseUrl);
 
-    eventSource.onopen = function (e) {
-        console.log("Successfully connected.");
-    };
+        eventSource.onopen = function (e) {
+            console.log("Successfully connected.");
+        };
 
-    eventSource.onmessage = function (e) {
-        const data = JSON.parse(e.data);
-        if (!data.status) console.log(data);
-        console.log("STATUS", data);
-        status.set(data.status);
-        reason.set(data.reason);
-        person = data.person;
-        document = data.document;
-        if (data.status === "resubmission_requested") {
-            DocFront.set(null);
-            Selfie.set(null);
-        }
-        verifStep.set(2);
-    };
-}
+        eventSource.onmessage = function (e) {
+            const data = JSON.parse(e.data);
+            if (!data.status) console.log(data);
+            console.log("STATUS", data);
+            status.set(data.status);
+            reason.set(data.reason);
+            person = data.person;
+            document = data.document;
+            if (data.status === "resubmission_requested") {
+                DocFront.set(null);
+                SelfiePic.set(null);
+            }
+            verifStep.set(2);
+        };
+    }
 
-let handleContinue: () => Promise<void>;
+    let handleContinue: () => Promise<void>;
 
-onMount(() => {
-    globalState = getContext<() => GlobalState>("globalState")();
-    // handle verification logic + sec user data in the store
+    onMount(() => {
+        globalState = getContext<() => GlobalState>("globalState")();
+        // handle verification logic + sec user data in the store
 
-    handleContinue = async () => {
-        if ($status !== "approved") return verifStep.set(0);
-        if (!globalState) throw new Error("Global state is not defined");
+        handleContinue = async () => {
+            if ($status !== "approved") return verifStep.set(0);
+            if (!globalState) throw new Error("Global state is not defined");
 
-        loading = true;
-        globalState.userController.user = {
-            name: capitalize(
-                person.firstName.value + " " + person.lastName.value,
-            ),
-            "Date of Birth": new Date(person.dateOfBirth.value).toDateString(),
-            "ID submitted": "Passport - " + person.nationality.value,
-            "Passport Number": document.number.value,
-        };
-        globalState.userController.document = {
-            "Valid From": new Date(document.validFrom.value).toDateString(),
-            "Valid Until": new Date(document.validUntil.value).toDateString(),
-            "Verified On": new Date().toDateString(),
-        };
-        const {
-            data: { token: registryEntropy },
-        } = await axios.get(
-            new URL("/entropy", PUBLIC_REGISTRY_URL).toString(),
-        );
-        const { data } = await axios.post(
-            new URL("/provision", PUBLIC_PROVISIONER_URL).toString(),
-            {
-                registryEntropy,
-                namespace: uuidv4(),
-                verificationId: $verificaitonId,
-            },
-        );
-        if (data.success === true) {
-            globalState.vaultController.vault = {
-                uri: data.uri,
-                ename: data.w3id,
+            loading = true;
+            globalState.userController.user = {
+                name: capitalize(
+                    person.firstName.value + " " + person.lastName.value,
+                ),
+                "Date of Birth": new Date(
+                    person.dateOfBirth.value,
+                ).toDateString(),
+                "ID submitted": "Passport - " + person.nationality.value,
+                "Passport Number": document.number.value,
+            };
+            globalState.userController.document = {
+                "Valid From": new Date(document.validFrom.value).toDateString(),
+                "Valid Until": new Date(
+                    document.validUntil.value,
+                ).toDateString(),
+                "Verified On": new Date().toDateString(),
             };
-        }
-        setTimeout(() => {
-            goto("/register");
-        }, 10_000);
-    };
-});
+            const {
+                data: { token: registryEntropy },
+            } = await axios.get(
+                new URL("/entropy", PUBLIC_REGISTRY_URL).toString(),
+            );
+            const { data } = await axios.post(
+                new URL("/provision", PUBLIC_PROVISIONER_URL).toString(),
+                {
+                    registryEntropy,
+                    namespace: uuidv4(),
+                    verificationId: $verificaitonId,
+                },
+            );
+            if (data.success === true) {
+                globalState.vaultController.vault = {
+                    uri: data.uri,
+                    ename: data.w3id,
+                };
+            }
+            setTimeout(() => {
+                goto("/register");
+            }, 10_000);
+        };
+    });
 </script>
 
 <main
diff --git a/infrastructure/evault-core/src/db/db.service.spec.ts b/infrastructure/evault-core/src/db/db.service.spec.ts
index 4ae8109e..ab09324b 100644
--- a/infrastructure/evault-core/src/db/db.service.spec.ts
+++ b/infrastructure/evault-core/src/db/db.service.spec.ts
@@ -52,6 +52,7 @@ describe("DbService (integration)", () => {
 
         const fetched = await service.findMetaEnvelopeById(id);
         expect(fetched).toBeDefined();
+        if (!fetched) return;
         expect(fetched.id).toBeDefined();
         expect(fetched.ontology).toBe("TestTypes");
         expect(fetched.acl).toEqual(["@test-user"]);
@@ -167,20 +168,25 @@ describe("DbService (integration)", () => {
         const result = await service.findMetaEnvelopeById(
             stored.metaEnvelope.id,
         );
+        if (!result) return;
         const targetEnvelope = result.envelopes.find(
             (e: Envelope) => e.ontology === "value",
         );
 
         // Update with a different type
         const newValue = new Date("2025-04-10T00:00:00Z");
+        if (!targetEnvelope) return;
         await service.updateEnvelopeValue(targetEnvelope.id, newValue);
 
         const updated = await service.findMetaEnvelopeById(
             stored.metaEnvelope.id,
         );
+        if (!updated) return;
         const updatedValue = updated.envelopes.find(
             (e: Envelope) => e.id === targetEnvelope.id,
         );
+
+        if (!updatedValue) return;
         expect(updatedValue.value).toBeInstanceOf(Date);
         expect(updatedValue.value.toISOString()).toBe(
             "2025-04-10T00:00:00.000Z",
diff --git a/infrastructure/evault-core/src/db/db.service.ts b/infrastructure/evault-core/src/db/db.service.ts
index a6efadb9..dd51d71f 100644
--- a/infrastructure/evault-core/src/db/db.service.ts
+++ b/infrastructure/evault-core/src/db/db.service.ts
@@ -366,6 +366,144 @@ export class DbService {
         );
     }
 
+    /**
+     * Updates a meta-envelope and its associated envelopes.
+     * @param id - The ID of the meta-envelope to update
+     * @param meta - The updated meta-envelope data
+     * @param acl - The updated access control list
+     * @returns The updated meta-envelope and its envelopes
+     */
+    async updateMetaEnvelopeById<
+        T extends Record<string, any> = Record<string, any>,
+    >(
+        id: string,
+        meta: Omit<MetaEnvelope<T>, "id">,
+        acl: string[],
+    ): Promise<StoreMetaEnvelopeResult<T>> {
+        try {
+            // First, get the existing meta-envelope to find existing envelopes
+            const existing = await this.findMetaEnvelopeById<T>(id);
+            if (!existing) {
+                throw new Error(`Meta-envelope with id ${id} not found`);
+            }
+
+            // Update the meta-envelope properties
+            await this.runQuery(
+                `
+                MATCH (m:MetaEnvelope { id: $id })
+                SET m.ontology = $ontology, m.acl = $acl
+                `,
+                { id, ontology: meta.ontology, acl }
+            );
+
+            const createdEnvelopes: Envelope<T[keyof T]>[] = [];
+            let counter = 0;
+
+            // For each field in the new payload
+            for (const [key, value] of Object.entries(meta.payload)) {
+                try {
+                    const { value: storedValue, type: valueType } = serializeValue(value);
+                    const alias = `e${counter}`;
+
+                    // Check if an envelope with this ontology already exists
+                    const existingEnvelope = existing.envelopes.find(e => e.ontology === key);
+
+                    if (existingEnvelope) {
+                        // Update existing envelope
+                        await this.runQuery(
+                            `
+                            MATCH (e:Envelope { id: $envelopeId })
+                            SET e.value = $newValue, e.valueType = $valueType
+                            `,
+                            {
+                                envelopeId: existingEnvelope.id,
+                                newValue: storedValue,
+                                valueType,
+                            }
+                        );
+
+                        createdEnvelopes.push({
+                            id: existingEnvelope.id,
+                            ontology: key,
+                            value: value as T[keyof T],
+                            valueType,
+                        });
+                    } else {
+                        // Create new envelope
+                        const envW3id = await new W3IDBuilder().build();
+                        const envelopeId = envW3id.id;
+
+                        await this.runQuery(
+                            `
+                            MATCH (m:MetaEnvelope { id: $metaId })
+                            CREATE (${alias}:Envelope {
+                                id: $${alias}_id,
+                                ontology: $${alias}_ontology,
+                                value: $${alias}_value,
+                                valueType: $${alias}_type
+                            })
+                            WITH m, ${alias}
+                            MERGE (m)-[:LINKS_TO]->(${alias})
+                            `,
+                            {
+                                metaId: id,
+                                [`${alias}_id`]: envelopeId,
+                                [`${alias}_ontology`]: key,
+                                [`${alias}_value`]: storedValue,
+                                [`${alias}_type`]: valueType,
+                            }
+                        );
+
+                        createdEnvelopes.push({
+                            id: envelopeId,
+                            ontology: key,
+                            value: value as T[keyof T],
+                            valueType,
+                        });
+                    }
+
+                    counter++;
+                } catch (error) {
+                    console.error(`Error processing field ${key}:`, error);
+                    throw error;
+                }
+            }
+
+            // Delete envelopes that are no longer in the payload
+            const existingOntologies = new Set(Object.keys(meta.payload));
+            const envelopesToDelete = existing.envelopes.filter(
+                e => !existingOntologies.has(e.ontology)
+            );
+
+            for (const envelope of envelopesToDelete) {
+                try {
+                    await this.runQuery(
+                        `
+                        MATCH (e:Envelope { id: $envelopeId })
+                        DETACH DELETE e
+                        `,
+                        { envelopeId: envelope.id }
+                    );
+                } catch (error) {
+                    console.error(`Error deleting envelope ${envelope.id}:`, error);
+                    throw error;
+                }
+            }
+
+            return {
+                metaEnvelope: {
+                    id,
+                    ontology: meta.ontology,
+                    acl,
+                },
+                envelopes: createdEnvelopes,
+            };
+        } catch (error) {
+            console.error('Error in updateMetaEnvelopeById:', error);
+            throw error;
+        }
+    }
+
     /**
      * Retrieves all envelopes in the system.
      * @returns Array of all envelopes
diff --git a/infrastructure/evault-core/src/db/retry-neo4j.ts b/infrastructure/evault-core/src/db/retry-neo4j.ts
new file mode 100644
index 00000000..d08f5178
--- /dev/null
+++ b/infrastructure/evault-core/src/db/retry-neo4j.ts
@@ -0,0 +1,40 @@
+import neo4j, { Driver } from "neo4j-driver";
+
+/**
+ * Attempts to connect to Neo4j with retry logic.
+ * @param uri - Neo4j URI
+ * @param user - Username
+ * @param password - Password
+ * @param maxRetries - Maximum number of retries (default: 10)
+ * @param delayMs - Delay between retries in ms (default: 3000)
+ * @returns Connected Neo4j Driver
+ * @throws Error if connection fails after all retries
+ */
+export async function connectWithRetry(
+    uri: string,
+    user: string,
+    password: string,
+    maxRetries = 30,
+    delayMs = 5000,
+): Promise<Driver> {
+    let attempt = 0;
+    while (attempt < maxRetries) {
+        try {
+            const driver = neo4j.driver(
+                uri,
+                neo4j.auth.basic(user, password),
+                { encrypted: "ENCRYPTION_OFF" }, // or { encrypted: false }
+            );
+            await driver.getServerInfo();
+            console.log("Connected to Neo4j!");
+            return driver;
+        } catch (err: any) {
+            attempt++;
+            console.warn(
+                `Neo4j connection attempt ${attempt} failed: ${err.message}. Retrying in ${delayMs}ms...`,
+            );
+            await new Promise((res) => setTimeout(res, delayMs));
+        }
+    }
+    throw new Error("Could not connect to Neo4j after multiple attempts");
+}
diff --git a/infrastructure/evault-core/src/db/types.ts b/infrastructure/evault-core/src/db/types.ts
index 1b79fd52..b76f9808 100644
--- a/infrastructure/evault-core/src/db/types.ts
+++ b/infrastructure/evault-core/src/db/types.ts
@@ -2,20 +2,20 @@
  * Represents a meta-envelope that contains multiple envelopes of data.
  */
 export type MetaEnvelope<T extends Record<string, any> = Record<string, any>> =
-  {
-    ontology: string;
-    payload: T;
-    acl: string[];
-  };
+    {
+        ontology: string;
+        payload: T;
+        acl: string[];
+    };
 
 /**
  * Represents an individual envelope containing a single piece of data.
  */
 export type Envelope<T = any> = {
-  id: string;
-  value: T;
-  ontology: string;
-  valueType: string;
+    id: string;
+    value: T;
+    ontology: string;
+    valueType: string;
 };
 
 /**
@@ -23,34 +23,34 @@ export type Envelope<T = any> = {
  * Includes the parsed payload structure reconstructed from the envelopes.
  */
 export type MetaEnvelopeResult<
-  T extends Record<string, any> = Record<string, any>,
+    T extends Record<string, any> = Record<string, any>
 > = {
-  id: string;
-  ontology: string;
-  acl: string[];
-  envelopes: Envelope<T[keyof T]>[];
-  parsed: T;
+    id: string;
+    ontology: string;
+    acl: string[];
+    envelopes: Envelope<T[keyof T]>[];
+    parsed: T;
 };
 
 /**
  * Result type for storing a new meta-envelope.
  */
 export type StoreMetaEnvelopeResult<
-  T extends Record<string, any> = Record<string, any>,
+    T extends Record<string, any> = Record<string, any>
 > = {
-  metaEnvelope: {
-    id: string;
-    ontology: string;
-    acl: string[];
-  };
-  envelopes: Envelope<T[keyof T]>[];
+    metaEnvelope: {
+        id: string;
+        ontology: string;
+        acl: string[];
+    };
+    envelopes: Envelope<T[keyof T]>[];
 };
 
 /**
  * Result type for searching meta-envelopes.
  */
 export type SearchMetaEnvelopesResult<
-  T extends Record<string, any> = Record<string, any>,
+    T extends Record<string, any> = Record<string, any>
 > = MetaEnvelopeResult<T>[];
 
 /**
diff --git a/infrastructure/evault-core/src/evault.ts b/infrastructure/evault-core/src/evault.ts
index 57b220ad..d30864df 100644
--- a/infrastructure/evault-core/src/evault.ts
+++ b/infrastructure/evault-core/src/evault.ts
@@ -13,6 +13,7 @@ import dotenv from "dotenv";
 import path from "path";
 import neo4j, { Driver } from "neo4j-driver";
 import { W3ID } from "./w3id/w3id";
+import { connectWithRetry } from "./db/retry-neo4j";
 
 dotenv.config({ path: path.resolve(__dirname, "../../../.env") });
 
@@ -22,7 +23,17 @@ class EVault {
     logService: LogService;
     driver: Driver;
 
-    constructor() {
+    private constructor(driver: Driver) {
+        this.driver = driver;
+        const dbService = new DbService(driver);
+        this.logService = new LogService(driver);
+        this.graphqlServer = new GraphQLServer(dbService);
+        this.server = fastify({
+            logger: true,
+        });
+    }
+
+    static async create(): Promise<EVault> {
         const uri = process.env.NEO4J_URI || "bolt://localhost:7687";
         const user = process.env.NEO4J_USER || "neo4j";
         const password = process.env.NEO4J_PASSWORD || "neo4j";
@@ -37,15 +48,8 @@ class EVault {
             );
         }
 
-        this.driver = neo4j.driver(uri, neo4j.auth.basic(user, password));
-
-        const dbService = new DbService(this.driver);
-        this.logService = new LogService(this.driver);
-        this.graphqlServer = new GraphQLServer(dbService);
-
-        this.server = fastify({
-            logger: true,
-        });
+        const driver = await connectWithRetry(uri, user, password);
+        return new EVault(driver);
     }
 
     async initialize() {
@@ -64,10 +68,7 @@ class EVault {
             url: yoga.graphqlEndpoint,
             method: ["GET", "POST", "OPTIONS"],
             handler: (req, reply) =>
-                yoga.handleNodeRequestAndResponse(req, reply, {
-                    req,
-                    reply,
-                }),
+                yoga.handleNodeRequestAndResponse(req, reply),
         });
 
         // Mount Voyager endpoint
@@ -102,5 +103,6 @@ class EVault {
     }
 }
 
-const evault = new EVault();
-evault.start().catch(console.error);
+EVault.create()
+    .then(evault => evault.start())
+    .catch(console.error);
diff --git a/infrastructure/evault-core/src/protocol/examples/examples.ts b/infrastructure/evault-core/src/protocol/examples/examples.ts
index 455f16b4..f36eb194 100644
--- a/infrastructure/evault-core/src/protocol/examples/examples.ts
+++ b/infrastructure/evault-core/src/protocol/examples/examples.ts
@@ -79,7 +79,7 @@ export const exampleQueries = `
 # }
 
 ################################################################################
-# ✏️ 5. Update a Single Envelope’s Value
+# ✏️ 5. Update a Single Envelope's Value
 ################################################################################
 
 # mutation {
@@ -98,7 +98,39 @@ export const exampleQueries = `
 # }
 
 ################################################################################
-# 📦 7. List All Envelopes in the System
+# 🔄 7. Update a MetaEnvelope by ID
+################################################################################
+
+# mutation {
+#   updateMetaEnvelopeById(
+#     id: "YOUR_META_ENVELOPE_ID_HERE",
+#     input: {
+#       ontology: "SocialMediaPost",
+#       payload: {
+#         text: "Updated post content",
+#         image: "https://example.com/new-pic.jpg",
+#         dateCreated: "2025-04-10T10:00:00Z",
+#         userLikes: ["@user1", "@user2", "@user3"]
+#       },
+#       acl: ["@d1fa5cb1-6178-534b-a096-59794d485f65"]
+#     }
+#   ) {
+#     metaEnvelope {
+#       id
+#       ontology
+#       parsed
+#     }
+#     envelopes {
+#       id
+#       ontology
+#       value
+#       valueType
+#     }
+#   }
+# }
+
+################################################################################
+# 📦 8. List All Envelopes in the System
 ################################################################################
 
 # query {
diff --git a/infrastructure/evault-core/src/protocol/graphql-server.ts b/infrastructure/evault-core/src/protocol/graphql-server.ts
index bde5adde..029090ac 100644
--- a/infrastructure/evault-core/src/protocol/graphql-server.ts
+++ b/infrastructure/evault-core/src/protocol/graphql-server.ts
@@ -9,119 +9,162 @@ import { GraphQLSchema } from "graphql";
 import { exampleQueries } from "./examples/examples";
 
 export class GraphQLServer {
-  private db: DbService;
-  private accessGuard: VaultAccessGuard;
-  private schema: GraphQLSchema = createSchema<VaultContext>({
-    typeDefs,
-    resolvers: {},
-  });
-  server?: Server;
-
-  constructor(db: DbService) {
-    this.db = db;
-    this.accessGuard = new VaultAccessGuard(db);
-  }
+    private db: DbService;
+    private accessGuard: VaultAccessGuard;
+    private schema: GraphQLSchema = createSchema<VaultContext>({
+        typeDefs,
+        resolvers: {},
+    });
+    server?: Server;
+    constructor(db: DbService) {
+        this.db = db;
+        this.accessGuard = new VaultAccessGuard(db);
+    }
 
-  public getSchema(): GraphQLSchema {
-    return this.schema;
-  }
+    public getSchema(): GraphQLSchema {
+        return this.schema;
+    }
 
-  init() {
-    const resolvers = {
-      JSON: require("graphql-type-json"),
+    init() {
+        const resolvers = {
+            JSON: require("graphql-type-json"),
 
-      Query: {
-        getMetaEnvelopeById: this.accessGuard.middleware(
-          (_: any, { id }: { id: string }) => {
-            return this.db.findMetaEnvelopeById(id);
-          }
-        ),
-        findMetaEnvelopesByOntology: this.accessGuard.middleware(
-          (_: any, { ontology }: { ontology: string }) => {
-            return this.db.findMetaEnvelopesByOntology(ontology);
-          }
-        ),
-        searchMetaEnvelopes: this.accessGuard.middleware(
-          (_: any, { ontology, term }: { ontology: string; term: string }) => {
-            return this.db.findMetaEnvelopesBySearchTerm(ontology, term);
-          }
-        ),
-        getAllEnvelopes: this.accessGuard.middleware(() => {
-          return this.db.getAllEnvelopes();
-        }),
-      },
+            Query: {
+                getMetaEnvelopeById: this.accessGuard.middleware(
+                    (_: any, { id }: { id: string }) => {
+                        return this.db.findMetaEnvelopeById(id);
+                    }
+                ),
+                findMetaEnvelopesByOntology: this.accessGuard.middleware(
+                    (_: any, { ontology }: { ontology: string }) => {
+                        return this.db.findMetaEnvelopesByOntology(ontology);
+                    }
+                ),
+                searchMetaEnvelopes: this.accessGuard.middleware(
+                    (
+                        _: any,
+                        { ontology, term }: { ontology: string; term: string }
+                    ) => {
+                        return this.db.findMetaEnvelopesBySearchTerm(
+                            ontology,
+                            term
+                        );
+                    }
+                ),
+                getAllEnvelopes: this.accessGuard.middleware(() => {
+                    return this.db.getAllEnvelopes();
+                }),
+            },
 
-      Mutation: {
-        storeMetaEnvelope: this.accessGuard.middleware(
-          async (
-            _: any,
-            {
-              input,
-            }: {
-              input: {
-                ontology: string;
-                payload: any;
-                acl: string[];
-              };
-            }
-          ) => {
-            const result = await this.db.storeMetaEnvelope(
-              {
-                ontology: input.ontology,
-                payload: input.payload,
-                acl: input.acl,
-              },
-              input.acl
-            );
-            return result;
-          }
-        ),
-        deleteMetaEnvelope: this.accessGuard.middleware(
-          async (_: any, { id }: { id: string }) => {
-            await this.db.deleteMetaEnvelope(id);
-            return true;
-          }
-        ),
-        updateEnvelopeValue: this.accessGuard.middleware(
-          async (
-            _: any,
-            { envelopeId, newValue }: { envelopeId: string; newValue: any }
-          ) => {
-            await this.db.updateEnvelopeValue(envelopeId, newValue);
-            return true;
-          }
-        ),
-      },
-    };
+            Mutation: {
+                storeMetaEnvelope: this.accessGuard.middleware(
+                    async (
+                        _: any,
+                        {
+                            input,
+                        }: {
+                            input: {
+                                ontology: string;
+                                payload: any;
+                                acl: string[];
+                            };
+                        }
+                    ) => {
+                        const result = await this.db.storeMetaEnvelope(
+                            {
+                                ontology: input.ontology,
+                                payload: input.payload,
+                                acl: input.acl,
+                            },
+                            input.acl
+                        );
+                        return result;
+                    }
+                ),
+                updateMetaEnvelopeById: this.accessGuard.middleware(
+                    async (
+                        _: any,
+                        {
+                            id,
+                            input,
+                        }: {
+                            id: string;
+                            input: {
+                                ontology: string;
+                                payload: any;
+                                acl: string[];
+                            };
+                        }
+                    ) => {
+                        try {
+                            const result = await this.db.updateMetaEnvelopeById(
+                                id,
+                                {
+                                    ontology: input.ontology,
+                                    payload: input.payload,
+                                    acl: input.acl,
+                                },
+                                input.acl
+                            );
+                            return result;
+                        } catch (error) {
+                            console.error(
+                                "Error in updateMetaEnvelopeById:",
+                                error
+                            );
+                            throw error;
+                        }
+                    }
+                ),
+                deleteMetaEnvelope: this.accessGuard.middleware(
+                    async (_: any, { id }: { id: string }) => {
+                        await this.db.deleteMetaEnvelope(id);
+                        return true;
+                    }
+                ),
+                updateEnvelopeValue: this.accessGuard.middleware(
+                    async (
+                        _: any,
+                        {
+                            envelopeId,
+                            newValue,
+                        }: { envelopeId: string; newValue: any }
+                    ) => {
+                        await this.db.updateEnvelopeValue(envelopeId, newValue);
+                        return true;
+                    }
+                ),
+            },
+        };
 
-    this.schema = createSchema<VaultContext>({
-      typeDefs,
-      resolvers,
-    });
+        this.schema = createSchema<VaultContext>({
+            typeDefs,
+            resolvers,
+        });
 
-    const yoga = createYoga({
-      schema: this.schema,
-      graphqlEndpoint: "/graphql",
-      graphiql: {
-        defaultQuery: exampleQueries,
-      },
-      context: async ({ request }) => {
-        const authHeader = request.headers.get("authorization") ?? "";
-        const token = authHeader.replace("Bearer ", "");
+        const yoga = createYoga({
+            schema: this.schema,
+            graphqlEndpoint: "/graphql",
+            graphiql: {
+                defaultQuery: exampleQueries,
+            },
+            context: async ({ request }) => {
+                const authHeader = request.headers.get("authorization") ?? "";
+                const token = authHeader.replace("Bearer ", "");
 
-        if (token) {
-          const id = getJWTHeader(token).kid?.split("#")[0];
-          return {
-            currentUser: id ?? null,
-          };
-        }
+                if (token) {
+                    const id = getJWTHeader(token).kid?.split("#")[0];
+                    return {
+                        currentUser: id ?? null,
+                    };
+                }
 
-        return {
-          currentUser: null,
-        };
-      },
-    });
+                return {
+                    currentUser: null,
+                };
+            },
+        });
 
-    return yoga;
-  }
+        return yoga;
+    }
 }
diff --git a/infrastructure/evault-core/src/protocol/typedefs.ts b/infrastructure/evault-core/src/protocol/typedefs.ts
index fdd0b7cf..a4b406b8 100644
--- a/infrastructure/evault-core/src/protocol/typedefs.ts
+++ b/infrastructure/evault-core/src/protocol/typedefs.ts
@@ -38,5 +38,6 @@ export const typeDefs = /* GraphQL */ `
         storeMetaEnvelope(input: MetaEnvelopeInput!): StoreMetaEnvelopeResult!
         deleteMetaEnvelope(id: String!): Boolean!
         updateEnvelopeValue(envelopeId: String!, newValue: JSON!): Boolean!
+        updateMetaEnvelopeById(id: String!, input: MetaEnvelopeInput!): StoreMetaEnvelopeResult!
     }
 `;
diff --git a/infrastructure/evault-core/src/protocol/vault-access-guard.ts b/infrastructure/evault-core/src/protocol/vault-access-guard.ts
index 867237c2..36a053bf 100644
--- a/infrastructure/evault-core/src/protocol/vault-access-guard.ts
+++ b/infrastructure/evault-core/src/protocol/vault-access-guard.ts
@@ -3,112 +3,115 @@ import { DbService } from "../db/db.service";
 import { MetaEnvelope } from "../db/types";
 
 export type VaultContext = YogaInitialContext & {
-  currentUser: string | null;
+    currentUser: string | null;
 };
 
 export class VaultAccessGuard {
-  constructor(private db: DbService) {}
+    constructor(private db: DbService) {}
 
-  /**
-   * Checks if the current user has access to a meta envelope based on its ACL
-   * @param metaEnvelopeId - The ID of the meta envelope to check access for
-   * @param context - The GraphQL context containing the current user
-   * @returns Promise<boolean> - Whether the user has access
-   */
-  private async checkAccess(
-    metaEnvelopeId: string,
-    context: VaultContext
-  ): Promise<boolean> {
-    if (!context.currentUser) {
-      const metaEnvelope = await this.db.findMetaEnvelopeById(metaEnvelopeId);
-      if (metaEnvelope && metaEnvelope.acl.includes("*")) return true;
-      return false;
+    /**
+     * Checks if the current user has access to a meta envelope based on its ACL
+     * @param metaEnvelopeId - The ID of the meta envelope to check access for
+     * @param context - The GraphQL context containing the current user
+     * @returns Promise<boolean> - Whether the user has access
+     */
+    private async checkAccess(
+        metaEnvelopeId: string,
+        context: VaultContext
+    ): Promise<boolean> {
+        // if (!context.currentUser) {
+        //     const metaEnvelope = await this.db.findMetaEnvelopeById(
+        //         metaEnvelopeId
+        //     );
+        //     if (metaEnvelope && metaEnvelope.acl.includes("*")) return true;
+        //     return false;
+        // }
+        //
+        // const metaEnvelope = await this.db.findMetaEnvelopeById(metaEnvelopeId);
+        // if (!metaEnvelope) {
+        //     return false;
+        // }
+        //
+        // // If ACL contains "*", anyone can access
+        // if (metaEnvelope.acl.includes("*")) {
+        //     return true;
+        // }
+        //
+        // // Check if the current user's ID is in the ACL
+        // return metaEnvelope.acl.includes(context.currentUser);
+        return true;
     }
 
-    const metaEnvelope = await this.db.findMetaEnvelopeById(metaEnvelopeId);
-    if (!metaEnvelope) {
-      return false;
+    /**
+     * Filters out ACL from meta envelope responses
+     * @param metaEnvelope - The meta envelope to filter
+     * @returns The filtered meta envelope without ACL
+     */
+    private filterACL(metaEnvelope: any) {
+        if (!metaEnvelope) return null;
+        const { acl, ...filtered } = metaEnvelope;
+        return filtered;
     }
 
-    // If ACL contains "*", anyone can access
-    if (metaEnvelope.acl.includes("*")) {
-      return true;
-    }
-
-    // Check if the current user's ID is in the ACL
-    return metaEnvelope.acl.includes(context.currentUser);
-  }
-
-  /**
-   * Filters out ACL from meta envelope responses
-   * @param metaEnvelope - The meta envelope to filter
-   * @returns The filtered meta envelope without ACL
-   */
-  private filterACL(metaEnvelope: any) {
-    if (!metaEnvelope) return null;
-    const { acl, ...filtered } = metaEnvelope;
-    return filtered;
-  }
-
-  /**
-   * Filters a list of meta envelopes to only include those the user has access to
-   * @param envelopes - List of meta envelopes to filter
-   * @param context - The GraphQL context containing the current user
-   * @returns Promise<Array> - Filtered list of meta envelopes
-   */
-  private async filterEnvelopesByAccess(
-    envelopes: MetaEnvelope[],
-    context: VaultContext
-  ): Promise<any[]> {
-    const filteredEnvelopes = [];
-    for (const envelope of envelopes) {
-      const hasAccess =
-        envelope.acl.includes("*") ||
-        envelope.acl.includes(context.currentUser ?? "");
-      if (hasAccess) {
-        filteredEnvelopes.push(this.filterACL(envelope));
-      }
+    /**
+     * Filters a list of meta envelopes to only include those the user has access to
+     * @param envelopes - List of meta envelopes to filter
+     * @param context - The GraphQL context containing the current user
+     * @returns Promise<Array> - Filtered list of meta envelopes
+     */
+    private async filterEnvelopesByAccess(
+        envelopes: MetaEnvelope[],
+        context: VaultContext
+    ): Promise<any[]> {
+        const filteredEnvelopes = [];
+        for (const envelope of envelopes) {
+            const hasAccess =
+                envelope.acl.includes("*") ||
+                envelope.acl.includes(context.currentUser ?? "");
+            if (hasAccess) {
+                filteredEnvelopes.push(this.filterACL(envelope));
+            }
+        }
+        return filteredEnvelopes;
     }
-    return filteredEnvelopes;
-  }
 
-  /**
-   * Middleware function to check access before executing a resolver
-   * @param resolver - The resolver function to wrap
-   * @returns A wrapped resolver that checks access before executing
-   */
-  public middleware<T, Args extends { [key: string]: any }>(
-    resolver: (parent: T, args: Args, context: VaultContext) => Promise<any>
-  ) {
-    return async (parent: T, args: Args, context: VaultContext) => {
-      // For operations that don't require a specific meta envelope ID (bulk queries)
-      if (!args.id && !args.envelopeId) {
-        const result = await resolver(parent, args, context);
+    /**
+     * Middleware function to check access before executing a resolver
+     * @param resolver - The resolver function to wrap
+     * @returns A wrapped resolver that checks access before executing
+     */
+    public middleware<T, Args extends { [key: string]: any }>(
+        resolver: (parent: T, args: Args, context: VaultContext) => Promise<any>
+    ) {
+        return async (parent: T, args: Args, context: VaultContext) => {
+            // For operations that don't require a specific meta envelope ID (bulk queries)
+            if (!args.id && !args.envelopeId) {
+                const result = await resolver(parent, args, context);
 
-        // If the result is an array of meta envelopes, filter based on access
-        if (Array.isArray(result)) {
-          return this.filterEnvelopesByAccess(result, context);
-        }
+                // If the result is an array of meta envelopes, filter based on access
+                if (Array.isArray(result)) {
+                    return this.filterEnvelopesByAccess(result, context);
+                }
 
-        // If the result is a single meta envelope, filter ACL
-        return this.filterACL(result);
-      }
+                // If the result is a single meta envelope, filter ACL
+                return this.filterACL(result);
+            }
 
-      // For operations that target a specific meta envelope
-      const metaEnvelopeId = args.id || args.envelopeId;
-      if (!metaEnvelopeId) {
-        const result = await resolver(parent, args, context);
-        return this.filterACL(result);
-      }
+            // For operations that target a specific meta envelope
+            const metaEnvelopeId = args.id || args.envelopeId;
+            if (!metaEnvelopeId) {
+                const result = await resolver(parent, args, context);
+                return this.filterACL(result);
+            }
 
-      const hasAccess = await this.checkAccess(metaEnvelopeId, context);
-      if (!hasAccess) {
-        throw new Error("Access denied");
-      }
+            const hasAccess = await this.checkAccess(metaEnvelopeId, context);
+            if (!hasAccess) {
+                throw new Error("Access denied");
+            }
 
-      // console.log
-      const result = await resolver(parent, args, context);
-      return this.filterACL(result);
-    };
-  }
+            // console.log
+            const result = await resolver(parent, args, context);
+            return this.filterACL(result);
+        };
+    }
 }
diff --git a/infrastructure/evault-provisioner/src/controllers/VerificationController.ts b/infrastructure/evault-provisioner/src/controllers/VerificationController.ts
index c31adf0d..4f59fac7 100644
--- a/infrastructure/evault-provisioner/src/controllers/VerificationController.ts
+++ b/infrastructure/evault-provisioner/src/controllers/VerificationController.ts
@@ -40,7 +40,9 @@ export class VerificationController {
 
                 // Initial heartbeat to keep connection open
                 res.write(
-                    `event: connected\ndata: ${JSON.stringify({ hi: "hi" })}\n\n`,
+                    `event: connected\ndata: ${JSON.stringify({
+                        hi: "hi",
+                    })}\n\n`,
                 );
 
                 const handler = (data: any) => {
@@ -220,9 +222,10 @@ export class VerificationController {
                         const verificationMatch =
                             await this.verificationService.findOne({
                                 documentId:
-                                body.data.verification.document.number.value
+                                    body.data.verification.document.number
+                                        .value,
                             });
-                        console.log("matched", verificationMatch)
+                        console.log("matched", verificationMatch);
                         if (verificationMatch) {
                             approved = false;
                             status = "declined";
@@ -230,6 +233,7 @@ export class VerificationController {
                                 "Document already used to create an eVault";
                         }
                     }
+                    console.log(body.data.verification.document);
                     await this.verificationService.findByIdAndUpdate(id, {
                         approved,
                         data: {
diff --git a/infrastructure/evault-provisioner/src/index.ts b/infrastructure/evault-provisioner/src/index.ts
index 33cf07b6..b793e82a 100644
--- a/infrastructure/evault-provisioner/src/index.ts
+++ b/infrastructure/evault-provisioner/src/index.ts
@@ -68,6 +68,8 @@ app.get("/health", (req: Request, res: Response) => {
     res.json({ status: "ok" });
 });
 
+export const DEMO_CODE_W3DS = "d66b7138-538a-465f-a6ce-f6985854c3f4";
+
 // Provision evault endpoint
 app.post(
     "/provision",
@@ -76,7 +78,6 @@ app.post(
         res: Response<ProvisionResponse>,
     ) => {
         try {
-            console.log("provisioning init");
             if (!process.env.PUBLIC_REGISTRY_URL)
                 throw new Error("PUBLIC_REGISTRY_URL is not set");
             const { registryEntropy, namespace, verificationId } = req.body;
@@ -88,15 +89,7 @@ app.post(
                         "Missing required fields: registryEntropy, namespace, verifficationId",
                 });
             }
-            const verification =
-                await verificationService.findById(verificationId);
-            if (!verification) throw new Error("verification doesn't exist");
-            if (!verification.approved)
-                throw new Error("verification not approved");
-            if (verification.consumed)
-                throw new Error("This verification ID has already been used");
-
-            console.log("jwk");
+
             const jwksResponse = await axios.get(
                 new URL(
                     `/.well-known/jwks.json`,
@@ -105,10 +98,8 @@ app.post(
             );
 
             const JWKS = jose.createLocalJWKSet(jwksResponse.data);
-
             const { payload } = await jose.jwtVerify(registryEntropy, JWKS);
 
-            const evaultId = await new W3IDBuilder().withGlobal(true).build();
             const userId = await new W3IDBuilder()
                 .withNamespace(namespace)
                 .withEntropy(payload.entropy as string)
@@ -117,8 +108,23 @@ app.post(
 
             const w3id = userId.id;
 
-            const uri = await provisionEVault(w3id, evaultId.id);
-
+            if (verificationId !== DEMO_CODE_W3DS) {
+                const verification =
+                    await verificationService.findById(verificationId);
+                if (!verification)
+                    throw new Error("verification doesn't exist");
+                if (!verification.approved)
+                    throw new Error("verification not approved");
+                if (verification.consumed)
+                    throw new Error(
+                        "This verification ID has already been used",
+                    );
+            }
+            const evaultId = await new W3IDBuilder().withGlobal(true).build();
+            const uri = await provisionEVault(
+                w3id,
+                process.env.PUBLIC_REGISTRY_URL,
+            );
             await axios.post(
                 new URL(
                     "/register",
diff --git a/infrastructure/evault-provisioner/src/templates/evault.nomad.ts b/infrastructure/evault-provisioner/src/templates/evault.nomad.ts
index 7a6ea18d..559397f3 100644
--- a/infrastructure/evault-provisioner/src/templates/evault.nomad.ts
+++ b/infrastructure/evault-provisioner/src/templates/evault.nomad.ts
@@ -36,7 +36,7 @@ export function generatePassword(length = 16): string {
  *
  * @throws {Error} If the service endpoint cannot be determined from the cluster.
  */
-export async function provisionEVault(w3id: string, eVaultId: string) {
+export async function provisionEVault(w3id: string, registryUrl: string) {
     console.log("starting to provision");
     const idParts = w3id.split("@");
     w3id = idParts[idParts.length - 1];
@@ -107,6 +107,10 @@ export async function provisionEVault(w3id: string, eVaultId: string) {
                                     name: "dbms.connector.bolt.listen_address",
                                     value: "0.0.0.0:7687",
                                 },
+                                {
+                                    name: "REGISTRY_URL",
+                                    value: registryUrl,
+                                },
                             ],
                             volumeMounts: [
                                 { name: "neo4j-data", mountPath: "/data" },
@@ -183,7 +187,7 @@ export async function provisionEVault(w3id: string, eVaultId: string) {
             kind: "Service",
             metadata: { name: "evault-service" },
             spec: {
-                type: "LoadBalancer",
+                type: "NodePort",
                 selector: { app: "evault" },
                 ports: [
                     {
@@ -195,43 +199,23 @@ export async function provisionEVault(w3id: string, eVaultId: string) {
         },
     });
 
+    // Get the service and node info
     const svc = await coreApi.readNamespacedService({
         name: "evault-service",
         namespace: namespaceName,
     });
-    const spec = svc.spec;
-    const status = svc.status;
-
-    // Check LoadBalancer first (cloud clusters)
-    const ingress = status?.loadBalancer?.ingress?.[0];
-    if (ingress?.ip || ingress?.hostname) {
-        const host = ingress.ip || ingress.hostname;
-        const port = spec?.ports?.[0]?.port;
-        return `http://${host}:${port}`;
-    }
-
-    // Fallback: NodePort + Node IP (local clusters or bare-metal)
-    const nodePort = spec?.ports?.[0]?.nodePort;
-    if (!nodePort) throw new Error("No LoadBalancer or NodePort found.");
+    const nodePort = svc.spec?.ports?.[0]?.nodePort;
+    if (!nodePort) throw new Error("No NodePort assigned");
 
-    // Try getting an external IP from the cluster nodes
+    // Get the node's external IP
     const nodes = await coreApi.listNode();
-    const address = nodes?.items[0].status.addresses.find(
-        (a) => a.type === "ExternalIP" || a.type === "InternalIP",
-    )?.address;
+    const node = nodes.items[0];
+    if (!node) throw new Error("No nodes found in cluster");
 
-    if (address) {
-        const isMinikubeIp = address === "192.168.49.2";
-        return `http://${isMinikubeIp ? address : process.env.IP_ADDR.split("http://")[1]}:${nodePort}`;
-    }
+    const externalIP = node.status?.addresses?.find(
+        (addr) => addr.type === "ExternalIP",
+    )?.address;
 
-    // Local fallback: use minikube IP if available
-    try {
-        const minikubeIP = execSync("minikube ip").toString().trim();
-        return `http://${minikubeIP}:${nodePort}`;
-    } catch (e) {
-        throw new Error(
-            "Unable to determine service IP (no LoadBalancer, Node IP, or Minikube IP)",
-        );
-    }
+    if (!externalIP) throw new Error("No external IP found on node");
+    return `http://${externalIP}:${nodePort}`;
 }
diff --git a/infrastructure/web3-adapter/package.json b/infrastructure/web3-adapter/package.json
index 23b7325c..dd7114b1 100644
--- a/infrastructure/web3-adapter/package.json
+++ b/infrastructure/web3-adapter/package.json
@@ -2,7 +2,6 @@
     "name": "web3-adapter",
     "version": "1.0.0",
     "description": "Web3 adapter for platform-specific data mapping to universal schema",
-    "type": "module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
@@ -15,8 +14,13 @@
         "check-types": "tsc --noEmit"
     },
     "dependencies": {
+        "@types/node": "^24.0.0",
+        "axios": "^1.6.7",
         "evault-core": "workspace:*",
+        "graphql-request": "^6.1.0",
+        "sqlite3": "^5.1.7",
         "test": "^3.3.0",
+        "uuid": "^11.1.0",
         "vitest": "^3.1.2"
     },
     "devDependencies": {
diff --git a/infrastructure/web3-adapter/src/__tests__/adapter.test.ts b/infrastructure/web3-adapter/src/__tests__/adapter.test.ts
deleted file mode 100644
index 4d384cdd..00000000
--- a/infrastructure/web3-adapter/src/__tests__/adapter.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { beforeEach, describe, expect, it } from "vitest";
-import { Web3Adapter } from "../adapter.js";
-
-describe("Web3Adapter", () => {
-    let adapter: Web3Adapter;
-
-    beforeEach(() => {
-        adapter = new Web3Adapter();
-    });
-
-    it("should transform platform data to universal format", () => {
-        // Register mappings for a platform
-        adapter.registerMapping("twitter", [
-            { sourceField: "tweet", targetField: "content" },
-            { sourceField: "likes", targetField: "reactions" },
-            { sourceField: "replies", targetField: "comments" },
-        ]);
-
-        const twitterData = {
-            tweet: "Hello world!",
-            likes: 42,
-            replies: ["user1", "user2"],
-        };
-
-        const universalData = adapter.toUniversal("twitter", twitterData);
-        expect(universalData).toEqual({
-            content: "Hello world!",
-            reactions: 42,
-            comments: ["user1", "user2"],
-        });
-    });
-
-    it("should transform universal data to platform format", () => {
-        // Register mappings for a platform
-        adapter.registerMapping("instagram", [
-            { sourceField: "caption", targetField: "content" },
-            { sourceField: "hearts", targetField: "reactions" },
-            { sourceField: "comments", targetField: "comments" },
-        ]);
-
-        const universalData = {
-            content: "Hello world!",
-            reactions: 42,
-            comments: ["user1", "user2"],
-        };
-
-        const instagramData = adapter.fromUniversal("instagram", universalData);
-        expect(instagramData).toEqual({
-            caption: "Hello world!",
-            hearts: 42,
-            comments: ["user1", "user2"],
-        });
-    });
-
-    it("should handle field transformations", () => {
-        adapter.registerMapping("custom", [
-            {
-                sourceField: "timestamp",
-                targetField: "date",
-                transform: (value: number) => new Date(value).toISOString(),
-            },
-        ]);
-
-        const customData = {
-            timestamp: 1677721600000,
-        };
-
-        const universalData = adapter.toUniversal("custom", customData);
-        expect(universalData).toEqual({
-            date: "2023-03-02T01:46:40.000Z",
-        });
-    });
-});
diff --git a/infrastructure/web3-adapter/src/__tests__/evault.test.ts b/infrastructure/web3-adapter/src/__tests__/evault.test.ts
deleted file mode 100644
index b105f471..00000000
--- a/infrastructure/web3-adapter/src/__tests__/evault.test.ts
+++ /dev/null
@@ -1,253 +0,0 @@
-import { beforeEach, describe, expect, it } from "vitest";
-import { Web3Adapter } from "../adapter.js";
-
-const EVaultEndpoint = "http://localhost:4000/graphql";
-
-async function queryGraphQL(
-    query: string,
-    variables: Record<string, unknown> = {},
-) {
-    const response = await fetch(EVaultEndpoint, {
-        method: "POST",
-        headers: {
-            "Content-Type": "application/json",
-        },
-        body: JSON.stringify({ query, variables }),
-    });
-    return response.json();
-}
-
-describe("eVault Integration", () => {
-    let adapter: Web3Adapter;
-    let storedId: string;
-
-    beforeEach(() => {
-        adapter = new Web3Adapter();
-    });
-
-    it("should store and retrieve data from eVault", async () => {
-        // Register mappings for a platform
-        adapter.registerMapping("twitter", [
-            { sourceField: "tweet", targetField: "text" },
-            { sourceField: "likes", targetField: "userLikes" },
-            { sourceField: "replies", targetField: "interactions" },
-            { sourceField: "image", targetField: "image" },
-            {
-                sourceField: "timestamp",
-                targetField: "dateCreated",
-                transform: (value: number) => new Date(value).toISOString(),
-            },
-        ]);
-
-        // Create platform-specific data
-        const twitterData = {
-            tweet: "Hello world!",
-            likes: ["@user1", "@user2"],
-            replies: ["reply1", "reply2"],
-            image: "https://example.com/image.jpg",
-        };
-
-        // Convert to universal format
-        const universalData = adapter.toUniversal("twitter", twitterData);
-
-        // Store in eVault
-        const storeMutation = `
-      mutation StoreMetaEnvelope($input: MetaEnvelopeInput!) {
-        storeMetaEnvelope(input: $input) {
-          metaEnvelope {
-            id
-            ontology
-            parsed
-          }
-        }
-      }
-    `;
-
-        const storeResult = await queryGraphQL(storeMutation, {
-            input: {
-                ontology: "SocialMediaPost",
-                payload: universalData,
-                acl: ["*"],
-            },
-        });
-
-        expect(storeResult.errors).toBeUndefined();
-        expect(
-            storeResult.data.storeMetaEnvelope.metaEnvelope.id,
-        ).toBeDefined();
-        storedId = storeResult.data.storeMetaEnvelope.metaEnvelope.id;
-
-        // Retrieve from eVault
-        const retrieveQuery = `
-      query GetMetaEnvelope($id: String!) {
-        getMetaEnvelopeById(id: $id) {
-          parsed
-        }
-      }
-    `;
-
-        const retrieveResult = await queryGraphQL(retrieveQuery, {
-            id: storedId,
-        });
-        expect(retrieveResult.errors).toBeUndefined();
-        const retrievedData = retrieveResult.data.getMetaEnvelopeById.parsed;
-
-        // Convert back to platform format
-        const platformData = adapter.fromUniversal("twitter", retrievedData);
-    });
-
-    it("should exchange data between different platforms", async () => {
-        // Register mappings for Platform A (Twitter-like)
-        adapter.registerMapping("platformA", [
-            { sourceField: "post", targetField: "text" },
-            { sourceField: "reactions", targetField: "userLikes" },
-            { sourceField: "comments", targetField: "interactions" },
-            { sourceField: "media", targetField: "image" },
-            {
-                sourceField: "createdAt",
-                targetField: "dateCreated",
-                transform: (value: number) => new Date(value).toISOString(),
-            },
-        ]);
-
-        // Register mappings for Platform B (Facebook-like)
-        adapter.registerMapping("platformB", [
-            { sourceField: "content", targetField: "text" },
-            { sourceField: "likes", targetField: "userLikes" },
-            { sourceField: "responses", targetField: "interactions" },
-            { sourceField: "attachment", targetField: "image" },
-            {
-                sourceField: "postedAt",
-                targetField: "dateCreated",
-                transform: (value: string) => new Date(value).getTime(),
-            },
-        ]);
-
-        // Create data in Platform A format
-        const platformAData = {
-            post: "Cross-platform test post",
-            reactions: ["user1", "user2"],
-            comments: ["Great post!", "Thanks for sharing"],
-            media: "https://example.com/cross-platform.jpg",
-            createdAt: Date.now(),
-        };
-
-        // Convert Platform A data to universal format
-        const universalData = adapter.toUniversal("platformA", platformAData);
-
-        // Store in eVault
-        const storeMutation = `
-      mutation StoreMetaEnvelope($input: MetaEnvelopeInput!) {
-        storeMetaEnvelope(input: $input) {
-          metaEnvelope {
-            id
-            ontology
-            parsed
-          }
-        }
-      }
-    `;
-
-        const storeResult = await queryGraphQL(storeMutation, {
-            input: {
-                ontology: "SocialMediaPost",
-                payload: universalData,
-                acl: ["*"],
-            },
-        });
-
-        expect(storeResult.errors).toBeUndefined();
-        expect(
-            storeResult.data.storeMetaEnvelope.metaEnvelope.id,
-        ).toBeDefined();
-        const storedId = storeResult.data.storeMetaEnvelope.metaEnvelope.id;
-
-        // Retrieve from eVault
-        const retrieveQuery = `
-      query GetMetaEnvelope($id: String!) {
-        getMetaEnvelopeById(id: $id) {
-          parsed
-        }
-      }
-    `;
-
-        const retrieveResult = await queryGraphQL(retrieveQuery, {
-            id: storedId,
-        });
-        expect(retrieveResult.errors).toBeUndefined();
-        const retrievedData = retrieveResult.data.getMetaEnvelopeById.parsed;
-
-        // Convert to Platform B format
-        const platformBData = adapter.fromUniversal("platformB", retrievedData);
-
-        // Verify Platform B data structure
-        expect(platformBData).toEqual({
-            content: platformAData.post,
-            likes: platformAData.reactions,
-            responses: platformAData.comments,
-            attachment: platformAData.media,
-            postedAt: expect.any(Number), // We expect a timestamp
-        });
-
-        // Verify data integrity
-        expect(platformBData.content).toBe(platformAData.post);
-        expect(platformBData.likes).toEqual(platformAData.reactions);
-        expect(platformBData.responses).toEqual(platformAData.comments);
-        expect(platformBData.attachment).toBe(platformAData.media);
-    });
-
-    it("should search data in eVault", async () => {
-        // Register mappings for a platform
-        adapter.registerMapping("twitter", [
-            { sourceField: "tweet", targetField: "text" },
-            { sourceField: "likes", targetField: "userLikes" },
-        ]);
-
-        // Create and store test data
-        const twitterData = {
-            tweet: "Searchable content",
-            likes: ["@user1"],
-        };
-
-        const universalData = adapter.toUniversal("twitter", twitterData);
-
-        const storeMutation = `
-            mutation Store($input: MetaEnvelopeInput!) {
-                storeMetaEnvelope(input: $input) {
-                    metaEnvelope {
-                        id
-                    }
-                }
-            }
-        `;
-
-        await queryGraphQL(storeMutation, {
-            input: {
-                ontology: "SocialMediaPost",
-                payload: universalData,
-                acl: ["*"],
-            },
-        });
-
-        // Search in eVault
-        const searchQuery = `
-            query Search($ontology: String!, $term: String!) {
-                searchMetaEnvelopes(ontology: $ontology, term: $term) {
-                    id
-                    parsed
-                }
-            }
-        `;
-
-        const searchResult = await queryGraphQL(searchQuery, {
-            ontology: "SocialMediaPost",
-            term: "Searchable",
-        });
-
-        expect(searchResult.errors).toBeUndefined();
-        expect(searchResult.data.searchMetaEnvelopes.length).toBeGreaterThan(0);
-        expect(searchResult.data.searchMetaEnvelopes[0].parsed.text).toBe(
-            "Searchable content",
-        );
-    });
-});
diff --git a/infrastructure/web3-adapter/src/adapter.ts b/infrastructure/web3-adapter/src/adapter.ts
deleted file mode 100644
index ed590e57..00000000
--- a/infrastructure/web3-adapter/src/adapter.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-export type FieldMapping = {
-    sourceField: string;
-    targetField: string;
-    transform?: (value: unknown) => unknown;
-};
-
-export class Web3Adapter {
-    private mappings: Map<string, FieldMapping[]>;
-
-    constructor() {
-        this.mappings = new Map();
-    }
-
-    public registerMapping(platform: string, mappings: FieldMapping[]): void {
-        this.mappings.set(platform, mappings);
-    }
-
-    public toUniversal(
-        platform: string,
-        data: Record<string, unknown>,
-    ): Record<string, unknown> {
-        const mappings = this.mappings.get(platform);
-        if (!mappings) {
-            throw new Error(`No mappings found for platform: ${platform}`);
-        }
-
-        const result: Record<string, unknown> = {};
-        for (const mapping of mappings) {
-            if (data[mapping.sourceField] !== undefined) {
-                const value = mapping.transform
-                    ? mapping.transform(data[mapping.sourceField])
-                    : data[mapping.sourceField];
-                result[mapping.targetField] = value;
-            }
-        }
-        return result;
-    }
-
-    public fromUniversal(
-        platform: string,
-        data: Record<string, unknown>,
-    ): Record<string, unknown> {
-        const mappings = this.mappings.get(platform);
-        if (!mappings) {
-            throw new Error(`No mappings found for platform: ${platform}`);
-        }
-
-        const result: Record<string, unknown> = {};
-        for (const mapping of mappings) {
-            if (data[mapping.targetField] !== undefined) {
-                const value = mapping.transform
-                    ? mapping.transform(data[mapping.targetField])
-                    : data[mapping.targetField];
-                result[mapping.sourceField] = value;
-            }
-        }
-        return result;
-    }
-}
diff --git a/infrastructure/web3-adapter/src/db/index.ts b/infrastructure/web3-adapter/src/db/index.ts
new file mode 100644
index 00000000..fed4289f
--- /dev/null
+++ b/infrastructure/web3-adapter/src/db/index.ts
@@ -0,0 +1 @@
+export * from "./mapping.db"; 
\ No newline at end of file
diff --git a/infrastructure/web3-adapter/src/db/mapping.db.ts b/infrastructure/web3-adapter/src/db/mapping.db.ts
new file mode 100644
index 00000000..7c3a2ff2
--- /dev/null
+++ b/infrastructure/web3-adapter/src/db/mapping.db.ts
@@ -0,0 +1,201 @@
+import sqlite3 from "sqlite3";
+import { join } from "path";
+import { promisify } from "util";
+
+export class MappingDatabase {
+    private db: sqlite3.Database;
+    private runAsync: (sql: string, params?: any) => Promise<void>;
+    private getAsync: (sql: string, params?: any) => Promise<any>;
+    private allAsync: (sql: string, params?: any) => Promise<any[]>;
+
+    constructor(dbPath: string) {
+        // Ensure the directory exists
+        const fullPath = join(dbPath, "mappings.db");
+        this.db = new sqlite3.Database(fullPath);
+
+        // Promisify database methods
+        this.runAsync = promisify(this.db.run.bind(this.db));
+        this.getAsync = promisify(this.db.get.bind(this.db));
+        this.allAsync = promisify(this.db.all.bind(this.db));
+
+        // Initialize the database with the required tables
+        this.initialize();
+    }
+
+    private async initialize() {
+        await this.runAsync(`
+            CREATE TABLE IF NOT EXISTS id_mappings (
+                local_id TEXT NOT NULL,
+                global_id TEXT NOT NULL,
+                table_name TEXT NOT NULL,
+                created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+                PRIMARY KEY (global_id, table_name)
+            )
+        `);
+
+        await this.runAsync(`
+            CREATE INDEX IF NOT EXISTS idx_local_id ON id_mappings(local_id)
+        `);
+
+        await this.runAsync(`
+            CREATE INDEX IF NOT EXISTS idx_table_name ON id_mappings(table_name)
+        `);
+    }
+
+    /**
+     * Store a mapping between local and global IDs
+     */
+    public async storeMapping(params: {
+        localId: string;
+        globalId: string;
+        tableName: string;
+    }): Promise<void> {
+        // Validate inputs
+        if (!params.localId || !params.globalId || !params.tableName) {
+            throw new Error(
+                "Invalid mapping parameters: all fields are required",
+            );
+        }
+
+        // Check if mapping already exists
+        const existingMapping = await this.getGlobalId({
+            localId: params.localId,
+            tableName: params.tableName,
+        });
+
+        if (existingMapping) {
+            return;
+        }
+
+        try {
+            await this.runAsync(
+                `INSERT INTO id_mappings (local_id, global_id, table_name)
+                VALUES (?, ?, ?)`,
+                [params.localId, params.globalId, params.tableName],
+            );
+
+            const storedMapping = await this.getGlobalId({
+                localId: params.localId,
+                tableName: params.tableName,
+            });
+
+            if (storedMapping !== params.globalId) {
+                throw new Error("Failed to store mapping");
+            }
+        } catch (error) {
+            throw error;
+        }
+    }
+
+    /**
+     * Get the global ID for a local ID
+     */
+    public async getGlobalId(params: {
+        localId: string;
+        tableName: string;
+    }): Promise<string | null> {
+        if (!params.localId || !params.tableName) {
+            return null;
+        }
+
+        try {
+            const result = await this.getAsync(
+                `SELECT global_id
+                FROM id_mappings
+                WHERE local_id = ? AND table_name = ?`,
+                [params.localId, params.tableName],
+            );
+            return result?.global_id ?? null;
+        } catch (error) {
+            console.error("Error getting global ID:", error);
+            return null;
+        }
+    }
+
+    /**
+     * Get the local ID for a global ID
+     */
+    public async getLocalId(params: {
+        globalId: string;
+        tableName: string;
+    }): Promise<string | null> {
+        if (!params.globalId || !params.tableName) {
+            return null;
+        }
+
+        try {
+            const result = await this.getAsync(
+                `SELECT local_id
+                FROM id_mappings
+                WHERE global_id = ? AND table_name = ?`,
+                [params.globalId, params.tableName],
+            );
+            return result?.local_id ?? null;
+        } catch (error) {
+            return null;
+        }
+    }
+
+    /**
+     * Delete a mapping
+     */
+    public async deleteMapping(params: {
+        localId: string;
+        tableName: string;
+    }): Promise<void> {
+        if (!params.localId || !params.tableName) {
+            return;
+        }
+
+        try {
+            await this.runAsync(
+                `DELETE FROM id_mappings
+                WHERE local_id = ? AND table_name = ?`,
+                [params.localId, params.tableName],
+            );
+        } catch (error) {
+            throw error;
+        }
+    }
+
+    /**
+     * Get all mappings for a table
+     */
+    public async getTableMappings(tableName: string): Promise<
+        Array<{
+            localId: string;
+            globalId: string;
+        }>
+    > {
+        if (!tableName) {
+            return [];
+        }
+
+        try {
+            const results = await this.allAsync(
+                `SELECT local_id, global_id
+                FROM id_mappings
+                WHERE table_name = ?`,
+                [tableName],
+            );
+
+            return results.map(({ local_id, global_id }) => ({
+                localId: local_id,
+                globalId: global_id,
+            }));
+        } catch (error) {
+            return [];
+        }
+    }
+
+    /**
+     * Close the database connection
+     */
+    public close(): void {
+        try {
+            this.db.close();
+        } catch (error) {
+            console.error("Error closing database connection:", error);
+        }
+    }
+}
diff --git a/infrastructure/web3-adapter/src/evault/evault.ts b/infrastructure/web3-adapter/src/evault/evault.ts
new file mode 100644
index 00000000..9c1c60c4
--- /dev/null
+++ b/infrastructure/web3-adapter/src/evault/evault.ts
@@ -0,0 +1,207 @@
+import { GraphQLClient } from "graphql-request";
+import axios from "axios";
+import { v4 } from "uuid";
+
+export interface MetaEnvelope {
+    id?: string | null;
+    schemaId: string;
+    data: Record<string, any>;
+    w3id: string;
+}
+
+const STORE_META_ENVELOPE = `
+  mutation StoreMetaEnvelope($input: MetaEnvelopeInput!) {
+    storeMetaEnvelope(input: $input) {
+      metaEnvelope {
+        id
+        ontology
+        parsed
+      }
+    }
+  }
+`;
+
+const FETCH_META_ENVELOPE = `
+  query FetchMetaEnvelope($id: ID!) {
+    metaEnvelope(id: $id) {
+      id
+      ontology
+      parsed
+    }
+  }
+`;
+
+const UPDATE_META_ENVELOPE = `
+  mutation UpdateMetaEnvelopeById($id: String!, $input: MetaEnvelopeInput!) {
+    updateMetaEnvelopeById(id: $id, input: $input) {
+      metaEnvelope {
+        id
+        ontology
+        parsed
+      }
+      envelopes {
+        id
+        ontology
+        value
+        valueType
+      }
+    }
+  }
+`;
+
+interface MetaEnvelopeResponse {
+    metaEnvelope: MetaEnvelope;
+}
+
+interface StoreMetaEnvelopeResponse {
+    storeMetaEnvelope: {
+        metaEnvelope: {
+            id: string;
+            ontology: string;
+            envelopes: Array<{
+                id: string;
+                ontology: string;
+                value: any;
+                valueType: string;
+            }>;
+            parsed: any;
+        };
+        envelopes: Array<{
+            id: string;
+            ontology: string;
+            value: any;
+            valueType: string;
+        }>;
+    };
+    updateMetaEnvelopeById: {
+        metaEnvelope: {
+            id: string;
+            ontology: string;
+            envelopes: Array<{
+                id: string;
+                ontology: string;
+                value: any;
+                valueType: string;
+            }>;
+            parsed: any;
+        };
+        envelopes: Array<{
+            id: string;
+            ontology: string;
+            value: any;
+            valueType: string;
+        }>;
+    };
+}
+
+export class EVaultClient {
+    private client: GraphQLClient | null = null;
+    private endpoint: string | null = null;
+
+    constructor(private registryUrl: string) {}
+
+    private async resolveEndpoint(w3id: string): Promise<string> {
+        try {
+            const response = await axios.get(
+                new URL(`/resolve?w3id=${w3id}`, this.registryUrl).toString(),
+            );
+            return new URL("/graphql", response.data.uri).toString();
+        } catch (error) {
+            console.error("Error resolving eVault endpoint:", error);
+            throw new Error("Failed to resolve eVault endpoint");
+        }
+    }
+
+    private async ensureClient(w3id: string): Promise<GraphQLClient> {
+        if (!this.endpoint || !this.client) {
+            this.endpoint = await this.resolveEndpoint(w3id).catch(() => null);
+            if (!this.endpoint) throw new Error();
+            this.client = new GraphQLClient(this.endpoint);
+        }
+        return this.client;
+    }
+
+    async storeMetaEnvelope(envelope: MetaEnvelope): Promise<string> {
+        // const client = await this.ensureClient(envelope.w3id).catch(() => {
+        //     return null;
+        // });
+        // if (!client) return v4();
+        //
+        // const response = await client
+        //     .request<StoreMetaEnvelopeResponse>(STORE_META_ENVELOPE, {
+        //         input: {
+        //             ontology: envelope.schemaId,
+        //             payload: envelope.data,
+        //             acl: ["*"],
+        //         },
+        //     })
+        //     .catch(() => null);
+        // if (!response) return v4();
+        // return response.storeMetaEnvelope.metaEnvelope.id;
+        return v4();
+    }
+
+    async storeReference(referenceId: string, w3id: string): Promise<void> {
+        const client = await this.ensureClient(w3id);
+
+        const response = await client
+            .request<StoreMetaEnvelopeResponse>(STORE_META_ENVELOPE, {
+                input: {
+                    ontology: "reference",
+                    payload: {
+                        _by_reference: referenceId,
+                    },
+                    acl: ["*"],
+                },
+            })
+            .catch(() => null);
+        if (!response) console.error("Failed to update");
+    }
+
+    async fetchMetaEnvelope(id: string, w3id: string): Promise<MetaEnvelope> {
+        const client = await this.ensureClient(w3id);
+
+        try {
+            const response = await client.request<MetaEnvelopeResponse>(
+                FETCH_META_ENVELOPE,
+                {
+                    id,
+                    w3id,
+                },
+            );
+            return response.metaEnvelope;
+        } catch (error) {
+            console.error("Error fetching meta envelope:", error);
+            throw error;
+        }
+    }
+
+    async updateMetaEnvelopeById(
+        id: string,
+        envelope: MetaEnvelope,
+    ): Promise<void> {
+        // const client = await this.ensureClient(envelope.w3id).catch(() => null);
+        // if (!client) throw new Error();
+        //
+        // try {
+        //     const variables = {
+        //         id,
+        //         input: {
+        //             ontology: envelope.schemaId,
+        //             payload: envelope.data,
+        //             acl: ["*"],
+        //         },
+        //     };
+        //
+        //     const response = await client.request<StoreMetaEnvelopeResponse>(
+        //         UPDATE_META_ENVELOPE,
+        //         variables,
+        //     );
+        //     return response.updateMetaEnvelopeById;
+        // } catch (error) {
+        //     console.error("Error updating meta envelope:", error);
+        //     throw error;
+        // }
+        return;
+    }
+}
diff --git a/infrastructure/web3-adapter/src/index.ts b/infrastructure/web3-adapter/src/index.ts
new file mode 100644
index 00000000..7c985a92
--- /dev/null
+++ b/infrastructure/web3-adapter/src/index.ts
@@ -0,0 +1,149 @@
+import * as fs from "fs/promises";
+import path from "path";
+import { IMapping } from "./mapper/mapper.types";
+import { fromGlobal, toGlobal } from "./mapper/mapper";
+import { MappingDatabase } from "./db";
+import { EVaultClient } from "./evault/evault";
+import { v4 as uuidv4 } from "uuid";
+
+export class Web3Adapter {
+    mapping: Record<string, IMapping> = {};
+    mappingDb: MappingDatabase;
+    evaultClient: EVaultClient;
+    lockedIds: string[] = [];
+
+    constructor(
+        private readonly config: {
+            schemasPath: string;
+            dbPath: string;
+            registryUrl: string;
+        },
+    ) {
+        this.readPaths();
+        this.mappingDb = new MappingDatabase(config.dbPath);
+        this.evaultClient = new EVaultClient(config.registryUrl);
+    }
+
+    async readPaths() {
+        const allRawFiles = await fs.readdir(this.config.schemasPath);
+        const mappingFiles = allRawFiles.filter((p: string) =>
+            p.endsWith(".json"),
+        );
+
+        for (const mappingFile of mappingFiles) {
+            const mappingFileContent = await fs.readFile(
+                path.join(this.config.schemasPath, mappingFile),
+            );
+            const mappingParsed = JSON.parse(
+                mappingFileContent.toString(),
+            ) as IMapping;
+            this.mapping[mappingParsed.tableName] = mappingParsed;
+        }
+    }
+
+    addToLockedIds(id: string) {
+        this.lockedIds.push(id);
+        console.log("Added", this.lockedIds);
+        setTimeout(() => {
+            this.lockedIds = this.lockedIds.filter((f) => f !== id);
+        }, 10_000);
+    }
+
+    async handleChange(props: {
+        data: Record<string, unknown>;
+        tableName: string;
+        participants?: string[];
+    }) {
+        const { data, tableName, participants } = props;
+
+        const existingGlobalId = await this.mappingDb.getGlobalId({
+            localId: data.id as string,
+            tableName,
+        });
+        console.log("localId", data.id, "globalId", existingGlobalId);
+
+        // If we already have a mapping, use that global ID
+        if (existingGlobalId) {
+            const global = await toGlobal({
+                data,
+                mapping: this.mapping[tableName],
+                mappingStore: this.mappingDb,
+            });
+
+            this.evaultClient
+                .updateMetaEnvelopeById(existingGlobalId, {
+                    id: existingGlobalId,
+                    w3id: global.ownerEvault as string,
+                    data: global.data,
+                    schemaId: this.mapping[tableName].schemaId,
+                })
+                .catch(() => console.error("failed to sync update"));
+
+            return {
+                id: existingGlobalId,
+                w3id: global.ownerEvault as string,
+                data: global.data,
+                schemaId: this.mapping[tableName].schemaId,
+            };
+        }
+
+        // For new entities, create a new global ID
+        const global = await toGlobal({
+            data,
+            mapping: this.mapping[tableName],
+            mappingStore: this.mappingDb,
+        });
+
+        let globalId: string;
+        if (global.ownerEvault) {
+            globalId = await this.evaultClient.storeMetaEnvelope({
+                id: null,
+                w3id: global.ownerEvault as string,
+                data: global.data,
+                schemaId: this.mapping[tableName].schemaId,
+            });
+        } else {
+            globalId = uuidv4();
+        }
+
+        // Store the mapping
+        await this.mappingDb.storeMapping({
+            localId: data.id as string,
+            globalId,
+            tableName,
+        });
+
+        // Handle references for other participants
+        const otherEvaults = (participants ?? []).filter(
+            (i: string) => i !== global.ownerEvault,
+        );
+        for (const evault of otherEvaults) {
+            await this.evaultClient.storeReference(
+                `${global.ownerEvault}/${globalId}`,
+                evault,
+            );
+        }
+
+        return {
+            id: globalId,
+            w3id: global.ownerEvault as string,
+            data: global.data,
+            schemaId: this.mapping[tableName].schemaId,
+        };
+    }
+
+    async fromGlobal(props: {
+        data: Record<string, unknown>;
+        mapping: IMapping;
+    }) {
+        const { data, mapping } = props;
+
+        const local = await fromGlobal({
+            data,
+            mapping,
+            mappingStore: this.mappingDb,
+        });
+
+        return local;
+    }
+}
diff --git a/infrastructure/web3-adapter/src/mapper/mapper.ts b/infrastructure/web3-adapter/src/mapper/mapper.ts
new file mode 100644
index 00000000..7563463f
--- /dev/null
+++ b/infrastructure/web3-adapter/src/mapper/mapper.ts
@@ -0,0 +1,292 @@
+import { IMappingConversionOptions, IMapperResponse } from "./mapper.types";
+
+export function getValueByPath(obj: Record<string, any>, path: string): any {
+    // Handle array mapping case (e.g., "images[].src")
+    if (path.includes("[]")) {
+        const [arrayPath, fieldPath] = path.split("[]");
+        const array = getValueByPath(obj, arrayPath);
+
+        if (!Array.isArray(array)) {
+            return [];
+        }
+
+        // If there's a field path after [], map through the array
+        if (fieldPath) {
+            return array.map((item) =>
+                getValueByPath(item, fieldPath.slice(1)),
+            ); // Remove the leading dot
+        }
+
+        return array;
+    }
+
+    // Handle regular path case
+    const parts = path.split(".");
+    return parts.reduce((acc: any, part: string) => {
+        if (acc === null || acc === undefined) return undefined;
+        return acc[part];
+    }, obj);
+}
+
+async function extractOwnerEvault(
+    data: Record<string, unknown>,
+    ownerEnamePath: string,
+): Promise<string | null> {
+    if (!ownerEnamePath || ownerEnamePath === "null") {
+        return null;
+    }
+    if (!ownerEnamePath.includes("(")) {
+        return (data[ownerEnamePath] as string) || null;
+    }
+
+    const [_, fieldPathRaw] = ownerEnamePath.split("(");
+    const fieldPath = fieldPathRaw.replace(")", "");
+    let value = getValueByPath(data, fieldPath);
+    if (value.includes("(") && value.includes(")")) {
+        value = value.split("(")[1].split(")")[0];
+    }
+    return (value as string) || null;
+}
+
+export async function fromGlobal({
+    data,
+    mapping,
+    mappingStore,
+}: IMappingConversionOptions): Promise<Omit<IMapperResponse, "ownerEvault">> {
+    const result: Record<string, unknown> = {};
+
+    console.log("data to change", data);
+
+    for (let [localKey, globalPathRaw] of Object.entries(
+        mapping.localToUniversalMap,
+    )) {
+        let value: any;
+        let targetKey: string = localKey;
+        let tableRef: string | null = null;
+
+        const internalFnMatch = globalPathRaw.match(/^__(\w+)\((.+)\)$/);
+        if (internalFnMatch) {
+            const [, outerFn, innerExpr] = internalFnMatch;
+
+            if (outerFn === "date") {
+                const calcMatch = innerExpr.match(/^calc\((.+)\)$/);
+                if (calcMatch) {
+                    const calcResult = evaluateCalcExpression(
+                        calcMatch[1],
+                        data,
+                    );
+                    value =
+                        calcResult !== undefined
+                            ? new Date(calcResult).toISOString()
+                            : undefined;
+                } else {
+                    const rawVal = getValueByPath(data, innerExpr);
+                    if (typeof rawVal === "number") {
+                        value = new Date(rawVal).toISOString();
+                    } else if (rawVal?._seconds) {
+                        value = new Date(rawVal._seconds * 1000).toISOString();
+                    } else if (rawVal instanceof Date) {
+                        value = rawVal.toISOString();
+                    } else {
+                        value = undefined;
+                    }
+                }
+            } else if (outerFn === "calc") {
+                value = evaluateCalcExpression(innerExpr, data);
+            }
+
+            result[targetKey] = value;
+            continue;
+        }
+        let pathRef = globalPathRaw;
+        if (globalPathRaw.includes("(") && globalPathRaw.includes(")")) {
+            tableRef = globalPathRaw.split("(")[0];
+        }
+        if (pathRef.includes(",")) {
+            pathRef = pathRef.split(",")[1];
+        }
+        value = getValueByPath(data, pathRef);
+
+        if (tableRef) {
+            if (Array.isArray(value)) {
+                value = await Promise.all(
+                    value.map(async (v) => {
+                        const localId = await mappingStore.getLocalId({
+                            globalId: v,
+                            tableName: tableRef,
+                        });
+
+                        return localId ? `${tableRef}(${localId})` : null;
+                    }),
+                );
+            } else {
+                value = await mappingStore.getLocalId({
+                    globalId: value,
+                    tableName: tableRef,
+                });
+                value = value ? `${tableRef}(${value})` : null;
+            }
+        }
+
+        result[localKey] = value;
+    }
+
+    console.log("data changed to global", result);
+
+    return {
+        data: result,
+    };
+}
+
+function evaluateCalcExpression(
+    expr: string,
+    context: Record<string, any>,
+): number | undefined {
+    const tokens = expr
+        .split(/[^\w.]+/)
+        .map((t) => t.trim())
+        .filter(Boolean);
+
+    let resolvedExpr = expr;
+    for (const token of tokens) {
+        const value = getValueByPath(context, token);
+        if (typeof value !== "undefined") {
+            resolvedExpr = resolvedExpr.replace(
+                new RegExp(`\\b${token.replace(".", "\\.")}\\b`, "g"),
+                value,
+            );
+        }
+    }
+
+    try {
+        return Function('"use strict"; return (' + resolvedExpr + ")")();
+    } catch {
+        return undefined;
+    }
+}
+
+export async function toGlobal({
+    data,
+    mapping,
+    mappingStore,
+}: IMappingConversionOptions): Promise<IMapperResponse> {
+    const result: Record<string, unknown> = {};
+
+    console.log("data to change", data);
+
+    for (let [localKey, globalPathRaw] of Object.entries(
+        mapping.localToUniversalMap,
+    )) {
+        let value: any;
+        let targetKey: string = globalPathRaw;
+
+        if (globalPathRaw.includes(",")) {
+            const [_, alias] = globalPathRaw.split(",");
+            targetKey = alias;
+        }
+
+        if (localKey.includes("[]")) {
+            const [arrayPath, innerPathRaw] = localKey.split("[]");
+            const cleanInnerPath = innerPathRaw.startsWith(".")
+                ? innerPathRaw.slice(1)
+                : innerPathRaw;
+            const array = getValueByPath(data, arrayPath);
+            value = Array.isArray(array)
+                ? array.map((item) => getValueByPath(item, cleanInnerPath))
+                : undefined;
+            result[targetKey] = value;
+            continue;
+        }
+
+        const internalFnMatch = globalPathRaw.match(/^__(\w+)\((.+)\)$/);
+        if (internalFnMatch) {
+            const [, outerFn, innerExpr] = internalFnMatch;
+
+            if (outerFn === "date") {
+                const calcMatch = innerExpr.match(/^calc\((.+)\)$/);
+                if (calcMatch) {
+                    const calcResult = evaluateCalcExpression(
+                        calcMatch[1],
+                        data,
+                    );
+                    value =
+                        calcResult !== undefined
+                            ? new Date(calcResult).toISOString()
+                            : undefined;
+                } else {
+                    const rawVal = getValueByPath(data, innerExpr);
+                    if (typeof rawVal === "number") {
+                        value = new Date(rawVal).toISOString();
+                    } else if (rawVal?._seconds) {
+                        value = new Date(rawVal._seconds * 1000).toISOString();
+                    } else if (rawVal instanceof Date) {
+                        value = rawVal.toISOString();
+                    } else {
+                        value = undefined;
+                    }
+                }
+            } else if (outerFn === "calc") {
+                value = evaluateCalcExpression(innerExpr, data);
+            }
+
+            result[targetKey] = value;
+            continue;
+        }
+
+        const relationMatch = globalPathRaw.match(/^(\w+)\((.+?)\)(\[\])?$/);
+        if (relationMatch) {
+            const [, tableRef, pathInData, isArray] = relationMatch;
+            const refValue = getValueByPath(data, pathInData);
+            if (isArray) {
+                value = Array.isArray(refValue)
+                    ? refValue.map((v) => `@${v}`)
+                    : [];
+            } else {
+                value = refValue ? `@${refValue}` : undefined;
+            }
+            result[targetKey] = value;
+            continue;
+        }
+
+        let pathRef: string = globalPathRaw.includes(",")
+            ? globalPathRaw
+            : localKey;
+        let tableRef: string | null = null;
+        if (globalPathRaw.includes("(") && globalPathRaw.includes(")")) {
+            pathRef = globalPathRaw.split("(")[1].split(")")[0];
+            tableRef = globalPathRaw.split("(")[0];
+        }
+        if (globalPathRaw.includes(",")) {
+            pathRef = pathRef.split(",")[0];
+        }
+        value = getValueByPath(data, pathRef);
+        if (tableRef) {
+            if (Array.isArray(value)) {
+                value = await Promise.all(
+                    value.map(
+                        async (v) =>
+                            (await mappingStore.getGlobalId({
+                                localId: v,
+                                tableName: tableRef,
+                            })) ?? undefined,
+                    ),
+                );
+            } else {
+                value =
+                    (await mappingStore.getGlobalId({
+                        localId: value,
+                        tableName: tableRef,
+                    })) ?? undefined;
+            }
+        }
+        result[targetKey] = value;
+    }
+    const ownerEvault = await extractOwnerEvault(data, mapping.ownerEnamePath);
+
+    console.log("changed data to local", result);
+
+    return {
+        ownerEvault,
+        data: result,
+    };
+}
diff --git a/infrastructure/web3-adapter/src/mapper/mapper.types.ts b/infrastructure/web3-adapter/src/mapper/mapper.types.ts
new file mode 100644
index 00000000..4b9bff6c
--- /dev/null
+++ b/infrastructure/web3-adapter/src/mapper/mapper.types.ts
@@ -0,0 +1,47 @@
+import { MappingDatabase } from "../db";
+
+export interface IMapping {
+    /**
+     * Name of the local table, this would be consumed by other schemas to
+     * identify relations
+     */
+    tableName: string;
+
+    /**
+     * Schema Identifier for the global schema this table maps to
+     */
+    schemaId: string;
+
+    /**
+     * Path used to determine which eVault owns this entry.
+     *
+     * This can be a direct field on the table or a nested path via a foreign table.
+     *
+     * - For direct fields, use the field name (e.g. `"ename"`).
+     * - For nested ownership, use a function-like syntax to reference another table
+     *   and field (e.g. `"user(createdBy.ename)"` means follow the `createdBy` field,
+     *   then resolve `ename` from the `user` table).
+     *
+     * Use `tableName(fieldPath)` to reference a field from another table.
+     *
+     * @example "ename" — direct reference to a field on the same table
+     * @example "user(createdBy.ename)" — nested reference via the `user` table
+     */
+    ownerEnamePath: string;
+
+    /**
+     * String to String mapping between what path maps to what global ontology
+     */
+    localToUniversalMap: Record<string, string>;
+}
+
+export interface IMappingConversionOptions {
+    data: Record<string, unknown>;
+    mapping: IMapping;
+    mappingStore: MappingDatabase;
+}
+
+export interface IMapperResponse {
+    ownerEvault: string | null;
+    data: Record<string, unknown>;
+}
diff --git a/infrastructure/web3-adapter/tsconfig.json b/infrastructure/web3-adapter/tsconfig.json
index 12ea365d..062be0be 100644
--- a/infrastructure/web3-adapter/tsconfig.json
+++ b/infrastructure/web3-adapter/tsconfig.json
@@ -1,17 +1,25 @@
 {
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "ES2020",
-    "moduleResolution": "node",
-    "lib": ["ES2020"],
-    "declaration": true,
-    "outDir": "./dist",
-    "rootDir": "./src",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist", "**/*.test.ts"]
-} 
\ No newline at end of file
+    "compilerOptions": {
+        "target": "ES2021",
+        "module": "NodeNext",
+        "moduleResolution": "node",
+        "lib": [
+            "ES2020"
+        ],
+        "declaration": true,
+        "outDir": "./dist",
+        "rootDir": "./src",
+        "strict": true,
+        "esModuleInterop": true,
+        "skipLibCheck": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "include": [
+        "src/**/*"
+    ],
+    "exclude": [
+        "node_modules",
+        "dist",
+        "**/*.test.ts"
+    ]
+}
diff --git a/platforms/blabsy-w3ds-auth-api/package.json b/platforms/blabsy-w3ds-auth-api/package.json
index e8abf137..06d84693 100644
--- a/platforms/blabsy-w3ds-auth-api/package.json
+++ b/platforms/blabsy-w3ds-auth-api/package.json
@@ -1,8 +1,8 @@
 {
     "name": "blabsy-w3ds-auth-api",
     "version": "1.0.0",
-    "description": "Piqtique Social Media Platform API",
-    "main": "src/index.ts",
+    "description": "Web3 Data Sync Authentication API for Blabsy",
+    "main": "dist/index.js",
     "scripts": {
         "start": "ts-node src/index.ts",
         "dev": "nodemon --exec ts-node src/index.ts",
@@ -10,7 +10,8 @@
         "typeorm": "typeorm-ts-node-commonjs",
         "migration:generate": "npm run typeorm migration:generate -- -d src/database/data-source.ts",
         "migration:run": "npm run typeorm migration:run -- -d src/database/data-source.ts",
-        "migration:revert": "npm run typeorm migration:revert -- -d src/database/data-source.ts"
+        "migration:revert": "npm run typeorm migration:revert -- -d src/database/data-source.ts",
+        "test": "jest"
     },
     "dependencies": {
         "axios": "^1.6.7",
@@ -18,18 +19,20 @@
         "dotenv": "^16.4.5",
         "eventsource-polyfill": "^0.9.6",
         "express": "^4.18.2",
-        "firebase-admin": "^13.4.0",
+        "firebase-admin": "^12.0.0",
         "jsonwebtoken": "^9.0.2",
         "pg": "^8.11.3",
         "reflect-metadata": "^0.2.1",
         "typeorm": "^0.3.20",
-        "uuid": "^9.0.1"
+        "uuid": "^9.0.1",
+        "graphql": "^16.8.1",
+        "graphql-request": "^6.1.0"
     },
     "devDependencies": {
         "@types/cors": "^2.8.17",
         "@types/express": "^4.17.21",
         "@types/jsonwebtoken": "^9.0.5",
-        "@types/node": "^20.11.24",
+        "@types/node": "^20.11.19",
         "@types/pg": "^8.11.2",
         "@types/uuid": "^9.0.8",
         "@typescript-eslint/eslint-plugin": "^7.0.1",
@@ -37,6 +40,10 @@
         "eslint": "^8.56.0",
         "nodemon": "^3.0.3",
         "ts-node": "^10.9.2",
-        "typescript": "^5.3.3"
+        "typescript": "^5.3.3",
+        "@types/jest": "^29.5.12",
+        "jest": "^29.7.0",
+        "ts-jest": "^29.1.2",
+        "ts-node-dev": "^2.0.0"
     }
 }
diff --git a/platforms/blabsy-w3ds-auth-api/src/controllers/AuthController.ts b/platforms/blabsy-w3ds-auth-api/src/controllers/AuthController.ts
index f398c850..0d1365e8 100644
--- a/platforms/blabsy-w3ds-auth-api/src/controllers/AuthController.ts
+++ b/platforms/blabsy-w3ds-auth-api/src/controllers/AuthController.ts
@@ -1,7 +1,6 @@
 import { Request, Response } from "express";
 import { v4 as uuidv4 } from "uuid";
 import { EventEmitter } from "events";
-import { applicationDefault, initializeApp } from "firebase-admin/app";
 import { auth } from "firebase-admin";
 export class AuthController {
     private eventEmitter: EventEmitter;
@@ -57,9 +56,6 @@ export class AuthController {
             if (!ename) {
                 return res.status(400).json({ error: "ename is required" });
             }
-            initializeApp({
-                credential: applicationDefault(),
-            });
             const token = await auth().createCustomToken(ename);
             console.log(token);
 
diff --git a/platforms/blabsy-w3ds-auth-api/src/controllers/WebhookController.ts b/platforms/blabsy-w3ds-auth-api/src/controllers/WebhookController.ts
new file mode 100644
index 00000000..df7083df
--- /dev/null
+++ b/platforms/blabsy-w3ds-auth-api/src/controllers/WebhookController.ts
@@ -0,0 +1,281 @@
+import { Request, Response } from "express";
+import { Web3Adapter } from "../../../../infrastructure/web3-adapter/src/index";
+import path from "path";
+import dotenv from "dotenv";
+import { getFirestore } from "firebase-admin/firestore";
+import { Timestamp } from "firebase-admin/firestore";
+
+// Define types locally since we can't import from @blabsy/types
+type User = {
+    id: string;
+    bio: string | null;
+    name: string;
+    theme: string | null;
+    accent: string | null;
+    website: string | null;
+    location: string | null;
+    username: string;
+    photoURL: string;
+    verified: boolean;
+    following: string[];
+    followers: string[];
+    createdAt: Timestamp;
+    updatedAt: Timestamp | null;
+    totalTweets: number;
+    totalPhotos: number;
+    pinnedTweet: string | null;
+    coverPhotoURL: string | null;
+};
+
+type Tweet = {
+    id: string;
+    text: string | null;
+    images: any | null;
+    parent: { id: string; username: string } | null;
+    userLikes: string[];
+    createdBy: string;
+    createdAt: Timestamp;
+    updatedAt: Timestamp | null;
+    userReplies: number;
+    userRetweets: string[];
+};
+
+type Chat = {
+    id: string;
+    type: "direct" | "group";
+    name?: string;
+    participants: string[];
+    createdAt: Timestamp;
+    updatedAt: Timestamp;
+    lastMessage?: {
+        text: string;
+        senderId: string;
+        timestamp: Timestamp;
+    };
+};
+
+type Message = {
+    id: string;
+    chatId: string;
+    senderId: string;
+    text: string;
+    createdAt: Timestamp;
+    updatedAt: Timestamp;
+    readBy: string[];
+};
+
+dotenv.config({ path: path.resolve(__dirname, "../../../../.env") });
+
+export const adapter = new Web3Adapter({
+    schemasPath: path.resolve(__dirname, "../web3adapter/mappings/"),
+    dbPath: path.resolve(process.env.BLABSY_MAPPING_DB_PATH as string),
+    registryUrl: process.env.PUBLIC_REGISTRY_URL as string,
+});
+
+export class WebhookController {
+    db: FirebaseFirestore.Firestore;
+
+    constructor() {
+        this.db = getFirestore();
+        // Bind the method to preserve 'this' context
+        this.handleWebhook = this.handleWebhook.bind(this);
+    }
+
+    async handleWebhook(req: Request, res: Response) {
+        try {
+            const { data, schemaId, id } = req.body;
+
+            const mapping = Object.values(adapter.mapping).find(
+                (m) => m.schemaId === schemaId,
+            );
+            if (!mapping) throw new Error();
+            const tableName = mapping.tableName + "s";
+
+            const local = await adapter.fromGlobal({ data, mapping });
+
+            // Get the local ID from the mapping database
+            const localId = await adapter.mappingDb.getLocalId({
+                globalId: id,
+                tableName,
+            });
+
+            if (localId) {
+                console.log("");
+                adapter.addToLockedIds(localId);
+                await this.updateRecord(tableName, localId, local.data);
+            } else {
+                await this.createRecord(tableName, local.data, req.body.id);
+            }
+
+            res.status(200).json({ success: true });
+        } catch (error) {
+            console.error("Error handling webhook:", error);
+            res.status(500).json({ error: "Internal server error" });
+        }
+    }
+
+    private async createRecord(tableName: string, data: any, globalId: string) {
+        if (adapter.lockedIds.includes(globalId)) return;
+        adapter.addToLockedIds(globalId);
+        const chatId = data.chatId
+            ? data.chatId.split("(")[1].split(")")[0]
+            : null;
+
+        let collection;
+        if (tableName === "messages" && data.chatId) {
+            collection = this.db.collection(`chats/${chatId}/messages`);
+        } else {
+            collection = this.db.collection(tableName);
+        }
+
+        const docRef = collection.doc();
+        const mappedData = await this.mapDataToFirebase(tableName, data);
+        await docRef.set(mappedData);
+
+        adapter.addToLockedIds(docRef.id);
+        adapter.addToLockedIds(globalId);
+        await adapter.mappingDb.storeMapping({
+            globalId: globalId,
+            localId: docRef.id,
+            tableName:
+                tableName === "messages"
+                    ? `chats/${data.chatId}/messages`
+                    : tableName,
+        });
+    }
+
+    private async updateRecord(tableName: string, localId: string, data: any) {
+        const collection = this.db.collection(tableName);
+        const docRef = collection.doc(localId);
+
+        adapter.addToLockedIds(docRef.id);
+        const mappedData = await this.mapDataToFirebase(tableName, data);
+        await docRef.update(mappedData);
+    }
+
+    private mapDataToFirebase(tableName: string, data: any): any {
+        const now = Timestamp.now();
+        console.log("MAPPING DATA TO ", tableName);
+
+        switch (tableName) {
+            case "users":
+                const result = this.mapUserData(data, now);
+                console.log("mappppped", result);
+                return result;
+            case "tweets":
+                return this.mapTweetData(data, now);
+            case "chats":
+                return this.mapChatData(data, now);
+            case "messages":
+                return this.mapMessageData(data, now);
+            default:
+                return data;
+        }
+    }
+
+    private mapUserData(data: any, now: Timestamp): Partial<User> {
+        return {
+            bio: data.bio || null,
+            name: data.name,
+            theme: data.theme || null,
+            accent: data.accent || null,
+            website: null,
+            location: null,
+            username: data.username,
+            photoURL: data.photoURL,
+            verified: data.verified || false,
+            following: data.following || [],
+            followers: data.followers || [],
+            createdAt: data.createdAt
+                ? Timestamp.fromDate(new Date(data.createdAt))
+                : now,
+            updatedAt: now,
+            totalTweets: data.totalTweets || 0,
+            totalPhotos: data.totalPhotos || 0,
+            pinnedTweet: data.pinnedTweet || null,
+            coverPhotoURL: data.coverPhotoURL || null,
+        };
+    }
+
+    private async mapTweetData(
+        data: any,
+        now: Timestamp,
+    ): Promise<Partial<Tweet>> {
+        let createdBy = data.createdBy;
+        if (createdBy.includes("(") && createdBy.includes(")")) {
+            createdBy = createdBy.split("(")[1].split(")")[0];
+        }
+        const filteredResult = {};
+        for (const key of Object.keys(data)) {
+            if (data[key]) {
+                // @ts-ignore
+                filteredResult[key] = data[key];
+            }
+        }
+        const usersCollectionRef = this.db.collection("users");
+        const user = (await usersCollectionRef.doc(createdBy).get()).data();
+
+        const tweetData = {
+            ...filteredResult,
+            userLikes: data.userLikes.map((u: string) => {
+                if (u.includes("(") && u.includes(")")) {
+                    return u.split("(")[1].split(")")[0];
+                } else {
+                    return u;
+                }
+            }),
+            createdBy,
+            images:
+                (data.images ?? []).map((i: string) => ({
+                    src: i,
+                })) || null,
+            parent:
+                data.parent && user
+                    ? {
+                          id: data.parent.split("(")[1].split(")")[0],
+                          username: user.username,
+                      }
+                    : null,
+            createdAt: Timestamp.fromDate(new Date(Date.now())),
+            userRetweets: [],
+            userReplies: 0,
+        };
+        return tweetData;
+    }
+
+    private mapChatData(data: any, now: Timestamp): Partial<Chat> {
+        return {
+            type: data.type || "direct",
+            name: data.name,
+            participants:
+                data.participants.map(
+                    (p: string) => p.split("(")[1].split(")")[0],
+                ) || [],
+            createdAt: data.createdAt
+                ? Timestamp.fromDate(new Date(data.createdAt))
+                : now,
+            updatedAt: now,
+            lastMessage: data.lastMessage
+                ? {
+                      ...data.lastMessage,
+                      timestamp: Timestamp.fromDate(
+                          new Date(data.lastMessage.timestamp),
+                      ),
+                  }
+                : null,
+        };
+    }
+
+    private mapMessageData(data: any, now: Timestamp): Partial<Message> {
+        return {
+            chatId: data.chatId.split("(")[1].split(")")[0],
+            senderId: data.senderId.split("(")[1].split(")")[0],
+            text: data.text,
+            createdAt: data.createdAt
+                ? Timestamp.fromDate(new Date(data.createdAt))
+                : now,
+            updatedAt: now,
+            readBy: data.readBy || [],
+        };
+    }
+}
diff --git a/platforms/blabsy-w3ds-auth-api/src/index.ts b/platforms/blabsy-w3ds-auth-api/src/index.ts
index 9eb37819..263c1f48 100644
--- a/platforms/blabsy-w3ds-auth-api/src/index.ts
+++ b/platforms/blabsy-w3ds-auth-api/src/index.ts
@@ -4,6 +4,9 @@ import cors from "cors";
 import { config } from "dotenv";
 import path from "path";
 import { AuthController } from "./controllers/AuthController";
+import { initializeApp, cert, applicationDefault } from "firebase-admin/app";
+import { Web3Adapter } from "./web3adapter";
+import { WebhookController } from "./controllers/WebhookController";
 
 config({ path: path.resolve(__dirname, "../../../.env") });
 
@@ -23,9 +26,33 @@ app.use(express.urlencoded({ limit: "50mb", extended: true }));
 
 const authController = new AuthController();
 
+initializeApp({
+    credential: applicationDefault(),
+});
+
+// Initialize Web3Adapter
+const web3Adapter = new Web3Adapter();
+
+web3Adapter.initialize().catch((error) => {
+    console.error("Failed to initialize Web3Adapter:", error);
+    process.exit(1);
+});
+
+// Register webhook endpoint
+
+const webhookController = new WebhookController();
+
 app.get("/api/auth/offer", authController.getOffer);
 app.post("/api/auth", authController.login);
 app.get("/api/auth/sessions/:id", authController.sseStream);
+app.post("/api/webhook", webhookController.handleWebhook);
+
+// Graceful shutdown
+process.on("SIGTERM", async () => {
+    console.log("SIGTERM received. Shutting down...");
+    await web3Adapter.shutdown();
+    process.exit(0);
+});
 
 app.listen(port, () => {
     console.log(`Server running on port ${port}`);
diff --git a/platforms/blabsy-w3ds-auth-api/src/web3adapter/index.ts b/platforms/blabsy-w3ds-auth-api/src/web3adapter/index.ts
new file mode 100644
index 00000000..63e962c9
--- /dev/null
+++ b/platforms/blabsy-w3ds-auth-api/src/web3adapter/index.ts
@@ -0,0 +1,107 @@
+import { getFirestore } from "firebase-admin/firestore";
+import { FirestoreWatcher } from "./watchers/firestoreWatcher";
+import path from "path";
+import dotenv from "dotenv";
+
+dotenv.config({ path: path.resolve(__dirname, "../../../../../.env") });
+
+export interface Web3AdapterConfig {
+    registryUrl: string;
+    webhookSecret: string;
+    webhookEndpoint: string;
+    pictiqueWebhookUrl: string;
+    pictiqueWebhookSecret: string;
+}
+
+export class Web3Adapter {
+    private readonly db = getFirestore();
+    private watchers: Map<string, FirestoreWatcher> = new Map();
+
+    async initialize(): Promise<void> {
+        console.log("Initializing Web3Adapter...");
+
+        // Initialize watchers for each collection
+        const collections = [
+            { name: "users", type: "user" },
+            { name: "tweets", type: "socialMediaPost" },
+            { name: "chats", type: "message" },
+            { name: "comments", type: "comment" },
+        ];
+
+        for (const { name, type } of collections) {
+            try {
+                console.log(`Setting up watcher for collection: ${name}`);
+                const collection = this.db.collection(name);
+                const watcher = new FirestoreWatcher(collection);
+                await watcher.start();
+                this.watchers.set(name, watcher);
+                console.log(`Successfully set up watcher for ${name}`);
+
+                // Special handling for messages using collection group
+                if (name === "chats") {
+                    const messagesWatcher = new FirestoreWatcher(
+                        this.db.collectionGroup("messages")
+                    );
+                    await messagesWatcher.start();
+                    this.watchers.set("messages", messagesWatcher);
+                    console.log("Successfully set up watcher for all messages");
+                }
+            } catch (error) {
+                console.error(`Failed to set up watcher for ${name}:`, error);
+            }
+        }
+
+        // Set up error handling for watchers
+        process.on("unhandledRejection", (error) => {
+            console.error("Unhandled promise rejection in watchers:", error);
+            // Attempt to restart watchers
+            this.restartWatchers();
+        });
+    }
+
+    private async restartWatchers(): Promise<void> {
+        console.log("Attempting to restart watchers...");
+
+        // Stop all existing watchers
+        await this.shutdown();
+
+        // Wait a bit before restarting
+        await new Promise((resolve) => setTimeout(resolve, 1000));
+
+        // Reinitialize watchers
+        await this.initialize();
+    }
+
+    async shutdown(): Promise<void> {
+        console.log("Shutting down Web3Adapter...");
+
+        // Stop all watchers
+        const stopPromises = Array.from(this.watchers.values()).map(
+            async (watcher) => {
+                try {
+                    await watcher.stop();
+                } catch (error) {
+                    console.error("Error stopping watcher:", error);
+                }
+            }
+        );
+
+        await Promise.all(stopPromises);
+        this.watchers.clear();
+        console.log("All watchers stopped");
+    }
+
+    // Method to manually trigger a watcher restart
+    async restartWatcher(collectionName: string): Promise<void> {
+        const watcher = this.watchers.get(collectionName);
+        if (watcher) {
+            console.log(`Restarting watcher for ${collectionName}...`);
+            await watcher.stop();
+            const collection = this.db.collection(collectionName);
+            const newWatcher = new FirestoreWatcher(collection);
+            await newWatcher.start();
+            this.watchers.set(collectionName, newWatcher);
+            console.log(`Successfully restarted watcher for ${collectionName}`);
+        }
+    }
+}
diff --git a/platforms/blabsy-w3ds-auth-api/src/web3adapter/mappings/chat.mapping.json b/platforms/blabsy-w3ds-auth-api/src/web3adapter/mappings/chat.mapping.json
new file mode 100644
index 00000000..b3c340c7
--- /dev/null
+++ b/platforms/blabsy-w3ds-auth-api/src/web3adapter/mappings/chat.mapping.json
@@ -0,0 +1,14 @@
+{
+    "tableName": "chat",
+    "schemaId": "550e8400-e29b-41d4-a716-446655440003",
+    "participants": "user(participants[])",
+    "localToUniversalMap": {
+        "name": "name",
+        "type": "type",
+        "participants": "user(participants[]),participantIds",
+        "lastMessage": "lastMessageId",
+        "createdAt": "__date(__calc(createdAt._seconds * 1000)),createdAt",
+        "updatedAt": "__date(__calc(updatedAt._seconds * 1000)),updatedAt",
+        "isArchived": "isArchived"
+    }
+}
diff --git a/platforms/blabsy-w3ds-auth-api/src/web3adapter/mappings/message.mapping.json b/platforms/blabsy-w3ds-auth-api/src/web3adapter/mappings/message.mapping.json
new file mode 100644
index 00000000..3d683896
--- /dev/null
+++ b/platforms/blabsy-w3ds-auth-api/src/web3adapter/mappings/message.mapping.json
@@ -0,0 +1,15 @@
+{
+    "tableName": "message",
+    "schemaId": "550e8400-e29b-41d4-a716-446655440004",
+    "ownerEnamePath": "user(senderId)",
+    "localToUniversalMap": {
+        "chatId": "chat(chatId),chatId",
+        "senderId": "user(senderId),senderId",
+        "text": "content",
+        "type": "type",
+        "mediaUrl": "mediaUrl",
+        "createdAt": "__date(calc(createdAt._seconds * 1000)),createdAt",
+        "updatedAt": "__date(calc(updatedAt._seconds * 1000)),updatedAt",
+        "isArchived": "isArchived"
+    }
+}
diff --git a/platforms/blabsy-w3ds-auth-api/src/web3adapter/mappings/social-media-post.mapping.json b/platforms/blabsy-w3ds-auth-api/src/web3adapter/mappings/social-media-post.mapping.json
new file mode 100644
index 00000000..4b0b9fe0
--- /dev/null
+++ b/platforms/blabsy-w3ds-auth-api/src/web3adapter/mappings/social-media-post.mapping.json
@@ -0,0 +1,14 @@
+{
+    "tableName": "tweet",
+    "schemaId": "550e8400-e29b-41d4-a716-446655440001",
+    "ownerEnamePath": "user(createdBy)",
+    "localToUniversalMap": {
+        "text": "content",
+        "createdBy": "user(createdBy),authorId",
+        "images": "images[].src,mediaUrls",
+        "parent": "tweet(parent.id),parentPostId",
+        "userLikes": "user(userLikes)[],likedBy",
+        "createdAt": "__date(calc(createdAt._seconds * 1000)),createdAt",
+        "updatedAt": "__date(calc(updatedAt._seconds * 1000)),updatedAt"
+    }
+}
diff --git a/platforms/blabsy-w3ds-auth-api/src/web3adapter/mappings/user.mapping.json b/platforms/blabsy-w3ds-auth-api/src/web3adapter/mappings/user.mapping.json
new file mode 100644
index 00000000..84b03040
--- /dev/null
+++ b/platforms/blabsy-w3ds-auth-api/src/web3adapter/mappings/user.mapping.json
@@ -0,0 +1,17 @@
+{
+    "tableName": "user",
+    "schemaId": "550e8400-e29b-41d4-a716-446655440000",
+    "ownerEnamePath": "id",
+    "localToUniversalMap": {
+        "bio": "bio",
+        "username": "username",
+        "name": "displayName",
+        "photoURL": "avatarUrl",
+        "coverPhotoURL": "bannerUrl",
+        "website": "website",
+        "location": "location",
+        "verified": "isVerified",
+        "createdAt": "__date(calc(createdAt._seconds * 1000)),createdAt",
+        "updatedAt": "__date(calc(updatedAt._seconds * 1000)),updatedAt"
+    }
+}
diff --git a/platforms/blabsy-w3ds-auth-api/src/web3adapter/watchers/firestoreWatcher.ts b/platforms/blabsy-w3ds-auth-api/src/web3adapter/watchers/firestoreWatcher.ts
new file mode 100644
index 00000000..e8763daa
--- /dev/null
+++ b/platforms/blabsy-w3ds-auth-api/src/web3adapter/watchers/firestoreWatcher.ts
@@ -0,0 +1,202 @@
+import {
+    DocumentChange,
+    DocumentData,
+    QuerySnapshot,
+    CollectionReference,
+    CollectionGroup,
+} from "firebase-admin/firestore";
+import path from "path";
+import dotenv from "dotenv";
+import axios from "axios";
+import { adapter } from "../../controllers/WebhookController";
+
+dotenv.config({ path: path.resolve(__dirname, "../../../../../.env") });
+
+export class FirestoreWatcher {
+    private unsubscribe: (() => void) | null = null;
+    private adapter = adapter;
+    private isProcessing = false;
+    private retryCount = 0;
+    private readonly maxRetries: number = 3;
+    private readonly retryDelay: number = 1000; // 1 second
+
+    constructor(
+        private readonly collection:
+            | CollectionReference<DocumentData>
+            | CollectionGroup<DocumentData>,
+    ) {}
+
+    async start(): Promise<void> {
+        const collectionPath =
+            this.collection instanceof CollectionReference
+                ? this.collection.path
+                : "collection group";
+
+        try {
+            // First, get all existing documents
+            const snapshot = await this.collection.get();
+            await this.processSnapshot(snapshot);
+
+            // Then set up real-time listener
+            this.unsubscribe = this.collection.onSnapshot(
+                async (snapshot) => {
+                    if (this.isProcessing) {
+                        console.log(
+                            "Still processing previous snapshot, skipping...",
+                        );
+                        return;
+                    }
+
+                    try {
+                        this.isProcessing = true;
+                        await this.processSnapshot(snapshot);
+                        this.retryCount = 0; // Reset retry count on success
+                    } catch (error) {
+                        console.error("Error processing snapshot:", error);
+                        await this.handleError(error);
+                    } finally {
+                        this.isProcessing = false;
+                    }
+                },
+                (error) => {
+                    console.error("Error in Firestore listener:", error);
+                    this.handleError(error);
+                },
+            );
+
+            console.log(`Successfully started watcher for ${collectionPath}`);
+        } catch (error) {
+            console.error(
+                `Failed to start watcher for ${collectionPath}:`,
+                error,
+            );
+            throw error;
+        }
+    }
+
+    async stop(): Promise<void> {
+        const collectionPath =
+            this.collection instanceof CollectionReference
+                ? this.collection.path
+                : "collection group";
+        console.log(`Stopping watcher for collection: ${collectionPath}`);
+
+        if (this.unsubscribe) {
+            this.unsubscribe();
+            this.unsubscribe = null;
+            console.log(`Successfully stopped watcher for ${collectionPath}`);
+        }
+    }
+
+    private async handleError(error: any): Promise<void> {
+        if (this.retryCount < this.maxRetries) {
+            this.retryCount++;
+            console.log(`Retrying (${this.retryCount}/${this.maxRetries})...`);
+            await new Promise((resolve) =>
+                setTimeout(resolve, this.retryDelay * this.retryCount),
+            );
+            await this.start();
+        } else {
+            console.error("Max retries reached, stopping watcher");
+            await this.stop();
+        }
+    }
+
+    private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
+        const changes = snapshot.docChanges();
+        const collectionPath =
+            this.collection instanceof CollectionReference
+                ? this.collection.path
+                : "collection group";
+        console.log(
+            `Processing ${changes.length} changes in ${collectionPath}`,
+        );
+
+        for (const change of changes) {
+            const doc = change.doc;
+            const data = doc.data();
+
+            try {
+                switch (change.type) {
+                    case "added":
+                    case "modified":
+                        setTimeout(() => {
+                            console.log(
+                                `${collectionPath} - processing - ${doc.id}`,
+                            );
+                            if (adapter.lockedIds.includes(doc.id)) return;
+                            this.handleCreateOrUpdate(doc, data);
+                        }, 2_000);
+                        break;
+                    case "removed":
+                        console.log(`Document removed: ${doc.id}`);
+                        // Handle document removal if needed
+                        break;
+                }
+            } catch (error) {
+                console.error(
+                    `Error processing ${change.type} for document ${doc.id}:`,
+                    error,
+                );
+                // Continue processing other changes even if one fails
+            }
+        }
+    }
+
+    private async handleCreateOrUpdate(
+        doc: FirebaseFirestore.QueryDocumentSnapshot<DocumentData>,
+        data: DocumentData,
+    ): Promise<void> {
+        const tableParts = doc.ref.path.split("/");
+        // -2 cuz -1 gives last entry and we need second last which would
+        // be the path specifier
+        const tableNameRaw = tableParts[tableParts.length - 2];
+
+        const tableName = tableNameRaw.slice(0, tableNameRaw.length - 1);
+
+        const envelope = await this.adapter
+            .handleChange({
+                data: { ...data, id: doc.id },
+                tableName,
+            })
+            .catch(() => null);
+
+        console.log("sending envelope", envelope);
+        if (envelope) {
+            try {
+                if (
+                    this.adapter.lockedIds.includes(envelope.id) ||
+                    this.adapter.lockedIds.includes(doc.id)
+                )
+                    return;
+                const response = await axios
+                    .post(
+                        new URL(
+                            "/api/webhook",
+                            process.env.PUBLIC_PICTIQUE_BASE_URL,
+                        ).toString(),
+                        envelope,
+                        {
+                            headers: {
+                                "Content-Type": "application/json",
+                                "X-Webhook-Source": "blabsy-w3ds-auth-api",
+                            },
+                        },
+                    )
+                    .catch(() => null);
+                if (!response)
+                    return console.error(`failed to sync ${envelope.id}`);
+                console.log(
+                    `Successfully forwarded webhook for ${doc.id}:`,
+                    response.status,
+                );
+            } catch (error) {
+                console.error(
+                    `Failed to forward webhook for ${doc.id}:`,
+                    error,
+                );
+                throw error; // Re-throw to trigger retry mechanism
+            }
+        }
+    }
+}
diff --git a/platforms/blabsy/.env.development b/platforms/blabsy/.env.development
index 9aaca90b..b4608230 100644
--- a/platforms/blabsy/.env.development
+++ b/platforms/blabsy/.env.development
@@ -1,7 +1,10 @@
 # Dev URL
-NEXT_PUBLIC_URL=http://localhost
+# NEXT_PUBLIC_URL=http://localhost
 NEXT_PUBLIC_BASE_URL=http://192.168.0.226:4444
 
+NEXT_PUBLIC_URL=https://blabsy.w3ds-prototype.merul.org
+# NEXT_PUBLIC_BASE_URL=https://blabsy.w3ds-prototype.merul.org
+
 # Emulator
 NEXT_PUBLIC_USE_EMULATOR=false
 
diff --git a/platforms/blabsy/package.json b/platforms/blabsy/package.json
index 5d37e2b7..34971e86 100644
--- a/platforms/blabsy/package.json
+++ b/platforms/blabsy/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "scripts": {
         "emulators": "firebase emulators:start --only firestore,auth,storage,functions",
-        "dev": "next dev -p 80",
+        "dev": "next dev -p 8080",
         "dev:emulators": "concurrently npm:dev npm:emulators",
         "build": "next build",
         "start": "next start",
diff --git a/platforms/blabsy/src/components/modal/mobile-sidebar-modal.tsx b/platforms/blabsy/src/components/modal/mobile-sidebar-modal.tsx
index 34f89550..661831df 100644
--- a/platforms/blabsy/src/components/modal/mobile-sidebar-modal.tsx
+++ b/platforms/blabsy/src/components/modal/mobile-sidebar-modal.tsx
@@ -120,7 +120,7 @@ export function MobileSidebarModal({
                 <ActionModal
                     useIcon
                     focusOnMainBtn
-                    title='Log out of Twitter?'
+                    title='Log out of Blabsy?'
                     description='You can always log back in at any time. If you just want to switch accounts, you can do that by adding an existing account.'
                     mainBtnLabel='Log out'
                     action={signOut}
diff --git a/platforms/blabsy/src/components/sidebar/more-settings.tsx b/platforms/blabsy/src/components/sidebar/more-settings.tsx
index e9c52295..b0a99a0f 100644
--- a/platforms/blabsy/src/components/sidebar/more-settings.tsx
+++ b/platforms/blabsy/src/components/sidebar/more-settings.tsx
@@ -55,7 +55,7 @@ export function MoreSettings(): JSX.Element {
                         <AnimatePresence>
                             {open && (
                                 <Menu.Items
-                                    className='menu-container absolute -top-44 w-60 font-medium xl:w-11/12'
+                                    className='menu-container absolute top-0 w-60 font-medium xl:w-11/12'
                                     as={motion.div}
                                     {...variants}
                                     static
diff --git a/platforms/blabsy/src/components/sidebar/sidebar-profile.tsx b/platforms/blabsy/src/components/sidebar/sidebar-profile.tsx
index cb05cb34..e22ec048 100644
--- a/platforms/blabsy/src/components/sidebar/sidebar-profile.tsx
+++ b/platforms/blabsy/src/components/sidebar/sidebar-profile.tsx
@@ -34,104 +34,122 @@ export function SidebarProfile(): JSX.Element {
   }}, [user]);
 
   return (
-    <>
-      <Modal
-        modalClassName='max-w-xs bg-main-background w-full p-8 rounded-2xl'
-        open={open}
-        closeModal={closeModal}
-      >
-        <ActionModal
-          useIcon
-          focusOnMainBtn
-          title='Log out of Twitter?'
-          description='You can always log back in at any time. If you just want to switch accounts, you can do that by adding an existing account.'
-          mainBtnLabel='Log out'
-          action={signOut}
-          closeModal={closeModal}
-        />
-      </Modal>
-      <Menu className='relative' as='section'>
-        {({ open }): JSX.Element => (
-          <>
-            <Menu.Button
-              className={cn(
-                `custom-button main-tab dark-bg-tab flex w-full items-center 
+      <>
+          <Modal
+              modalClassName='max-w-xs bg-main-background w-full p-8 rounded-2xl'
+              open={open}
+              closeModal={closeModal}
+          >
+              <ActionModal
+                  useIcon
+                  focusOnMainBtn
+                  title='Log out of Blabsy?'
+                  description='You can always log back in at any time. If you just want to switch accounts, you can do that by adding an existing account.'
+                  mainBtnLabel='Log out'
+                  action={signOut}
+                  closeModal={closeModal}
+              />
+          </Modal>
+          <Menu className='relative' as='section'>
+              {({ open }): JSX.Element => (
+                  <>
+                      <Menu.Button
+                          className={cn(
+                              `custom-button main-tab dark-bg-tab flex w-full items-center
                  justify-between hover:bg-light-primary/10 active:bg-light-primary/20
                  dark:hover:bg-dark-primary/10 dark:active:bg-dark-primary/20`,
-                open && 'bg-light-primary/10 dark:bg-dark-primary/10'
-              )}
-            >
-              <div className='flex gap-3 truncate'>
-                <UserAvatar src={photoURL} alt={name} size={40} />
-                <div className='hidden truncate text-start leading-5 xl:block'>
-                  <UserName name={name} className='start' verified={verified} />
-                  <UserUsername username={username} disableLink />
-                </div>
-              </div>
-              <HeroIcon
-                className='hidden h-6 w-6 xl:block'
-                iconName='EllipsisHorizontalIcon'
-              />
-            </Menu.Button>
-            <AnimatePresence>
-              {open && (
-                <Menu.Items
-                  className='menu-container absolute left-0 right-0 -top-36 w-60 xl:w-full'
-                  as={motion.div}
-                  {...variants}
-                  static
-                >
-                  <Menu.Item
-                    className='flex items-center justify-between gap-4 border-b 
-                               border-light-border px-4 py-3 dark:border-dark-border'
-                    as='div'
-                    disabled
-                  >
-                    <div className='flex items-center gap-3 truncate'>
-                      <UserAvatar src={photoURL} alt={name} />
-                      <div className='truncate'>
-                        <UserName name={name} verified={verified} />
-                        <UserUsername username={username} disableLink />
-                      </div>
-                    </div>
-                    <i>
-                      <HeroIcon
-                        className='h-5 w-5 text-main-accent'
-                        iconName='CheckIcon'
-                      />
-                    </i>
-                  </Menu.Item>
-                  <Menu.Item>
-                    {({ active }): JSX.Element => (
-                      <Button
-                        className={cn(
-                          'flex w-full gap-3 rounded-md rounded-t-none p-4',
-                          active && 'bg-main-sidebar-background'
-                        )}
-                        onClick={openModal}
+                              open &&
+                                  'bg-light-primary/10 dark:bg-dark-primary/10'
+                          )}
                       >
-                        <HeroIcon iconName='ArrowRightOnRectangleIcon' />
-                        Log out @{username}
-                      </Button>
-                    )}
-                  </Menu.Item>
-                  <i
-                    className='absolute -bottom-[10px] left-2 translate-x-1/2 rotate-180
-                               [filter:drop-shadow(#cfd9de_1px_-1px_1px)] 
+                          <div className='flex gap-3 truncate'>
+                              <UserAvatar src={photoURL} alt={name} size={40} />
+                              <div className='hidden truncate text-start leading-5 xl:block'>
+                                  <UserName
+                                      name={name}
+                                      className='start'
+                                      verified={verified}
+                                  />
+                                  <UserUsername
+                                      username={username}
+                                      disableLink
+                                  />
+                              </div>
+                          </div>
+                          <HeroIcon
+                              className='hidden h-6 w-6 xl:block'
+                              iconName='EllipsisHorizontalIcon'
+                          />
+                      </Menu.Button>
+                      <AnimatePresence>
+                          {open && (
+                              <Menu.Items
+                                  className='menu-container absolute left-0 right-0 -top-36 w-60 xl:w-full'
+                                  as={motion.div}
+                                  {...variants}
+                                  static
+                              >
+                                  <Menu.Item
+                                      className='flex items-center justify-between gap-4 border-b
+                               border-light-border px-4 py-3 dark:border-dark-border'
+                                      as='div'
+                                      disabled
+                                  >
+                                      <div className='flex items-center gap-3 truncate'>
+                                          <UserAvatar
+                                              src={photoURL}
+                                              alt={name}
+                                          />
+                                          <div className='truncate'>
+                                              <UserName
+                                                  name={name}
+                                                  verified={verified}
+                                              />
+                                              <UserUsername
+                                                  username={username}
+                                                  disableLink
+                                              />
+                                          </div>
+                                      </div>
+                                      <i>
+                                          <HeroIcon
+                                              className='h-5 w-5 text-main-accent'
+                                              iconName='CheckIcon'
+                                          />
+                                      </i>
+                                  </Menu.Item>
+                                  <Menu.Item>
+                                      {({ active }): JSX.Element => (
+                                          <Button
+                                              className={cn(
+                                                  'flex w-full gap-3 rounded-md rounded-t-none p-4',
+                                                  active &&
+                                                      'bg-main-sidebar-background'
+                                              )}
+                                              onClick={openModal}
+                                          >
+                                              <HeroIcon iconName='ArrowRightOnRectangleIcon' />
+                                              Log out @{username}
+                                          </Button>
+                                      )}
+                                  </Menu.Item>
+                                  <i
+                                      className='absolute -bottom-[10px] left-2 translate-x-1/2 rotate-180
+                               [filter:drop-shadow(#cfd9de_1px_-1px_1px)]
                                dark:[filter:drop-shadow(#333639_1px_-1px_1px)]
                                xl:left-1/2 xl:-translate-x-1/2'
-                  >
-                    <CustomIcon
-                      className='h-4 w-6 fill-main-background'
-                      iconName='TriangleIcon'
-                    />
-                  </i>
-                </Menu.Items>
+                                  >
+                                      <CustomIcon
+                                          className='h-4 w-6 fill-main-background'
+                                          iconName='TriangleIcon'
+                                      />
+                                  </i>
+                              </Menu.Items>
+                          )}
+                      </AnimatePresence>
+                  </>
               )}
-            </AnimatePresence>
-          </>
-        )}
-      </Menu>
-    </>
+          </Menu>
+      </>
   );
 }
diff --git a/platforms/blabsy/src/components/user/user-avatar.tsx b/platforms/blabsy/src/components/user/user-avatar.tsx
index 3364bafa..2ebaab20 100644
--- a/platforms/blabsy/src/components/user/user-avatar.tsx
+++ b/platforms/blabsy/src/components/user/user-avatar.tsx
@@ -3,42 +3,44 @@ import cn from 'clsx';
 import { NextImage } from '@components/ui/next-image';
 
 type UserAvatarProps = {
-  src: string;
-  alt: string;
-  size?: number;
-  username?: string;
-  className?: string;
+    src: string;
+    alt: string;
+    size?: number;
+    username?: string;
+    className?: string;
 };
 
 export function UserAvatar({
-  src,
-  alt,
-  size,
-  username,
-  className
+    src,
+    alt,
+    size,
+    username,
+    className
 }: UserAvatarProps): JSX.Element {
-  const pictureSize = size ?? 48;
+    const pictureSize = size ?? 48;
 
-  return (
-    <Link href={username ? `/user/${username}` : '#'}>
-      <a
-        className={cn(
-          'blur-picture flex self-start',
-          !username && 'pointer-events-none',
-          className
-        )}
-        tabIndex={username ? 0 : -1}
-      >
-        <NextImage
-          useSkeleton
-          imgClassName='rounded-full'
-          width={pictureSize}
-          height={pictureSize}
-          src={src}
-          alt={alt}
-          key={src}
-        />
-      </a>
-    </Link>
-  );
+    console.log(typeof src);
+
+    return (
+        <Link href={username ? `/user/${username}` : '#'}>
+            <a
+                className={cn(
+                    'blur-picture flex self-start',
+                    !username && 'pointer-events-none',
+                    className
+                )}
+                tabIndex={username ? 0 : -1}
+            >
+                <NextImage
+                    useSkeleton
+                    imgClassName='rounded-full'
+                    width={pictureSize}
+                    height={pictureSize}
+                    src={src}
+                    alt={alt}
+                    key={src}
+                />
+            </a>
+        </Link>
+    );
 }
diff --git a/platforms/blabsy/src/lib/types/tweet.ts b/platforms/blabsy/src/lib/types/tweet.ts
index d9c408f4..83799206 100644
--- a/platforms/blabsy/src/lib/types/tweet.ts
+++ b/platforms/blabsy/src/lib/types/tweet.ts
@@ -3,28 +3,28 @@ import type { ImagesPreview } from './file';
 import type { User } from './user';
 
 export type Tweet = {
-  id: string;
-  text: string | null;
-  images: ImagesPreview | null;
-  parent: { id: string; username: string } | null;
-  userLikes: string[];
-  createdBy: string;
-  createdAt: Timestamp;
-  updatedAt: Timestamp | null;
-  userReplies: number;
-  userRetweets: string[];
+    id: string;
+    text: string | null;
+    images: ImagesPreview | null;
+    parent: { id: string; username: string } | null;
+    userLikes: string[];
+    createdBy: string;
+    createdAt: Timestamp;
+    updatedAt: Timestamp | null;
+    userReplies: number;
+    userRetweets: string[];
 };
 
 export type TweetWithUser = Tweet & { user: User };
 
 export const tweetConverter: FirestoreDataConverter<Tweet> = {
-  toFirestore(tweet) {
-    return { ...tweet };
-  },
-  fromFirestore(snapshot, options) {
-    const { id } = snapshot;
-    const data = snapshot.data(options);
+    toFirestore(tweet) {
+        return { ...tweet };
+    },
+    fromFirestore(snapshot, options) {
+        const { id } = snapshot;
+        const data = snapshot.data(options);
 
-    return { id, ...data } as Tweet;
-  }
+        return { id, ...data } as Tweet;
+    }
 };
diff --git a/platforms/metagram/project.inlang/.gitignore b/platforms/metagram/project.inlang/.gitignore
new file mode 100644
index 00000000..5e465967
--- /dev/null
+++ b/platforms/metagram/project.inlang/.gitignore
@@ -0,0 +1 @@
+cache
\ No newline at end of file
diff --git a/platforms/metagram/project.inlang/project_id b/platforms/metagram/project.inlang/project_id
new file mode 100644
index 00000000..66ac0986
--- /dev/null
+++ b/platforms/metagram/project.inlang/project_id
@@ -0,0 +1 @@
+1lExt3FnvpxOpPeeZE
\ No newline at end of file
diff --git a/platforms/metagram/project.inlang/settings.json b/platforms/metagram/project.inlang/settings.json
new file mode 100644
index 00000000..dc73166c
--- /dev/null
+++ b/platforms/metagram/project.inlang/settings.json
@@ -0,0 +1,12 @@
+{
+	"$schema": "https://inlang.com/schema/project-settings",
+	"modules": [
+		"https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@4/dist/index.js",
+		"https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@2/dist/index.js"
+	],
+	"plugin.inlang.messageFormat": {
+		"pathPattern": "../messages/{locale}.json"
+	},
+	"baseLocale": "en",
+	"locales": ["en", "es"]
+}
diff --git a/platforms/pictique-api/package.json b/platforms/pictique-api/package.json
index 8a1fe477..865b2dde 100644
--- a/platforms/pictique-api/package.json
+++ b/platforms/pictique-api/package.json
@@ -18,10 +18,11 @@
         "dotenv": "^16.4.5",
         "eventsource-polyfill": "^0.9.6",
         "express": "^4.18.2",
+        "graphql-request": "^6.1.0",
         "jsonwebtoken": "^9.0.2",
         "pg": "^8.11.3",
         "reflect-metadata": "^0.2.1",
-        "typeorm": "^0.3.20",
+        "typeorm": "^0.3.24",
         "uuid": "^9.0.1"
     },
     "devDependencies": {
diff --git a/platforms/pictique-api/src/controllers/MessageController.ts b/platforms/pictique-api/src/controllers/MessageController.ts
index 4f37308c..0dd81648 100644
--- a/platforms/pictique-api/src/controllers/MessageController.ts
+++ b/platforms/pictique-api/src/controllers/MessageController.ts
@@ -23,7 +23,7 @@ export class MessageController {
             ];
             const chat = await this.chatService.createChat(
                 name,
-                allParticipants,
+                allParticipants
             );
             res.status(201).json(chat);
         } catch (error) {
@@ -60,7 +60,7 @@ export class MessageController {
                 chatId,
                 userId,
                 page,
-                limit,
+                limit
             );
 
             res.json({
@@ -89,7 +89,7 @@ export class MessageController {
             const result = await this.chatService.getUserChats(
                 userId,
                 page,
-                limit,
+                limit
             );
 
             // Transform the response to include only necessary data
@@ -129,7 +129,7 @@ export class MessageController {
 
             const chat = await this.chatService.addParticipants(
                 chatId,
-                participantIds,
+                participantIds
             );
             res.json(chat);
         } catch (error) {
@@ -149,7 +149,7 @@ export class MessageController {
 
             const chat = await this.chatService.removeParticipant(
                 chatId,
-                userId,
+                userId
             );
             res.json(chat);
         } catch (error) {
@@ -168,12 +168,11 @@ export class MessageController {
             if (!userId) {
                 return res.status(401).json({ error: "Unauthorized" });
             }
-            console.log("asdfasd");
 
             const message = await this.chatService.sendMessage(
                 chatId,
                 userId,
-                text,
+                text
             );
             res.status(201).json(message);
         } catch (error) {
@@ -197,7 +196,7 @@ export class MessageController {
                 chatId,
                 userId,
                 page,
-                limit,
+                limit
             );
             res.json(result);
         } catch (error) {
@@ -251,7 +250,7 @@ export class MessageController {
 
             const count = await this.chatService.getUnreadMessageCount(
                 chatId,
-                userId,
+                userId
             );
             res.json({ count });
         } catch (error) {
@@ -310,7 +309,7 @@ export class MessageController {
                 chatId,
                 userId,
                 page,
-                limit,
+                limit
             );
 
             // Send initial connection message
@@ -319,8 +318,10 @@ export class MessageController {
             // Create event listener for this chat
             const eventEmitter = this.chatService.getEventEmitter();
             const eventName = `chat:${chatId}`;
+            console.log("listening for", eventName);
 
             const messageHandler = (data: any) => {
+                console.log("received event to send", data);
                 res.write(`data: ${JSON.stringify(data)}\n\n`);
             };
 
diff --git a/platforms/pictique-api/src/controllers/PostController.ts b/platforms/pictique-api/src/controllers/PostController.ts
index d33bb565..f754323e 100644
--- a/platforms/pictique-api/src/controllers/PostController.ts
+++ b/platforms/pictique-api/src/controllers/PostController.ts
@@ -22,7 +22,7 @@ export class PostController {
             const feed = await this.postService.getFollowingFeed(
                 userId,
                 page,
-                limit,
+                limit
             );
             res.json(feed);
         } catch (error) {
@@ -63,7 +63,6 @@ export class PostController {
             }
 
             const post = await this.postService.toggleLike(postId, userId);
-            console.log(post);
             res.json(post);
         } catch (error) {
             console.error("Error toggling like:", error);
diff --git a/platforms/pictique-api/src/controllers/UserController.ts b/platforms/pictique-api/src/controllers/UserController.ts
index f10ef9f0..fc59495a 100644
--- a/platforms/pictique-api/src/controllers/UserController.ts
+++ b/platforms/pictique-api/src/controllers/UserController.ts
@@ -81,10 +81,12 @@ export class UserController {
                 return res.status(401).json({ error: "Unauthorized" });
             }
 
+            const user = await this.userService.findById(userId);
+
             const updatedUser = await this.userService.updateProfile(userId, {
-                handle,
-                avatarUrl: avatar,
-                name
+                handle: handle ?? user?.handle,
+                avatarUrl: avatar ?? user?.avatarUrl,
+                name: name ?? user?.name,
             });
 
             res.json(updatedUser);
diff --git a/platforms/pictique-api/src/controllers/WebhookController.ts b/platforms/pictique-api/src/controllers/WebhookController.ts
new file mode 100644
index 00000000..cfad6855
--- /dev/null
+++ b/platforms/pictique-api/src/controllers/WebhookController.ts
@@ -0,0 +1,287 @@
+import { Request, Response } from "express";
+import { UserService } from "../services/UserService";
+import { ChatService } from "../services/ChatService";
+import { PostService } from "../services/PostService";
+import { CommentService } from "../services/CommentService";
+import { Web3Adapter } from "../../../../infrastructure/web3-adapter/src";
+import { User } from "database/entities/User";
+import { Chat } from "database/entities/Chat";
+import { MessageService } from "../services/MessageService";
+import { Post } from "database/entities/Post";
+
+export class WebhookController {
+    userService: UserService;
+    chatService: ChatService;
+    postsService: PostService;
+    commentService: CommentService;
+    adapter: Web3Adapter;
+    messageService: MessageService;
+
+    constructor(adapter: Web3Adapter) {
+        this.userService = new UserService();
+        this.chatService = new ChatService();
+        this.postsService = new PostService();
+        this.commentService = new CommentService();
+        this.adapter = adapter;
+        this.messageService = new MessageService();
+    }
+
+    handleWebhook = async (req: Request, res: Response) => {
+        try {
+            const schemaId = req.body.schemaId;
+            const globalId = req.body.id;
+            const mapping = Object.values(this.adapter.mapping).find(
+                (m) => m.schemaId === schemaId,
+            );
+
+            if (!mapping) throw new Error();
+            const local = await this.adapter.fromGlobal({
+                data: req.body.data,
+                mapping,
+            });
+
+            mapping.tableName =
+                mapping.tableName === "comments" ? "posts" : mapping.tableName;
+            let localId = await this.adapter.mappingDb.getLocalId({
+                globalId,
+                tableName: mapping.tableName,
+            });
+
+            if (mapping.tableName === "users") {
+                const { user } = await this.userService.findOrCreateUser(
+                    req.body.w3id,
+                );
+                for (const key of Object.keys(local.data)) {
+                    // @ts-ignore
+                    user[key] = local.data[key];
+                }
+                await this.userService.userRepository.save(user);
+                await this.adapter.mappingDb.storeMapping({
+                    localId: user.id,
+                    globalId: req.body.id,
+                    tableName: mapping.tableName,
+                });
+                this.adapter.addToLockedIds(user.id);
+            } else if (mapping.tableName === "posts") {
+                let author: User | null = null;
+                if (local.data.author) {
+                    const authorId = local.data.author
+                        // @ts-ignore
+                        .split("(")[1]
+                        .split(")")[0];
+                    author = await this.userService.findById(authorId);
+                    console.log("nuh uh not here", author);
+                }
+                let likedBy: User[] = [];
+                if (local.data.likedBy && Array.isArray(local.data.likedBy)) {
+                    const likedByPromises = local.data.likedBy.map(
+                        async (ref: string) => {
+                            if (ref && typeof ref === "string") {
+                                const userId = ref.split("(")[1].split(")")[0];
+                                return await this.userService.findById(userId);
+                            }
+                            return null;
+                        },
+                    );
+                    likedBy = (await Promise.all(likedByPromises)).filter(
+                        (user): user is User => user !== null,
+                    );
+                }
+
+                if (local.data.parentPostId) {
+                    const parentId = (local.data.parentPostId as string)
+                        .split("(")[1]
+                        .split(")")[0];
+                    const parent = await this.postsService.findById(parentId);
+                    if (localId) {
+                        const comment =
+                            await this.commentService.getCommentById(localId);
+                        if (!comment) return;
+                        comment.text = local.data.text as string;
+                        comment.likedBy = likedBy as User[];
+                        comment.author = author as User;
+                        comment.post = parent as Post;
+                        await this.commentService.commentRepository.save(
+                            comment,
+                        );
+                    } else {
+                        const comment = await this.commentService.createComment(
+                            parent?.id as string,
+                            author?.id as string,
+                            local.data.text as string,
+                        );
+                        localId = comment.id;
+                        await this.adapter.mappingDb.storeMapping({
+                            localId,
+                            globalId,
+                            tableName: mapping.tableName,
+                        });
+                    }
+                    this.adapter.addToLockedIds(localId);
+                } else {
+                    let likedBy: User[] = [];
+                    if (
+                        local.data.likedBy &&
+                        Array.isArray(local.data.likedBy)
+                    ) {
+                        const likedByPromises = local.data.likedBy.map(
+                            async (ref: string) => {
+                                if (ref && typeof ref === "string") {
+                                    const userId = ref
+                                        .split("(")[1]
+                                        .split(")")[0];
+                                    return await this.userService.findById(
+                                        userId,
+                                    );
+                                }
+                                return null;
+                            },
+                        );
+                        likedBy = (await Promise.all(likedByPromises)).filter(
+                            (user): user is User => user !== null,
+                        );
+                    }
+
+                    if (localId) {
+                        const post = await this.postsService.findById(localId);
+                        if (!post) return res.status(500).send();
+                        for (const key of Object.keys(local.data)) {
+                            // @ts-ignore
+                            post[key] = local.data[key];
+                        }
+                        post.likedBy = likedBy;
+                        // @ts-ignore
+                        post.author = author ?? undefined;
+
+                        this.adapter.addToLockedIds(localId);
+                        await this.postsService.postRepository.save(post);
+                    } else {
+                        console.log("Creating new post");
+                        const post = await this.postsService.createPost(
+                            author?.id as string,
+                            // @ts-ignore
+                            {
+                                ...local.data,
+                                likedBy,
+                            },
+                        );
+
+                        this.adapter.addToLockedIds(post.id);
+                        await this.adapter.mappingDb.storeMapping({
+                            localId: post.id,
+                            globalId,
+                            tableName: mapping.tableName,
+                        });
+
+                        // Verify the mapping was stored
+                        const verifyLocalId =
+                            await this.adapter.mappingDb.getLocalId({
+                                globalId,
+                                tableName: mapping.tableName,
+                            });
+                        console.log("Verified mapping:", {
+                            expected: post.id,
+                            actual: verifyLocalId,
+                        });
+                    }
+                }
+            } else if (mapping.tableName === "chats") {
+                let participants: User[] = [];
+                if (
+                    local.data.participants &&
+                    Array.isArray(local.data.participants)
+                ) {
+                    const participantPromises = local.data.participants.map(
+                        async (ref: string) => {
+                            if (ref && typeof ref === "string") {
+                                const userId = ref.split("(")[1].split(")")[0];
+                                return await this.userService.findById(userId);
+                            }
+                            return null;
+                        },
+                    );
+                    participants = (
+                        await Promise.all(participantPromises)
+                    ).filter((user): user is User => user !== null);
+                }
+
+                if (localId) {
+                    const chat = await this.chatService.findById(localId);
+                    if (!chat) return res.status(500).send();
+
+                    chat.name = local.data.name as string;
+                    chat.participants = participants;
+
+                    this.adapter.addToLockedIds(localId);
+                    await this.chatService.chatRepository.save(chat);
+                } else {
+                    const chat = await this.chatService.createChat(
+                        local.data.name as string,
+                        participants.map((p) => p.id),
+                    );
+
+                    this.adapter.addToLockedIds(chat.id);
+                    await this.adapter.mappingDb.storeMapping({
+                        localId: chat.id,
+                        globalId: req.body.id,
+                        tableName: mapping.tableName,
+                    });
+                }
+            } else if (mapping.tableName === "messages") {
+                console.log("messages");
+                console.log(local.data);
+                let sender: User | null = null;
+                if (
+                    local.data.sender &&
+                    typeof local.data.sender === "string"
+                ) {
+                    const senderId = local.data.sender
+                        .split("(")[1]
+                        .split(")")[0];
+                    sender = await this.userService.findById(senderId);
+                }
+
+                let chat: Chat | null = null;
+                if (local.data.chat && typeof local.data.chat === "string") {
+                    const chatId = local.data.chat.split("(")[1].split(")")[0];
+                    chat = await this.chatService.findById(chatId);
+                }
+
+                if (!sender || !chat) {
+                    console.log(local.data);
+                    console.log("Missing sender or chat for message");
+                    return res.status(400).send();
+                }
+
+                if (localId) {
+                    console.log("Updating existing message");
+                    const message = await this.messageService.findById(localId);
+                    if (!message) return res.status(500).send();
+
+                    message.text = local.data.text as string;
+                    message.sender = sender;
+                    message.chat = chat;
+
+                    this.adapter.addToLockedIds(localId);
+                    await this.messageService.messageRepository.save(message);
+                } else {
+                    const message = await this.chatService.sendMessage(
+                        chat.id,
+                        sender.id,
+                        local.data.text as string,
+                    );
+
+                    this.adapter.addToLockedIds(message.id);
+                    await this.adapter.mappingDb.storeMapping({
+                        localId: message.id,
+                        globalId: req.body.id,
+                        tableName: mapping.tableName,
+                    });
+                }
+            }
+            res.status(200).send();
+        } catch (e) {
+            console.error(e);
+        }
+    };
+}
diff --git a/platforms/pictique-api/src/database/data-source.ts b/platforms/pictique-api/src/database/data-source.ts
index afde67f9..879fe0c2 100644
--- a/platforms/pictique-api/src/database/data-source.ts
+++ b/platforms/pictique-api/src/database/data-source.ts
@@ -8,6 +8,7 @@ import { Message } from "./entities/Message";
 import path from "path";
 import { Chat } from "./entities/Chat";
 import { MessageReadStatus } from "./entities/MessageReadStatus";
+import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";
 
 config({ path: path.resolve(__dirname, "../../../../.env") });
 
@@ -18,5 +19,5 @@ export const AppDataSource = new DataSource({
     logging: process.env.NODE_ENV === "development",
     entities: [User, Post, Comment, Message, Chat, MessageReadStatus],
     migrations: ["src/database/migrations/*.ts"],
-    subscribers: [],
+    subscribers: [PostgresSubscriber],
 });
diff --git a/platforms/pictique-api/src/database/migrations/1749561069022-migration.ts b/platforms/pictique-api/src/database/migrations/1749561069022-migration.ts
new file mode 100644
index 00000000..33d26378
--- /dev/null
+++ b/platforms/pictique-api/src/database/migrations/1749561069022-migration.ts
@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class Migration1749561069022 implements MigrationInterface {
+    name = 'Migration1749561069022'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "__web3_id_mapping" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "localId" character varying NOT NULL, "metaEnvelopeId" character varying NOT NULL, "entityType" character varying NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_4c57c87c4ee60f42d9c6b0861c2" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_e6df8ee410baeffd472e93cdd2" ON "__web3_id_mapping" ("localId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_9bdab2968d15942d3e3187a620" ON "__web3_id_mapping" ("metaEnvelopeId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_f62e57b7b9f593f2e1715912c9" ON "__web3_id_mapping" ("entityType") `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "public"."IDX_f62e57b7b9f593f2e1715912c9"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_9bdab2968d15942d3e3187a620"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_e6df8ee410baeffd472e93cdd2"`);
+        await queryRunner.query(`DROP TABLE "__web3_id_mapping"`);
+    }
+
+}
diff --git a/platforms/pictique-api/src/index.ts b/platforms/pictique-api/src/index.ts
index ff233dc6..78f3721f 100644
--- a/platforms/pictique-api/src/index.ts
+++ b/platforms/pictique-api/src/index.ts
@@ -10,47 +10,59 @@ import { CommentController } from "./controllers/CommentController";
 import { MessageController } from "./controllers/MessageController";
 import { authMiddleware, authGuard } from "./middleware/auth";
 import { UserController } from "./controllers/UserController";
+import { WebhookController } from "./controllers/WebhookController";
+import { adapter } from "./web3adapter/watchers/subscriber";
 
 config({ path: path.resolve(__dirname, "../../../.env") });
 
 const app = express();
 const port = process.env.PORT || 3000;
 
+// Initialize database connection and adapter
+AppDataSource.initialize()
+    .then(async () => {
+        console.log("Database connection established");
+        console.log("Web3 adapter initialized");
+    })
+    .catch((error: any) => {
+        console.error("Error during initialization:", error);
+        process.exit(1);
+    });
+
 // Middleware
 app.use(
     cors({
         origin: "*",
         methods: ["GET", "POST", "OPTIONS", "PATCH", "DELETE"],
-        allowedHeaders: ["Content-Type", "Authorization"],
+        allowedHeaders: [
+            "Content-Type",
+            "Authorization",
+            "X-Webhook-Signature",
+            "X-Webhook-Timestamp",
+        ],
         credentials: true,
     }),
 );
 app.use(express.json({ limit: "50mb" }));
 app.use(express.urlencoded({ limit: "50mb", extended: true }));
 
-// Initialize database connection
-AppDataSource.initialize()
-    .then(() => {
-        console.log("Database connection established");
-    })
-    .catch((error) => {
-        console.error("Error connecting to database:", error);
-        process.exit(1);
-    });
-
 // Controllers
 const postController = new PostController();
 const authController = new AuthController();
 const commentController = new CommentController();
 const messageController = new MessageController();
 const userController = new UserController();
+const webhookController = new WebhookController(adapter);
+
+// Webhook route (no auth required)
+// app.post("/api/webhook", adapter.webhookHandler.handleWebhook);
 
 // Public routes (no auth required)
 app.get("/api/auth/offer", authController.getOffer);
-app.get("/api/auth/offerb", authController.getOfferBlab);
 app.post("/api/auth", authController.login);
 app.get("/api/auth/sessions/:id", authController.sseStream);
 app.get("/api/chats/:chatId/events", messageController.getChatEvents);
+app.post("/api/webhook", webhookController.handleWebhook);
 
 // Protected routes (auth required)
 app.use(authMiddleware); // Apply auth middleware to all routes below
diff --git a/platforms/pictique-api/src/middleware/auth.ts b/platforms/pictique-api/src/middleware/auth.ts
index fdace1d2..51346556 100644
--- a/platforms/pictique-api/src/middleware/auth.ts
+++ b/platforms/pictique-api/src/middleware/auth.ts
@@ -11,7 +11,7 @@ export const authMiddleware = async (
     try {
         const authHeader = req.headers.authorization;
         if (!authHeader?.startsWith("Bearer ")) {
-            return res.status(401).json({ error: "No token provided" });
+            return next();
         }
 
         const token = authHeader.split(" ")[1];
@@ -29,7 +29,6 @@ export const authMiddleware = async (
         }
 
         req.user = user;
-        console.log("user", user.ename);
         next();
     } catch (error) {
         console.error("Auth middleware error:", error);
@@ -43,4 +42,3 @@ export const authGuard = (req: Request, res: Response, next: NextFunction) => {
     }
     next();
 };
-
diff --git a/platforms/pictique-api/src/services/ChatService.ts b/platforms/pictique-api/src/services/ChatService.ts
index 1deb0ae6..01ac9578 100644
--- a/platforms/pictique-api/src/services/ChatService.ts
+++ b/platforms/pictique-api/src/services/ChatService.ts
@@ -5,14 +5,19 @@ import { User } from "../database/entities/User";
 import { MessageReadStatus } from "../database/entities/MessageReadStatus";
 import { In } from "typeorm";
 import { EventEmitter } from "events";
+import { emitter } from "./event-emitter";
 
 export class ChatService {
-    private chatRepository = AppDataSource.getRepository(Chat);
+    public chatRepository = AppDataSource.getRepository(Chat);
     private messageRepository = AppDataSource.getRepository(Message);
     private userRepository = AppDataSource.getRepository(User);
     private messageReadStatusRepository =
         AppDataSource.getRepository(MessageReadStatus);
-    private eventEmitter = new EventEmitter();
+    private eventEmitter: EventEmitter;
+
+    constructor() {
+        this.eventEmitter = emitter;
+    }
 
     // Event emitter getter
     getEventEmitter(): EventEmitter {
@@ -22,7 +27,7 @@ export class ChatService {
     // Chat CRUD Operations
     async createChat(
         name?: string,
-        participantIds: string[] = [],
+        participantIds: string[] = []
     ): Promise<Chat> {
         const participants = await this.userRepository.findBy({
             id: In(participantIds),
@@ -70,7 +75,7 @@ export class ChatService {
     // Participant Operations
     async addParticipants(
         chatId: string,
-        participantIds: string[],
+        participantIds: string[]
     ): Promise<Chat> {
         const chat = await this.getChatById(chatId);
         if (!chat) {
@@ -102,7 +107,7 @@ export class ChatService {
     async sendMessage(
         chatId: string,
         senderId: string,
-        text: string,
+        text: string
     ): Promise<Message> {
         const chat = await this.getChatById(chatId);
         if (!chat) {
@@ -126,8 +131,9 @@ export class ChatService {
         });
 
         const savedMessage = await this.messageRepository.save(message);
+        console.log("Sent event", `chat:${chatId}`);
+        this.eventEmitter.emit(`chat:${chatId}`, [savedMessage]);
 
-        // Create read status entries for all participants except sender
         const readStatuses = chat.participants
             .filter((p) => p.id !== senderId)
             .map((participant) =>
@@ -135,13 +141,12 @@ export class ChatService {
                     message: savedMessage,
                     user: participant,
                     isRead: false,
-                }),
+                })
             );
 
-        await this.messageReadStatusRepository.save(readStatuses);
-
-        // Emit new message event
-        this.eventEmitter.emit(`chat:${chatId}`, [savedMessage]);
+        await this.messageReadStatusRepository
+            .save(readStatuses)
+            .catch(() => null);
 
         return savedMessage;
     }
@@ -150,7 +155,7 @@ export class ChatService {
         chatId: string,
         userId: string,
         page: number = 1,
-        limit: number = 20,
+        limit: number = 20
     ): Promise<{
         messages: Message[];
         total: number;
@@ -201,7 +206,9 @@ export class ChatService {
             .createQueryBuilder()
             .update(MessageReadStatus)
             .set({ isRead: true })
-            .where("message.id IN (:...messageIds)", { messageIds: messageIds.map(m => m.id) })
+            .where("message.id IN (:...messageIds)", {
+                messageIds: messageIds.map((m) => m.id),
+            })
             .andWhere("user.id = :userId", { userId })
             .andWhere("isRead = :isRead", { isRead: false })
             .execute();
@@ -228,7 +235,7 @@ export class ChatService {
     async getUserChats(
         userId: string,
         page: number = 1,
-        limit: number = 10,
+        limit: number = 10
     ): Promise<{
         chats: (Chat & { latestMessage?: { text: string; isRead: boolean } })[];
         total: number;
@@ -291,7 +298,7 @@ export class ChatService {
 
     async getUnreadMessageCount(
         chatId: string,
-        userId: string,
+        userId: string
     ): Promise<number> {
         return await this.messageReadStatusRepository.count({
             where: {
@@ -301,4 +308,11 @@ export class ChatService {
             },
         });
     }
+
+    async findById(id: string): Promise<Chat | null> {
+        return await this.chatRepository.findOne({
+            where: { id },
+            relations: ["participants"],
+        });
+    }
 }
diff --git a/platforms/pictique-api/src/services/CommentService.ts b/platforms/pictique-api/src/services/CommentService.ts
index e994aa6c..6f2f6e68 100644
--- a/platforms/pictique-api/src/services/CommentService.ts
+++ b/platforms/pictique-api/src/services/CommentService.ts
@@ -3,19 +3,23 @@ import { Comment } from "../database/entities/Comment";
 import { Post } from "../database/entities/Post";
 
 export class CommentService {
-    private commentRepository = AppDataSource.getRepository(Comment);
+    commentRepository = AppDataSource.getRepository(Comment);
     private postRepository = AppDataSource.getRepository(Post);
 
-    async createComment(postId: string, authorId: string, text: string): Promise<Comment> {
+    async createComment(
+        postId: string,
+        authorId: string,
+        text: string
+    ): Promise<Comment> {
         const post = await this.postRepository.findOneBy({ id: postId });
         if (!post) {
-            throw new Error('Post not found');
+            throw new Error("Post not found");
         }
 
         const comment = this.commentRepository.create({
             text,
             author: { id: authorId },
-            post: { id: postId }
+            post: { id: postId },
         });
 
         return await this.commentRepository.save(comment);
@@ -24,22 +28,22 @@ export class CommentService {
     async getPostComments(postId: string): Promise<Comment[]> {
         return await this.commentRepository.find({
             where: { post: { id: postId } },
-            relations: ['author'],
-            order: { createdAt: 'DESC' }
+            relations: ["author"],
+            order: { createdAt: "DESC" },
         });
     }
 
     async getCommentById(id: string): Promise<Comment | null> {
         return await this.commentRepository.findOne({
             where: { id },
-            relations: ['author']
+            relations: ["author"],
         });
     }
 
     async updateComment(id: string, text: string): Promise<Comment> {
         const comment = await this.getCommentById(id);
         if (!comment) {
-            throw new Error('Comment not found');
+            throw new Error("Comment not found");
         }
 
         comment.text = text;
@@ -49,9 +53,10 @@ export class CommentService {
     async deleteComment(id: string): Promise<void> {
         const comment = await this.getCommentById(id);
         if (!comment) {
-            throw new Error('Comment not found');
+            throw new Error("Comment not found");
         }
 
         await this.commentRepository.softDelete(id);
     }
-} 
\ No newline at end of file
+}
+
diff --git a/platforms/pictique-api/src/services/MessageService.ts b/platforms/pictique-api/src/services/MessageService.ts
new file mode 100644
index 00000000..5d385439
--- /dev/null
+++ b/platforms/pictique-api/src/services/MessageService.ts
@@ -0,0 +1,21 @@
+import { AppDataSource } from "../database/data-source";
+import { Message } from "../database/entities/Message";
+
+export class MessageService {
+    public messageRepository = AppDataSource.getRepository(Message);
+
+    async findById(id: string): Promise<Message | null> {
+        return await this.messageRepository.findOneBy({ id });
+    }
+
+    async createMessage(senderId: string, chatId: string, text: string): Promise<Message> {
+        const message = this.messageRepository.create({
+            sender: { id: senderId },
+            chat: { id: chatId },
+            text,
+            isArchived: false
+        });
+
+        return await this.messageRepository.save(message);
+    }
+} 
\ No newline at end of file
diff --git a/platforms/pictique-api/src/services/PostService.ts b/platforms/pictique-api/src/services/PostService.ts
index 47048a00..5e23cd89 100644
--- a/platforms/pictique-api/src/services/PostService.ts
+++ b/platforms/pictique-api/src/services/PostService.ts
@@ -7,12 +7,17 @@ interface CreatePostData {
     text: string;
     images?: string[];
     hashtags?: string[];
+    likedBy?: User[];
 }
 
 export class PostService {
-    private postRepository = AppDataSource.getRepository(Post);
+    postRepository = AppDataSource.getRepository(Post);
     private userRepository = AppDataSource.getRepository(User);
 
+    async findById(id: string) {
+        return await this.postRepository.findOneBy({ id });
+    }
+
     async getFollowingFeed(userId: string, page: number, limit: number) {
         const user = await this.userRepository.findOne({
             where: { id: userId },
@@ -28,7 +33,6 @@ export class PostService {
 
         const [posts, total] = await this.postRepository.findAndCount({
             where: {
-                author: { id: In(authorIds) },
                 isArchived: false,
             },
             relations: ["author", "likedBy", "comments", "comments.author"],
@@ -58,7 +62,7 @@ export class PostService {
             text: data.text,
             images: data.images || [],
             hashtags: data.hashtags || [],
-            likedBy: [],
+            likedBy: data.likedBy,
         });
 
         return await this.postRepository.save(post);
diff --git a/platforms/pictique-api/src/services/UserService.ts b/platforms/pictique-api/src/services/UserService.ts
index 6f68ec2f..945d3e1e 100644
--- a/platforms/pictique-api/src/services/UserService.ts
+++ b/platforms/pictique-api/src/services/UserService.ts
@@ -5,7 +5,7 @@ import { signToken } from "../utils/jwt";
 import { Like } from "typeorm";
 
 export class UserService {
-    private userRepository = AppDataSource.getRepository(User);
+    userRepository = AppDataSource.getRepository(User);
     private postRepository = AppDataSource.getRepository(Post);
 
     async createBlankUser(ename: string): Promise<User> {
diff --git a/platforms/pictique-api/src/services/event-emitter.ts b/platforms/pictique-api/src/services/event-emitter.ts
new file mode 100644
index 00000000..320b7406
--- /dev/null
+++ b/platforms/pictique-api/src/services/event-emitter.ts
@@ -0,0 +1,3 @@
+import { EventEmitter } from "events";
+
+export const emitter = new EventEmitter();
diff --git a/platforms/pictique-api/src/web3adapter/config/index.ts b/platforms/pictique-api/src/web3adapter/config/index.ts
deleted file mode 100644
index f056e6da..00000000
--- a/platforms/pictique-api/src/web3adapter/config/index.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-export const web3AdapterConfig = {
-    // Registry URL for resolving ename to eVault URLs
-    registryUrl: process.env.REGISTRY_URL || "http://localhost:4000",
-    
-    // Webhook configuration
-    webhook: {
-        // The URL where this adapter will receive updates from other platforms
-        receiveUrl: process.env.WEB3_ADAPTER_WEBHOOK_URL || "http://localhost:4444/web3adapter/webhook",
-        // Secret for webhook signature verification
-        secret: process.env.WEB3_ADAPTER_WEBHOOK_SECRET || "your-webhook-secret"
-    },
-
-    // eVault configuration
-    eVault: {
-        // GraphQL endpoint for eVault operations
-        graphqlUrl: process.env.EVAULT_GRAPHQL_URL || "http://localhost:4000/graphql",
-        // Default ACL for stored envelopes
-        defaultAcl: process.env.EVAULT_DEFAULT_ACL ? 
-            process.env.EVAULT_DEFAULT_ACL.split(",") : 
-            ["@d1fa5cb1-6178-534b-a096-59794d485f65"]
-    },
-
-    // Entity type mappings to global ontology
-    entityMappings: {
-        User: "UserProfile",
-        Post: "SocialMediaPost",
-        Comment: "SocialMediaPost",
-        Chat: "Chat",
-        Message: "Message",
-        MessageReadStatus: "MessageReadStatus"
-    }
-} as const; 
\ No newline at end of file
diff --git a/platforms/pictique-api/src/web3adapter/controllers/WebhookController.ts b/platforms/pictique-api/src/web3adapter/controllers/WebhookController.ts
deleted file mode 100644
index 7a5eb553..00000000
--- a/platforms/pictique-api/src/web3adapter/controllers/WebhookController.ts
+++ /dev/null
@@ -1,298 +0,0 @@
-import { Request, Response } from "express";
-import { TransformService } from "../services/TransformService";
-import { web3AdapterConfig } from "../config";
-import { EntityType, WebhookPayload, TransformContext } from "../types";
-import { AppDataSource } from "../../database/data-source";
-import { User } from "../../database/entities/User";
-import { Post } from "../../database/entities/Post";
-import { Comment } from "../../database/entities/Comment";
-import { Chat } from "../../database/entities/Chat";
-import { Message } from "../../database/entities/Message";
-import { MessageReadStatus } from "../../database/entities/MessageReadStatus";
-import { In } from "typeorm";
-
-export class WebhookController {
-    private userRepository = AppDataSource.getRepository(User);
-    private postRepository = AppDataSource.getRepository(Post);
-    private commentRepository = AppDataSource.getRepository(Comment);
-    private chatRepository = AppDataSource.getRepository(Chat);
-    private messageRepository = AppDataSource.getRepository(Message);
-    private messageReadStatusRepository = AppDataSource.getRepository(MessageReadStatus);
-
-    async handleWebhook(req: Request, res: Response) {
-        const payload = req.body as WebhookPayload;
-        console.log("Received webhook payload:", payload);
-
-        // For now, we're not verifying signatures
-        // TODO: Implement signature verification
-
-        try {
-            const entityType = this.getEntityTypeFromGlobal(payload.entityType);
-            if (!entityType) {
-                throw new Error(`Unsupported global ontology type: ${payload.entityType}`);
-            }
-
-            const transformContext: TransformContext = {
-                platform: "blabsy",
-                entityType,
-                internalId: payload.metaEnvelopeId
-            };
-
-            const platformData = TransformService.getInstance().fromGlobalOntology(
-                entityType,
-                payload.payload,
-                transformContext
-            );
-
-            switch (payload.operation) {
-                case "create":
-                    await this.handleCreate(entityType, platformData);
-                    break;
-                case "update":
-                    await this.handleUpdate(entityType, platformData);
-                    break;
-                case "delete":
-                    await this.handleDelete(entityType, platformData);
-                    break;
-                default:
-                    throw new Error(`Unsupported operation: ${payload.operation}`);
-            }
-
-            res.status(200).json({ success: true });
-        } catch (error) {
-            console.error("Error handling webhook:", error);
-            res.status(500).json({ error: (error as Error).message });
-        }
-    }
-
-    private getEntityTypeFromGlobal(globalType: string): EntityType | null {
-        const mapping = Object.entries(web3AdapterConfig.entityMappings).find(
-            ([_, value]) => value === globalType
-        );
-        return mapping ? (mapping[0] as EntityType) : null;
-    }
-
-    private async handleCreate(entityType: EntityType, data: any) {
-        switch (entityType) {
-            case "User": {
-                const user = this.userRepository.create({
-                    ename: data.ename,
-                    handle: data.username,
-                    name: data.displayName,
-                    description: data.bio,
-                    avatarUrl: data.avatarUrl
-                });
-                await this.userRepository.save(user);
-                break;
-            }
-            case "Post": {
-                const author = await this.userRepository.findOneBy({ ename: data.authorEname });
-                if (!author) throw new Error(`Author not found: ${data.authorEname}`);
-
-                const post = this.postRepository.create({
-                    text: data.content,
-                    images: data.images,
-                    hashtags: data.hashtags,
-                    author
-                });
-                await this.postRepository.save(post);
-                break;
-            }
-            case "Comment": {
-                const author = await this.userRepository.findOneBy({ ename: data.authorEname });
-                if (!author) throw new Error(`Author not found: ${data.authorEname}`);
-
-                // Find the parent post by its meta envelope ID
-                const parentPost = await this.postRepository.findOne({
-                    where: { id: data.parentId },
-                    relations: ["author"]
-                });
-                if (!parentPost) throw new Error(`Parent post not found: ${data.parentId}`);
-
-                const comment = this.commentRepository.create({
-                    text: data.content,
-                    author,
-                    post: parentPost
-                });
-                await this.commentRepository.save(comment);
-                break;
-            }
-            case "Chat": {
-                const participants = await this.userRepository.findBy({
-                    ename: In(data.participants)
-                });
-                if (participants.length === 0) {
-                    throw new Error("No participants found");
-                }
-
-                const chat = this.chatRepository.create({
-                    name: data.name,
-                    participants
-                });
-                await this.chatRepository.save(chat);
-                break;
-            }
-            case "Message": {
-                const sender = await this.userRepository.findOneBy({ ename: data.authorEname });
-                if (!sender) throw new Error(`Sender not found: ${data.authorEname}`);
-
-                const chat = await this.chatRepository.findOneBy({ id: data.chatId });
-                if (!chat) throw new Error(`Chat not found: ${data.chatId}`);
-
-                const message = this.messageRepository.create({
-                    text: data.content,
-                    sender,
-                    chat
-                });
-                await this.messageRepository.save(message);
-
-                // Create read statuses for all chat participants except the sender
-                const readStatuses = chat.participants
-                    .filter(p => p.ename !== data.authorEname)
-                    .map(participant =>
-                        this.messageReadStatusRepository.create({
-                            message,
-                            user: participant,
-                            isRead: false
-                        })
-                    );
-                await this.messageReadStatusRepository.save(readStatuses);
-                break;
-            }
-            case "MessageReadStatus": {
-                const message = await this.messageRepository.findOneBy({ id: data.messageId });
-                if (!message) throw new Error(`Message not found: ${data.messageId}`);
-
-                const user = await this.userRepository.findOneBy({ ename: data.userEname });
-                if (!user) throw new Error(`User not found: ${data.userEname}`);
-
-                const readStatus = this.messageReadStatusRepository.create({
-                    message,
-                    user,
-                    isRead: data.isRead
-                });
-                await this.messageReadStatusRepository.save(readStatus);
-                break;
-            }
-        }
-    }
-
-    private async handleUpdate(entityType: EntityType, data: any) {
-        switch (entityType) {
-            case "User": {
-                const user = await this.userRepository.findOneBy({ ename: data.ename });
-                if (!user) throw new Error(`User not found: ${data.ename}`);
-
-                Object.assign(user, {
-                    handle: data.username,
-                    name: data.displayName,
-                    description: data.bio,
-                    avatarUrl: data.avatarUrl
-                });
-                await this.userRepository.save(user);
-                break;
-            }
-            case "Post": {
-                const post = await this.postRepository.findOneBy({ id: data.id });
-                if (!post) throw new Error(`Post not found: ${data.id}`);
-
-                Object.assign(post, {
-                    text: data.content,
-                    images: data.images,
-                    hashtags: data.hashtags
-                });
-                await this.postRepository.save(post);
-                break;
-            }
-            case "Comment": {
-                const comment = await this.commentRepository.findOneBy({ id: data.id });
-                if (!comment) throw new Error(`Comment not found: ${data.id}`);
-
-                Object.assign(comment, {
-                    text: data.content
-                });
-                await this.commentRepository.save(comment);
-                break;
-            }
-            case "Chat": {
-                const chat = await this.chatRepository.findOneBy({ id: data.id });
-                if (!chat) throw new Error(`Chat not found: ${data.id}`);
-
-                const participants = await this.userRepository.findBy({
-                    ename: In(data.participants)
-                });
-                if (participants.length === 0) {
-                    throw new Error("No participants found");
-                }
-
-                Object.assign(chat, {
-                    name: data.name,
-                    participants
-                });
-                await this.chatRepository.save(chat);
-                break;
-            }
-            case "Message": {
-                const message = await this.messageRepository.findOneBy({ id: data.id });
-                if (!message) throw new Error(`Message not found: ${data.id}`);
-
-                Object.assign(message, {
-                    text: data.content
-                });
-                await this.messageRepository.save(message);
-                break;
-            }
-            case "MessageReadStatus": {
-                const readStatus = await this.messageReadStatusRepository.findOneBy({ id: data.id });
-                if (!readStatus) throw new Error(`Read status not found: ${data.id}`);
-
-                Object.assign(readStatus, {
-                    isRead: data.isRead
-                });
-                await this.messageReadStatusRepository.save(readStatus);
-                break;
-            }
-        }
-    }
-
-    private async handleDelete(entityType: EntityType, data: any) {
-        switch (entityType) {
-            case "User": {
-                const user = await this.userRepository.findOneBy({ ename: data.ename });
-                if (!user) throw new Error(`User not found: ${data.ename}`);
-                await this.userRepository.softDelete(user.id);
-                break;
-            }
-            case "Post": {
-                const post = await this.postRepository.findOneBy({ id: data.id });
-                if (!post) throw new Error(`Post not found: ${data.id}`);
-                await this.postRepository.softDelete(post.id);
-                break;
-            }
-            case "Comment": {
-                const comment = await this.commentRepository.findOneBy({ id: data.id });
-                if (!comment) throw new Error(`Comment not found: ${data.id}`);
-                await this.commentRepository.softDelete(comment.id);
-                break;
-            }
-            case "Chat": {
-                const chat = await this.chatRepository.findOneBy({ id: data.id });
-                if (!chat) throw new Error(`Chat not found: ${data.id}`);
-                await this.chatRepository.softDelete(chat.id);
-                break;
-            }
-            case "Message": {
-                const message = await this.messageRepository.findOneBy({ id: data.id });
-                if (!message) throw new Error(`Message not found: ${data.id}`);
-                await this.messageRepository.softDelete(message.id);
-                break;
-            }
-            case "MessageReadStatus": {
-                const readStatus = await this.messageReadStatusRepository.findOneBy({ id: data.id });
-                if (!readStatus) throw new Error(`Read status not found: ${data.id}`);
-                await this.messageReadStatusRepository.softDelete(readStatus.id);
-                break;
-            }
-        }
-    }
-} 
\ No newline at end of file
diff --git a/platforms/pictique-api/src/web3adapter/entities/MetaEnvelopeMap.ts b/platforms/pictique-api/src/web3adapter/entities/MetaEnvelopeMap.ts
deleted file mode 100644
index 2e538c20..00000000
--- a/platforms/pictique-api/src/web3adapter/entities/MetaEnvelopeMap.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import {
-    Entity,
-    PrimaryGeneratedColumn,
-    Column,
-    CreateDateColumn,
-    UpdateDateColumn,
-    Index
-} from "typeorm";
-
-@Entity("_w3_adapter_meta_envelope_maps")
-export class MetaEnvelopeMap {
-    @PrimaryGeneratedColumn("uuid")
-    id!: string;
-
-    @Column()
-    @Index()
-    metaEnvelopeId!: string;
-
-    @Column()
-    @Index()
-    internalId!: string;
-
-    @Column()
-    entityType!: string;
-
-    @Column({ nullable: true })
-    parentMetaEnvelopeId?: string;
-
-    @CreateDateColumn()
-    createdAt!: Date;
-
-    @UpdateDateColumn()
-    updatedAt!: Date;
-} 
\ No newline at end of file
diff --git a/platforms/pictique-api/src/web3adapter/index.ts b/platforms/pictique-api/src/web3adapter/index.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/platforms/pictique-api/src/web3adapter/mappings/chat.mapping.json b/platforms/pictique-api/src/web3adapter/mappings/chat.mapping.json
new file mode 100644
index 00000000..f6f15859
--- /dev/null
+++ b/platforms/pictique-api/src/web3adapter/mappings/chat.mapping.json
@@ -0,0 +1,15 @@
+{
+    "tableName": "chats",
+    "schemaId": "550e8400-e29b-41d4-a716-446655440003",
+    "ownerEnamePath": "null",
+    "ownedJunctionTables": [
+        "chat_participants"
+    ],
+    "localToUniversalMap": {
+        "name": "name",
+        "type": "type",
+        "participants": "users(participants[].id),participantIds",
+        "createdAt": "createdAt",
+        "updatedAt": "updatedAt"
+    }
+}
diff --git a/platforms/pictique-api/src/web3adapter/mappings/comment.mapping.json b/platforms/pictique-api/src/web3adapter/mappings/comment.mapping.json
new file mode 100644
index 00000000..822e8a5e
--- /dev/null
+++ b/platforms/pictique-api/src/web3adapter/mappings/comment.mapping.json
@@ -0,0 +1,19 @@
+{
+    "tableName": "comments",
+    "schemaId": "550e8400-e29b-41d4-a716-446655440001",
+    "ownerEnamePath": "users(author.ename)",
+    "ownedJunctionTables": [
+        "comment_likes"
+    ],
+    "localToUniversalMap": {
+        "text": "content",
+        "images": "mediaUrls",
+        "hashtags": "tags",
+        "createdAt": "createdAt",
+        "parentPostId": "posts(post.id),parentPostId",
+        "updatedAt": "updatedAt",
+        "isArchived": "isArchived",
+        "likedBy": "users(likedBy[].id),likedBy",
+        "author": "users(author.id),authorId"
+    }
+}
diff --git a/platforms/pictique-api/src/web3adapter/mappings/message.mapping.json b/platforms/pictique-api/src/web3adapter/mappings/message.mapping.json
new file mode 100644
index 00000000..e7f495db
--- /dev/null
+++ b/platforms/pictique-api/src/web3adapter/mappings/message.mapping.json
@@ -0,0 +1,12 @@
+{
+    "tableName": "messages",
+    "schemaId": "550e8400-e29b-41d4-a716-446655440004",
+    "ownerEnamePath": "users(sender.ename)",
+    "localToUniversalMap": {
+        "chat": "chats(chat.id),chatId",
+        "text": "content",
+        "sender": "users(sender.id),senderId",
+        "createdAt": "createdAt",
+        "updatedAt": "updatedAt"
+    }
+}
diff --git a/platforms/pictique-api/src/web3adapter/mappings/post.mapping.json b/platforms/pictique-api/src/web3adapter/mappings/post.mapping.json
new file mode 100644
index 00000000..4d09b222
--- /dev/null
+++ b/platforms/pictique-api/src/web3adapter/mappings/post.mapping.json
@@ -0,0 +1,19 @@
+{
+    "tableName": "posts",
+    "schemaId": "550e8400-e29b-41d4-a716-446655440001",
+    "ownerEnamePath": "users(author.ename)",
+    "ownedJunctionTables": [
+        "post_likes"
+    ],
+    "localToUniversalMap": {
+        "text": "content",
+        "images": "mediaUrls",
+        "hashtags": "tags",
+        "createdAt": "createdAt",
+        "parentPostId": "posts(parentPostId),parentPostId",
+        "updatedAt": "updatedAt",
+        "isArchived": "isArchived",
+        "likedBy": "users(likedBy[].id),likedBy",
+        "author": "users(author.id),authorId"
+    }
+}
diff --git a/platforms/pictique-api/src/web3adapter/mappings/user.mapping.json b/platforms/pictique-api/src/web3adapter/mappings/user.mapping.json
new file mode 100644
index 00000000..f896f59c
--- /dev/null
+++ b/platforms/pictique-api/src/web3adapter/mappings/user.mapping.json
@@ -0,0 +1,24 @@
+{
+    "tableName": "users",
+    "schemaId": "550e8400-e29b-41d4-a716-446655440000",
+    "ownerEnamePath": "ename",
+    "ownedJunctionTables": [
+        "user_followers",
+        "user_following"
+    ],
+    "localToUniversalMap": {
+        "handle": "username",
+        "name": "displayName",
+        "description": "bio",
+        "avatarUrl": "avatarUrl",
+        "bannerUrl": "bannerUrl",
+        "ename": "ename",
+        "isVerified": "isVerified",
+        "isPrivate": "isPrivate",
+        "createdAt": "createdAt",
+        "updatedAt": "updatedAt",
+        "isArchived": "isArchived",
+        "followers": "followers",
+        "following": "following"
+    }
+}
diff --git a/platforms/pictique-api/src/web3adapter/routes/webhook.ts b/platforms/pictique-api/src/web3adapter/routes/webhook.ts
deleted file mode 100644
index 10e31536..00000000
--- a/platforms/pictique-api/src/web3adapter/routes/webhook.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Router } from "express";
-import { WebhookController } from "../controllers/WebhookController";
-
-const router = Router();
-const webhookController = new WebhookController();
-
-router.post("/webhook", (req, res) => webhookController.handleWebhook(req, res));
-
-export default router; 
\ No newline at end of file
diff --git a/platforms/pictique-api/src/web3adapter/services/TransformService.ts b/platforms/pictique-api/src/web3adapter/services/TransformService.ts
deleted file mode 100644
index 3b226f27..00000000
--- a/platforms/pictique-api/src/web3adapter/services/TransformService.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import { web3AdapterConfig } from "../config";
-import { EntityType, GlobalOntologyType, TransformContext } from "../types";
-
-export class TransformService {
-    private static instance: TransformService;
-    private constructor() {}
-
-    static getInstance(): TransformService {
-        if (!TransformService.instance) {
-            TransformService.instance = new TransformService();
-        }
-        return TransformService.instance;
-    }
-
-    toGlobalOntology(
-        entityType: EntityType,
-        platformData: any,
-        context: TransformContext
-    ): Record<string, any> {
-        switch (entityType) {
-            case "User":
-                return this.transformUser(platformData);
-            case "Post":
-                return this.transformPost(platformData);
-            case "Comment":
-                return this.transformComment(platformData, context);
-            case "Chat":
-                return this.transformChat(platformData);
-            case "Message":
-                return this.transformMessage(platformData);
-            case "MessageReadStatus":
-                return this.transformMessageReadStatus(platformData);
-            default:
-                throw new Error(`Unsupported entity type: ${entityType}`);
-        }
-    }
-
-    fromGlobalOntology(
-        entityType: EntityType,
-        globalData: any,
-        context: TransformContext
-    ): Record<string, any> {
-        switch (entityType) {
-            case "User":
-                return this.transformUserFromGlobal(globalData);
-            case "Post":
-                return this.transformPostFromGlobal(globalData);
-            case "Comment":
-                return this.transformCommentFromGlobal(globalData);
-            case "Chat":
-                return this.transformChatFromGlobal(globalData);
-            case "Message":
-                return this.transformMessageFromGlobal(globalData);
-            case "MessageReadStatus":
-                return this.transformMessageReadStatusFromGlobal(globalData);
-            default:
-                throw new Error(`Unsupported entity type: ${entityType}`);
-        }
-    }
-
-    private transformUser(user: any): Record<string, any> {
-        return {
-            id: user.id,
-            username: user.handle,
-            displayName: user.name,
-            bio: user.description,
-            avatarUrl: user.avatarUrl,
-            followers: user.followers?.map((f: any) => f.id) || [],
-            following: user.following?.map((f: any) => f.id) || [],
-            createdAt: user.createdAt,
-            updatedAt: user.updatedAt
-        };
-    }
-
-    private transformUserFromGlobal(global: any): Record<string, any> {
-        return {
-            id: global.id,
-            handle: global.username,
-            name: global.displayName,
-            description: global.bio,
-            avatarUrl: global.avatarUrl,
-            createdAt: global.createdAt,
-            updatedAt: global.updatedAt
-        };
-    }
-
-    private transformPost(post: any): Record<string, any> {
-        return {
-            content: post.text,
-            images: post.images || [],
-            hashtags: post.hashtags || [],
-            authorEname: post.author?.ename,
-            likes: post.likedBy?.length || 0,
-            replies: post.comments?.length || 0,
-            isArchived: post.isArchived,
-            createdAt: post.createdAt,
-            updatedAt: post.updatedAt
-        };
-    }
-
-    private transformPostFromGlobal(global: any): Record<string, any> {
-        return {
-            id: global.id,
-            text: global.content,
-            createdAt: global.createdAt,
-            updatedAt: global.updatedAt
-        };
-    }
-
-    private transformComment(comment: any, context: TransformContext): Record<string, any> {
-        console.log("Transforming comment with context:", context);
-        const data: Record<string, any> = {
-            content: comment.text,
-            authorEname: comment.author?.ename,
-            likes: comment.likedBy?.length || 0,
-            isArchived: comment.isArchived,
-            createdAt: comment.createdAt,
-            updatedAt: comment.updatedAt
-        };
-        if (context.parentMetaEnvelopeId) {
-            data.parentId = context.parentMetaEnvelopeId;
-        }
-        console.log("Transformed comment data:", data);
-        return data;
-    }
-
-    private transformCommentFromGlobal(global: any): Record<string, any> {
-        return {
-            id: global.id,
-            text: global.content,
-            createdAt: global.createdAt,
-            updatedAt: global.updatedAt
-        };
-    }
-
-    private transformChat(chat: any): Record<string, any> {
-        return {
-            id: chat.id,
-            name: chat.name,
-            participants: chat.participants?.map((p: any) => p.id) || [],
-            messages: chat.messages?.map((m: any) => m.id) || [],
-            createdAt: chat.createdAt,
-            updatedAt: chat.updatedAt,
-            isArchived: chat.isArchived || false
-        };
-    }
-
-    private transformChatFromGlobal(global: any): Record<string, any> {
-        return {
-            id: global.id,
-            createdAt: global.createdAt,
-            updatedAt: global.updatedAt
-        };
-    }
-
-    private transformMessage(message: any): Record<string, any> {
-        return {
-            id: message.id,
-            content: message.text,
-            authorId: message.sender?.id,
-            chatId: message.chat?.id,
-            readStatuses: message.readStatuses?.map((status: any) => ({
-                userId: status.user?.id,
-                isRead: status.isRead,
-                readAt: status.readAt
-            })) || [],
-            createdAt: message.createdAt,
-            updatedAt: message.updatedAt,
-            isArchived: message.isArchived || false
-        };
-    }
-
-    private transformMessageFromGlobal(global: any): Record<string, any> {
-        return {
-            id: global.id,
-            text: global.content,
-            createdAt: global.createdAt,
-            updatedAt: global.updatedAt,
-            isArchived: global.isArchived
-        };
-    }
-
-    private transformMessageReadStatus(status: any): Record<string, any> {
-        return {
-            id: status.id,
-            messageId: status.message?.id,
-            userId: status.user?.id,
-            isRead: status.isRead,
-            readAt: status.readAt,
-            createdAt: status.createdAt,
-            updatedAt: status.updatedAt
-        };
-    }
-
-    private transformMessageReadStatusFromGlobal(global: any): Record<string, any> {
-        return {
-            id: global.id,
-            readAt: global.readAt
-        };
-    }
-} 
\ No newline at end of file
diff --git a/platforms/pictique-api/src/web3adapter/services/eVaultService.ts b/platforms/pictique-api/src/web3adapter/services/eVaultService.ts
deleted file mode 100644
index aa9927d3..00000000
--- a/platforms/pictique-api/src/web3adapter/services/eVaultService.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { web3AdapterConfig } from "../config";
-import axios from "axios";
-
-interface MetaEnvelopeMapping {
-    entityType: string;
-    internalId: string;
-    metaEnvelopeId: string;
-}
-
-class eVaultServiceClass {
-    private static instance: eVaultServiceClass;
-    private constructor() {}
-
-    static getInstance(): eVaultServiceClass {
-        if (!eVaultServiceClass.instance) {
-            eVaultServiceClass.instance = new eVaultServiceClass();
-        }
-        return eVaultServiceClass.instance;
-    }
-
-    async storeMetaEnvelope(
-        ownerEname: string,
-        ontology: string,
-        data: Record<string, any>
-    ) {
-        const response = await axios.post(web3AdapterConfig.eVault.graphqlUrl, {
-            query: `
-                mutation StoreMetaEnvelope($input: StoreMetaEnvelopeInput!) {
-                    storeMetaEnvelope(input: $input) {
-                        metaEnvelope {
-                            id
-                            ontology
-                            parsed
-                        }
-                        envelopes {
-                            id
-                            ontology
-                            value
-                            valueType
-                        }
-                    }
-                }
-            `,
-            variables: {
-                input: {
-                    ownerEname,
-                    ontology,
-                    data,
-                    acl: web3AdapterConfig.eVault.defaultAcl
-                }
-            }
-        });
-
-        if (response.data.errors) {
-            throw new Error(`Failed to store meta envelope: ${response.data.errors[0].message}`);
-        }
-
-        return response.data.data.storeMetaEnvelope;
-    }
-
-    async findMetaEnvelopeMapping(
-        entityType: string,
-        internalId: string
-    ): Promise<MetaEnvelopeMapping | null> {
-        const response = await axios.post(web3AdapterConfig.eVault.graphqlUrl, {
-            query: `
-                query FindMetaEnvelopeMapping($entityType: String!, $internalId: String!) {
-                    findMetaEnvelopeMapping(entityType: $entityType, internalId: $internalId) {
-                        entityType
-                        internalId
-                        metaEnvelopeId
-                    }
-                }
-            `,
-            variables: {
-                entityType,
-                internalId
-            }
-        });
-
-        if (response.data.errors) {
-            throw new Error(`Failed to find meta envelope mapping: ${response.data.errors[0].message}`);
-        }
-
-        return response.data.data.findMetaEnvelopeMapping;
-    }
-}
-
-export const eVaultService = eVaultServiceClass.getInstance(); 
\ No newline at end of file
diff --git a/platforms/pictique-api/src/web3adapter/subscribers/EntitySubscriber.ts b/platforms/pictique-api/src/web3adapter/subscribers/EntitySubscriber.ts
deleted file mode 100644
index d29efc61..00000000
--- a/platforms/pictique-api/src/web3adapter/subscribers/EntitySubscriber.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-import { EntitySubscriberInterface, EventSubscriber, InsertEvent, UpdateEvent, RemoveEvent, DataSource } from "typeorm";
-import { User } from "../../database/entities/User";
-import { Post } from "../../database/entities/Post";
-import { Comment } from "../../database/entities/Comment";
-import { Chat } from "../../database/entities/Chat";
-import { Message } from "../../database/entities/Message";
-import { MessageReadStatus } from "../../database/entities/MessageReadStatus";
-import { web3AdapterConfig } from "../config";
-import { TransformService } from "../services/TransformService";
-import { eVaultService } from "../services/eVaultService";
-import { EntityType } from "../types";
-import axios from "axios";
-
-@EventSubscriber()
-export class EntitySubscriber implements EntitySubscriberInterface {
-    constructor(private dataSource: DataSource) {
-        this.dataSource.subscribers.push(this as EntitySubscriberInterface);
-    }
-
-    listenTo(): Function {
-        return function() {
-            return [User, Post, Comment, Chat, Message, MessageReadStatus];
-        };
-    }
-
-    async afterInsert(event: InsertEvent<any>): Promise<void> {
-        if (!event.entity) return;
-
-        try {
-            const entityType = this.determineEntityType(event.entity);
-            const ownerEname = this.determineOwnerEname(event.entity);
-            const transformService = TransformService.getInstance();
-
-            // Transform to global ontology
-            const globalEntity = transformService.toGlobalOntology(
-                entityType,
-                event.entity,
-                {
-                    platform: "pictique",
-                    entityType,
-                    internalId: event.entity.id.toString()
-                }
-            );
-
-            // Store in eVault
-            const result = await eVaultService.storeMetaEnvelope(
-                ownerEname,
-                web3AdapterConfig.entityMappings[entityType],
-                globalEntity
-            );
-
-            // Send webhook to Blabsy
-            await axios.post(web3AdapterConfig.webhook.receiveUrl, {
-                operation: "create",
-                entityType,
-                data: globalEntity,
-                metaEnvelopeId: result.metaEnvelope.id
-            }, {
-                headers: {
-                    "X-Webhook-Secret": web3AdapterConfig.webhook.secret
-                }
-            });
-        } catch (error) {
-            console.error("Error in afterInsert:", error);
-        }
-    }
-
-    async afterUpdate(event: UpdateEvent<any>): Promise<void> {
-        if (!event.entity) return;
-
-        try {
-            const entityType = this.determineEntityType(event.entity);
-            const ownerEname = this.determineOwnerEname(event.entity);
-            const transformService = TransformService.getInstance();
-
-            // Transform to global ontology
-            const globalEntity = transformService.toGlobalOntology(
-                entityType,
-                event.entity,
-                {
-                    platform: "pictique",
-                    entityType,
-                    internalId: event.entity.id.toString()
-                }
-            );
-
-            // Store in eVault
-            const result = await eVaultService.storeMetaEnvelope(
-                ownerEname,
-                web3AdapterConfig.entityMappings[entityType],
-                globalEntity
-            );
-
-            // Send webhook to Blabsy
-            await axios.post(web3AdapterConfig.webhook.receiveUrl, {
-                operation: "update",
-                entityType,
-                data: globalEntity,
-                metaEnvelopeId: result.metaEnvelope.id
-            }, {
-                headers: {
-                    "X-Webhook-Secret": web3AdapterConfig.webhook.secret
-                }
-            });
-        } catch (error) {
-            console.error("Error in afterUpdate:", error);
-        }
-    }
-
-    async afterRemove(event: RemoveEvent<any>): Promise<void> {
-        if (!event.entity) return;
-
-        try {
-            const entityType = this.determineEntityType(event.entity);
-            const ownerEname = this.determineOwnerEname(event.entity);
-
-            // Send webhook to Blabsy
-            await axios.post(web3AdapterConfig.webhook.receiveUrl, {
-                operation: "delete",
-                entityType,
-                data: {
-                    id: event.entity.id,
-                    ownerEname
-                }
-            }, {
-                headers: {
-                    "X-Webhook-Secret": web3AdapterConfig.webhook.secret
-                }
-            });
-        } catch (error) {
-            console.error("Error in afterRemove:", error);
-        }
-    }
-
-    private determineEntityType(entity: any): EntityType {
-        if (entity instanceof User) return "User";
-        if (entity instanceof Post) return "Post";
-        if (entity instanceof Comment) return "Comment";
-        if (entity instanceof Chat) return "Chat";
-        if (entity instanceof Message) return "Message";
-        if (entity instanceof MessageReadStatus) return "MessageReadStatus";
-        throw new Error("Unknown entity type");
-    }
-
-    private determineOwnerEname(entity: any): string {
-        if (entity instanceof User) return entity.ename;
-        if (entity instanceof Post) return entity.author.ename;
-        if (entity instanceof Comment) return entity.author.ename;
-        if (entity instanceof Chat) return entity.participants[0].ename;
-        if (entity instanceof Message) return entity.sender.ename;
-        if (entity instanceof MessageReadStatus) return entity.user.ename;
-        throw new Error("Unknown entity type for owner determination");
-    }
-} 
\ No newline at end of file
diff --git a/platforms/pictique-api/src/web3adapter/types/index.ts b/platforms/pictique-api/src/web3adapter/types/index.ts
deleted file mode 100644
index d13e7bf0..00000000
--- a/platforms/pictique-api/src/web3adapter/types/index.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { web3AdapterConfig } from "../config";
-
-export type EntityType = "User" | "Post" | "Comment" | "Chat" | "Message" | "MessageReadStatus";
-export type GlobalOntologyType = typeof web3AdapterConfig.entityMappings[EntityType];
-
-export interface MetaEnvelopePayload {
-    [key: string]: any;
-}
-
-export interface WebhookPayload {
-    metaEnvelopeId: string;
-    entityType: GlobalOntologyType;
-    operation: "create" | "update" | "delete";
-    payload: MetaEnvelopePayload;
-    timestamp: string;
-    signature: string;
-}
-
-export interface TransformContext {
-    platform: "blabsy" | "pictique";
-    entityType: EntityType;
-    internalId: string;
-    parentMetaEnvelopeId?: string;
-}
-
-export interface eVaultResponse {
-    metaEnvelope: {
-        id: string;
-        ontology: string;
-        parsed: any;
-    };
-    envelopes: Array<{
-        id: string;
-        ontology: string;
-        value: any;
-        valueType: string;
-    }>;
-} 
\ No newline at end of file
diff --git a/platforms/pictique-api/src/web3adapter/watchers/subscriber.ts b/platforms/pictique-api/src/web3adapter/watchers/subscriber.ts
new file mode 100644
index 00000000..f293c27f
--- /dev/null
+++ b/platforms/pictique-api/src/web3adapter/watchers/subscriber.ts
@@ -0,0 +1,302 @@
+import {
+    EventSubscriber,
+    EntitySubscriberInterface,
+    InsertEvent,
+    UpdateEvent,
+    RemoveEvent,
+    ObjectLiteral,
+} from "typeorm";
+import { Web3Adapter } from "../../../../../infrastructure/web3-adapter/src/index";
+import path from "path";
+import dotenv from "dotenv";
+import { AppDataSource } from "../../database/data-source";
+import axios from "axios";
+
+dotenv.config({ path: path.resolve(__dirname, "../../../../../.env") });
+export const adapter = new Web3Adapter({
+    schemasPath: path.resolve(__dirname, "../mappings/"),
+    dbPath: path.resolve(process.env.PICTIQUE_MAPPING_DB_PATH as string),
+    registryUrl: process.env.PUBLIC_REGISTRY_URL as string,
+});
+
+// Map of junction tables to their parent entities
+const JUNCTION_TABLE_MAP = {
+    user_followers: { entity: "User", idField: "user_id" },
+    user_following: { entity: "User", idField: "user_id" },
+    post_likes: { entity: "Post", idField: "post_id" },
+    comment_likes: { entity: "Comment", idField: "comment_id" },
+    chat_participants: { entity: "Chat", idField: "chat_id" },
+};
+
+@EventSubscriber()
+export class PostgresSubscriber implements EntitySubscriberInterface {
+    private adapter: Web3Adapter;
+
+    constructor() {
+        this.adapter = adapter;
+    }
+
+    /**
+     * Called after entity is loaded.
+     */
+    afterLoad(entity: any) {
+        // Handle any post-load processing if needed
+    }
+
+    /**
+     * Called before entity insertion.
+     */
+    beforeInsert(event: InsertEvent<any>) {
+        // Handle any pre-insert processing if needed
+    }
+
+    async enrichEntity(entity: any, tableName: string, tableTarget: any) {
+        try {
+            const enrichedEntity = { ...entity };
+
+            if (entity.author) {
+                const author = await AppDataSource.getRepository(
+                    "User",
+                ).findOne({ where: { id: entity.author.id } });
+                enrichedEntity.author = author;
+            }
+
+            return this.entityToPlain(enrichedEntity);
+        } catch (error) {
+            console.error("Error loading relations:", error);
+            return this.entityToPlain(entity);
+        }
+    }
+
+    /**
+     * Called after entity insertion.
+     */
+    async afterInsert(event: InsertEvent<any>) {
+        let entity = event.entity;
+        console.log("pre - ", entity);
+        if (entity) {
+            entity = (await this.enrichEntity(
+                entity,
+                event.metadata.tableName,
+                event.metadata.target,
+            )) as ObjectLiteral;
+        }
+        this.handleChange(
+            // @ts-ignore
+            entity ?? event.entityId,
+            event.metadata.tableName,
+        );
+    }
+
+    /**
+     * Called before entity update.
+     */
+    beforeUpdate(event: UpdateEvent<any>) {
+        // Handle any pre-update processing if needed
+    }
+
+    /**
+     * Called after entity update.
+     */
+    async afterUpdate(event: UpdateEvent<any>) {
+        let entity = event.entity;
+        if (entity) {
+            entity = (await this.enrichEntity(
+                entity,
+                event.metadata.tableName,
+                event.metadata.target,
+            )) as ObjectLiteral;
+        }
+        this.handleChange(
+            // @ts-ignore
+            entity ?? event.entityId,
+            event.metadata.tableName,
+        );
+    }
+
+    /**
+     * Called before entity removal.
+     */
+    beforeRemove(event: RemoveEvent<any>) {
+        // Handle any pre-remove processing if needed
+    }
+
+    /**
+     * Called after entity removal.
+     */
+    async afterRemove(event: RemoveEvent<any>) {
+        let entity = event.entity;
+        if (entity) {
+            entity = (await this.enrichEntity(
+                entity,
+                event.metadata.tableName,
+                event.metadata.target,
+            )) as ObjectLiteral;
+        }
+        this.handleChange(
+            // @ts-ignore
+            entity ?? event.entityId,
+            event.metadata.tableName,
+        );
+    }
+
+    /**
+     * Process the change and send it to the Web3Adapter
+     */
+    private async handleChange(entity: any, tableName: string): Promise<void> {
+        // Check if this is a junction table
+        if (tableName === "message_read_status") return;
+        // @ts-ignore
+        const junctionInfo = JUNCTION_TABLE_MAP[tableName];
+        if (junctionInfo) {
+            console.log("Processing junction table change:", tableName);
+            await this.handleJunctionTableChange(entity, junctionInfo);
+            return;
+        }
+        // Handle regular entity changes
+        const data = this.entityToPlain(entity);
+        if (!data.id) return;
+
+        setTimeout(async () => {
+            try {
+                if (!this.adapter.lockedIds.includes(entity.id)) {
+                    const envelope = await this.adapter.handleChange({
+                        data,
+                        tableName: tableName.toLowerCase(),
+                    });
+                    this.deliverWebhook(envelope);
+                }
+            } catch (error) {
+                console.error(
+                    `Error processing change for ${tableName}:`,
+                    error,
+                );
+            }
+        }, 2_000);
+    }
+
+    private async deliverWebhook(envelope: Record<string, unknown>) {
+        console.log("sending envelope", envelope);
+        axios
+            .post(
+                new URL(
+                    "/api/webhook",
+                    process.env.PUBLIC_BLABSY_BASE_URL,
+                ).toString(),
+                envelope,
+            )
+            .catch((e) => console.error(e));
+    }
+
+    /**
+     * Handle changes in junction tables by converting them to parent entity changes
+     */
+    private async handleJunctionTableChange(
+        entity: any,
+        junctionInfo: { entity: string; idField: string },
+    ): Promise<void> {
+        try {
+            const parentId = entity[junctionInfo.idField];
+            if (!parentId) {
+                console.error("No parent ID found in junction table change");
+                return;
+            }
+
+            // Get the parent entity repository
+            // GET THE REPOSITORY FROM ENTITY VIA THE MAIN THINGY AND THEN THIS
+            // PART IS TAKEN CARE OF, TEST MESSAGES & CHAT & STUFF TOMORROW
+            const repository = AppDataSource.getRepository(junctionInfo.entity);
+            const parentEntity = await repository.findOne({
+                where: { id: parentId },
+                relations: this.getRelationsForEntity(junctionInfo.entity),
+            });
+
+            if (!parentEntity) {
+                console.error(`Parent entity not found: ${parentId}`);
+                return;
+            }
+
+            // Process the parent entity change
+            setTimeout(async () => {
+                try {
+                    if (!this.adapter.lockedIds.includes(parentId)) {
+                        const envelope = await this.adapter.handleChange({
+                            data: this.entityToPlain(parentEntity),
+                            tableName: junctionInfo.entity.toLowerCase() + "s",
+                        });
+                        this.deliverWebhook(envelope);
+                    }
+                } catch (error) {
+                    console.error(
+                        `Error processing junction table change for ${junctionInfo.entity}:`,
+                        error,
+                    );
+                }
+            }, 2_000);
+        } catch (error) {
+            console.error("Error handling junction table change:", error);
+        }
+    }
+
+    /**
+     * Get the relations that should be loaded for each entity type
+     */
+    private getRelationsForEntity(entityName: string): string[] {
+        switch (entityName) {
+            case "User":
+                return ["followers", "following", "posts", "comments", "chats"];
+            case "Post":
+                return ["author", "likedBy", "comments"];
+            case "Comment":
+                return ["author", "post", "likedBy"];
+            case "Chat":
+                return ["participants", "messages"];
+            default:
+                return [];
+        }
+    }
+
+    /**
+     * Convert TypeORM entity to plain object
+     */
+    private entityToPlain(entity: any): any {
+        if (!entity) return {};
+
+        // If it's already a plain object, return it
+        if (typeof entity !== "object" || entity === null) {
+            return entity;
+        }
+
+        // Handle Date objects
+        if (entity instanceof Date) {
+            return entity.toISOString();
+        }
+
+        // Handle arrays
+        if (Array.isArray(entity)) {
+            return entity.map((item) => this.entityToPlain(item));
+        }
+
+        // Convert entity to plain object
+        const plain: Record<string, unknown> = {};
+        for (const [key, value] of Object.entries(entity)) {
+            // Skip private properties and methods
+            if (key.startsWith("_")) continue;
+
+            // Handle nested objects and arrays
+            if (value && typeof value === "object") {
+                if (Array.isArray(value)) {
+                    plain[key] = value.map((item) => this.entityToPlain(item));
+                } else if (value instanceof Date) {
+                    plain[key] = value.toISOString();
+                } else {
+                    plain[key] = this.entityToPlain(value);
+                }
+            } else {
+                plain[key] = value;
+            }
+        }
+
+        return plain;
+    }
+}
diff --git a/platforms/pictique/package.json b/platforms/pictique/package.json
index f35eb2d6..f8b21b88 100644
--- a/platforms/pictique/package.json
+++ b/platforms/pictique/package.json
@@ -51,6 +51,7 @@
 	},
 	"dependencies": {
 		"-": "^0.0.1",
+		"@sveltejs/adapter-node": "^5.2.12",
 		"D": "^1.0.0",
 		"axios": "^1.6.7",
 		"moment": "^2.30.1",
diff --git a/platforms/pictique/src/lib/fragments/BottomNav/BottomNav.svelte b/platforms/pictique/src/lib/fragments/BottomNav/BottomNav.svelte
index c0dff182..f7e8eaed 100644
--- a/platforms/pictique/src/lib/fragments/BottomNav/BottomNav.svelte
+++ b/platforms/pictique/src/lib/fragments/BottomNav/BottomNav.svelte
@@ -2,9 +2,9 @@
 	import { goto } from '$app/navigation';
 	import { page } from '$app/state';
 	import { Camera, CommentsTwo, Home, Search } from '$lib/icons';
-	import { isNavigatingThroughNav, ownerId } from '$lib/store/store.svelte';
-    import { uploadedImages } from '$lib/store/store.svelte';
-	import { revokeImageUrls } from '$lib/utils';
+	import { isNavigatingThroughNav } from '$lib/store/store.svelte';
+	import { uploadedImages } from '$lib/store/store.svelte';
+	import { getAuthId, revokeImageUrls } from '$lib/utils';
 	import type { HTMLAttributes } from 'svelte/elements';
 
 	interface IBottomNavProps extends HTMLAttributes<HTMLElement> {
@@ -20,9 +20,9 @@
 	let previousTab = $state('home');
 	let _activeTab = $derived(page.url.pathname);
 	let fullPath = $derived(page.url.pathname);
-
 	let imageInput: HTMLInputElement;
-    let images: FileList | null = $state(null);
+	let images: FileList | null = $state(null);
+	let ownerId: string | null = $state(null);
 
 	const handleNavClick = (newTab: string) => {
 		// activeTab = newTab;
@@ -34,9 +34,9 @@
 		previousTab = newTab;
 		if (newTab === 'profile') {
 			goto(`/profile/${ownerId}`);
-		} else if (newTab === "post") {
-            uploadedImages.value = null;
-            imageInput.value = "";
+		} else if (newTab === 'post') {
+			uploadedImages.value = null;
+			imageInput.value = '';
 			imageInput.click();
 		} else {
 			goto(`/${newTab}`);
@@ -44,23 +44,36 @@
 	};
 
 	$effect(() => {
+		ownerId = getAuthId();
 		activeTab = _activeTab.split('/').pop() ?? '';
-		if (images && images.length > 0 && activeTab !== 'post' && previousTab === 'post' && !_activeTab.includes('post/audience')) {
-            if (uploadedImages.value)
-			revokeImageUrls(uploadedImages.value);
-            uploadedImages.value = Array.from(images).map(file => ({
-                url: URL.createObjectURL(file),
-                alt: file.name
-            }));
+		if (
+			images &&
+			images.length > 0 &&
+			activeTab !== 'post' &&
+			previousTab === 'post' &&
+			!_activeTab.includes('post/audience')
+		) {
+			if (uploadedImages.value) revokeImageUrls(uploadedImages.value);
+			uploadedImages.value = Array.from(images).map((file) => ({
+				url: URL.createObjectURL(file),
+				alt: file.name
+			}));
 			images = null; // To prevent re-triggering the effect and thus making an infinite loop with /post route's effect when the length of uploadedImages goes to 0
-            if (uploadedImages.value.length > 0) {
-                goto("/post");
-            }
+			if (uploadedImages.value.length > 0) {
+				goto('/post');
+			}
 		}
 	});
 </script>
 
-<input type="file" accept="image/*" multiple bind:files={images} bind:this={imageInput} class="hidden" />
+<input
+	type="file"
+	accept="image/*"
+	multiple
+	bind:files={images}
+	bind:this={imageInput}
+	class="hidden"
+/>
 <!-- svelte-ignore a11y_no_noninteractive_element_to_interactive_role -->
 <nav
 	aria-label="Main navigation"
diff --git a/platforms/pictique/src/lib/fragments/Comment/Comment.svelte b/platforms/pictique/src/lib/fragments/Comment/Comment.svelte
index 86a5a068..42b0eb55 100644
--- a/platforms/pictique/src/lib/fragments/Comment/Comment.svelte
+++ b/platforms/pictique/src/lib/fragments/Comment/Comment.svelte
@@ -28,49 +28,6 @@
 		</div>
 	</div>
 	<div class="ms-12 mt-2 flex items-center gap-2">
-		<button
-			onclick={() => {
-				if (!comment.isUpVoted) {
-					comment.upVotes++;
-					comment.isUpVoted = true;
-					comment.isDownVoted = false;
-				}
-			}}
-		>
-			<Like
-				size="18px"
-				color={comment.isUpVoted
-					? 'var(--color-brand-burnt-orange)'
-					: 'var(--color-black-600)'}
-				fill={comment.isUpVoted
-					? 'var(--color-brand-burnt-orange)'
-					: 'var(--color-black-600)'}
-			/>
-		</button>
-		<p class="text-black-600 font-semibold">{comment.upVotes}</p>
-		<button
-			onclick={() => {
-				if (!comment.isDownVoted) {
-					comment.upVotes--;
-					comment.isDownVoted = true;
-					comment.isUpVoted = false;
-				}
-			}}
-		>
-			<Like
-				size="18px"
-				color={comment.isDownVoted
-					? 'var(--color-brand-burnt-orange)'
-					: 'var(--color-black-600)'}
-				fill={comment.isDownVoted
-					? 'var(--color-brand-burnt-orange)'
-					: 'var(--color-black-600)'}
-				class="rotate-180"
-			/>
-		</button>
-		<span class="bg-black-600 inline-block h-1 w-1 rounded-full"></span>
-		<button onclick={handleReply} class="text-black-600 font-semibold">Reply</button>
-		<span class="bg-black-600 inline-block h-1 w-1 rounded-full"></span>
 		<p class="text-black-600">{comment.time}</p>
 	</div>
 	{#if comment?.replies?.length}
diff --git a/platforms/pictique/src/lib/fragments/CreatePostModal/CreatePostModal.svelte b/platforms/pictique/src/lib/fragments/CreatePostModal/CreatePostModal.svelte
index 67c14581..51366482 100644
--- a/platforms/pictique/src/lib/fragments/CreatePostModal/CreatePostModal.svelte
+++ b/platforms/pictique/src/lib/fragments/CreatePostModal/CreatePostModal.svelte
@@ -51,13 +51,14 @@
 			<button
 				type="button"
 				class="rounded-full p-2 hover:bg-gray-100"
-				on:click={closeCreatePostModal}
+				onclick={closeCreatePostModal}
 			>
 				✕
 			</button>
 		</div>
 
 		<div class="mb-4">
+			<!-- svelte-ignore element_invalid_self_closing_tag -->
 			<textarea
 				bind:value={text}
 				placeholder="What's on your mind?"
@@ -70,6 +71,7 @@
 			<div class="mb-4 grid grid-cols-2 gap-4">
 				{#each images as image, index}
 					<div class="relative">
+						<!-- svelte-ignore a11y_img_redundant_alt -->
 						<img
 							src={image}
 							alt="Post image"
@@ -78,7 +80,7 @@
 						<button
 							type="button"
 							class="absolute top-2 right-2 rounded-full bg-black/50 p-1 text-white hover:bg-black/70"
-							on:click={() => removeImage(index)}
+							onclick={() => removeImage(index)}
 						>
 							✕
 						</button>
@@ -87,14 +89,17 @@
 			</div>
 		{/if}
 
-		<div class="flex items-center justify-between">
-			<label class="cursor-pointer rounded-lg bg-gray-100 px-4 py-2 hover:bg-gray-200">
-				<input type="file" accept="image/*" class="hidden" on:change={handleImageUpload} />
+		<div class="flex items-center justify-between gap-2">
+			<label
+				class="w-full cursor-pointer rounded-full bg-gray-100 px-4 py-3 text-center hover:bg-gray-200"
+			>
+				<input type="file" accept="image/*" class="hidden" onchange={handleImageUpload} />
 				Add Photo
 			</label>
 
 			<Button
 				variant="secondary"
+				size="sm"
 				callback={handleSubmit}
 				isLoading={isSubmitting}
 				disabled={!text.trim() && images.length === 0}
diff --git a/platforms/pictique/src/lib/fragments/InputFile/InputFile.svelte b/platforms/pictique/src/lib/fragments/InputFile/InputFile.svelte
index 14e80402..fad01660 100644
--- a/platforms/pictique/src/lib/fragments/InputFile/InputFile.svelte
+++ b/platforms/pictique/src/lib/fragments/InputFile/InputFile.svelte
@@ -26,7 +26,7 @@
 
 <label
 	for={uniqueId}
-	class="bg-grey text-black-400 font-geist rounded-4xl flex h-[158px] w-full items-center justify-center text-base font-normal"
+	class="bg-grey text-black-400 font-geist flex h-[158px] w-full items-center justify-center rounded-4xl text-base font-normal"
 >
 	{#if files}
 		<div class="flex flex-col items-center gap-2">
diff --git a/platforms/pictique/src/lib/fragments/MessageInput/MessageInput.svelte b/platforms/pictique/src/lib/fragments/MessageInput/MessageInput.svelte
index 200bd0b7..62bf1000 100644
--- a/platforms/pictique/src/lib/fragments/MessageInput/MessageInput.svelte
+++ b/platforms/pictique/src/lib/fragments/MessageInput/MessageInput.svelte
@@ -52,7 +52,7 @@
 	<!-- svelte-ignore a11y_click_events_have_key_events -->
 	<!-- svelte-ignore a11y_no_static_element_interactions -->
 	<div
-		class="bg-grey h-13 w-13 flex aspect-square items-center justify-center rounded-full"
+		class="bg-grey flex aspect-square h-13 w-13 items-center justify-center rounded-full"
 		onclick={handleSend}
 	>
 		<HugeiconsIcon size="24px" icon={SentIcon} color="var(--color-black-400)" />
diff --git a/platforms/pictique/src/lib/fragments/Post/Post.svelte b/platforms/pictique/src/lib/fragments/Post/Post.svelte
index 7e26dcb1..0b785104 100644
--- a/platforms/pictique/src/lib/fragments/Post/Post.svelte
+++ b/platforms/pictique/src/lib/fragments/Post/Post.svelte
@@ -12,14 +12,15 @@
 	} from '@hugeicons/core-free-icons';
 	import { HugeiconsIcon } from '@hugeicons/svelte';
 	import type { HTMLAttributes } from 'svelte/elements';
+	import ActionMenu from '../ActionMenu/ActionMenu.svelte';
 
 	interface IPostProps extends HTMLAttributes<HTMLElement> {
 		avatar: string;
 		username: string;
-		userId: string;
+		userId?: string;
 		imgUris: string[];
-		caption: string;
-		count: {
+		text: string;
+		count?: {
 			likes: number;
 			comments: number;
 		};
@@ -29,39 +30,49 @@
 			comment: () => void;
 		};
 		time: string;
+		options?: Array<{ name: string; handler: () => void }>;
 	}
 
 	function pairAndJoinChunks(chunks: string[]): string[] {
 		const result: string[] = [];
 
+		console.log('chunks', chunks);
 		for (let i = 0; i < chunks.length; i += 2) {
 			const dataPart = chunks[i];
 			const chunkPart = chunks[i + 1];
 
 			if (dataPart && chunkPart) {
-				result.push(dataPart + ',' + chunkPart);
+				if (dataPart.startsWith('data:')) {
+					result.push(dataPart + ',' + chunkPart);
+				} else {
+					result.push(dataPart);
+					result.push(chunkPart);
+				}
 			} else {
+				if (!dataPart.startsWith('data:')) result.push(dataPart);
 				console.warn(`Skipping incomplete pair at index ${i}`);
 			}
 		}
+		console.log('result', result);
 
 		return result;
 	}
 
 	const {
 		avatar,
+		userId,
 		username,
 		imgUris: uris,
 		text,
 		count,
 		callback,
 		time,
+		options,
 		...restProps
 	}: IPostProps = $props();
 
-	let imgUris = $derived.by(() => pairAndJoinChunks(uris));
-
-	let galleryRef: HTMLDivElement;
+	let imgUris = $derived(pairAndJoinChunks(uris));
+	let galleryRef: HTMLDivElement | undefined = $state();
 	let currentIndex = $state(0);
 
 	function scrollLeft() {
@@ -101,12 +112,7 @@
 				></Avatar>
 				<h2>{username}</h2>
 			</div>
-			<button
-				onclick={callback.menu}
-				class="cursor-pointer rounded-full p-2 hover:bg-gray-100"
-			>
-				<HugeiconsIcon icon={MoreVerticalIcon} size={24} color="var(--color-black-500)" />
-			</button>
+			<ActionMenu {options} />
 		</div>
 	{/if}
 	{#if imgUris.length > 0}
diff --git a/platforms/pictique/src/lib/fragments/Profile/Profile.svelte b/platforms/pictique/src/lib/fragments/Profile/Profile.svelte
index 661c9f71..2a61ee9f 100644
--- a/platforms/pictique/src/lib/fragments/Profile/Profile.svelte
+++ b/platforms/pictique/src/lib/fragments/Profile/Profile.svelte
@@ -3,28 +3,36 @@
 	import type { userProfile, PostData } from '$lib/types';
 	import Post from '../Post/Post.svelte';
 
-	export let variant: 'user' | 'other' = 'user';
-	export let profileData: userProfile;
-	export let handleSinglePost: (post: PostData) => void;
-	export let handleFollow: () => Promise<void>;
-	export let handleMessage: () => Promise<void>;
+	let {
+		variant = 'user',
+		profileData,
+		handleSinglePost,
+		handleFollow,
+		handleMessage
+	}: {
+		variant: 'user' | 'other';
+		profileData: userProfile;
+		handleSinglePost: (post: PostData) => void;
+		handleFollow: () => Promise<void>;
+		handleMessage: () => Promise<void>;
+	} = $props();
 </script>
 
 <div class="flex flex-col gap-4 p-4">
 	<div class="flex items-center gap-4">
 		<img
-			src={profileData.avatar ?? 'https://picsum.photos/200/200'}
+			src={profileData.avatarUrl || 'https://picsum.photos/200/200'}
 			alt={profileData.username}
 			class="h-20 w-20 rounded-full object-cover"
 		/>
 		<div class="flex-1">
-			<h2 class="text-xl font-semibold">{profileData.username}</h2>
-			<p class="text-gray-600">{profileData.userBio}</p>
+			<h2 class="text-xl font-semibold">{profileData?.handle}</h2>
+			<p class="text-gray-600">{profileData?.description}</p>
 		</div>
 		{#if variant === 'other'}
 			<div class="flex gap-2">
-				<Button variant="primary" callback={handleFollow}>Follow</Button>
-				<Button variant="primary" callback={handleMessage}>Message</Button>
+				<Button variant="primary" size="sm" callback={handleFollow}>Follow</Button>
+				<Button variant="primary" size="sm" callback={handleMessage}>Message</Button>
 			</div>
 		{/if}
 	</div>
@@ -46,13 +54,13 @@
 
 	<div class="grid grid-cols-3 gap-1">
 		{#each profileData.posts.filter((e) => e.imgUris && e.imgUris.length > 0) as post}
-			<li class="mb-6">
+			<li class="mb-6 list-none">
 				<Post
-					avatar={'https://picsum.photos/200/200'}
+					avatar={profileData.avatarUrl || 'https://picsum.photos/200/200'}
 					username={profileData?.username}
 					imgUris={post.imgUris ?? []}
-					text={post.text}
-					time={new Date(post.createdAt).toLocaleDateString()}
+					text={post.caption}
+					time={post.time ? new Date(post.time).toLocaleDateString() : ''}
 					callback={{
 						like: async () => {
 							try {
diff --git a/platforms/pictique/src/lib/fragments/SettingsNavigationButton/SettingsNavigationButton.svelte b/platforms/pictique/src/lib/fragments/SettingsNavigationButton/SettingsNavigationButton.svelte
index fda243ca..1461331e 100644
--- a/platforms/pictique/src/lib/fragments/SettingsNavigationButton/SettingsNavigationButton.svelte
+++ b/platforms/pictique/src/lib/fragments/SettingsNavigationButton/SettingsNavigationButton.svelte
@@ -38,7 +38,7 @@
 			<img
 				width="24px"
 				height="24px"
-				class="flex aspect-square size-10 items-center justify-center rounded-full md:size-12"
+				class="flex aspect-square size-10 items-center justify-center rounded-full object-cover md:size-12"
 				src={profileSrc}
 				alt=""
 			/>
diff --git a/platforms/pictique/src/lib/fragments/SideBar/SideBar.svelte b/platforms/pictique/src/lib/fragments/SideBar/SideBar.svelte
index 51897fd9..b97317c7 100644
--- a/platforms/pictique/src/lib/fragments/SideBar/SideBar.svelte
+++ b/platforms/pictique/src/lib/fragments/SideBar/SideBar.svelte
@@ -4,8 +4,9 @@
 	import { goto } from '$app/navigation';
 	import { page } from '$app/state';
 	import Button from '$lib/ui/Button/Button.svelte';
-	import { cn } from '$lib/utils';
-	import { ownerId } from '$lib/store/store.svelte';
+	import { cn, getAuthId } from '$lib/utils';
+
+	let ownerId: string | null = $state(null);
 
 	interface ISideBarProps extends HTMLAttributes<HTMLElement> {
 		activeTab?: string;
@@ -20,6 +21,7 @@
 	}: ISideBarProps = $props();
 
 	$effect(() => {
+		ownerId = getAuthId();
 		const pathname = page.url.pathname;
 		if (pathname.includes('/home')) {
 			activeTab = 'home';
@@ -142,14 +144,13 @@
 				Settings
 			</h3>
 		</button>
-
 		<button
 			type="button"
 			class="flex items-center gap-2"
 			aria-current={activeTab === 'profile' ? 'page' : undefined}
 			onclick={() => {
 				activeTab = 'profile';
-				goto(`/profile/${ownerId.value}`);
+				goto(`/profile/${ownerId}`);
 			}}
 		>
 			<span
@@ -158,8 +159,8 @@
 				<img
 					width="24px"
 					height="24px"
-					class="aspect-square rounded-full"
-					src={'https://picsum.photos/200/200'}
+					class="aspect-square rounded-full object-cover"
+					src={profileSrc || 'https://picsum.photos/200/200'}
 					alt="profile"
 				/>
 			</span>
diff --git a/platforms/pictique/src/lib/fragments/UploadedPostView/UploadedPostView.svelte b/platforms/pictique/src/lib/fragments/UploadedPostView/UploadedPostView.svelte
index e3f22655..79f7a265 100644
--- a/platforms/pictique/src/lib/fragments/UploadedPostView/UploadedPostView.svelte
+++ b/platforms/pictique/src/lib/fragments/UploadedPostView/UploadedPostView.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
 	import { Cross } from '$lib/icons';
-    import type { Image } from '$lib/types';
+	import type { Image } from '$lib/types';
 	import { cn } from '$lib/utils';
 	import type { HTMLAttributes } from 'svelte/elements';
 
-
 	interface IUploadedPostViewProps extends HTMLAttributes<HTMLElement> {
 		images: Image[];
 		width?: string;
@@ -23,12 +22,17 @@
 
 <article
 	{...restProps}
-	class={cn(['pl-0.5 pr-4 max-w-screen flex flex-row items-center gap-4 overflow-x-auto min-h-max', restProps.class].join(' '))}
+	class={cn(
+		[
+			'flex min-h-max max-w-screen flex-row items-center gap-4 overflow-x-auto pr-4 pl-0.5',
+			restProps.class
+		].join(' ')
+	)}
 >
 	{#each images as image, i}
-		<div class={cn(['group relative shrink-0 mt-3 mb-2'])}>
+		<div class={cn(['group relative mt-3 mb-2 shrink-0'])}>
 			<Cross
-				class="absolute right-0 top-0 hidden -translate-y-1/2 translate-x-1/2 cursor-pointer group-hover:block"
+				class="absolute top-0 right-0 hidden translate-x-1/2 -translate-y-1/2 cursor-pointer group-hover:block"
 				onclick={() => callback(i)}
 			/>
 			<img
diff --git a/platforms/pictique/src/lib/fragments/UserRequest/UserRequest.svelte b/platforms/pictique/src/lib/fragments/UserRequest/UserRequest.svelte
index 7e67fd6b..41881a38 100644
--- a/platforms/pictique/src/lib/fragments/UserRequest/UserRequest.svelte
+++ b/platforms/pictique/src/lib/fragments/UserRequest/UserRequest.svelte
@@ -26,9 +26,6 @@
 			<p class="text-black-600">{description}</p>
 		</div>
 	</div>
-	<Button class="max-w-[100px]" variant="secondary" size="sm" callback={handleFollow}
-		>Follow</Button
-	>
 </article>
 
 <!--
diff --git a/platforms/pictique/src/lib/store/store.svelte.ts b/platforms/pictique/src/lib/store/store.svelte.ts
index 7a219adf..1a090e49 100644
--- a/platforms/pictique/src/lib/store/store.svelte.ts
+++ b/platforms/pictique/src/lib/store/store.svelte.ts
@@ -1,25 +1,26 @@
-import type { Image, PostData } from "$lib/types";
+import type { Image, PostData } from '$lib/types';
 
 export const isNavigatingThroughNav = $state({
-    value: false,
+	value: false
 });
 
 export const showComments = $state({
-    value: false,
+	value: false
 });
 
 export const ownerId = $state({
-    value: "1",
+	value: '1'
 });
 
 export const selectedPost: { value: PostData | null } = $state({
-    value: null,
+	value: null
 });
 
 export const uploadedImages: { value: Image[] | null } = $state({
-    value: null,
+	value: null
 });
 
 export const audience: { value: string } = $state({
-    value: "Everyone",
+	value: 'Everyone'
 });
+
diff --git a/platforms/pictique/src/lib/stores/auth.ts b/platforms/pictique/src/lib/stores/auth.ts
index 0225c01d..18ac776f 100644
--- a/platforms/pictique/src/lib/stores/auth.ts
+++ b/platforms/pictique/src/lib/stores/auth.ts
@@ -1,24 +1,25 @@
 import { writable } from 'svelte/store';
-import { apiClient, setAuthToken, removeAuthToken } from '$lib/utils/axios';
+import { apiClient, setAuthToken, removeAuthToken, removeAuthId } from '$lib/utils/axios';
 
 export const isAuthenticated = writable(false);
 
 export const initializeAuth = () => {
-    const token = localStorage.getItem('pictique_auth_token');
-    if (token) {
-        apiClient.defaults.headers.common['Authorization'] = `Bearer ${token}`;
-        isAuthenticated.set(true);
-    }
+	const token = localStorage.getItem('pictique_auth_token');
+	if (token) {
+		apiClient.defaults.headers.common['Authorization'] = `Bearer ${token}`;
+		isAuthenticated.set(true);
+	}
 };
 
 export const login = (token: string) => {
-    setAuthToken(token);
-    apiClient.defaults.headers.common['Authorization'] = `Bearer ${token}`;
-    isAuthenticated.set(true);
+	setAuthToken(token);
+	apiClient.defaults.headers.common['Authorization'] = `Bearer ${token}`;
+	isAuthenticated.set(true);
 };
 
 export const logout = () => {
-    removeAuthToken();
-    delete apiClient.defaults.headers.common['Authorization'];
-    isAuthenticated.set(false);
-}; 
\ No newline at end of file
+	removeAuthToken();
+	removeAuthId();
+	delete apiClient.defaults.headers.common['Authorization'];
+	isAuthenticated.set(false);
+};
diff --git a/platforms/pictique/src/lib/stores/comments.ts b/platforms/pictique/src/lib/stores/comments.ts
index 36af8fe9..d1839bc9 100644
--- a/platforms/pictique/src/lib/stores/comments.ts
+++ b/platforms/pictique/src/lib/stores/comments.ts
@@ -2,15 +2,15 @@ import { writable } from 'svelte/store';
 import { apiClient } from '$lib/utils/axios';
 
 export interface Comment {
-    id: string;
-    text: string;
-    createdAt: string;
-    author: {
-        id: string;
-        handle: string;
-        name: string;
-        avatarUrl: string;
-    };
+	id: string;
+	text: string;
+	createdAt: string;
+	author: {
+		id: string;
+		handle: string;
+		name: string;
+		avatarUrl: string;
+	};
 }
 
 export const comments = writable<Comment[]>([]);
@@ -19,29 +19,29 @@ export const error = writable<string | null>(null);
 export const activePostId = writable<string | null>();
 
 export const fetchComments = async (postId: string) => {
-    try {
-        isLoading.set(true);
-        error.set(null);
-        const response = await apiClient.get(`/api/posts/${postId}/comments`);
-        comments.set(response.data);
-    } catch (err) {
-        error.set(err instanceof Error ? err.message : 'Failed to fetch comments');
-    } finally {
-        isLoading.set(false);
-    }
+	try {
+		isLoading.set(true);
+		error.set(null);
+		const response = await apiClient.get(`/api/posts/${postId}/comments`);
+		comments.set(response.data);
+	} catch (err) {
+		error.set(err instanceof Error ? err.message : 'Failed to fetch comments');
+	} finally {
+		isLoading.set(false);
+	}
 };
 
 export const createComment = async (postId: string, text: string) => {
-    try {
-        isLoading.set(true);
-        error.set(null);
-        const response = await apiClient.post('/api/comments', { postId, text });
-        await fetchComments(postId); // Refresh comments after creating
-        return response.data;
-    } catch (err) {
-        error.set(err instanceof Error ? err.message : 'Failed to create comment');
-        throw err;
-    } finally {
-        isLoading.set(false);
-    }
+	try {
+		isLoading.set(true);
+		error.set(null);
+		const response = await apiClient.post('/api/comments', { postId, text });
+		await fetchComments(postId); // Refresh comments after creating
+		return response.data;
+	} catch (err) {
+		error.set(err instanceof Error ? err.message : 'Failed to create comment');
+		throw err;
+	} finally {
+		isLoading.set(false);
+	}
 };
diff --git a/platforms/pictique/src/lib/stores/posts.ts b/platforms/pictique/src/lib/stores/posts.ts
index 5743f76a..bb653d14 100644
--- a/platforms/pictique/src/lib/stores/posts.ts
+++ b/platforms/pictique/src/lib/stores/posts.ts
@@ -1,5 +1,6 @@
 import { writable } from 'svelte/store';
 import { apiClient } from '$lib/utils/axios';
+import { goto } from '$app/navigation';
 
 export interface Post {
     id: string;
@@ -34,7 +35,7 @@ export const isCreatePostModalOpen = writable(false);
 export const openCreatePostModal = () => isCreatePostModalOpen.set(true);
 export const closeCreatePostModal = () => isCreatePostModalOpen.set(false);
 
-export const fetchFeed = async (page = 1, limit = 10) => {
+export const fetchFeed = async (page = 1, limit = 10_000) => {
     try {
         isLoading.set(true);
         error.set(null);
diff --git a/platforms/pictique/src/lib/stores/users.ts b/platforms/pictique/src/lib/stores/users.ts
index bad67bee..5ca291ca 100644
--- a/platforms/pictique/src/lib/stores/users.ts
+++ b/platforms/pictique/src/lib/stores/users.ts
@@ -2,12 +2,12 @@ import { writable } from 'svelte/store';
 import { apiClient } from '$lib/utils/axios';
 
 export interface User {
-    id: string;
-    handle: string;
-    name: string;
-    description: string;
-    avatarUrl: string;
-    isVerified: boolean;
+	id: string;
+	handle: string;
+	name: string;
+	description: string;
+	avatarUrl: string;
+	isVerified: boolean;
 }
 
 export const searchResults = writable<User[]>([]);
@@ -15,30 +15,30 @@ export const isSearching = writable(false);
 export const searchError = writable<string | null>(null);
 
 export const searchUsers = async (query: string) => {
-    if (!query.trim()) {
-        searchResults.set([]);
-        return;
-    }
+	if (!query.trim()) {
+		searchResults.set([]);
+		return;
+	}
 
-    try {
-        isSearching.set(true);
-        searchError.set(null);
-        const response = await apiClient.get(`/api/users/search?q=${encodeURIComponent(query)}`);
-        searchResults.set(response.data);
-    } catch (err) {
-        searchError.set(err instanceof Error ? err.message : 'Failed to search users');
-        searchResults.set([]);
-    } finally {
-        isSearching.set(false);
-    }
+	try {
+		isSearching.set(true);
+		searchError.set(null);
+		const response = await apiClient.get(`/api/users/search?q=${encodeURIComponent(query)}`);
+		searchResults.set(response.data);
+	} catch (err) {
+		searchError.set(err instanceof Error ? err.message : 'Failed to search users');
+		searchResults.set([]);
+	} finally {
+		isSearching.set(false);
+	}
 };
 
 export const followUser = async (followingId: string) => {
-    try {
-        await apiClient.post('/api/users/follow', { followingId });
-        return true;
-    } catch (err) {
-        console.error('Failed to follow user:', err);
-        return false;
-    }
-}; 
\ No newline at end of file
+	try {
+		await apiClient.post('/api/users/follow', { followingId });
+		return true;
+	} catch (err) {
+		console.error('Failed to follow user:', err);
+		return false;
+	}
+};
diff --git a/platforms/pictique/src/lib/types.ts b/platforms/pictique/src/lib/types.ts
index 8ab5647f..b21b4334 100644
--- a/platforms/pictique/src/lib/types.ts
+++ b/platforms/pictique/src/lib/types.ts
@@ -18,6 +18,7 @@ export type CommentType = {
 };
 
 export type PostData = {
+	createdAt: string | number | Date;
     id: string;
     avatar: string;
     userId: string;
@@ -34,7 +35,7 @@ export type PostData = {
 export type userProfile = {
     userId: string;
     username: string;
-    avatar: string;
+    avatarUrl: string;
     totalPosts: number;
     followers: number;
     following: number;
diff --git a/platforms/pictique/src/lib/ui/Avatar/Avatar.svelte b/platforms/pictique/src/lib/ui/Avatar/Avatar.svelte
index 768136ee..0c8545c3 100644
--- a/platforms/pictique/src/lib/ui/Avatar/Avatar.svelte
+++ b/platforms/pictique/src/lib/ui/Avatar/Avatar.svelte
@@ -18,7 +18,7 @@
 	};
 
 	const classes = $derived({
-		common: cn('rounded-full'),
+		common: cn('rounded-full object-cover aspect-[1]'),
 		size: sizeVariant[size] || sizeVariant.md
 	});
 </script>
diff --git a/platforms/pictique/src/lib/utils/axios.ts b/platforms/pictique/src/lib/utils/axios.ts
index 9c1585d8..275f9977 100644
--- a/platforms/pictique/src/lib/utils/axios.ts
+++ b/platforms/pictique/src/lib/utils/axios.ts
@@ -3,25 +3,44 @@ import { PUBLIC_PICTIQUE_BASE_URL } from '$env/static/public';
 
 const TOKEN_KEY = 'pictique_auth_token';
 
+let headers: Record<string, any> = {
+    'Content-Type': 'application/json'
+};
+if (getAuthToken()) {
+    headers.authorization = `Bearer ${getAuthToken()}`;
+}
+
 // Create axios instance with base configuration
 export const apiClient: AxiosInstance = axios.create({
     baseURL: PUBLIC_PICTIQUE_BASE_URL,
-    headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${localStorage.getItem(TOKEN_KEY)}`
-    }
+    headers
 });
 
 // Utility function to store auth token
 export const setAuthToken = (token: string): void => {
     localStorage.setItem(TOKEN_KEY, token);
+    window.location.href = '/home';
 };
 
-export const getAuthToken = () => {
+export function getAuthToken() {
     return localStorage.getItem(TOKEN_KEY);
-};
+}
 
 // Utility function to remove auth token
 export const removeAuthToken = (): void => {
     localStorage.removeItem(TOKEN_KEY);
 };
+
+// Utility function to store auth id
+export const setAuthId = (id: string): void => {
+    localStorage.setItem('ownerId', id);
+};
+
+export const getAuthId = () => {
+    return localStorage.getItem('ownerId');
+};
+
+// Utility function to remove auth token
+export const removeAuthId = (): void => {
+    localStorage.removeItem('ownerId');
+};
diff --git a/platforms/pictique/src/routes/(auth)/auth/+page.svelte b/platforms/pictique/src/routes/(auth)/auth/+page.svelte
index 5d7c49f6..092a077e 100644
--- a/platforms/pictique/src/routes/(auth)/auth/+page.svelte
+++ b/platforms/pictique/src/routes/(auth)/auth/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Qr } from '$lib/ui';
 	import { onMount } from 'svelte';
-	import { apiClient, setAuthToken } from '$lib/utils';
+	import { apiClient, setAuthId, setAuthToken } from '$lib/utils';
 	import { PUBLIC_PICTIQUE_BASE_URL } from '$env/static/public';
 	import { goto } from '$app/navigation';
 
@@ -21,6 +21,8 @@
 
 			eventSource.onmessage = function (e) {
 				const data = JSON.parse(e.data);
+				const {user} =  data
+				setAuthId(user.id);
 				const { token } = data;
 				setAuthToken(token);
 				goto('/home');
diff --git a/platforms/pictique/src/routes/(protected)/+layout.svelte b/platforms/pictique/src/routes/(protected)/+layout.svelte
index 06ecf5ba..6658d67a 100644
--- a/platforms/pictique/src/routes/(protected)/+layout.svelte
+++ b/platforms/pictique/src/routes/(protected)/+layout.svelte
@@ -5,17 +5,24 @@
 	import { openCreatePostModal, isCreatePostModalOpen } from '$lib/stores/posts';
 	import { comments, fetchComments, createComment, activePostId } from '$lib/stores/comments';
 	import CreatePostModal from '$lib/fragments/CreatePostModal/CreatePostModal.svelte';
+	import { onMount } from 'svelte';
+	import { apiClient, getAuthId, getAuthToken } from '$lib/utils';
+	import type { userProfile } from '$lib/types';
+	import { heading } from '../store';
+	import { goto } from '$app/navigation';
+	import type { AxiosError } from 'axios';
 
 	let { children } = $props();
-
+	let ownerId: string | null = $state(null);
 	let route = $derived(page.url.pathname);
-	let heading = $state('');
+
 	let commentValue: string = $state('');
 	let commentInput: HTMLInputElement | undefined = $state();
 	let activeReplyToId: string | null = $state(null);
 	let idFromParams = $state();
 	let isCommentsLoading = $state(false);
 	let commentsError = $state<string | null>(null);
+	let profile = $state<userProfile | null>(null);
 
 	const handleSend = async () => {
 		console.log($activePostId, commentValue);
@@ -34,26 +41,25 @@
 		idFromParams = page.params.id;
 
 		if (route.includes('home')) {
-			heading = 'Feed';
+			heading.set('Feed');
 		} else if (route.includes('discover')) {
-			heading = 'Search';
+			heading.set('Search');
 		} else if (route.includes('/post/audience')) {
-			heading = 'Audience';
+			heading.set('Audience');
 		} else if (route.includes('post')) {
-			heading = 'Upload photo';
-		} else if (route === `/messages/${idFromParams}`) {
-			heading = 'User Name';
-		} else if (route.includes('messages')) {
-			heading = 'Messages';
+			heading.set('Upload photo');
+		} else if (route === '/messages') {
+			heading.set('Messages');
 		} else if (route.includes('settings')) {
-			heading = 'Settings';
+			heading.set('Settings');
 		} else if (route.includes('profile')) {
-			heading = 'Profile';
+			heading.set('Profile');
 		}
 	});
 
 	// Watch for changes in showComments to fetch comments when opened
 	$effect(() => {
+		ownerId = getAuthId();
 		if (showComments.value && activePostId) {
 			isCommentsLoading = true;
 			commentsError = null;
@@ -66,13 +72,32 @@
 				});
 		}
 	});
+
+	async function fetchProfile() {
+		try {
+			if (!getAuthToken()) {
+				goto('/auth');
+			}
+			const response = await apiClient.get(`/api/users/${ownerId}`).catch((e: AxiosError) => {
+				if (e.response?.status === 401) {
+					goto('/auth');
+				}
+			});
+			if (!response) return;
+			profile = response.data;
+		} catch (err) {
+			console.log(err instanceof Error ? err.message : 'Failed to load profile');
+		}
+	}
+
+	onMount(fetchProfile);
 </script>
 
 <main
-	class={`block h-[100dvh] ${route !== '/home' && route !== '/messages' && route !== '/profile' && route !== '/settings' && !route.includes('/profile') ? 'grid-cols-[20vw_auto]' : 'grid-cols-[20vw_auto_30vw]'} md:grid`}
+	class={`block h-[100dvh] ${route !== '/home' && route !== '/messages' && route !== '/profile' && !route.includes('settings') && !route.includes('/profile') ? 'grid-cols-[20vw_auto]' : 'grid-cols-[20vw_auto_30vw]'} md:grid`}
 >
 	<SideBar
-		profileSrc="https://picsum.photos/200"
+		profileSrc={profile?.avatarUrl}
 		handlePost={async () => {
 			openCreatePostModal();
 		}}
@@ -85,7 +110,7 @@
 					: route.includes('profile')
 						? 'tertiary'
 						: 'primary'}
-				{heading}
+				heading={$heading}
 				isCallBackNeeded={route.includes('profile')}
 				callback={() => alert('Ads')}
 				options={[
@@ -136,7 +161,7 @@
 						<MessageInput
 							class="sticky start-0 bottom-4 mt-4 w-full px-2"
 							variant="comment"
-							src="https://picsum.photos/200/200"
+							src={profile?.avatarUrl || 'https://picsum.photos/200/200'}
 							bind:value={commentValue}
 							{handleSend}
 							bind:input={commentInput}
@@ -148,7 +173,7 @@
 	{/if}
 
 	{#if route !== `/messages/${idFromParams}`}
-		<BottomNav class="btm-nav" profileSrc="https://picsum.photos/200" />
+		<BottomNav class="btm-nav" profileSrc={profile?.avatarUrl ?? ''} />
 	{/if}
 </main>
 
diff --git a/platforms/pictique/src/routes/(protected)/discover/+page.svelte b/platforms/pictique/src/routes/(protected)/discover/+page.svelte
index b95f5748..5f587bcd 100644
--- a/platforms/pictique/src/routes/(protected)/discover/+page.svelte
+++ b/platforms/pictique/src/routes/(protected)/discover/+page.svelte
@@ -39,6 +39,10 @@
 			clearTimeout(debounceTimer);
 		};
 	});
+
+	$effect(() => {
+		console.log($searchResults);
+	})
 </script>
 
 <section class="w-full max-w-[500px]">
@@ -60,7 +64,7 @@
 			{#each $searchResults as user}
 				<li>
 					<UserRequest
-						userImgSrc={user.avatarUrl || 'https://picsum.photos/200'}
+						userImgSrc={user.avatarUrl}
 						userName={user.name || user.handle}
 						description={user.description || ''}
 						handleFollow={() => handleFollow(user.id)}
diff --git a/platforms/pictique/src/routes/(protected)/home/+page.svelte b/platforms/pictique/src/routes/(protected)/home/+page.svelte
index 3e33b5e1..1f681f55 100644
--- a/platforms/pictique/src/routes/(protected)/home/+page.svelte
+++ b/platforms/pictique/src/routes/(protected)/home/+page.svelte
@@ -3,17 +3,23 @@
 	import { onMount } from 'svelte';
 	import type { CupertinoPane } from 'cupertino-pane';
 	import { Comment, MessageInput } from '$lib/fragments';
-	import type { CommentType } from '$lib/types';
+	import type { userProfile } from '$lib/types';
 	import { showComments } from '$lib/store/store.svelte';
 	import { posts, isLoading, error, fetchFeed, toggleLike } from '$lib/stores/posts';
-	import { activePostId } from '$lib/stores/comments';
+	import { activePostId, comments, createComment, fetchComments } from '$lib/stores/comments';
+	import { apiClient, getAuthId } from '$lib/utils';
 
 	let listElement: HTMLElement;
 	let drawer: CupertinoPane | undefined = $state();
 	let commentValue: string = $state('');
 	let commentInput: HTMLInputElement | undefined = $state();
-	let _comments = $state<CommentType[]>([]);
 	let activeReplyToId: string | null = $state(null);
+	let followError = $state<string | null>(null);
+	let ownerId: string | null = $state(null);
+	let profile = $state<userProfile | null>(null);
+	let loading = $state(true);
+	let isCommentsLoading = $state(false);
+	let commentsError = $state<string | null>(null);
 
 	const onScroll = () => {
 		if (listElement.scrollTop + listElement.clientHeight >= listElement.scrollHeight) {
@@ -22,47 +28,62 @@
 	};
 
 	const handleSend = async () => {
-		const newComment = {
-			userImgSrc: 'https://www.gravatar.com/avatar/2c7d99fe281ecd3bcd65ab915bac6dd5?s=250',
-			name: 'You',
-			commentId: Date.now().toString(),
-			comment: commentValue,
-			isUpVoted: false,
-			isDownVoted: false,
-			upVotes: 0,
-			time: 'Just now',
-			replies: []
-		};
+		if (!$activePostId || !commentValue.trim()) return;
 
-		if (activeReplyToId) {
-			// Find the parent comment by id and push reply
-			const addReplyToComment = (commentsArray: CommentType[]) => {
-				for (const c of commentsArray) {
-					if (c.commentId === activeReplyToId) {
-						c.replies.push(newComment);
-						return true;
-					} else if (c.replies.length) {
-						if (addReplyToComment(c.replies)) return true;
-					}
-				}
-				return false;
-			};
-			addReplyToComment(_comments);
-		} else {
-			// If no activeReplyToId, add as a new parent comment
-			_comments = [newComment, ..._comments];
+		try {
+			await createComment($activePostId, commentValue);
+			commentValue = '';
+			activeReplyToId = null;
+		} catch (err) {
+			console.error('Failed to create comment:', err);
 		}
-		commentValue = '';
-		activeReplyToId = null;
 	};
 
+	async function handleFollow(profileId: string) {
+		try {
+			await apiClient.post(`/api/users/${profileId}/follow`);
+		} catch (err) {
+			followError = err instanceof Error ? err.message : 'Failed to follow user';
+			console.log(followError);
+		}
+	}
+
+	async function fetchProfile() {
+		try {
+			loading = true;
+			const response = await apiClient.get(`/api/users/${ownerId}`);
+			profile = response.data;
+			console.log(JSON.stringify(profile));
+		} catch (err) {
+			console.log(err instanceof Error ? err.message : 'Failed to load profile');
+		} finally {
+			loading = false;
+		}
+	}
+
 	$effect(() => {
 		listElement.addEventListener('scroll', onScroll);
 		return () => listElement.removeEventListener('scroll', onScroll);
 	});
 
+	$effect(()=> {
+		if (showComments.value && activePostId) {
+			isCommentsLoading = true;
+			commentsError = null;
+			fetchComments($activePostId)
+				.catch((err) => {
+					commentsError = err.message;
+				})
+				.finally(() => {
+					isCommentsLoading = false;
+				});
+		}
+	})
+
 	onMount(() => {
+		ownerId = getAuthId();
 		fetchFeed();
+		fetchProfile();
 	});
 </script>
 
@@ -78,6 +99,7 @@
 					<Post
 						avatar={post.author.avatarUrl}
 						username={post.author.handle}
+						userId = {post.author.id}
 						imgUris={post.images}
 						text={post.text}
 						time={new Date(post.createdAt).toLocaleDateString()}
@@ -94,6 +116,8 @@
 							comment: () => {
 								if (window.matchMedia('(max-width: 768px)').matches) {
 									drawer?.present({ animate: true });
+									showComments.value = true;
+									activePostId.set(post.id);
 								} else {
 									showComments.value = true;
 									activePostId.set(post.id);
@@ -101,6 +125,7 @@
 							},
 							menu: () => alert('menu')
 						}}
+						options = {[{name: "Follow",handler: () => handleFollow(post.author.id)}]}
 					/>
 				</li>
 			{/each}
@@ -109,26 +134,46 @@
 </div>
 
 <Drawer bind:drawer>
-	<ul class="pb-4">
-		<h3 class="text-black-600 mb-6 text-center">{_comments.length} Comments</h3>
-		{#each _comments as comment}
-			<li class="mb-4">
-				<Comment
-					{comment}
-					handleReply={() => {
-						activeReplyToId = comment.commentId;
-						commentInput?.focus();
-					}}
-				/>
-			</li>
-		{/each}
-		<MessageInput
-			class="fixed start-0 bottom-4 mt-4 w-full px-5"
-			variant="comment"
-			src="https://www.gravatar.com/avatar/2c7d99fe281ecd3bcd65ab915bac6dd5?s=250"
-			bind:value={commentValue}
-			{handleSend}
-			bind:input={commentInput}
-		/>
-	</ul>
+	{#if showComments.value}
+		<ul class="pb-4">
+			<h3 class="text-black-600 mb-6 text-center">{$comments.length} Comments</h3>
+			{#if isCommentsLoading}
+				<li class="text-center text-gray-500">Loading comments...</li>
+			{:else if commentsError}
+				<li class="text-center text-red-500">{commentsError}</li>
+			{:else}
+				{#each $comments as comment}
+					<li class="mb-4">
+						<Comment
+							comment={{
+								userImgSrc:
+									comment.author.avatarUrl ||
+									'https://picsum.photos/200/200',
+								name: comment.author.name || comment.author.handle,
+								commentId: comment.id,
+								comment: comment.text,
+								isUpVoted: false,
+								isDownVoted: false,
+								upVotes: 0,
+								time: new Date(comment.createdAt).toLocaleDateString(),
+								replies: []
+							}}
+							handleReply={() => {
+								activeReplyToId = comment.id;
+								commentInput?.focus();
+							}}
+						/>
+					</li>
+				{/each}
+			{/if}
+			<MessageInput
+				class="sticky start-0 bottom-4 mt-4 w-full px-2"
+				variant="comment"
+				src={profile?.avatarUrl || 'https://picsum.photos/200/200'}
+				bind:value={commentValue}
+				{handleSend}
+				bind:input={commentInput}
+			/>
+		</ul>
+	{/if}
 </Drawer>
diff --git a/platforms/pictique/src/routes/(protected)/messages/+page.svelte b/platforms/pictique/src/routes/(protected)/messages/+page.svelte
index 1238578d..c58c5661 100644
--- a/platforms/pictique/src/routes/(protected)/messages/+page.svelte
+++ b/platforms/pictique/src/routes/(protected)/messages/+page.svelte
@@ -3,6 +3,8 @@
 	import { Message } from '$lib/fragments';
 	import { onMount } from 'svelte';
 	import { apiClient } from '$lib/utils/axios';
+	import { heading } from '../../store';
+	import Button from '$lib/ui/Button/Button.svelte';
 
 	let messages = $state([]);
 
@@ -11,21 +13,21 @@
 		const { data: userData } = await apiClient.get('/api/users');
 		messages = data.chats.map((c) => {
 			const members = c.participants.filter((u) => u.id !== userData.id);
-			console.log(members);
 			const memberNames = members.map((m) => m.name ?? m.handle ?? m.ename);
 			const avatar = members.length > 1 ? '/images/group.png' : members[0].avatarUrl;
 			return {
 				id: c.id,
 				avatar,
 				username: memberNames.join(', '),
-				unread: c.latestMessage.isRead,
-				text: c.latestMessage.text
+				unread: c.latestMessage ? c.latestMessage.isRead : false,
+				text: c.latestMessage?.text ?? 'No message yet'
 			};
 		});
 	});
 </script>
 
 <section>
+	{#if messages}
 	{#each messages as message}
 		<Message
 			class="mb-6"
@@ -33,7 +35,16 @@
 			username={message.username}
 			text={message.text}
 			unread={!message.unread}
-			callback={() => goto(`/messages/${message.id}`)}
+			callback={() => {
+				heading.set(message.username);
+				goto(`/messages/${message.id}`);
+			}}
 		/>
 	{/each}
+	{:else}
+		<div class="h-[100vh] flex flex-col justify-center items-center gap-4">
+			<h2 class="text-center">You have not started any conversations yet, find users and start a conversation with them.</h2>
+			<Button class="w-[max-content]" variant="primary" size="sm" callback={async() => await goto('/discover')}>Search User</Button>
+		</div>
+	{/if}
 </section>
diff --git a/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte b/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte
index e1ee2d8e..ca2529fb 100644
--- a/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte
+++ b/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte
@@ -39,6 +39,7 @@
 
 		eventSource.onmessage = function (e) {
 			const data = JSON.parse(e.data);
+			console.log('messages', data);
 			addMessages(data);
 			// Use setTimeout to ensure DOM has updated
 			setTimeout(scrollToBottom, 0);
diff --git a/platforms/pictique/src/routes/(protected)/profile/+page.svelte b/platforms/pictique/src/routes/(protected)/profile/+page.svelte
index 0fbba997..b396987d 100644
--- a/platforms/pictique/src/routes/(protected)/profile/+page.svelte
+++ b/platforms/pictique/src/routes/(protected)/profile/+page.svelte
@@ -1,2 +1,3 @@
-<script lang="ts">
+<script>
 </script>
+
diff --git a/platforms/pictique/src/routes/(protected)/profile/[id]/+page.svelte b/platforms/pictique/src/routes/(protected)/profile/[id]/+page.svelte
index 2aeea589..063bb67b 100644
--- a/platforms/pictique/src/routes/(protected)/profile/[id]/+page.svelte
+++ b/platforms/pictique/src/routes/(protected)/profile/[id]/+page.svelte
@@ -2,16 +2,16 @@
 	import { goto } from '$app/navigation';
 	import { page } from '$app/state';
 	import { Profile } from '$lib/fragments';
-	import { ownerId, selectedPost } from '$lib/store/store.svelte';
+	import { selectedPost } from '$lib/store/store.svelte';
 	import type { userProfile, PostData } from '$lib/types';
-	import { apiClient } from '$lib/utils/axios';
+	import { apiClient, getAuthId } from '$lib/utils/axios';
 	import { onMount } from 'svelte';
-	import Post from '../../../../lib/fragments/Post/Post.svelte';
 
 	let profileId = $derived(page.params.id);
 	let profile = $state<userProfile | null>(null);
 	let error = $state<string | null>(null);
 	let loading = $state(true);
+	let ownerId: string | null = $state(null);
 
 	async function fetchProfile() {
 		try {
@@ -19,6 +19,7 @@
 			error = null;
 			const response = await apiClient.get(`/api/users/${profileId}`);
 			profile = response.data;
+			console.log(JSON.stringify(profile));
 		} catch (err) {
 			error = err instanceof Error ? err.message : 'Failed to load profile';
 		} finally {
@@ -38,7 +39,7 @@
 	async function handleMessage() {
 		try {
 			await apiClient.post(`/api/chats/`, {
-				name: profile.username,
+				name: profile?.username,
 				participantIds: [profileId]
 			});
 			goto('/messages');
@@ -52,6 +53,9 @@
 		selectedPost.value = post;
 		goto('/profile/post');
 	}
+	$effect(()=> {
+		ownerId = getAuthId();
+	})
 
 	onMount(fetchProfile);
 </script>
@@ -67,7 +71,7 @@
 		</div>
 	{:else if profile}
 		<Profile
-			variant={ownerId.value === profileId ? 'user' : 'other'}
+			variant={ownerId === profileId ? 'user' : 'other'}
 			profileData={profile}
 			handleSinglePost={(post) => handlePostClick(post)}
 			{handleFollow}
diff --git a/platforms/pictique/src/routes/(protected)/settings/+page.svelte b/platforms/pictique/src/routes/(protected)/settings/+page.svelte
index 70433ebb..80b755ab 100644
--- a/platforms/pictique/src/routes/(protected)/settings/+page.svelte
+++ b/platforms/pictique/src/routes/(protected)/settings/+page.svelte
@@ -2,28 +2,60 @@
 	import { goto } from '$app/navigation';
 	import { page } from '$app/state';
 	import SettingsNavigationButton from '$lib/fragments/SettingsNavigationButton/SettingsNavigationButton.svelte';
+	import type { userProfile } from '$lib/types';
+	import { apiClient, getAuthId } from '$lib/utils';
 	import {
 		DatabaseIcon,
 		Logout01Icon,
 		Notification02FreeIcons
 	} from '@hugeicons/core-free-icons';
 	import { HugeiconsIcon } from '@hugeicons/svelte';
+	import { onMount } from 'svelte';
 
 	let route = $derived(page.url.pathname);
-	let username: string = $state('_.ananyayaya._');
-	let userEmail: string = $state('ananya@auvo.io');
-	let userImage: string = $state('https://picsum.photos/200/300');
+	let ownerId: string | null = $state(null);
+
+	let profile = $state<userProfile | null>(null);
+	let error = $state<string | null>(null);
+	let loading = $state(true);
+
+	async function fetchProfile() {
+		try {
+			loading = true;
+			error = null;
+			const response = await apiClient.get(`/api/users/${ownerId}`);
+			profile = response.data;
+		} catch (err) {
+			error = err instanceof Error ? err.message : 'Failed to load profile';
+		} finally {
+			loading = false;
+		}
+	}
+	$effect(()=> { 
+		ownerId = getAuthId();
+	})
+	onMount(fetchProfile)
 </script>
 
 <div class="bg-grey rounded-xl p-3 md:p-5">
-	<SettingsNavigationButton onclick={() => goto(`/settings/account`)} profileSrc={userImage}>
+	{#if loading}
+		<div class="flex h-64 items-center justify-center">
+			<p class="text-gray-500">Loading profile...</p>
+		</div>
+	{:else if error}
+		<div class="flex h-64 items-center justify-center">
+			<p class="text-red-500">{error}</p>
+		</div>
+	{:else if profile}
+	<SettingsNavigationButton onclick={() => goto(`/settings/account`)} profileSrc={profile?.avatarUrl || 'https://picsum.photos/200/200'}>
 		{#snippet children()}
 			<div class="flex flex-col items-start">
-				<h2 class="text-lg">{username}</h2>
-				<p class="text-sm">{userEmail}</p>
+				<h2 class="text-lg">{profile?.handle || "Please add a username"}</h2>
+				<p class="text-sm">{profile?.description || "please add a description"}</p>
 			</div>
 		{/snippet}
 	</SettingsNavigationButton>
+	{/if}
 </div>
 <hr class="text-grey" />
 <div class="flex flex-col gap-3">
@@ -42,8 +74,12 @@
 			{/snippet}
 		</SettingsNavigationButton>
 	</div>
-	<div class="{route === `/settings/data-and-storage` ? 'bg-grey' : ''} rounded-xl p-2">
-		<SettingsNavigationButton onclick={() => goto(`/settings/data-and-storage`)}>
+	<div
+		class="{route === `/settings/data-and-storage`
+			? 'bg-grey'
+			: ''} !cursor-not-allowed rounded-xl p-2 opacity-[50%]"
+	>
+		<SettingsNavigationButton>
 			{#snippet leadingIcon()}
 				<HugeiconsIcon
 					size="24px"
diff --git a/platforms/pictique/src/routes/(protected)/settings/account/username/+page.svelte b/platforms/pictique/src/routes/(protected)/settings/account/username/+page.svelte
index 429ee12e..3d3ffd49 100644
--- a/platforms/pictique/src/routes/(protected)/settings/account/username/+page.svelte
+++ b/platforms/pictique/src/routes/(protected)/settings/account/username/+page.svelte
@@ -2,11 +2,14 @@
 	import { Button, Input, Label } from '$lib/ui';
 	import { InputFile } from '$lib/fragments';
 	import { apiClient } from '$lib/utils/axios';
+	import { goto } from '$app/navigation';
+	import { onMount } from 'svelte';
 
 	let handle = $state();
 	let name = $state();
 	let profileImageDataUrl = $state('');
 	let files = $state<FileList | undefined>();
+	let saved = $state(false);
 
 	function handleFileChange() {
 		if (files && files[0]) {
@@ -24,11 +27,17 @@
 	}
 
 	async function saveProfileData() {
-		await apiClient.patch(`/api/users`, {
-			handle,
-			avatar: profileImageDataUrl,
-			name
-		});
+		try {
+			await apiClient.patch(`/api/users/`, {
+				handle,
+				avatar: profileImageDataUrl,
+				name
+			});
+			saved = true;
+			setTimeout(() => (saved = false), 3_000);
+		} catch (err) {
+			console.log(err instanceof Error ? err.message : 'please check the info again');
+		}
 	}
 
 	$effect(() => {
@@ -36,9 +45,20 @@
 			handleFileChange();
 		}
 	});
+
+	onMount(async () => {
+		const { data } = await apiClient.get('/api/users');
+		handle = data.handle;
+		name = data.name;
+	});
 </script>
 
 <div class="flex flex-col gap-6">
+	{#if saved}
+		<div class=" w-full rounded-md bg-[#33cc33] px-10 py-2 text-center text-white">
+			Changes Saved!
+		</div>
+	{/if}
 	<div>
 		<Label>Change your profile picture</Label>
 		<InputFile
diff --git a/platforms/pictique/src/routes/(protected)/settings/logout/+page.svelte b/platforms/pictique/src/routes/(protected)/settings/logout/+page.svelte
index d1fca886..d19b7753 100644
--- a/platforms/pictique/src/routes/(protected)/settings/logout/+page.svelte
+++ b/platforms/pictique/src/routes/(protected)/settings/logout/+page.svelte
@@ -2,6 +2,13 @@
 	import { goto } from '$app/navigation';
 	import { Button } from '$lib/ui';
 	import { SettingsNavigationButton } from '$lib/fragments';
+	import { removeAuthId, removeAuthToken } from '$lib/utils';
+
+	async function handleLogout() {
+		removeAuthToken();
+		removeAuthId();
+		window.location.href = '/auth';
+	}
 </script>
 
 <div class="flex flex-col gap-3">
@@ -17,5 +24,5 @@
 		{/snippet}
 	</SettingsNavigationButton>
 	<hr class="text-grey" />
-	<Button size="sm" variant="secondary" callback={() => alert('logout')}>Logout</Button>
-</div>
+	<Button size="sm" variant="secondary" callback={handleLogout}>Logout</Button>
+</div>
\ No newline at end of file
diff --git a/platforms/pictique/src/routes/+layout.svelte b/platforms/pictique/src/routes/+layout.svelte
index d2583c88..fbd2bb6f 100644
--- a/platforms/pictique/src/routes/+layout.svelte
+++ b/platforms/pictique/src/routes/+layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { onNavigate } from '$app/navigation';
-	import { isNavigatingThroughNav, ownerId } from '$lib/store/store.svelte';
+	import { isNavigatingThroughNav } from '$lib/store/store.svelte';
 	import { onMount } from 'svelte';
 	import '../app.css';
 	import { page } from '$app/state';
@@ -37,7 +37,6 @@
 	});
 
 	onMount(() => {
-		ownerId.value = '1';
 		setTimeout(() => {
 			showSplashScreen = false;
 		}, 2500);
diff --git a/platforms/pictique/src/routes/store.ts b/platforms/pictique/src/routes/store.ts
new file mode 100644
index 00000000..934e4582
--- /dev/null
+++ b/platforms/pictique/src/routes/store.ts
@@ -0,0 +1,3 @@
+import { writable } from 'svelte/store';
+
+export let heading = writable();
diff --git a/platforms/pictique/svelte.config.js b/platforms/pictique/svelte.config.js
index 27ddeeee..a99eceb9 100644
--- a/platforms/pictique/svelte.config.js
+++ b/platforms/pictique/svelte.config.js
@@ -1,4 +1,4 @@
-import adapter from '@sveltejs/adapter-static';
+import adapter from '@sveltejs/adapter-node';
 import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
 
 const config = {
diff --git a/platforms/pictique/vite.config.ts b/platforms/pictique/vite.config.ts
index 2d35c4f5..73d957c9 100644
--- a/platforms/pictique/vite.config.ts
+++ b/platforms/pictique/vite.config.ts
@@ -3,5 +3,8 @@ import { sveltekit } from '@sveltejs/kit/vite';
 import { defineConfig } from 'vite';
 
 export default defineConfig({
-	plugins: [tailwindcss(), sveltekit()]
+	plugins: [tailwindcss(), sveltekit()],
+	server: {
+		allowedHosts: ["pictique.w3ds-prototype.merul.org"]
+	}
 });
diff --git a/platforms/registry/src/index.ts b/platforms/registry/src/index.ts
index 28fe83ab..319636f4 100644
--- a/platforms/registry/src/index.ts
+++ b/platforms/registry/src/index.ts
@@ -1,5 +1,5 @@
 import fastify from "fastify";
-import { generateEntropy, getJWK } from "./jwt";
+import { generateEntropy, generatePlatformToken, getJWK } from "./jwt";
 import dotenv from "dotenv";
 import path from "path";
 import { AppDataSource } from "./config/database";
@@ -87,6 +87,23 @@ server.get("/entropy", async (request, reply) => {
     }
 });
 
+server.post("/platforms/certification", async (request, reply) => {
+    try {
+        const { platform } = request.body as { platform: string };
+        const token = await generatePlatformToken(platform);
+        return { token };
+    } catch (error) {
+        server.log.error(error);
+        reply.status(500).send({ error: "Failed to generate platform token" });
+    }
+});
+
+server.get("/platforms", async (request, reply) => {
+    return [ process.env.PUBLIC_PICTIQUE_BASE_URL, process.env.PUBLIC_BLABSY_BASE_URL ]
+});
+
+
+
 // Expose the JWK used for signing
 server.get("/.well-known/jwks.json", async (request, reply) => {
     try {
diff --git a/platforms/registry/src/jwt.ts b/platforms/registry/src/jwt.ts
index 2d4db87c..35af8a93 100644
--- a/platforms/registry/src/jwt.ts
+++ b/platforms/registry/src/jwt.ts
@@ -56,6 +56,16 @@ export async function generateEntropy(): Promise<string> {
   return token;
 }
 
+export async function generatePlatformToken(platform: string): Promise<string> {
+  await initializeKeys();
+  const token = await new SignJWT({ platform })
+    .setProtectedHeader({ alg: "ES256", kid: "entropy-key-1" })
+    .setIssuedAt()
+    .setExpirationTime("1y")
+    .sign(privateKey);
+  return token;
+}
+
 // Get the JWK for verification
 export async function getJWK(): Promise<any> {
   await initializeKeys();
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ad430d5f..fad2c546 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,6 +26,9 @@ importers:
       '@hugeicons/svelte':
         specifier: ^1.0.2
         version: 1.0.2(svelte@5.33.1)
+      '@ngneat/falso':
+        specifier: ^7.3.0
+        version: 7.3.0
       '@tailwindcss/container-queries':
         specifier: ^0.1.1
         version: 0.1.1(tailwindcss@4.1.7)
@@ -249,7 +252,7 @@ importers:
     dependencies:
       '@kubernetes/client-node':
         specifier: ^1.3.0
-        version: 1.3.0
+        version: 1.3.0(encoding@0.1.13)
       axios:
         specifier: ^1.6.7
         version: 1.9.0
@@ -276,7 +279,7 @@ importers:
         version: 0.2.0
       typeorm:
         specifier: ^0.3.24
-        version: 0.3.24(babel-plugin-macros@3.1.0)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@20.17.50)(typescript@5.8.3))
+        version: 0.3.24(babel-plugin-macros@3.1.0)(better-sqlite3@11.10.0)(pg@8.16.0)(reflect-metadata@0.2.2)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@20.17.50)(typescript@5.8.3))
       w3id:
         specifier: workspace:*
         version: link:../w3id
@@ -342,15 +345,30 @@ importers:
 
   infrastructure/web3-adapter:
     dependencies:
+      '@types/node':
+        specifier: ^24.0.0
+        version: 24.0.0
+      axios:
+        specifier: ^1.6.7
+        version: 1.9.0
       evault-core:
         specifier: workspace:*
         version: link:../evault-core
+      graphql-request:
+        specifier: ^6.1.0
+        version: 6.1.0(encoding@0.1.13)(graphql@16.11.0)
+      sqlite3:
+        specifier: ^5.1.7
+        version: 5.1.7
       test:
         specifier: ^3.3.0
         version: 3.3.0
+      uuid:
+        specifier: ^11.1.0
+        version: 11.1.0
       vitest:
         specifier: ^3.1.2
-        version: 3.1.4(@types/node@22.15.21)(@vitest/browser@3.1.4)(jiti@2.4.2)(jsdom@19.0.0)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+        version: 3.1.4(@types/node@24.0.0)(@vitest/browser@3.1.4)(jiti@2.4.2)(jsdom@19.0.0)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
     devDependencies:
       '@types/jest':
         specifier: ^29.5.0
@@ -366,10 +384,10 @@ importers:
         version: 8.57.1
       jest:
         specifier: ^29.5.0
-        version: 29.7.0(@types/node@22.15.21)(babel-plugin-macros@3.1.0)
+        version: 29.7.0(@types/node@24.0.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3))
       ts-jest:
         specifier: ^29.1.0
-        version: 29.3.4(@babel/core@7.27.1)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.27.1))(jest@29.7.0(@types/node@22.15.21)(babel-plugin-macros@3.1.0))(typescript@5.8.3)
+        version: 29.3.4(@babel/core@7.27.1)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.27.1))(jest@29.7.0(@types/node@24.0.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)))(typescript@5.8.3)
       typescript:
         specifier: ^5.0.4
         version: 5.8.3
@@ -431,10 +449,10 @@ importers:
         version: 4.1.0
       firebase:
         specifier: ^9.9.4
-        version: 9.23.0
+        version: 9.23.0(encoding@0.1.13)
       firebase-admin:
         specifier: ^13.4.0
-        version: 13.4.0
+        version: 13.4.0(encoding@0.1.13)
       framer-motion:
         specifier: ^7.2.1
         version: 7.10.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
@@ -554,8 +572,14 @@ importers:
         specifier: ^4.18.2
         version: 4.21.2
       firebase-admin:
-        specifier: ^13.4.0
-        version: 13.4.0
+        specifier: ^12.0.0
+        version: 12.7.0(encoding@0.1.13)
+      graphql:
+        specifier: ^16.8.1
+        version: 16.11.0
+      graphql-request:
+        specifier: ^6.1.0
+        version: 6.1.0(encoding@0.1.13)(graphql@16.11.0)
       jsonwebtoken:
         specifier: ^9.0.2
         version: 9.0.2
@@ -567,7 +591,7 @@ importers:
         version: 0.2.2
       typeorm:
         specifier: ^0.3.20
-        version: 0.3.24(babel-plugin-macros@3.1.0)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@20.17.50)(typescript@5.8.3))
+        version: 0.3.24(babel-plugin-macros@3.1.0)(better-sqlite3@11.10.0)(pg@8.16.0)(reflect-metadata@0.2.2)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@20.17.50)(typescript@5.8.3))
       uuid:
         specifier: ^9.0.1
         version: 9.0.1
@@ -578,11 +602,14 @@ importers:
       '@types/express':
         specifier: ^4.17.21
         version: 4.17.22
+      '@types/jest':
+        specifier: ^29.5.12
+        version: 29.5.14
       '@types/jsonwebtoken':
         specifier: ^9.0.5
         version: 9.0.9
       '@types/node':
-        specifier: ^20.11.24
+        specifier: ^20.11.19
         version: 20.17.50
       '@types/pg':
         specifier: ^8.11.2
@@ -599,12 +626,21 @@ importers:
       eslint:
         specifier: ^8.56.0
         version: 8.57.1
+      jest:
+        specifier: ^29.7.0
+        version: 29.7.0(@types/node@20.17.50)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.17.50)(typescript@5.8.3))
       nodemon:
         specifier: ^3.0.3
         version: 3.1.10
+      ts-jest:
+        specifier: ^29.1.2
+        version: 29.3.4(@babel/core@7.27.1)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.27.1))(jest@29.7.0(@types/node@20.17.50)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.17.50)(typescript@5.8.3)))(typescript@5.8.3)
       ts-node:
         specifier: ^10.9.2
         version: 10.9.2(@types/node@20.17.50)(typescript@5.8.3)
+      ts-node-dev:
+        specifier: ^2.0.0
+        version: 2.0.0(@types/node@20.17.50)(typescript@5.8.3)
       typescript:
         specifier: ^5.3.3
         version: 5.8.3
@@ -614,6 +650,9 @@ importers:
       '-':
         specifier: ^0.0.1
         version: 0.0.1
+      '@sveltejs/adapter-node':
+        specifier: ^5.2.12
+        version: 5.2.12(@sveltejs/kit@2.21.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))
       D:
         specifier: ^1.0.0
         version: 1.0.0
@@ -650,7 +689,7 @@ importers:
         version: 8.6.14(@types/react@19.1.5)(storybook@8.6.14(prettier@3.5.3))
       '@storybook/addon-svelte-csf':
         specifier: ^5.0.0-next.0
-        version: 5.0.1(@storybook/svelte@8.6.14(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1))(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(babel-plugin-macros@3.1.0)(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+        version: 5.0.1(@storybook/svelte@8.6.14(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1))(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(babel-plugin-macros@3.1.0)(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
       '@storybook/blocks':
         specifier: ^8.6.12
         version: 8.6.14(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(storybook@8.6.14(prettier@3.5.3))
@@ -659,22 +698,22 @@ importers:
         version: 8.6.14(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)
       '@storybook/sveltekit':
         specifier: ^8.6.12
-        version: 8.6.14(@babel/core@7.27.1)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)))(postcss@8.5.3)(sass@1.89.1)(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+        version: 8.6.14(@babel/core@7.27.1)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)))(postcss@8.5.3)(sass@1.89.1)(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
       '@storybook/test':
         specifier: ^8.6.12
         version: 8.6.14(storybook@8.6.14(prettier@3.5.3))
       '@sveltejs/adapter-static':
         specifier: ^3.0.8
-        version: 3.0.8(@sveltejs/kit@2.21.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))
+        version: 3.0.8(@sveltejs/kit@2.21.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))
       '@sveltejs/kit':
         specifier: ^2.16.0
-        version: 2.21.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+        version: 2.21.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
       '@sveltejs/vite-plugin-svelte':
         specifier: ^5.0.0
-        version: 5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+        version: 5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
       '@tailwindcss/vite':
         specifier: ^4.0.0
-        version: 4.1.7(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+        version: 4.1.7(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
       clsx:
         specifier: ^2.1.1
         version: 2.1.1
@@ -689,7 +728,7 @@ importers:
         version: 10.1.5(eslint@9.27.0(jiti@2.4.2))
       eslint-plugin-svelte:
         specifier: ^3.0.0
-        version: 3.9.0(eslint@9.27.0(jiti@2.4.2))(svelte@5.33.1)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3))
+        version: 3.9.0(eslint@9.27.0(jiti@2.4.2))(svelte@5.33.1)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3))
       globals:
         specifier: ^16.0.0
         version: 16.1.0
@@ -725,7 +764,7 @@ importers:
         version: 8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3)
       vite:
         specifier: ^6.2.6
-        version: 6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+        version: 6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
 
   platforms/pictique-api:
     dependencies:
@@ -744,6 +783,9 @@ importers:
       express:
         specifier: ^4.18.2
         version: 4.21.2
+      graphql-request:
+        specifier: ^6.1.0
+        version: 6.1.0(encoding@0.1.13)(graphql@16.11.0)
       jsonwebtoken:
         specifier: ^9.0.2
         version: 9.0.2
@@ -754,8 +796,8 @@ importers:
         specifier: ^0.2.1
         version: 0.2.2
       typeorm:
-        specifier: ^0.3.20
-        version: 0.3.24(babel-plugin-macros@3.1.0)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@20.17.50)(typescript@5.8.3))
+        specifier: ^0.3.24
+        version: 0.3.24(babel-plugin-macros@3.1.0)(better-sqlite3@11.10.0)(pg@8.16.0)(reflect-metadata@0.2.2)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@20.17.50)(typescript@5.8.3))
       uuid:
         specifier: ^9.0.1
         version: 9.0.1
@@ -825,7 +867,7 @@ importers:
         version: 0.2.2
       typeorm:
         specifier: ^0.3.24
-        version: 0.3.24(babel-plugin-macros@3.1.0)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@20.17.50)(typescript@5.8.3))
+        version: 0.3.24(babel-plugin-macros@3.1.0)(better-sqlite3@11.10.0)(pg@8.16.0)(reflect-metadata@0.2.2)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@20.17.50)(typescript@5.8.3))
     devDependencies:
       '@types/jest':
         specifier: ^29.5.12
@@ -1593,6 +1635,9 @@ packages:
   '@firebase/app-check-interop-types@0.3.0':
     resolution: {integrity: sha512-xAxHPZPIgFXnI+vb4sbBjZcde7ZluzPPaSK7Lx3/nmuVk4TjZvnL8ONnkd4ERQKL8WePQySU+pRcWkh8rDf5Sg==}
 
+  '@firebase/app-check-interop-types@0.3.2':
+    resolution: {integrity: sha512-LMs47Vinv2HBMZi49C09dJxp0QT5LwDzFaVGf/+ITHe3BlIhUiLNttkATSXplc89A2lAaeTqjgqVkiRfUGyQiQ==}
+
   '@firebase/app-check-interop-types@0.3.3':
     resolution: {integrity: sha512-gAlxfPLT2j8bTI/qfe3ahl2I2YcBQ8cFIBdhAQA4I2f3TndcO+22YizyGYuttLHPQEpWkhmpFW60VCFEPg4g5A==}
 
@@ -1610,6 +1655,9 @@ packages:
   '@firebase/app-types@0.9.0':
     resolution: {integrity: sha512-AeweANOIo0Mb8GiYm3xhTEBVCmPwTYAu9Hcd2qSkLuga/6+j9b1Jskl5bpiSQWy9eJ/j5pavxj6eYogmnuzm+Q==}
 
+  '@firebase/app-types@0.9.2':
+    resolution: {integrity: sha512-oMEZ1TDlBz479lmABwWsWjzHwheQKiAgnuKxE0pz0IXCVx7/rtlkx1fQ6GfgK24WCrxDKMplZrT50Kh04iMbXQ==}
+
   '@firebase/app-types@0.9.3':
     resolution: {integrity: sha512-kRVpIl4vVGJ4baogMDINbyrIOtOxqhkZQg4jTq3l8Lw6WSk0xfpEYzezFu+Kl4ve4fbPl79dvwRtaFqAC/ucCw==}
 
@@ -1624,6 +1672,9 @@ packages:
   '@firebase/auth-interop-types@0.2.1':
     resolution: {integrity: sha512-VOaGzKp65MY6P5FI84TfYKBXEPi6LmOCSMMzys6o2BN2LOsqy7pCuZCup7NYnfbk5OkkQKzvIfHOzTm0UDpkyg==}
 
+  '@firebase/auth-interop-types@0.2.3':
+    resolution: {integrity: sha512-Fc9wuJGgxoxQeavybiuwgyi+0rssr76b+nHpj+eGhXFYAdudMWyfBHvFL/I5fEHniUM/UQdFzi9VXJK2iZF7FQ==}
+
   '@firebase/auth-interop-types@0.2.4':
     resolution: {integrity: sha512-JPgcXKCuO+CWqGDnigBtvo09HeBs5u/Ktc2GaFj2m01hLarbxthLNm7Fk8iOP1aqAtXV+fnnGj7U28xmk7IwVA==}
 
@@ -1645,9 +1696,15 @@ packages:
   '@firebase/component@0.6.4':
     resolution: {integrity: sha512-rLMyrXuO9jcAUCaQXCMjCMUsWrba5fzHlNK24xz5j2W6A/SRmK8mZJ/hn7V0fViLbxC0lPMtrK1eYzk6Fg03jA==}
 
+  '@firebase/component@0.6.9':
+    resolution: {integrity: sha512-gm8EUEJE/fEac86AvHn8Z/QW8BvR56TBw3hMW0O838J/1mThYQXAIQBgUv75EqlCZfdawpWLrKt1uXvp9ciK3Q==}
+
   '@firebase/database-compat@0.3.4':
     resolution: {integrity: sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg==}
 
+  '@firebase/database-compat@1.0.8':
+    resolution: {integrity: sha512-OpeWZoPE3sGIRPBKYnW9wLad25RaWbGyk7fFQe4xnJQKRzlynWeFBSRRAoLE2Old01WXwskUiucNqUUVlFsceg==}
+
   '@firebase/database-compat@2.0.10':
     resolution: {integrity: sha512-3sjl6oGaDDYJw/Ny0E5bO6v+KM3KoD4Qo/sAfHGdRFmcJ4QnfxOX9RbG9+ce/evI3m64mkPr24LlmTDduqMpog==}
     engines: {node: '>=18.0.0'}
@@ -1658,6 +1715,9 @@ packages:
   '@firebase/database-types@1.0.14':
     resolution: {integrity: sha512-8a0Q1GrxM0akgF0RiQHliinhmZd+UQPrxEmUv7MnQBYfVFiLtKOgs3g6ghRt/WEGJHyQNslZ+0PocIwNfoDwKw==}
 
+  '@firebase/database-types@1.0.5':
+    resolution: {integrity: sha512-fTlqCNwFYyq/C6W7AJ5OCuq5CeZuBEsEwptnVxlNPkWCo5cTTyukzAHRSO/jaQcItz33FfYrrFk1SJofcu2AaQ==}
+
   '@firebase/database@0.14.4':
     resolution: {integrity: sha512-+Ea/IKGwh42jwdjCyzTmeZeLM3oy1h0mFPsTy6OqCWzcu/KFqRAr5Tt1HRCOBlNOdbh84JPZC47WLU18n2VbxQ==}
 
@@ -1665,6 +1725,9 @@ packages:
     resolution: {integrity: sha512-khE+MIYK+XlIndVn/7mAQ9F1fwG5JHrGKaG72hblCC6JAlUBDd3SirICH6SMCf2PQ0iYkruTECth+cRhauacyQ==}
     engines: {node: '>=18.0.0'}
 
+  '@firebase/database@1.0.8':
+    resolution: {integrity: sha512-dzXALZeBI1U5TXt6619cv0+tgEhJiwlUtQ55WNZY7vGAjv7Q1QioV969iYwt1AQQ0ovHnEW0YW9TiBfefLvErg==}
+
   '@firebase/firestore-compat@0.3.12':
     resolution: {integrity: sha512-mazuNGAx5Kt9Nph0pm6ULJFp/+j7GSsx+Ncw1GrnKl+ft1CQ4q2LcUssXnjqkX2Ry0fNGqUzC1mfIUrk9bYtjQ==}
     peerDependencies:
@@ -1713,6 +1776,9 @@ packages:
   '@firebase/logger@0.4.0':
     resolution: {integrity: sha512-eRKSeykumZ5+cJPdxxJRgAC3G5NknY2GwEbKfymdnXtnT0Ucm4pspfR6GT4MUQEDuJwRVbVcSx85kgJulMoFFA==}
 
+  '@firebase/logger@0.4.2':
+    resolution: {integrity: sha512-Q1VuA5M1Gjqrwom6I6NUU4lQXdo9IAQieXlujeHZWvRt1b7qQ0KwBaNAjgxG27jgF9/mUwsNmO8ptBCGVYhB0A==}
+
   '@firebase/logger@0.4.4':
     resolution: {integrity: sha512-mH0PEh1zoXGnaR8gD1DeGeNZtWFKbnz9hDO91dIml3iou1gpOnLqXQ2dJfB71dj6dpmUjcQ6phY3ZZJbjErr9g==}
     engines: {node: '>=18.0.0'}
@@ -1772,6 +1838,9 @@ packages:
     peerDependencies:
       '@firebase/app': 0.x
 
+  '@firebase/util@1.10.0':
+    resolution: {integrity: sha512-xKtx4A668icQqoANRxyDLBLz51TAbDP9KRfpbKGxiCAW346d0BeJe5vN6/hKxxmWwnZ0mautyv39JxviwwQMOQ==}
+
   '@firebase/util@1.12.0':
     resolution: {integrity: sha512-Z4rK23xBCwgKDqmzGVMef+Vb4xso2j5Q8OG0vVL4m4fA5ZjPMYQazu8OJJC3vtQRC3SQ/Pgx/6TPNVsCd70QRw==}
     engines: {node: '>=18.0.0'}
@@ -1797,6 +1866,9 @@ packages:
   '@floating-ui/utils@0.2.9':
     resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==}
 
+  '@gar/promisify@1.1.3':
+    resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==}
+
   '@google-cloud/firestore@7.11.1':
     resolution: {integrity: sha512-ZxOdH8Wr01hBDvKCQfMWqwUcfNcN3JY19k1LtS1fTFhEyorYPLsbWN+VxIRL46pOYGHTPkU3Or5HbT/SLQM5nA==}
     engines: {node: '>=14.0.0'}
@@ -2392,6 +2464,14 @@ packages:
     resolution: {integrity: sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==}
     engines: {node: '>=12.4.0'}
 
+  '@npmcli/fs@1.1.1':
+    resolution: {integrity: sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==}
+
+  '@npmcli/move-file@1.1.2':
+    resolution: {integrity: sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==}
+    engines: {node: '>=10'}
+    deprecated: This functionality has been moved to @npmcli/fs
+
   '@opentelemetry/api@1.9.0':
     resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==}
     engines: {node: '>=8.0.0'}
@@ -2521,6 +2601,42 @@ packages:
   '@repeaterjs/repeater@3.0.6':
     resolution: {integrity: sha512-Javneu5lsuhwNCryN+pXH93VPQ8g0dBX7wItHFgYiwQmzE1sVdg5tWHiOgHywzL2W21XQopa7IwIEnNbmeUJYA==}
 
+  '@rollup/plugin-commonjs@28.0.5':
+    resolution: {integrity: sha512-lytLp2JgAMwqJY6ve3OSROXr2XuEYHjnsQN3hmnxC+w11dI91LuUw4Yc1kk2FqKXeMG8psoFejFgK+znoij0cg==}
+    engines: {node: '>=16.0.0 || 14 >= 14.17'}
+    peerDependencies:
+      rollup: ^2.68.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+
+  '@rollup/plugin-json@6.1.0':
+    resolution: {integrity: sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+
+  '@rollup/plugin-node-resolve@16.0.1':
+    resolution: {integrity: sha512-tk5YCxJWIG81umIvNkSod2qK5KyQW19qcBF/B78n1bjtOON6gzKoVeSzAE8yHCZEDmqkHKkxplExA8KzdJLJpA==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^2.78.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+
+  '@rollup/pluginutils@5.1.4':
+    resolution: {integrity: sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+    peerDependenciesMeta:
+      rollup:
+        optional: true
+
   '@rollup/rollup-android-arm-eabi@4.41.0':
     resolution: {integrity: sha512-KxN+zCjOYHGwCl4UCtSfZ6jrq/qi88JDUtiEFk8LELEHq2Egfc/FgW+jItZiOLRuQfb/3xJSgFuNPC9jzggX+A==}
     cpu: [arm]
@@ -2844,6 +2960,11 @@ packages:
     peerDependencies:
       acorn: ^8.9.0
 
+  '@sveltejs/adapter-node@5.2.12':
+    resolution: {integrity: sha512-0bp4Yb3jKIEcZWVcJC/L1xXp9zzJS4hDwfb4VITAkfT4OVdkspSHsx7YhqJDbb2hgLl6R9Vs7VQR+fqIVOxPUQ==}
+    peerDependencies:
+      '@sveltejs/kit': ^2.4.0
+
   '@sveltejs/adapter-static@3.0.8':
     resolution: {integrity: sha512-YaDrquRpZwfcXbnlDsSrBQNCChVOT9MGuSg+dMAyfsAa1SmiAhrA5jUYUiIMC59G92kIbY/AaQOWcBdq+lh+zg==}
     peerDependencies:
@@ -3124,6 +3245,10 @@ packages:
     peerDependencies:
       '@testing-library/dom': '>=7.21.4'
 
+  '@tootallnate/once@1.1.2':
+    resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==}
+    engines: {node: '>= 6'}
+
   '@tootallnate/once@2.0.0':
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
     engines: {node: '>= 10'}
@@ -3248,6 +3373,9 @@ packages:
   '@types/node@22.15.21':
     resolution: {integrity: sha512-EV/37Td6c+MgKAbkcLG6vqZ2zEYHD7bvSrzqqs2RIhbA6w3x+Dqz8MZM3sP6kGTeLrdoOgKZe+Xja7tUB2DNkQ==}
 
+  '@types/node@24.0.0':
+    resolution: {integrity: sha512-yZQa2zm87aRVcqDyH5+4Hv9KYgSdgwX1rFnGvpbzMaC7YAljmhBET93TPiTd3ObwTL+gSpIzPKg5BqVxdCvxKg==}
+
   '@types/parse-json@4.0.2':
     resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
 
@@ -3289,6 +3417,9 @@ packages:
   '@types/request@2.48.12':
     resolution: {integrity: sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==}
 
+  '@types/resolve@1.20.2':
+    resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
+
   '@types/scheduler@0.26.0':
     resolution: {integrity: sha512-WFHp9YUJQ6CKshqoC37iOlHnQSmxNc795UhB26CyBBttrN9svdIrUjl/NjnNmfcwtncN0h/0PPAFWv9ovP8mLA==}
 
@@ -3716,6 +3847,9 @@ packages:
     resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
     deprecated: Use your platform's native atob() and btoa() methods instead
 
+  abbrev@1.1.1:
+    resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
+
   abort-controller@3.0.0:
     resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
     engines: {node: '>=6.5'}
@@ -3761,6 +3895,14 @@ packages:
     resolution: {integrity: sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==}
     engines: {node: '>= 14'}
 
+  agentkeepalive@4.6.0:
+    resolution: {integrity: sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==}
+    engines: {node: '>= 8.0.0'}
+
+  aggregate-error@3.1.0:
+    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
+    engines: {node: '>=8'}
+
   ajv-formats@2.1.1:
     resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
     peerDependencies:
@@ -3830,6 +3972,9 @@ packages:
     resolution: {integrity: sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==}
     engines: {node: '>= 6.0.0'}
 
+  aproba@2.0.0:
+    resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==}
+
   archiver-utils@5.0.2:
     resolution: {integrity: sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==}
     engines: {node: '>= 14'}
@@ -3838,6 +3983,11 @@ packages:
     resolution: {integrity: sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==}
     engines: {node: '>= 14'}
 
+  are-we-there-yet@3.0.1:
+    resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+    deprecated: This package is no longer supported.
+
   arg@4.1.3:
     resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
 
@@ -4059,6 +4209,9 @@ packages:
     resolution: {integrity: sha512-aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ==}
     engines: {node: '>=12.0.0'}
 
+  better-sqlite3@11.10.0:
+    resolution: {integrity: sha512-EwhOpyXiOEL/lKzHz9AW1msWFNzGc/z+LzeB3/jnFJpxu+th2yqvzsSWas1v9jgs9+xiXJcD5A8CJxAG2TaghQ==}
+
   bignumber.js@9.3.0:
     resolution: {integrity: sha512-EM7aMFTXbptt/wZdMlBv2t8IViwQL+h6SLHosp8Yf0dqJMTnY6iL32opnAB6kAdL0SZPuvcAzFr31o0c/R3/RA==}
 
@@ -4066,6 +4219,9 @@ packages:
     resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
     engines: {node: '>=8'}
 
+  bindings@1.5.0:
+    resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
+
   bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
 
@@ -4136,6 +4292,10 @@ packages:
     resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
     engines: {node: '>=8'}
 
+  cacache@15.3.0:
+    resolution: {integrity: sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==}
+    engines: {node: '>= 10'}
+
   call-bind-apply-helpers@1.0.2:
     resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
     engines: {node: '>= 0.4'}
@@ -4213,6 +4373,10 @@ packages:
   chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
 
+  chownr@2.0.0:
+    resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
+    engines: {node: '>=10'}
+
   chownr@3.0.0:
     resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==}
     engines: {node: '>=18'}
@@ -4237,6 +4401,10 @@ packages:
   cjs-module-lexer@1.4.3:
     resolution: {integrity: sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==}
 
+  clean-stack@2.2.0:
+    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
+    engines: {node: '>=6'}
+
   cli-cursor@4.0.0:
     resolution: {integrity: sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -4277,6 +4445,10 @@ packages:
   color-name@1.1.4:
     resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
 
+  color-support@1.1.3:
+    resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==}
+    hasBin: true
+
   colorette@2.0.20:
     resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
 
@@ -4292,6 +4464,9 @@ packages:
     resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
     engines: {node: '>= 6'}
 
+  commondir@1.0.1:
+    resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
+
   commonmark@0.30.0:
     resolution: {integrity: sha512-j1yoUo4gxPND1JWV9xj5ELih0yMv1iCWDG6eEQIPLSWLxzCXiFoyS7kvB+WwU+tZMf4snwJMMtaubV0laFpiBA==}
     hasBin: true
@@ -4311,6 +4486,9 @@ packages:
   confbox@0.1.8:
     resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
 
+  console-control-strings@1.1.0:
+    resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
+
   content-disposition@0.5.4:
     resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
     engines: {node: '>= 0.6'}
@@ -4378,6 +4556,9 @@ packages:
   create-require@1.1.1:
     resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
 
+  cross-fetch@3.2.0:
+    resolution: {integrity: sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==}
+
   cross-inspect@1.0.1:
     resolution: {integrity: sha512-Pcw1JTvZLSJH83iiGWt6fRcT+BjZlCDRVwYLbUcHzv/CRpB7r0MlSrGbIyQvVSNyGnbt7G4AXuyCiDR3POvZ1A==}
     engines: {node: '>=16.0.0'}
@@ -4476,6 +4657,10 @@ packages:
   decimal.js@10.5.0:
     resolution: {integrity: sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==}
 
+  decompress-response@6.0.0:
+    resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
+    engines: {node: '>=10'}
+
   dedent-js@1.0.1:
     resolution: {integrity: sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==}
 
@@ -4502,6 +4687,10 @@ packages:
     resolution: {integrity: sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==}
     engines: {node: '>= 0.4'}
 
+  deep-extend@0.6.0:
+    resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
+    engines: {node: '>=4.0.0'}
+
   deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
@@ -4525,6 +4714,9 @@ packages:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
     engines: {node: '>=0.4.0'}
 
+  delegates@1.0.0:
+    resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==}
+
   depd@2.0.0:
     resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
     engines: {node: '>= 0.8'}
@@ -4694,6 +4886,9 @@ packages:
     resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==}
     engines: {node: '>= 0.8'}
 
+  encoding@0.1.13:
+    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
+
   end-of-stream@1.4.4:
     resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
 
@@ -4711,6 +4906,13 @@ packages:
   entities@2.2.0:
     resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
 
+  env-paths@2.2.1:
+    resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
+    engines: {node: '>=6'}
+
+  err-code@2.0.3:
+    resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
+
   error-ex@1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
 
@@ -5006,6 +5208,9 @@ packages:
     resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
     engines: {node: '>=4.0'}
 
+  estree-walker@2.0.2:
+    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
+
   estree-walker@3.0.3:
     resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
 
@@ -5047,6 +5252,10 @@ packages:
     resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
     engines: {node: '>= 0.8.0'}
 
+  expand-template@2.0.3:
+    resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
+    engines: {node: '>=6'}
+
   expect-type@1.2.1:
     resolution: {integrity: sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw==}
     engines: {node: '>=12.0.0'}
@@ -5165,6 +5374,9 @@ packages:
     resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
     engines: {node: '>=16.0.0'}
 
+  file-uri-to-path@1.0.0:
+    resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
+
   filelist@1.0.4:
     resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
 
@@ -5195,6 +5407,10 @@ packages:
     resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
     engines: {node: '>=10'}
 
+  firebase-admin@12.7.0:
+    resolution: {integrity: sha512-raFIrOyTqREbyXsNkSHyciQLfv8AUZazehPaQS1lZBSCDYW74FYXU0nQZa3qHI4K+hawohlDbywZ4+qce9YNxA==}
+    engines: {node: '>=14'}
+
   firebase-admin@13.4.0:
     resolution: {integrity: sha512-Y8DcyKK+4pl4B93ooiy1G8qvdyRMkcNFfBSh+8rbVcw4cW8dgG0VXCCTp5NUwub8sn9vSPsOwpb9tE2OuFmcfQ==}
     engines: {node: '>=18'}
@@ -5264,6 +5480,10 @@ packages:
   fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
 
+  fs-minipass@2.1.0:
+    resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
+    engines: {node: '>= 8'}
+
   fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
@@ -5290,6 +5510,11 @@ packages:
   functions-have-names@1.2.3:
     resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
 
+  gauge@4.0.4:
+    resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+    deprecated: This package is no longer supported.
+
   gaxios@6.7.1:
     resolution: {integrity: sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==}
     engines: {node: '>=14'}
@@ -5340,6 +5565,9 @@ packages:
   get-tsconfig@4.10.1:
     resolution: {integrity: sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==}
 
+  github-from-package@0.0.0:
+    resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
+
   glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}
@@ -5414,6 +5642,11 @@ packages:
   graphemer@1.4.0:
     resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
 
+  graphql-request@6.1.0:
+    resolution: {integrity: sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw==}
+    peerDependencies:
+      graphql: 14 - 16
+
   graphql-type-json@0.3.2:
     resolution: {integrity: sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg==}
     peerDependencies:
@@ -5467,6 +5700,9 @@ packages:
     resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
     engines: {node: '>= 0.4'}
 
+  has-unicode@2.0.1:
+    resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==}
+
   hasown@2.0.2:
     resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
     engines: {node: '>= 0.4'}
@@ -5494,6 +5730,9 @@ packages:
   htmlparser2-svelte@4.1.0:
     resolution: {integrity: sha512-+4f4RBFz7Rj2Hp0ZbFbXC+Kzbd6S9PgjiuFtdT76VMNgKogrEZy0pG2UrPycPbrZzVEIM5lAT3lAdkSTCHLPjg==}
 
+  http-cache-semantics@4.2.0:
+    resolution: {integrity: sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==}
+
   http-errors@2.0.0:
     resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
     engines: {node: '>= 0.8'}
@@ -5501,6 +5740,10 @@ packages:
   http-parser-js@0.5.10:
     resolution: {integrity: sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==}
 
+  http-proxy-agent@4.0.1:
+    resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==}
+    engines: {node: '>= 6'}
+
   http-proxy-agent@5.0.0:
     resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
     engines: {node: '>= 6'}
@@ -5525,6 +5768,9 @@ packages:
     resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
     engines: {node: '>=16.17.0'}
 
+  humanize-ms@1.2.1:
+    resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
+
   husky@8.0.3:
     resolution: {integrity: sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==}
     engines: {node: '>=14'}
@@ -5587,6 +5833,9 @@ packages:
     resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
     engines: {node: '>=8'}
 
+  infer-owner@1.0.4:
+    resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==}
+
   inflight@1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
     deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
@@ -5594,6 +5843,9 @@ packages:
   inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
+  ini@1.3.8:
+    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
+
   internal-slot@1.1.0:
     resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==}
     engines: {node: '>= 0.4'}
@@ -5685,10 +5937,16 @@ packages:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
 
+  is-lambda@1.0.1:
+    resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==}
+
   is-map@2.0.3:
     resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==}
     engines: {node: '>= 0.4'}
 
+  is-module@1.0.0:
+    resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==}
+
   is-number-object@1.1.1:
     resolution: {integrity: sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==}
     engines: {node: '>= 0.4'}
@@ -5704,6 +5962,9 @@ packages:
   is-potential-custom-element-name@1.0.1:
     resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
 
+  is-reference@1.2.1:
+    resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==}
+
   is-reference@3.0.3:
     resolution: {integrity: sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==}
 
@@ -6422,6 +6683,10 @@ packages:
   make-error@1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
 
+  make-fetch-happen@9.1.0:
+    resolution: {integrity: sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==}
+    engines: {node: '>= 10'}
+
   makeerror@1.0.12:
     resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
 
@@ -6490,6 +6755,10 @@ packages:
     resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
     engines: {node: '>=12'}
 
+  mimic-response@3.1.0:
+    resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
+    engines: {node: '>=10'}
+
   min-indent@1.0.1:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
@@ -6515,10 +6784,42 @@ packages:
   minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
+  minipass-collect@1.0.2:
+    resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==}
+    engines: {node: '>= 8'}
+
+  minipass-fetch@1.4.1:
+    resolution: {integrity: sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==}
+    engines: {node: '>=8'}
+
+  minipass-flush@1.0.5:
+    resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==}
+    engines: {node: '>= 8'}
+
+  minipass-pipeline@1.2.4:
+    resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==}
+    engines: {node: '>=8'}
+
+  minipass-sized@1.0.3:
+    resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==}
+    engines: {node: '>=8'}
+
+  minipass@3.3.6:
+    resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
+    engines: {node: '>=8'}
+
+  minipass@5.0.0:
+    resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
+    engines: {node: '>=8'}
+
   minipass@7.1.2:
     resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
     engines: {node: '>=16 || 14 >=14.17'}
 
+  minizlib@2.1.2:
+    resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
+    engines: {node: '>= 8'}
+
   minizlib@3.0.2:
     resolution: {integrity: sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==}
     engines: {node: '>= 18'}
@@ -6583,6 +6884,9 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
+  napi-build-utils@2.0.0:
+    resolution: {integrity: sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==}
+
   napi-postinstall@0.2.4:
     resolution: {integrity: sha512-ZEzHJwBhZ8qQSbknHqYcdtQVr8zUgGyM/q6h6qAyhtyVMNrSgDhrC4disf03dYW0e+czXyLnZINnCTEkWy0eJg==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
@@ -6628,6 +6932,10 @@ packages:
   no-case@3.0.4:
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
 
+  node-abi@3.75.0:
+    resolution: {integrity: sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==}
+    engines: {node: '>=10'}
+
   node-addon-api@7.1.1:
     resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
 
@@ -6653,6 +6961,11 @@ packages:
     resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==}
     engines: {node: '>= 6.13.0'}
 
+  node-gyp@8.4.1:
+    resolution: {integrity: sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==}
+    engines: {node: '>= 10.12.0'}
+    hasBin: true
+
   node-int64@0.4.0:
     resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
 
@@ -6664,6 +6977,11 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  nopt@5.0.0:
+    resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==}
+    engines: {node: '>=6'}
+    hasBin: true
+
   normalize-path@3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
@@ -6680,6 +6998,11 @@ packages:
     resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
+  npmlog@6.0.2:
+    resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+    deprecated: This package is no longer supported.
+
   nwsapi@2.2.20:
     resolution: {integrity: sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==}
 
@@ -6789,6 +7112,10 @@ packages:
     resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
     engines: {node: '>=10'}
 
+  p-map@4.0.0:
+    resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
+    engines: {node: '>=10'}
+
   p-try@2.2.0:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
@@ -7043,6 +7370,11 @@ packages:
     resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}
     engines: {node: '>=0.10.0'}
 
+  prebuild-install@7.1.3:
+    resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
@@ -7153,6 +7485,18 @@ packages:
     resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
     engines: {node: '>=0.4.0'}
 
+  promise-inflight@1.0.1:
+    resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
+    peerDependencies:
+      bluebird: '*'
+    peerDependenciesMeta:
+      bluebird:
+        optional: true
+
+  promise-retry@2.0.1:
+    resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==}
+    engines: {node: '>=10'}
+
   prompts@2.4.2:
     resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
     engines: {node: '>= 6'}
@@ -7229,6 +7573,10 @@ packages:
     resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==}
     engines: {node: '>= 0.8'}
 
+  rc@1.2.8:
+    resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
+    hasBin: true
+
   react-confetti@6.4.0:
     resolution: {integrity: sha512-5MdGUcqxrTU26I2EU7ltkWPwxvucQTuqMm8dUz72z2YMqTD6s9vMcDUysk7n9jnC+lXuCPeJJ7Knf98VEYE9Rg==}
     engines: {node: '>=16'}
@@ -7508,6 +7856,9 @@ packages:
     resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==}
     engines: {node: '>= 0.8.0'}
 
+  set-blocking@2.0.0:
+    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
+
   set-cookie-parser@2.7.1:
     resolution: {integrity: sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==}
 
@@ -7571,6 +7922,12 @@ packages:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
 
+  simple-concat@1.0.1:
+    resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
+
+  simple-get@4.0.1:
+    resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
+
   simple-update-notifier@2.0.0:
     resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==}
     engines: {node: '>=10'}
@@ -7594,6 +7951,10 @@ packages:
     resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
     engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
 
+  socks-proxy-agent@6.2.1:
+    resolution: {integrity: sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==}
+    engines: {node: '>= 10'}
+
   socks-proxy-agent@8.0.5:
     resolution: {integrity: sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==}
     engines: {node: '>= 14'}
@@ -7644,6 +8005,9 @@ packages:
     resolution: {integrity: sha512-+fLpbAbWkQ+d0JEchJT/NrRRXbYRNbG15gFpANx73EwxQB1PRjj+k/OI0GTU0J63g8ikGkJECQp9z8XEJZvPRw==}
     engines: {node: '>=14'}
 
+  sqlite3@5.1.7:
+    resolution: {integrity: sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==}
+
   ssh-remote-port-forward@1.0.4:
     resolution: {integrity: sha512-x0LV1eVDwjf1gmG7TTnfqIzf+3VPRz7vrNIjX6oYLbeCrf/PeVY6hkT68Mg+q02qXxQhrLjB0jfgvhevoCRmLQ==}
 
@@ -7651,6 +8015,10 @@ packages:
     resolution: {integrity: sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==}
     engines: {node: '>=10.16.0'}
 
+  ssri@8.0.1:
+    resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==}
+    engines: {node: '>= 8'}
+
   stable-hash@0.0.5:
     resolution: {integrity: sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==}
 
@@ -7957,6 +8325,10 @@ packages:
   tar-stream@3.1.7:
     resolution: {integrity: sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==}
 
+  tar@6.2.1:
+    resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
+    engines: {node: '>=10'}
+
   tar@7.4.3:
     resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==}
     engines: {node: '>=18'}
@@ -8176,6 +8548,9 @@ packages:
   tua-body-scroll-lock@1.2.1:
     resolution: {integrity: sha512-DuGbQxIBSbz7/aAwh0oMThOwCwDdYzsU8nF5XQPAvoeOBWp/qhjrZfOtc84gj6CQLZu5L1+TgMNX6fW3OuafHA==}
 
+  tunnel-agent@0.6.0:
+    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
+
   turbo-darwin-64@2.5.3:
     resolution: {integrity: sha512-YSItEVBUIvAGPUDpAB9etEmSqZI3T6BHrkBkeSErvICXn3dfqXUfeLx35LfptLDEbrzFUdwYFNmt8QXOwe9yaw==}
     cpu: [x64]
@@ -8376,10 +8751,19 @@ packages:
   undici-types@6.21.0:
     resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
 
+  undici-types@7.8.0:
+    resolution: {integrity: sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==}
+
   undici@5.29.0:
     resolution: {integrity: sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==}
     engines: {node: '>=14.0'}
 
+  unique-filename@1.1.1:
+    resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==}
+
+  unique-slug@2.0.2:
+    resolution: {integrity: sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==}
+
   universalify@0.2.0:
     resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
     engines: {node: '>= 4.0.0'}
@@ -8702,6 +9086,9 @@ packages:
     engines: {node: '>=8'}
     hasBin: true
 
+  wide-align@1.1.5:
+    resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==}
+
   word-wrap@1.2.5:
     resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
     engines: {node: '>=0.10.0'}
@@ -9548,6 +9935,8 @@ snapshots:
 
   '@firebase/app-check-interop-types@0.3.0': {}
 
+  '@firebase/app-check-interop-types@0.3.2': {}
+
   '@firebase/app-check-interop-types@0.3.3': {}
 
   '@firebase/app-check-types@0.5.0': {}
@@ -9570,6 +9959,8 @@ snapshots:
 
   '@firebase/app-types@0.9.0': {}
 
+  '@firebase/app-types@0.9.2': {}
+
   '@firebase/app-types@0.9.3': {}
 
   '@firebase/app@0.9.13':
@@ -9580,14 +9971,14 @@ snapshots:
       idb: 7.1.1
       tslib: 2.8.1
 
-  '@firebase/auth-compat@0.4.2(@firebase/app-compat@0.2.13)(@firebase/app-types@0.9.0)(@firebase/app@0.9.13)':
+  '@firebase/auth-compat@0.4.2(@firebase/app-compat@0.2.13)(@firebase/app-types@0.9.0)(@firebase/app@0.9.13)(encoding@0.1.13)':
     dependencies:
       '@firebase/app-compat': 0.2.13
-      '@firebase/auth': 0.23.2(@firebase/app@0.9.13)
+      '@firebase/auth': 0.23.2(@firebase/app@0.9.13)(encoding@0.1.13)
       '@firebase/auth-types': 0.12.0(@firebase/app-types@0.9.0)(@firebase/util@1.9.3)
       '@firebase/component': 0.6.4
       '@firebase/util': 1.9.3
-      node-fetch: 2.6.7
+      node-fetch: 2.6.7(encoding@0.1.13)
       tslib: 2.8.1
     transitivePeerDependencies:
       - '@firebase/app'
@@ -9596,6 +9987,8 @@ snapshots:
 
   '@firebase/auth-interop-types@0.2.1': {}
 
+  '@firebase/auth-interop-types@0.2.3': {}
+
   '@firebase/auth-interop-types@0.2.4': {}
 
   '@firebase/auth-types@0.12.0(@firebase/app-types@0.9.0)(@firebase/util@1.9.3)':
@@ -9603,13 +9996,13 @@ snapshots:
       '@firebase/app-types': 0.9.0
       '@firebase/util': 1.9.3
 
-  '@firebase/auth@0.23.2(@firebase/app@0.9.13)':
+  '@firebase/auth@0.23.2(@firebase/app@0.9.13)(encoding@0.1.13)':
     dependencies:
       '@firebase/app': 0.9.13
       '@firebase/component': 0.6.4
       '@firebase/logger': 0.4.0
       '@firebase/util': 1.9.3
-      node-fetch: 2.6.7
+      node-fetch: 2.6.7(encoding@0.1.13)
       tslib: 2.8.1
     transitivePeerDependencies:
       - encoding
@@ -9624,6 +10017,11 @@ snapshots:
       '@firebase/util': 1.9.3
       tslib: 2.8.1
 
+  '@firebase/component@0.6.9':
+    dependencies:
+      '@firebase/util': 1.10.0
+      tslib: 2.8.1
+
   '@firebase/database-compat@0.3.4':
     dependencies:
       '@firebase/component': 0.6.4
@@ -9633,6 +10031,15 @@ snapshots:
       '@firebase/util': 1.9.3
       tslib: 2.8.1
 
+  '@firebase/database-compat@1.0.8':
+    dependencies:
+      '@firebase/component': 0.6.9
+      '@firebase/database': 1.0.8
+      '@firebase/database-types': 1.0.5
+      '@firebase/logger': 0.4.2
+      '@firebase/util': 1.10.0
+      tslib: 2.8.1
+
   '@firebase/database-compat@2.0.10':
     dependencies:
       '@firebase/component': 0.6.17
@@ -9652,6 +10059,11 @@ snapshots:
       '@firebase/app-types': 0.9.3
       '@firebase/util': 1.12.0
 
+  '@firebase/database-types@1.0.5':
+    dependencies:
+      '@firebase/app-types': 0.9.2
+      '@firebase/util': 1.10.0
+
   '@firebase/database@0.14.4':
     dependencies:
       '@firebase/auth-interop-types': 0.2.1
@@ -9671,11 +10083,21 @@ snapshots:
       faye-websocket: 0.11.4
       tslib: 2.8.1
 
-  '@firebase/firestore-compat@0.3.12(@firebase/app-compat@0.2.13)(@firebase/app-types@0.9.0)(@firebase/app@0.9.13)':
+  '@firebase/database@1.0.8':
+    dependencies:
+      '@firebase/app-check-interop-types': 0.3.2
+      '@firebase/auth-interop-types': 0.2.3
+      '@firebase/component': 0.6.9
+      '@firebase/logger': 0.4.2
+      '@firebase/util': 1.10.0
+      faye-websocket: 0.11.4
+      tslib: 2.8.1
+
+  '@firebase/firestore-compat@0.3.12(@firebase/app-compat@0.2.13)(@firebase/app-types@0.9.0)(@firebase/app@0.9.13)(encoding@0.1.13)':
     dependencies:
       '@firebase/app-compat': 0.2.13
       '@firebase/component': 0.6.4
-      '@firebase/firestore': 3.13.0(@firebase/app@0.9.13)
+      '@firebase/firestore': 3.13.0(@firebase/app@0.9.13)(encoding@0.1.13)
       '@firebase/firestore-types': 2.5.1(@firebase/app-types@0.9.0)(@firebase/util@1.9.3)
       '@firebase/util': 1.9.3
       tslib: 2.8.1
@@ -9689,7 +10111,7 @@ snapshots:
       '@firebase/app-types': 0.9.0
       '@firebase/util': 1.9.3
 
-  '@firebase/firestore@3.13.0(@firebase/app@0.9.13)':
+  '@firebase/firestore@3.13.0(@firebase/app@0.9.13)(encoding@0.1.13)':
     dependencies:
       '@firebase/app': 0.9.13
       '@firebase/component': 0.6.4
@@ -9698,16 +10120,16 @@ snapshots:
       '@firebase/webchannel-wrapper': 0.10.1
       '@grpc/grpc-js': 1.7.3
       '@grpc/proto-loader': 0.6.13
-      node-fetch: 2.6.7
+      node-fetch: 2.6.7(encoding@0.1.13)
       tslib: 2.8.1
     transitivePeerDependencies:
       - encoding
 
-  '@firebase/functions-compat@0.3.5(@firebase/app-compat@0.2.13)(@firebase/app@0.9.13)':
+  '@firebase/functions-compat@0.3.5(@firebase/app-compat@0.2.13)(@firebase/app@0.9.13)(encoding@0.1.13)':
     dependencies:
       '@firebase/app-compat': 0.2.13
       '@firebase/component': 0.6.4
-      '@firebase/functions': 0.10.0(@firebase/app@0.9.13)
+      '@firebase/functions': 0.10.0(@firebase/app@0.9.13)(encoding@0.1.13)
       '@firebase/functions-types': 0.6.0
       '@firebase/util': 1.9.3
       tslib: 2.8.1
@@ -9717,7 +10139,7 @@ snapshots:
 
   '@firebase/functions-types@0.6.0': {}
 
-  '@firebase/functions@0.10.0(@firebase/app@0.9.13)':
+  '@firebase/functions@0.10.0(@firebase/app@0.9.13)(encoding@0.1.13)':
     dependencies:
       '@firebase/app': 0.9.13
       '@firebase/app-check-interop-types': 0.3.0
@@ -9725,7 +10147,7 @@ snapshots:
       '@firebase/component': 0.6.4
       '@firebase/messaging-interop-types': 0.2.0
       '@firebase/util': 1.9.3
-      node-fetch: 2.6.7
+      node-fetch: 2.6.7(encoding@0.1.13)
       tslib: 2.8.1
     transitivePeerDependencies:
       - encoding
@@ -9758,6 +10180,10 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
+  '@firebase/logger@0.4.2':
+    dependencies:
+      tslib: 2.8.1
+
   '@firebase/logger@0.4.4':
     dependencies:
       tslib: 2.8.1
@@ -9830,11 +10256,11 @@ snapshots:
       '@firebase/util': 1.9.3
       tslib: 2.8.1
 
-  '@firebase/storage-compat@0.3.2(@firebase/app-compat@0.2.13)(@firebase/app-types@0.9.0)(@firebase/app@0.9.13)':
+  '@firebase/storage-compat@0.3.2(@firebase/app-compat@0.2.13)(@firebase/app-types@0.9.0)(@firebase/app@0.9.13)(encoding@0.1.13)':
     dependencies:
       '@firebase/app-compat': 0.2.13
       '@firebase/component': 0.6.4
-      '@firebase/storage': 0.11.2(@firebase/app@0.9.13)
+      '@firebase/storage': 0.11.2(@firebase/app@0.9.13)(encoding@0.1.13)
       '@firebase/storage-types': 0.8.0(@firebase/app-types@0.9.0)(@firebase/util@1.9.3)
       '@firebase/util': 1.9.3
       tslib: 2.8.1
@@ -9848,16 +10274,20 @@ snapshots:
       '@firebase/app-types': 0.9.0
       '@firebase/util': 1.9.3
 
-  '@firebase/storage@0.11.2(@firebase/app@0.9.13)':
+  '@firebase/storage@0.11.2(@firebase/app@0.9.13)(encoding@0.1.13)':
     dependencies:
       '@firebase/app': 0.9.13
       '@firebase/component': 0.6.4
       '@firebase/util': 1.9.3
-      node-fetch: 2.6.7
+      node-fetch: 2.6.7(encoding@0.1.13)
       tslib: 2.8.1
     transitivePeerDependencies:
       - encoding
 
+  '@firebase/util@1.10.0':
+    dependencies:
+      tslib: 2.8.1
+
   '@firebase/util@1.12.0':
     dependencies:
       tslib: 2.8.1
@@ -9885,12 +10315,15 @@ snapshots:
 
   '@floating-ui/utils@0.2.9': {}
 
-  '@google-cloud/firestore@7.11.1':
+  '@gar/promisify@1.1.3':
+    optional: true
+
+  '@google-cloud/firestore@7.11.1(encoding@0.1.13)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       fast-deep-equal: 3.1.3
       functional-red-black-tree: 1.0.1
-      google-gax: 4.6.1
+      google-gax: 4.6.1(encoding@0.1.13)
       protobufjs: 7.4.0
     transitivePeerDependencies:
       - encoding
@@ -9909,7 +10342,7 @@ snapshots:
   '@google-cloud/promisify@4.0.0':
     optional: true
 
-  '@google-cloud/storage@7.16.0':
+  '@google-cloud/storage@7.16.0(encoding@0.1.13)':
     dependencies:
       '@google-cloud/paginator': 5.0.2
       '@google-cloud/projectify': 4.0.0
@@ -9918,13 +10351,13 @@ snapshots:
       async-retry: 1.3.3
       duplexify: 4.1.3
       fast-xml-parser: 4.5.3
-      gaxios: 6.7.1
-      google-auth-library: 9.15.1
+      gaxios: 6.7.1(encoding@0.1.13)
+      google-auth-library: 9.15.1(encoding@0.1.13)
       html-entities: 2.6.0
       mime: 3.0.0
       p-limit: 3.1.0
-      retry-request: 7.0.2
-      teeny-request: 9.0.0
+      retry-request: 7.0.2(encoding@0.1.13)
+      teeny-request: 9.0.0(encoding@0.1.13)
       uuid: 8.3.2
     transitivePeerDependencies:
       - encoding
@@ -10179,6 +10612,41 @@ snapshots:
       - supports-color
       - ts-node
 
+  '@jest/core@29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3))':
+    dependencies:
+      '@jest/console': 29.7.0
+      '@jest/reporters': 29.7.0
+      '@jest/test-result': 29.7.0
+      '@jest/transform': 29.7.0
+      '@jest/types': 29.6.3
+      '@types/node': 20.17.50
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      exit: 0.1.2
+      graceful-fs: 4.2.11
+      jest-changed-files: 29.7.0
+      jest-config: 29.7.0(@types/node@20.17.50)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3))
+      jest-haste-map: 29.7.0
+      jest-message-util: 29.7.0
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-resolve-dependencies: 29.7.0
+      jest-runner: 29.7.0
+      jest-runtime: 29.7.0
+      jest-snapshot: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      jest-watcher: 29.7.0
+      micromatch: 4.0.8
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-ansi: 6.0.1
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+      - ts-node
+
   '@jest/environment@28.1.3':
     dependencies:
       '@jest/fake-timers': 28.1.3
@@ -10447,7 +10915,7 @@ snapshots:
     dependencies:
       jsep: 1.4.0
 
-  '@kubernetes/client-node@1.3.0':
+  '@kubernetes/client-node@1.3.0(encoding@0.1.13)':
     dependencies:
       '@types/js-yaml': 4.0.9
       '@types/node': 22.15.21
@@ -10458,7 +10926,7 @@ snapshots:
       isomorphic-ws: 5.0.0(ws@8.18.2)
       js-yaml: 4.1.0
       jsonpath-plus: 10.3.0
-      node-fetch: 2.7.0
+      node-fetch: 2.7.0(encoding@0.1.13)
       openid-client: 6.5.0
       rfc4648: 1.5.4
       socks-proxy-agent: 8.0.5
@@ -10710,6 +11178,18 @@ snapshots:
 
   '@nolyfill/is-core-module@1.0.39': {}
 
+  '@npmcli/fs@1.1.1':
+    dependencies:
+      '@gar/promisify': 1.1.3
+      semver: 7.7.2
+    optional: true
+
+  '@npmcli/move-file@1.1.2':
+    dependencies:
+      mkdirp: 1.0.4
+      rimraf: 3.0.2
+    optional: true
+
   '@opentelemetry/api@1.9.0':
     optional: true
 
@@ -10806,9 +11286,45 @@ snapshots:
 
   '@repeaterjs/repeater@3.0.6': {}
 
-  '@rollup/rollup-android-arm-eabi@4.41.0':
-    optional: true
-
+  '@rollup/plugin-commonjs@28.0.5(rollup@4.41.0)':
+    dependencies:
+      '@rollup/pluginutils': 5.1.4(rollup@4.41.0)
+      commondir: 1.0.1
+      estree-walker: 2.0.2
+      fdir: 6.4.4(picomatch@4.0.2)
+      is-reference: 1.2.1
+      magic-string: 0.30.17
+      picomatch: 4.0.2
+    optionalDependencies:
+      rollup: 4.41.0
+
+  '@rollup/plugin-json@6.1.0(rollup@4.41.0)':
+    dependencies:
+      '@rollup/pluginutils': 5.1.4(rollup@4.41.0)
+    optionalDependencies:
+      rollup: 4.41.0
+
+  '@rollup/plugin-node-resolve@16.0.1(rollup@4.41.0)':
+    dependencies:
+      '@rollup/pluginutils': 5.1.4(rollup@4.41.0)
+      '@types/resolve': 1.20.2
+      deepmerge: 4.3.1
+      is-module: 1.0.0
+      resolve: 1.22.10
+    optionalDependencies:
+      rollup: 4.41.0
+
+  '@rollup/pluginutils@5.1.4(rollup@4.41.0)':
+    dependencies:
+      '@types/estree': 1.0.7
+      estree-walker: 2.0.2
+      picomatch: 4.0.2
+    optionalDependencies:
+      rollup: 4.41.0
+
+  '@rollup/rollup-android-arm-eabi@4.41.0':
+    optional: true
+
   '@rollup/rollup-android-arm64@4.41.0':
     optional: true
 
@@ -10970,11 +11486,11 @@ snapshots:
       storybook: 8.6.14(prettier@3.5.3)
       ts-dedent: 2.2.0
 
-  '@storybook/addon-svelte-csf@5.0.1(@storybook/svelte@8.6.14(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1))(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(babel-plugin-macros@3.1.0)(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))':
+  '@storybook/addon-svelte-csf@5.0.1(@storybook/svelte@8.6.14(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1))(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(babel-plugin-macros@3.1.0)(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))':
     dependencies:
       '@storybook/csf': 0.1.13
       '@storybook/svelte': 8.6.14(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)
-      '@sveltejs/vite-plugin-svelte': 5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+      '@sveltejs/vite-plugin-svelte': 5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
       dedent: 1.6.0(babel-plugin-macros@3.1.0)
       es-toolkit: 1.38.0
       esrap: 1.4.6
@@ -10982,7 +11498,7 @@ snapshots:
       storybook: 8.6.14(prettier@3.5.3)
       svelte: 5.33.1
       svelte-ast-print: 0.4.2(svelte@5.33.1)
-      vite: 6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+      vite: 6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
       zimmerframe: 1.1.2
     transitivePeerDependencies:
       - babel-plugin-macros
@@ -11022,6 +11538,14 @@ snapshots:
       ts-dedent: 2.2.0
       vite: 6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
 
+  '@storybook/builder-vite@8.6.14(storybook@8.6.14(prettier@3.5.3))(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))':
+    dependencies:
+      '@storybook/csf-plugin': 8.6.14(storybook@8.6.14(prettier@3.5.3))
+      browser-assert: 1.2.1
+      storybook: 8.6.14(prettier@3.5.3)
+      ts-dedent: 2.2.0
+      vite: 6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+
   '@storybook/components@8.6.14(storybook@8.6.14(prettier@3.5.3))':
     dependencies:
       storybook: 8.6.14(prettier@3.5.3)
@@ -11136,20 +11660,20 @@ snapshots:
       - sugarss
       - supports-color
 
-  '@storybook/svelte-vite@8.6.14(@babel/core@7.27.1)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)))(postcss@8.5.3)(sass@1.89.1)(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))':
+  '@storybook/svelte-vite@8.6.14(@babel/core@7.27.1)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)))(postcss@8.5.3)(sass@1.89.1)(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))':
     dependencies:
-      '@storybook/builder-vite': 8.6.14(storybook@8.6.14(prettier@3.5.3))(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+      '@storybook/builder-vite': 8.6.14(storybook@8.6.14(prettier@3.5.3))(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
       '@storybook/svelte': 8.6.14(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)
-      '@sveltejs/vite-plugin-svelte': 5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+      '@sveltejs/vite-plugin-svelte': 5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
       magic-string: 0.30.17
       storybook: 8.6.14(prettier@3.5.3)
       svelte: 5.33.1
-      svelte-preprocess: 5.1.4(@babel/core@7.27.1)(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)))(postcss@8.5.3)(sass@1.89.1)(svelte@5.33.1)(typescript@5.8.3)
+      svelte-preprocess: 5.1.4(@babel/core@7.27.1)(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)))(postcss@8.5.3)(sass@1.89.1)(svelte@5.33.1)(typescript@5.8.3)
       svelte2tsx: 0.7.39(svelte@5.33.1)(typescript@5.8.3)
       sveltedoc-parser: 4.2.1
       ts-dedent: 2.2.0
       typescript: 5.8.3
-      vite: 6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+      vite: 6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
     transitivePeerDependencies:
       - '@babel/core'
       - coffeescript
@@ -11200,15 +11724,15 @@ snapshots:
       - sugarss
       - supports-color
 
-  '@storybook/sveltekit@8.6.14(@babel/core@7.27.1)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)))(postcss@8.5.3)(sass@1.89.1)(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))':
+  '@storybook/sveltekit@8.6.14(@babel/core@7.27.1)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)))(postcss@8.5.3)(sass@1.89.1)(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))':
     dependencies:
       '@storybook/addon-actions': 8.6.14(storybook@8.6.14(prettier@3.5.3))
-      '@storybook/builder-vite': 8.6.14(storybook@8.6.14(prettier@3.5.3))(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+      '@storybook/builder-vite': 8.6.14(storybook@8.6.14(prettier@3.5.3))(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
       '@storybook/svelte': 8.6.14(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)
-      '@storybook/svelte-vite': 8.6.14(@babel/core@7.27.1)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)))(postcss@8.5.3)(sass@1.89.1)(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+      '@storybook/svelte-vite': 8.6.14(@babel/core@7.27.1)(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)))(postcss@8.5.3)(sass@1.89.1)(storybook@8.6.14(prettier@3.5.3))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
       storybook: 8.6.14(prettier@3.5.3)
       svelte: 5.33.1
-      vite: 6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+      vite: 6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
     transitivePeerDependencies:
       - '@babel/core'
       - '@sveltejs/vite-plugin-svelte'
@@ -11247,10 +11771,22 @@ snapshots:
     dependencies:
       acorn: 8.14.1
 
+  '@sveltejs/adapter-node@5.2.12(@sveltejs/kit@2.21.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))':
+    dependencies:
+      '@rollup/plugin-commonjs': 28.0.5(rollup@4.41.0)
+      '@rollup/plugin-json': 6.1.0(rollup@4.41.0)
+      '@rollup/plugin-node-resolve': 16.0.1(rollup@4.41.0)
+      '@sveltejs/kit': 2.21.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+      rollup: 4.41.0
+
   '@sveltejs/adapter-static@3.0.8(@sveltejs/kit@2.21.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))':
     dependencies:
       '@sveltejs/kit': 2.21.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
 
+  '@sveltejs/adapter-static@3.0.8(@sveltejs/kit@2.21.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))':
+    dependencies:
+      '@sveltejs/kit': 2.21.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+
   '@sveltejs/kit@2.21.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))':
     dependencies:
       '@sveltejs/acorn-typescript': 1.0.5(acorn@8.14.1)
@@ -11269,6 +11805,24 @@ snapshots:
       svelte: 5.33.1
       vite: 6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
 
+  '@sveltejs/kit@2.21.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))':
+    dependencies:
+      '@sveltejs/acorn-typescript': 1.0.5(acorn@8.14.1)
+      '@sveltejs/vite-plugin-svelte': 5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+      '@types/cookie': 0.6.0
+      acorn: 8.14.1
+      cookie: 0.6.0
+      devalue: 5.1.1
+      esm-env: 1.2.2
+      kleur: 4.1.5
+      magic-string: 0.30.17
+      mrmime: 2.0.1
+      sade: 1.8.1
+      set-cookie-parser: 2.7.1
+      sirv: 3.0.1
+      svelte: 5.33.1
+      vite: 6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+
   '@sveltejs/vite-plugin-svelte-inspector@4.0.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))':
     dependencies:
       '@sveltejs/vite-plugin-svelte': 5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
@@ -11278,6 +11832,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@sveltejs/vite-plugin-svelte-inspector@4.0.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))':
+    dependencies:
+      '@sveltejs/vite-plugin-svelte': 5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+      debug: 4.4.1(supports-color@5.5.0)
+      svelte: 5.33.1
+      vite: 6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+    transitivePeerDependencies:
+      - supports-color
+
   '@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))':
     dependencies:
       '@sveltejs/vite-plugin-svelte-inspector': 4.0.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
@@ -11291,6 +11854,19 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))':
+    dependencies:
+      '@sveltejs/vite-plugin-svelte-inspector': 4.0.1(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)))(svelte@5.33.1)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+      debug: 4.4.1(supports-color@5.5.0)
+      deepmerge: 4.3.1
+      kleur: 4.1.5
+      magic-string: 0.30.17
+      svelte: 5.33.1
+      vite: 6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+      vitefu: 1.0.6(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+    transitivePeerDependencies:
+      - supports-color
+
   '@swc/helpers@0.4.11':
     dependencies:
       tslib: 2.8.1
@@ -11383,6 +11959,13 @@ snapshots:
       tailwindcss: 4.1.7
       vite: 6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
 
+  '@tailwindcss/vite@4.1.7(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))':
+    dependencies:
+      '@tailwindcss/node': 4.1.7
+      '@tailwindcss/oxide': 4.1.7
+      tailwindcss: 4.1.7
+      vite: 6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+
   '@tanstack/react-virtual@3.13.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@tanstack/virtual-core': 3.13.9
@@ -11543,6 +12126,9 @@ snapshots:
     dependencies:
       '@testing-library/dom': 9.3.4
 
+  '@tootallnate/once@1.1.2':
+    optional: true
+
   '@tootallnate/once@2.0.0': {}
 
   '@tsconfig/node10@1.0.11': {}
@@ -11691,6 +12277,10 @@ snapshots:
     dependencies:
       undici-types: 6.21.0
 
+  '@types/node@24.0.0':
+    dependencies:
+      undici-types: 7.8.0
+
   '@types/parse-json@4.0.2': {}
 
   '@types/parse5@6.0.3': {}
@@ -11737,6 +12327,8 @@ snapshots:
       form-data: 2.5.3
     optional: true
 
+  '@types/resolve@1.20.2': {}
+
   '@types/scheduler@0.26.0': {}
 
   '@types/semver@7.7.0': {}
@@ -12188,6 +12780,26 @@ snapshots:
       - utf-8-validate
       - vite
 
+  '@vitest/browser@3.1.4(playwright@1.52.0)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))(vitest@3.1.4)':
+    dependencies:
+      '@testing-library/dom': 10.4.0
+      '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.0)
+      '@vitest/mocker': 3.1.4(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+      '@vitest/utils': 3.1.4
+      magic-string: 0.30.17
+      sirv: 3.0.1
+      tinyrainbow: 2.0.0
+      vitest: 3.1.4(@types/node@24.0.0)(@vitest/browser@3.1.4)(jiti@2.4.2)(jsdom@19.0.0)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+      ws: 8.18.2
+    optionalDependencies:
+      playwright: 1.52.0
+    transitivePeerDependencies:
+      - bufferutil
+      - msw
+      - utf-8-validate
+      - vite
+    optional: true
+
   '@vitest/coverage-v8@3.1.4(@vitest/browser@3.1.4)(vitest@3.1.4)':
     dependencies:
       '@ampproject/remapping': 2.3.0
@@ -12236,6 +12848,14 @@ snapshots:
     optionalDependencies:
       vite: 6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
 
+  '@vitest/mocker@3.1.4(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))':
+    dependencies:
+      '@vitest/spy': 3.1.4
+      estree-walker: 3.0.3
+      magic-string: 0.30.17
+    optionalDependencies:
+      vite: 6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+
   '@vitest/pretty-format@2.0.5':
     dependencies:
       tinyrainbow: 1.2.0
@@ -12346,6 +12966,9 @@ snapshots:
 
   abab@2.0.6: {}
 
+  abbrev@1.1.1:
+    optional: true
+
   abort-controller@3.0.0:
     dependencies:
       event-target-shim: 5.0.1
@@ -12384,6 +13007,17 @@ snapshots:
 
   agent-base@7.1.3: {}
 
+  agentkeepalive@4.6.0:
+    dependencies:
+      humanize-ms: 1.2.1
+    optional: true
+
+  aggregate-error@3.1.0:
+    dependencies:
+      clean-stack: 2.2.0
+      indent-string: 4.0.0
+    optional: true
+
   ajv-formats@2.1.1(ajv@8.17.1):
     optionalDependencies:
       ajv: 8.17.1
@@ -12439,6 +13073,9 @@ snapshots:
 
   app-root-path@3.1.0: {}
 
+  aproba@2.0.0:
+    optional: true
+
   archiver-utils@5.0.2:
     dependencies:
       glob: 10.4.5
@@ -12459,6 +13096,12 @@ snapshots:
       tar-stream: 3.1.7
       zip-stream: 6.0.1
 
+  are-we-there-yet@3.0.1:
+    dependencies:
+      delegates: 1.0.0
+      readable-stream: 3.6.2
+    optional: true
+
   arg@4.1.3: {}
 
   arg@5.0.2: {}
@@ -12744,10 +13387,20 @@ snapshots:
     dependencies:
       open: 8.4.2
 
+  better-sqlite3@11.10.0:
+    dependencies:
+      bindings: 1.5.0
+      prebuild-install: 7.1.3
+    optional: true
+
   bignumber.js@9.3.0: {}
 
   binary-extensions@2.3.0: {}
 
+  bindings@1.5.0:
+    dependencies:
+      file-uri-to-path: 1.0.0
+
   bl@4.1.0:
     dependencies:
       buffer: 5.7.1
@@ -12830,6 +13483,30 @@ snapshots:
 
   cac@6.7.14: {}
 
+  cacache@15.3.0:
+    dependencies:
+      '@npmcli/fs': 1.1.1
+      '@npmcli/move-file': 1.1.2
+      chownr: 2.0.0
+      fs-minipass: 2.1.0
+      glob: 7.2.3
+      infer-owner: 1.0.4
+      lru-cache: 6.0.0
+      minipass: 3.3.6
+      minipass-collect: 1.0.2
+      minipass-flush: 1.0.5
+      minipass-pipeline: 1.2.4
+      mkdirp: 1.0.4
+      p-map: 4.0.0
+      promise-inflight: 1.0.1
+      rimraf: 3.0.2
+      ssri: 8.0.1
+      tar: 6.2.1
+      unique-filename: 1.1.1
+    transitivePeerDependencies:
+      - bluebird
+    optional: true
+
   call-bind-apply-helpers@1.0.2:
     dependencies:
       es-errors: 1.3.0
@@ -12915,6 +13592,8 @@ snapshots:
 
   chownr@1.1.4: {}
 
+  chownr@2.0.0: {}
+
   chownr@3.0.0: {}
 
   chromatic@11.28.3: {}
@@ -12923,6 +13602,9 @@ snapshots:
 
   cjs-module-lexer@1.4.3: {}
 
+  clean-stack@2.2.0:
+    optional: true
+
   cli-cursor@4.0.0:
     dependencies:
       restore-cursor: 4.0.0
@@ -12960,6 +13642,9 @@ snapshots:
 
   color-name@1.1.4: {}
 
+  color-support@1.1.3:
+    optional: true
+
   colorette@2.0.20: {}
 
   combined-stream@1.0.8:
@@ -12970,6 +13655,8 @@ snapshots:
 
   commander@4.1.1: {}
 
+  commondir@1.0.1: {}
+
   commonmark@0.30.0:
     dependencies:
       entities: 2.0.3
@@ -13001,6 +13688,9 @@ snapshots:
 
   confbox@0.1.8: {}
 
+  console-control-strings@1.1.0:
+    optional: true
+
   content-disposition@0.5.4:
     dependencies:
       safe-buffer: 5.2.1
@@ -13066,13 +13756,13 @@ snapshots:
       - supports-color
       - ts-node
 
-  create-jest@29.7.0(@types/node@22.15.21)(babel-plugin-macros@3.1.0):
+  create-jest@29.7.0(@types/node@24.0.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)):
     dependencies:
       '@jest/types': 29.6.3
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.11
-      jest-config: 29.7.0(@types/node@22.15.21)(babel-plugin-macros@3.1.0)
+      jest-config: 29.7.0(@types/node@24.0.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3))
       jest-util: 29.7.0
       prompts: 2.4.2
     transitivePeerDependencies:
@@ -13083,6 +13773,12 @@ snapshots:
 
   create-require@1.1.1: {}
 
+  cross-fetch@3.2.0(encoding@0.1.13):
+    dependencies:
+      node-fetch: 2.7.0(encoding@0.1.13)
+    transitivePeerDependencies:
+      - encoding
+
   cross-inspect@1.0.1:
     dependencies:
       tslib: 2.8.1
@@ -13163,6 +13859,10 @@ snapshots:
 
   decimal.js@10.5.0: {}
 
+  decompress-response@6.0.0:
+    dependencies:
+      mimic-response: 3.1.0
+
   dedent-js@1.0.1: {}
 
   dedent@0.7.0: {}
@@ -13198,6 +13898,8 @@ snapshots:
       which-collection: 1.0.2
       which-typed-array: 1.1.19
 
+  deep-extend@0.6.0: {}
+
   deep-is@0.1.4: {}
 
   deepmerge@4.3.1: {}
@@ -13218,6 +13920,9 @@ snapshots:
 
   delayed-stream@1.0.0: {}
 
+  delegates@1.0.0:
+    optional: true
+
   depd@2.0.0: {}
 
   dequal@2.0.3: {}
@@ -13371,6 +14076,11 @@ snapshots:
 
   encodeurl@2.0.0: {}
 
+  encoding@0.1.13:
+    dependencies:
+      iconv-lite: 0.6.3
+    optional: true
+
   end-of-stream@1.4.4:
     dependencies:
       once: 1.4.0
@@ -13389,6 +14099,12 @@ snapshots:
 
   entities@2.2.0: {}
 
+  env-paths@2.2.1:
+    optional: true
+
+  err-code@2.0.3:
+    optional: true
+
   error-ex@1.3.2:
     dependencies:
       is-arrayish: 0.2.1
@@ -13796,7 +14512,7 @@ snapshots:
       string.prototype.matchall: 4.0.12
       string.prototype.repeat: 1.0.0
 
-  eslint-plugin-svelte@3.9.0(eslint@9.27.0(jiti@2.4.2))(svelte@5.33.1)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)):
+  eslint-plugin-svelte@3.9.0(eslint@9.27.0(jiti@2.4.2))(svelte@5.33.1)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)):
     dependencies:
       '@eslint-community/eslint-utils': 4.7.0(eslint@9.27.0(jiti@2.4.2))
       '@jridgewell/sourcemap-codec': 1.5.0
@@ -13805,7 +14521,7 @@ snapshots:
       globals: 16.1.0
       known-css-properties: 0.36.0
       postcss: 8.5.3
-      postcss-load-config: 3.1.4(postcss@8.5.3)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3))
+      postcss-load-config: 3.1.4(postcss@8.5.3)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3))
       postcss-safe-parser: 7.0.1(postcss@8.5.3)
       semver: 7.7.2
       svelte-eslint-parser: 1.2.0(svelte@5.33.1)
@@ -14066,6 +14782,8 @@ snapshots:
 
   estraverse@5.3.0: {}
 
+  estree-walker@2.0.2: {}
+
   estree-walker@3.0.3:
     dependencies:
       '@types/estree': 1.0.7
@@ -14120,6 +14838,8 @@ snapshots:
 
   exit@0.1.2: {}
 
+  expand-template@2.0.3: {}
+
   expect-type@1.2.1: {}
 
   expect@28.1.3:
@@ -14299,6 +15019,8 @@ snapshots:
     dependencies:
       flat-cache: 4.0.1
 
+  file-uri-to-path@1.0.0: {}
+
   filelist@1.0.4:
     dependencies:
       minimatch: 5.1.6
@@ -14339,26 +15061,44 @@ snapshots:
       locate-path: 6.0.0
       path-exists: 4.0.0
 
-  firebase-admin@13.4.0:
+  firebase-admin@12.7.0(encoding@0.1.13):
+    dependencies:
+      '@fastify/busboy': 3.1.1
+      '@firebase/database-compat': 1.0.8
+      '@firebase/database-types': 1.0.5
+      '@types/node': 22.15.21
+      farmhash-modern: 1.1.0
+      jsonwebtoken: 9.0.2
+      jwks-rsa: 3.2.0
+      node-forge: 1.3.1
+      uuid: 10.0.0
+    optionalDependencies:
+      '@google-cloud/firestore': 7.11.1(encoding@0.1.13)
+      '@google-cloud/storage': 7.16.0(encoding@0.1.13)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  firebase-admin@13.4.0(encoding@0.1.13):
     dependencies:
       '@fastify/busboy': 3.1.1
       '@firebase/database-compat': 2.0.10
       '@firebase/database-types': 1.0.14
       '@types/node': 22.15.21
       farmhash-modern: 1.1.0
-      google-auth-library: 9.15.1
+      google-auth-library: 9.15.1(encoding@0.1.13)
       jsonwebtoken: 9.0.2
       jwks-rsa: 3.2.0
       node-forge: 1.3.1
       uuid: 11.1.0
     optionalDependencies:
-      '@google-cloud/firestore': 7.11.1
-      '@google-cloud/storage': 7.16.0
+      '@google-cloud/firestore': 7.11.1(encoding@0.1.13)
+      '@google-cloud/storage': 7.16.0(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  firebase@9.23.0:
+  firebase@9.23.0(encoding@0.1.13):
     dependencies:
       '@firebase/analytics': 0.10.0(@firebase/app@0.9.13)
       '@firebase/analytics-compat': 0.2.6(@firebase/app-compat@0.2.13)(@firebase/app@0.9.13)
@@ -14367,14 +15107,14 @@ snapshots:
       '@firebase/app-check-compat': 0.3.7(@firebase/app-compat@0.2.13)(@firebase/app@0.9.13)
       '@firebase/app-compat': 0.2.13
       '@firebase/app-types': 0.9.0
-      '@firebase/auth': 0.23.2(@firebase/app@0.9.13)
-      '@firebase/auth-compat': 0.4.2(@firebase/app-compat@0.2.13)(@firebase/app-types@0.9.0)(@firebase/app@0.9.13)
+      '@firebase/auth': 0.23.2(@firebase/app@0.9.13)(encoding@0.1.13)
+      '@firebase/auth-compat': 0.4.2(@firebase/app-compat@0.2.13)(@firebase/app-types@0.9.0)(@firebase/app@0.9.13)(encoding@0.1.13)
       '@firebase/database': 0.14.4
       '@firebase/database-compat': 0.3.4
-      '@firebase/firestore': 3.13.0(@firebase/app@0.9.13)
-      '@firebase/firestore-compat': 0.3.12(@firebase/app-compat@0.2.13)(@firebase/app-types@0.9.0)(@firebase/app@0.9.13)
-      '@firebase/functions': 0.10.0(@firebase/app@0.9.13)
-      '@firebase/functions-compat': 0.3.5(@firebase/app-compat@0.2.13)(@firebase/app@0.9.13)
+      '@firebase/firestore': 3.13.0(@firebase/app@0.9.13)(encoding@0.1.13)
+      '@firebase/firestore-compat': 0.3.12(@firebase/app-compat@0.2.13)(@firebase/app-types@0.9.0)(@firebase/app@0.9.13)(encoding@0.1.13)
+      '@firebase/functions': 0.10.0(@firebase/app@0.9.13)(encoding@0.1.13)
+      '@firebase/functions-compat': 0.3.5(@firebase/app-compat@0.2.13)(@firebase/app@0.9.13)(encoding@0.1.13)
       '@firebase/installations': 0.6.4(@firebase/app@0.9.13)
       '@firebase/installations-compat': 0.2.4(@firebase/app-compat@0.2.13)(@firebase/app-types@0.9.0)(@firebase/app@0.9.13)
       '@firebase/messaging': 0.12.4(@firebase/app@0.9.13)
@@ -14383,8 +15123,8 @@ snapshots:
       '@firebase/performance-compat': 0.2.4(@firebase/app-compat@0.2.13)(@firebase/app@0.9.13)
       '@firebase/remote-config': 0.4.4(@firebase/app@0.9.13)
       '@firebase/remote-config-compat': 0.2.4(@firebase/app-compat@0.2.13)(@firebase/app@0.9.13)
-      '@firebase/storage': 0.11.2(@firebase/app@0.9.13)
-      '@firebase/storage-compat': 0.3.2(@firebase/app-compat@0.2.13)(@firebase/app-types@0.9.0)(@firebase/app@0.9.13)
+      '@firebase/storage': 0.11.2(@firebase/app@0.9.13)(encoding@0.1.13)
+      '@firebase/storage-compat': 0.3.2(@firebase/app-compat@0.2.13)(@firebase/app-types@0.9.0)(@firebase/app@0.9.13)(encoding@0.1.13)
       '@firebase/util': 1.9.3
     transitivePeerDependencies:
       - encoding
@@ -14451,6 +15191,10 @@ snapshots:
 
   fs-constants@1.0.0: {}
 
+  fs-minipass@2.1.0:
+    dependencies:
+      minipass: 3.3.6
+
   fs.realpath@1.0.0: {}
 
   fsevents@2.3.2:
@@ -14474,20 +15218,32 @@ snapshots:
 
   functions-have-names@1.2.3: {}
 
-  gaxios@6.7.1:
+  gauge@4.0.4:
+    dependencies:
+      aproba: 2.0.0
+      color-support: 1.1.3
+      console-control-strings: 1.1.0
+      has-unicode: 2.0.1
+      signal-exit: 3.0.7
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wide-align: 1.1.5
+    optional: true
+
+  gaxios@6.7.1(encoding@0.1.13):
     dependencies:
       extend: 3.0.2
       https-proxy-agent: 7.0.6
       is-stream: 2.0.1
-      node-fetch: 2.7.0
+      node-fetch: 2.7.0(encoding@0.1.13)
       uuid: 9.0.1
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  gcp-metadata@6.1.1:
+  gcp-metadata@6.1.1(encoding@0.1.13):
     dependencies:
-      gaxios: 6.7.1
+      gaxios: 6.7.1(encoding@0.1.13)
       google-logging-utils: 0.0.2
       json-bigint: 1.0.0
     transitivePeerDependencies:
@@ -14536,6 +15292,8 @@ snapshots:
     dependencies:
       resolve-pkg-maps: 1.0.0
 
+  github-from-package@0.0.0: {}
+
   glob-parent@5.1.2:
     dependencies:
       is-glob: 4.0.3
@@ -14599,31 +15357,31 @@ snapshots:
     dependencies:
       csstype: 3.1.3
 
-  google-auth-library@9.15.1:
+  google-auth-library@9.15.1(encoding@0.1.13):
     dependencies:
       base64-js: 1.5.1
       ecdsa-sig-formatter: 1.0.11
-      gaxios: 6.7.1
-      gcp-metadata: 6.1.1
-      gtoken: 7.1.0
+      gaxios: 6.7.1(encoding@0.1.13)
+      gcp-metadata: 6.1.1(encoding@0.1.13)
+      gtoken: 7.1.0(encoding@0.1.13)
       jws: 4.0.0
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  google-gax@4.6.1:
+  google-gax@4.6.1(encoding@0.1.13):
     dependencies:
       '@grpc/grpc-js': 1.13.4
       '@grpc/proto-loader': 0.7.15
       '@types/long': 4.0.2
       abort-controller: 3.0.0
       duplexify: 4.1.3
-      google-auth-library: 9.15.1
-      node-fetch: 2.7.0
+      google-auth-library: 9.15.1(encoding@0.1.13)
+      node-fetch: 2.7.0(encoding@0.1.13)
       object-hash: 3.0.0
       proto3-json-serializer: 2.0.2
       protobufjs: 7.4.0
-      retry-request: 7.0.2
+      retry-request: 7.0.2(encoding@0.1.13)
       uuid: 9.0.1
     transitivePeerDependencies:
       - encoding
@@ -14640,6 +15398,14 @@ snapshots:
 
   graphemer@1.4.0: {}
 
+  graphql-request@6.1.0(encoding@0.1.13)(graphql@16.11.0):
+    dependencies:
+      '@graphql-typed-document-node/core': 3.2.0(graphql@16.11.0)
+      cross-fetch: 3.2.0(encoding@0.1.13)
+      graphql: 16.11.0
+    transitivePeerDependencies:
+      - encoding
+
   graphql-type-json@0.3.2(graphql@16.11.0):
     dependencies:
       graphql: 16.11.0
@@ -14679,9 +15445,9 @@ snapshots:
 
   graphql@16.11.0: {}
 
-  gtoken@7.1.0:
+  gtoken@7.1.0(encoding@0.1.13):
     dependencies:
-      gaxios: 6.7.1
+      gaxios: 6.7.1(encoding@0.1.13)
       jws: 4.0.0
     transitivePeerDependencies:
       - encoding
@@ -14707,6 +15473,9 @@ snapshots:
     dependencies:
       has-symbols: 1.1.0
 
+  has-unicode@2.0.1:
+    optional: true
+
   hasown@2.0.2:
     dependencies:
       function-bind: 1.1.2
@@ -14735,6 +15504,9 @@ snapshots:
       domutils: 2.8.0
       entities: 2.2.0
 
+  http-cache-semantics@4.2.0:
+    optional: true
+
   http-errors@2.0.0:
     dependencies:
       depd: 2.0.0
@@ -14745,6 +15517,15 @@ snapshots:
 
   http-parser-js@0.5.10: {}
 
+  http-proxy-agent@4.0.1:
+    dependencies:
+      '@tootallnate/once': 1.1.2
+      agent-base: 6.0.2
+      debug: 4.4.1(supports-color@5.5.0)
+    transitivePeerDependencies:
+      - supports-color
+    optional: true
+
   http-proxy-agent@5.0.0:
     dependencies:
       '@tootallnate/once': 2.0.0
@@ -14773,6 +15554,11 @@ snapshots:
 
   human-signals@5.0.0: {}
 
+  humanize-ms@1.2.1:
+    dependencies:
+      ms: 2.1.3
+    optional: true
+
   husky@8.0.3: {}
 
   iconv-lite@0.4.24:
@@ -14817,6 +15603,9 @@ snapshots:
 
   indent-string@4.0.0: {}
 
+  infer-owner@1.0.4:
+    optional: true
+
   inflight@1.0.6:
     dependencies:
       once: 1.4.0
@@ -14824,6 +15613,8 @@ snapshots:
 
   inherits@2.0.4: {}
 
+  ini@1.3.8: {}
+
   internal-slot@1.1.0:
     dependencies:
       es-errors: 1.3.0
@@ -14917,8 +15708,13 @@ snapshots:
     dependencies:
       is-extglob: 2.1.1
 
+  is-lambda@1.0.1:
+    optional: true
+
   is-map@2.0.3: {}
 
+  is-module@1.0.0: {}
+
   is-number-object@1.1.1:
     dependencies:
       call-bound: 1.0.4
@@ -14930,6 +15726,10 @@ snapshots:
 
   is-potential-custom-element-name@1.0.1: {}
 
+  is-reference@1.2.1:
+    dependencies:
+      '@types/estree': 1.0.7
+
   is-reference@3.0.3:
     dependencies:
       '@types/estree': 1.0.7
@@ -15161,16 +15961,16 @@ snapshots:
       - supports-color
       - ts-node
 
-  jest-cli@29.7.0(@types/node@22.15.21)(babel-plugin-macros@3.1.0):
+  jest-cli@29.7.0(@types/node@24.0.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)):
     dependencies:
-      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.17.50)(typescript@5.8.3))
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3))
       '@jest/test-result': 29.7.0
       '@jest/types': 29.6.3
       chalk: 4.1.2
-      create-jest: 29.7.0(@types/node@22.15.21)(babel-plugin-macros@3.1.0)
+      create-jest: 29.7.0(@types/node@24.0.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3))
       exit: 0.1.2
       import-local: 3.2.0
-      jest-config: 29.7.0(@types/node@22.15.21)(babel-plugin-macros@3.1.0)
+      jest-config: 29.7.0(@types/node@24.0.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3))
       jest-util: 29.7.0
       jest-validate: 29.7.0
       yargs: 17.7.2
@@ -15271,7 +16071,7 @@ snapshots:
       - babel-plugin-macros
       - supports-color
 
-  jest-config@29.7.0(@types/node@22.15.21)(babel-plugin-macros@3.1.0):
+  jest-config@29.7.0(@types/node@20.17.50)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)):
     dependencies:
       '@babel/core': 7.27.1
       '@jest/test-sequencer': 29.7.0
@@ -15296,7 +16096,39 @@ snapshots:
       slash: 3.0.0
       strip-json-comments: 3.1.1
     optionalDependencies:
-      '@types/node': 22.15.21
+      '@types/node': 20.17.50
+      ts-node: 10.9.2(@types/node@24.0.0)(typescript@5.8.3)
+    transitivePeerDependencies:
+      - babel-plugin-macros
+      - supports-color
+
+  jest-config@29.7.0(@types/node@24.0.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)):
+    dependencies:
+      '@babel/core': 7.27.1
+      '@jest/test-sequencer': 29.7.0
+      '@jest/types': 29.6.3
+      babel-jest: 29.7.0(@babel/core@7.27.1)
+      chalk: 4.1.2
+      ci-info: 3.9.0
+      deepmerge: 4.3.1
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      jest-circus: 29.7.0(babel-plugin-macros@3.1.0)
+      jest-environment-node: 29.7.0
+      jest-get-type: 29.6.3
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.7.0
+      jest-runner: 29.7.0
+      jest-util: 29.7.0
+      jest-validate: 29.7.0
+      micromatch: 4.0.8
+      parse-json: 5.2.0
+      pretty-format: 29.7.0
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+    optionalDependencies:
+      '@types/node': 24.0.0
+      ts-node: 10.9.2(@types/node@24.0.0)(typescript@5.8.3)
     transitivePeerDependencies:
       - babel-plugin-macros
       - supports-color
@@ -15771,12 +16603,12 @@ snapshots:
       - supports-color
       - ts-node
 
-  jest@29.7.0(@types/node@22.15.21)(babel-plugin-macros@3.1.0):
+  jest@29.7.0(@types/node@24.0.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)):
     dependencies:
-      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@20.17.50)(typescript@5.8.3))
+      '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3))
       '@jest/types': 29.6.3
       import-local: 3.2.0
-      jest-cli: 29.7.0(@types/node@22.15.21)(babel-plugin-macros@3.1.0)
+      jest-cli: 29.7.0(@types/node@24.0.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3))
     transitivePeerDependencies:
       - '@types/node'
       - babel-plugin-macros
@@ -16160,6 +16992,29 @@ snapshots:
 
   make-error@1.3.6: {}
 
+  make-fetch-happen@9.1.0:
+    dependencies:
+      agentkeepalive: 4.6.0
+      cacache: 15.3.0
+      http-cache-semantics: 4.2.0
+      http-proxy-agent: 4.0.1
+      https-proxy-agent: 5.0.1
+      is-lambda: 1.0.1
+      lru-cache: 6.0.0
+      minipass: 3.3.6
+      minipass-collect: 1.0.2
+      minipass-fetch: 1.4.1
+      minipass-flush: 1.0.5
+      minipass-pipeline: 1.2.4
+      negotiator: 0.6.3
+      promise-retry: 2.0.1
+      socks-proxy-agent: 6.2.1
+      ssri: 8.0.1
+    transitivePeerDependencies:
+      - bluebird
+      - supports-color
+    optional: true
+
   makeerror@1.0.12:
     dependencies:
       tmpl: 1.0.5
@@ -16208,6 +17063,8 @@ snapshots:
 
   mimic-fn@4.0.0: {}
 
+  mimic-response@3.1.0: {}
+
   min-indent@1.0.1: {}
 
   mini-svg-data-uri@1.4.4: {}
@@ -16228,8 +17085,48 @@ snapshots:
 
   minimist@1.2.8: {}
 
+  minipass-collect@1.0.2:
+    dependencies:
+      minipass: 3.3.6
+    optional: true
+
+  minipass-fetch@1.4.1:
+    dependencies:
+      minipass: 3.3.6
+      minipass-sized: 1.0.3
+      minizlib: 2.1.2
+    optionalDependencies:
+      encoding: 0.1.13
+    optional: true
+
+  minipass-flush@1.0.5:
+    dependencies:
+      minipass: 3.3.6
+    optional: true
+
+  minipass-pipeline@1.2.4:
+    dependencies:
+      minipass: 3.3.6
+    optional: true
+
+  minipass-sized@1.0.3:
+    dependencies:
+      minipass: 3.3.6
+    optional: true
+
+  minipass@3.3.6:
+    dependencies:
+      yallist: 4.0.0
+
+  minipass@5.0.0: {}
+
   minipass@7.1.2: {}
 
+  minizlib@2.1.2:
+    dependencies:
+      minipass: 3.3.6
+      yallist: 4.0.0
+
   minizlib@3.0.2:
     dependencies:
       minipass: 7.1.2
@@ -16284,6 +17181,8 @@ snapshots:
 
   nanoid@3.3.11: {}
 
+  napi-build-utils@2.0.0: {}
+
   napi-postinstall@0.2.4: {}
 
   natural-compare-lite@1.4.0: {}
@@ -16340,19 +17239,43 @@ snapshots:
       lower-case: 2.0.2
       tslib: 2.8.1
 
-  node-addon-api@7.1.1:
-    optional: true
+  node-abi@3.75.0:
+    dependencies:
+      semver: 7.7.2
 
-  node-fetch@2.6.7:
+  node-addon-api@7.1.1: {}
+
+  node-fetch@2.6.7(encoding@0.1.13):
     dependencies:
       whatwg-url: 5.0.0
+    optionalDependencies:
+      encoding: 0.1.13
 
-  node-fetch@2.7.0:
+  node-fetch@2.7.0(encoding@0.1.13):
     dependencies:
       whatwg-url: 5.0.0
+    optionalDependencies:
+      encoding: 0.1.13
 
   node-forge@1.3.1: {}
 
+  node-gyp@8.4.1:
+    dependencies:
+      env-paths: 2.2.1
+      glob: 7.2.3
+      graceful-fs: 4.2.11
+      make-fetch-happen: 9.1.0
+      nopt: 5.0.0
+      npmlog: 6.0.2
+      rimraf: 3.0.2
+      semver: 7.7.2
+      tar: 6.2.1
+      which: 2.0.2
+    transitivePeerDependencies:
+      - bluebird
+      - supports-color
+    optional: true
+
   node-int64@0.4.0: {}
 
   node-releases@2.0.19: {}
@@ -16370,6 +17293,11 @@ snapshots:
       touch: 3.1.1
       undefsafe: 2.0.5
 
+  nopt@5.0.0:
+    dependencies:
+      abbrev: 1.1.1
+    optional: true
+
   normalize-path@3.0.0: {}
 
   normalize-range@0.1.2: {}
@@ -16382,6 +17310,14 @@ snapshots:
     dependencies:
       path-key: 4.0.0
 
+  npmlog@6.0.2:
+    dependencies:
+      are-we-there-yet: 3.0.1
+      console-control-strings: 1.1.0
+      gauge: 4.0.4
+      set-blocking: 2.0.0
+    optional: true
+
   nwsapi@2.2.20: {}
 
   oauth4webapi@3.5.1: {}
@@ -16507,6 +17443,11 @@ snapshots:
     dependencies:
       p-limit: 3.1.0
 
+  p-map@4.0.0:
+    dependencies:
+      aggregate-error: 3.1.0
+    optional: true
+
   p-try@2.2.0: {}
 
   package-json-from-dist@1.0.1: {}
@@ -16661,13 +17602,13 @@ snapshots:
       camelcase-css: 2.0.1
       postcss: 8.5.3
 
-  postcss-load-config@3.1.4(postcss@8.5.3)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)):
+  postcss-load-config@3.1.4(postcss@8.5.3)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)):
     dependencies:
       lilconfig: 2.1.0
       yaml: 1.10.2
     optionalDependencies:
       postcss: 8.5.3
-      ts-node: 10.9.2(@types/node@22.15.21)(typescript@5.8.3)
+      ts-node: 10.9.2(@types/node@24.0.0)(typescript@5.8.3)
 
   postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@18.6.4)(typescript@4.7.4)):
     dependencies:
@@ -16686,13 +17627,13 @@ snapshots:
       ts-node: 10.9.2(@types/node@22.15.21)(typescript@5.6.3)
     optional: true
 
-  postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)):
+  postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)):
     dependencies:
       lilconfig: 3.1.3
       yaml: 2.8.0
     optionalDependencies:
       postcss: 8.5.3
-      ts-node: 10.9.2(@types/node@22.15.21)(typescript@5.8.3)
+      ts-node: 10.9.2(@types/node@24.0.0)(typescript@5.8.3)
     optional: true
 
   postcss-nested@6.2.0(postcss@8.5.3):
@@ -16747,6 +17688,21 @@ snapshots:
     dependencies:
       xtend: 4.0.2
 
+  prebuild-install@7.1.3:
+    dependencies:
+      detect-libc: 2.0.4
+      expand-template: 2.0.3
+      github-from-package: 0.0.0
+      minimist: 1.2.8
+      mkdirp-classic: 0.5.3
+      napi-build-utils: 2.0.0
+      node-abi: 3.75.0
+      pump: 3.0.2
+      rc: 1.2.8
+      simple-get: 4.0.1
+      tar-fs: 2.1.3
+      tunnel-agent: 0.6.0
+
   prelude-ls@1.2.1: {}
 
   prettier-plugin-svelte@3.4.0(prettier@3.5.3)(svelte@5.33.1):
@@ -16797,6 +17753,15 @@ snapshots:
 
   progress@2.0.3: {}
 
+  promise-inflight@1.0.1:
+    optional: true
+
+  promise-retry@2.0.1:
+    dependencies:
+      err-code: 2.0.3
+      retry: 0.12.0
+    optional: true
+
   prompts@2.4.2:
     dependencies:
       kleur: 3.0.3
@@ -16899,6 +17864,13 @@ snapshots:
       iconv-lite: 0.4.24
       unpipe: 1.0.0
 
+  rc@1.2.8:
+    dependencies:
+      deep-extend: 0.6.0
+      ini: 1.3.8
+      minimist: 1.2.8
+      strip-json-comments: 2.0.1
+
   react-confetti@6.4.0(react@18.2.0):
     dependencies:
       react: 18.2.0
@@ -17081,11 +18053,11 @@ snapshots:
 
   ret@0.4.3: {}
 
-  retry-request@7.0.2:
+  retry-request@7.0.2(encoding@0.1.13):
     dependencies:
       '@types/request': 2.48.12
       extend: 3.0.2
-      teeny-request: 9.0.0
+      teeny-request: 9.0.0(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -17239,6 +18211,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  set-blocking@2.0.0:
+    optional: true
+
   set-cookie-parser@2.7.1: {}
 
   set-function-length@1.2.2:
@@ -17317,6 +18292,14 @@ snapshots:
 
   signal-exit@4.1.0: {}
 
+  simple-concat@1.0.1: {}
+
+  simple-get@4.0.1:
+    dependencies:
+      decompress-response: 6.0.0
+      once: 1.4.0
+      simple-concat: 1.0.1
+
   simple-update-notifier@2.0.0:
     dependencies:
       semver: 7.7.2
@@ -17338,6 +18321,15 @@ snapshots:
 
   smart-buffer@4.2.0: {}
 
+  socks-proxy-agent@6.2.1:
+    dependencies:
+      agent-base: 6.0.2
+      debug: 4.4.1(supports-color@5.5.0)
+      socks: 2.8.4
+    transitivePeerDependencies:
+      - supports-color
+    optional: true
+
   socks-proxy-agent@8.0.5:
     dependencies:
       agent-base: 7.1.3
@@ -17385,6 +18377,18 @@ snapshots:
 
   sql-highlight@6.0.0: {}
 
+  sqlite3@5.1.7:
+    dependencies:
+      bindings: 1.5.0
+      node-addon-api: 7.1.1
+      prebuild-install: 7.1.3
+      tar: 6.2.1
+    optionalDependencies:
+      node-gyp: 8.4.1
+    transitivePeerDependencies:
+      - bluebird
+      - supports-color
+
   ssh-remote-port-forward@1.0.4:
     dependencies:
       '@types/ssh2': 0.5.52
@@ -17398,6 +18402,11 @@ snapshots:
       cpu-features: 0.0.10
       nan: 2.22.2
 
+  ssri@8.0.1:
+    dependencies:
+      minipass: 3.3.6
+    optional: true
+
   stable-hash@0.0.5: {}
 
   stack-utils@2.0.6:
@@ -17671,7 +18680,7 @@ snapshots:
       sass: 1.89.1
       typescript: 5.8.3
 
-  svelte-preprocess@5.1.4(@babel/core@7.27.1)(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3)))(postcss@8.5.3)(sass@1.89.1)(svelte@5.33.1)(typescript@5.8.3):
+  svelte-preprocess@5.1.4(@babel/core@7.27.1)(postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)))(postcss@8.5.3)(sass@1.89.1)(svelte@5.33.1)(typescript@5.8.3):
     dependencies:
       '@types/pug': 2.0.10
       detect-indent: 6.1.0
@@ -17682,7 +18691,7 @@ snapshots:
     optionalDependencies:
       '@babel/core': 7.27.1
       postcss: 8.5.3
-      postcss-load-config: 4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3))
+      postcss-load-config: 4.0.2(postcss@8.5.3)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3))
       sass: 1.89.1
       typescript: 5.8.3
 
@@ -17794,6 +18803,15 @@ snapshots:
       fast-fifo: 1.3.2
       streamx: 2.22.0
 
+  tar@6.2.1:
+    dependencies:
+      chownr: 2.0.0
+      fs-minipass: 2.1.0
+      minipass: 5.0.0
+      minizlib: 2.1.2
+      mkdirp: 1.0.4
+      yallist: 4.0.0
+
   tar@7.4.3:
     dependencies:
       '@isaacs/fs-minipass': 4.0.1
@@ -17803,11 +18821,11 @@ snapshots:
       mkdirp: 3.0.1
       yallist: 5.0.0
 
-  teeny-request@9.0.0:
+  teeny-request@9.0.0(encoding@0.1.13):
     dependencies:
       http-proxy-agent: 5.0.0
       https-proxy-agent: 5.0.1
-      node-fetch: 2.7.0
+      node-fetch: 2.7.0(encoding@0.1.13)
       stream-events: 1.0.5
       uuid: 9.0.1
     transitivePeerDependencies:
@@ -17963,12 +18981,12 @@ snapshots:
       '@jest/types': 29.6.3
       babel-jest: 29.7.0(@babel/core@7.27.1)
 
-  ts-jest@29.3.4(@babel/core@7.27.1)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.27.1))(jest@29.7.0(@types/node@22.15.21)(babel-plugin-macros@3.1.0))(typescript@5.8.3):
+  ts-jest@29.3.4(@babel/core@7.27.1)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.27.1))(jest@29.7.0(@types/node@24.0.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3)))(typescript@5.8.3):
     dependencies:
       bs-logger: 0.2.6
       ejs: 3.1.10
       fast-json-stable-stringify: 2.1.0
-      jest: 29.7.0(@types/node@22.15.21)(babel-plugin-macros@3.1.0)
+      jest: 29.7.0(@types/node@24.0.0)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3))
       jest-util: 29.7.0
       json5: 2.2.3
       lodash.memoize: 4.1.2
@@ -18057,14 +19075,14 @@ snapshots:
       yn: 3.1.1
     optional: true
 
-  ts-node@10.9.2(@types/node@22.15.21)(typescript@5.8.3):
+  ts-node@10.9.2(@types/node@24.0.0)(typescript@5.8.3):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
       '@tsconfig/node10': 1.0.11
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.4
-      '@types/node': 22.15.21
+      '@types/node': 24.0.0
       acorn: 8.14.1
       acorn-walk: 8.3.4
       arg: 4.1.3
@@ -18115,6 +19133,10 @@ snapshots:
 
   tua-body-scroll-lock@1.2.1: {}
 
+  tunnel-agent@0.6.0:
+    dependencies:
+      safe-buffer: 5.2.1
+
   turbo-darwin-64@2.5.3:
     optional: true
 
@@ -18204,7 +19226,7 @@ snapshots:
       possible-typed-array-names: 1.1.0
       reflect.getprototypeof: 1.0.10
 
-  typeorm@0.3.24(babel-plugin-macros@3.1.0)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@20.17.50)(typescript@5.8.3)):
+  typeorm@0.3.24(babel-plugin-macros@3.1.0)(better-sqlite3@11.10.0)(pg@8.16.0)(reflect-metadata@0.2.2)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@20.17.50)(typescript@5.8.3)):
     dependencies:
       '@sqltools/formatter': 1.2.5
       ansis: 3.17.0
@@ -18222,7 +19244,9 @@ snapshots:
       uuid: 11.1.0
       yargs: 17.7.2
     optionalDependencies:
+      better-sqlite3: 11.10.0
       pg: 8.16.0
+      sqlite3: 5.1.7
       ts-node: 10.9.2(@types/node@20.17.50)(typescript@5.8.3)
     transitivePeerDependencies:
       - babel-plugin-macros
@@ -18263,10 +19287,22 @@ snapshots:
 
   undici-types@6.21.0: {}
 
+  undici-types@7.8.0: {}
+
   undici@5.29.0:
     dependencies:
       '@fastify/busboy': 2.1.1
 
+  unique-filename@1.1.1:
+    dependencies:
+      unique-slug: 2.0.2
+    optional: true
+
+  unique-slug@2.0.2:
+    dependencies:
+      imurmurhash: 0.1.4
+    optional: true
+
   universalify@0.2.0: {}
 
   universalify@2.0.1: {}
@@ -18411,6 +19447,27 @@ snapshots:
       - tsx
       - yaml
 
+  vite-node@3.1.4(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0):
+    dependencies:
+      cac: 6.7.14
+      debug: 4.4.1(supports-color@5.5.0)
+      es-module-lexer: 1.7.0
+      pathe: 2.0.3
+      vite: 6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+    transitivePeerDependencies:
+      - '@types/node'
+      - jiti
+      - less
+      - lightningcss
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+      - tsx
+      - yaml
+
   vite@5.4.19(@types/node@20.17.50)(lightningcss@1.30.1)(sass@1.89.1):
     dependencies:
       esbuild: 0.21.5
@@ -18439,10 +19496,31 @@ snapshots:
       tsx: 4.19.4
       yaml: 2.8.0
 
+  vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0):
+    dependencies:
+      esbuild: 0.25.4
+      fdir: 6.4.4(picomatch@4.0.2)
+      picomatch: 4.0.2
+      postcss: 8.5.3
+      rollup: 4.41.0
+      tinyglobby: 0.2.13
+    optionalDependencies:
+      '@types/node': 24.0.0
+      fsevents: 2.3.3
+      jiti: 2.4.2
+      lightningcss: 1.30.1
+      sass: 1.89.1
+      tsx: 4.19.4
+      yaml: 2.8.0
+
   vitefu@1.0.6(vite@6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)):
     optionalDependencies:
       vite: 6.3.5(@types/node@22.15.21)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
 
+  vitefu@1.0.6(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)):
+    optionalDependencies:
+      vite: 6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+
   vitest@1.6.1(@types/node@20.17.50)(jsdom@19.0.0)(lightningcss@1.30.1)(sass@1.89.1):
     dependencies:
       '@vitest/expect': 1.6.1
@@ -18519,6 +19597,47 @@ snapshots:
       - tsx
       - yaml
 
+  vitest@3.1.4(@types/node@24.0.0)(@vitest/browser@3.1.4)(jiti@2.4.2)(jsdom@19.0.0)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0):
+    dependencies:
+      '@vitest/expect': 3.1.4
+      '@vitest/mocker': 3.1.4(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))
+      '@vitest/pretty-format': 3.1.4
+      '@vitest/runner': 3.1.4
+      '@vitest/snapshot': 3.1.4
+      '@vitest/spy': 3.1.4
+      '@vitest/utils': 3.1.4
+      chai: 5.2.0
+      debug: 4.4.1(supports-color@5.5.0)
+      expect-type: 1.2.1
+      magic-string: 0.30.17
+      pathe: 2.0.3
+      std-env: 3.9.0
+      tinybench: 2.9.0
+      tinyexec: 0.3.2
+      tinyglobby: 0.2.13
+      tinypool: 1.0.2
+      tinyrainbow: 2.0.0
+      vite: 6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+      vite-node: 3.1.4(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0)
+      why-is-node-running: 2.3.0
+    optionalDependencies:
+      '@types/node': 24.0.0
+      '@vitest/browser': 3.1.4(playwright@1.52.0)(vite@6.3.5(@types/node@24.0.0)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.1)(tsx@4.19.4)(yaml@2.8.0))(vitest@3.1.4)
+      jsdom: 19.0.0
+    transitivePeerDependencies:
+      - jiti
+      - less
+      - lightningcss
+      - msw
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+      - tsx
+      - yaml
+
   w3c-hr-time@1.0.2:
     dependencies:
       browser-process-hrtime: 1.0.0
@@ -18616,6 +19735,11 @@ snapshots:
       siginfo: 2.0.0
       stackback: 0.0.2
 
+  wide-align@1.1.5:
+    dependencies:
+      string-width: 4.2.3
+    optional: true
+
   word-wrap@1.2.5: {}
 
   wordwrap@0.0.3: {}
diff --git a/services/ontology/schemas/bookmark.json b/services/ontology/schemas/bookmark.json
new file mode 100644
index 00000000..3788b081
--- /dev/null
+++ b/services/ontology/schemas/bookmark.json
@@ -0,0 +1,39 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "schemaId": "550e8400-e29b-41d4-a716-446655440005",
+    "title": "Bookmark",
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string",
+            "format": "uuid",
+            "description": "The unique identifier for the bookmark"
+        },
+        "userId": {
+            "type": "string",
+            "format": "uuid",
+            "description": "The ID of the user who created the bookmark"
+        },
+        "postId": {
+            "type": "string",
+            "format": "uuid",
+            "description": "The ID of the post being bookmarked"
+        },
+        "createdAt": {
+            "type": "string",
+            "format": "date-time",
+            "description": "When the bookmark was created"
+        },
+        "updatedAt": {
+            "type": "string",
+            "format": "date-time",
+            "description": "When the bookmark was last updated"
+        },
+        "isArchived": {
+            "type": "boolean",
+            "description": "Whether the bookmark is archived"
+        }
+    },
+    "required": ["id", "userId", "postId", "createdAt"],
+    "additionalProperties": false
+}
diff --git a/services/ontology/schemas/chat.json b/services/ontology/schemas/chat.json
new file mode 100644
index 00000000..5979d89f
--- /dev/null
+++ b/services/ontology/schemas/chat.json
@@ -0,0 +1,51 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "schemaId": "550e8400-e29b-41d4-a716-446655440003",
+    "title": "Chat",
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string",
+            "format": "uuid",
+            "description": "The unique identifier for the chat"
+        },
+        "name": {
+            "type": "string",
+            "description": "The name of the chat (for group chats)"
+        },
+        "type": {
+            "type": "string",
+            "enum": ["direct", "group"],
+            "description": "The type of chat (direct message or group chat)"
+        },
+        "participantIds": {
+            "type": "array",
+            "items": {
+                "type": "string",
+                "format": "uuid"
+            },
+            "description": "Array of user IDs participating in the chat"
+        },
+        "lastMessageId": {
+            "type": "string",
+            "format": "uuid",
+            "description": "ID of the most recent message in the chat"
+        },
+        "createdAt": {
+            "type": "string",
+            "format": "date-time",
+            "description": "When the chat was created"
+        },
+        "updatedAt": {
+            "type": "string",
+            "format": "date-time",
+            "description": "When the chat was last updated"
+        },
+        "isArchived": {
+            "type": "boolean",
+            "description": "Whether the chat is archived"
+        }
+    },
+    "required": ["id", "type", "participantIds", "createdAt"],
+    "additionalProperties": false
+}
diff --git a/services/ontology/schemas/message.json b/services/ontology/schemas/message.json
new file mode 100644
index 00000000..d690e0f5
--- /dev/null
+++ b/services/ontology/schemas/message.json
@@ -0,0 +1,61 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "schemaId": "550e8400-e29b-41d4-a716-446655440004",
+    "title": "Message",
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string",
+            "format": "uuid",
+            "description": "The unique identifier for the message"
+        },
+        "chatId": {
+            "type": "string",
+            "format": "uuid",
+            "description": "The ID of the chat this message belongs to"
+        },
+        "senderId": {
+            "type": "string",
+            "format": "uuid",
+            "description": "The ID of the user who sent the message"
+        },
+        "content": {
+            "type": "string",
+            "description": "The text content of the message"
+        },
+        "type": {
+            "type": "string",
+            "enum": ["text", "image", "file", "system"],
+            "description": "The type of message content"
+        },
+        "mediaUrl": {
+            "type": "string",
+            "format": "uri",
+            "description": "URL to media attachment if message type is image or file"
+        },
+        "readBy": {
+            "type": "array",
+            "items": {
+                "type": "string",
+                "format": "uuid"
+            },
+            "description": "Array of user IDs who have read the message"
+        },
+        "createdAt": {
+            "type": "string",
+            "format": "date-time",
+            "description": "When the message was created"
+        },
+        "updatedAt": {
+            "type": "string",
+            "format": "date-time",
+            "description": "When the message was last updated"
+        },
+        "isArchived": {
+            "type": "boolean",
+            "description": "Whether the message is archived"
+        }
+    },
+    "required": ["id", "chatId", "senderId", "content", "type", "createdAt"],
+    "additionalProperties": false
+}
diff --git a/services/ontology/schemas/socialMediaPost.json b/services/ontology/schemas/socialMediaPost.json
index 49ec4dc7..71d11ebf 100644
--- a/services/ontology/schemas/socialMediaPost.json
+++ b/services/ontology/schemas/socialMediaPost.json
@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-07/schema#",
-    "schemaId": "6ba7b810-9dad-11d1-80b4-00c04fd430c8",
+    "schemaId": "550e8400-e29b-41d4-a716-446655440001",
     "title": "SocialMediaPost",
     "type": "object",
     "properties": {
@@ -12,12 +12,11 @@
         "authorId": {
             "type": "string",
             "format": "uuid",
-            "description": "Reference to the user who created the post"
+            "description": "The ID of the user who created the post"
         },
         "content": {
             "type": "string",
-            "maxLength": 500,
-            "description": "The main content of the post"
+            "description": "The main text content of the post"
         },
         "mediaUrls": {
             "type": "array",
@@ -27,28 +26,39 @@
             },
             "description": "Array of URLs to media attachments (images, videos, etc.)"
         },
-        "comments": {
+        "parentPostId": {
+            "type": "string",
+            "format": "uuid",
+            "description": "ID of the parent post if this is a reply"
+        },
+        "hashtags": {
             "type": "array",
             "items": {
                 "type": "string"
             },
-            "description": "Array of comment IDs associated with this post"
+            "description": "Array of hashtags used in the post"
         },
-        "likes": {
-            "type": "array",
-            "items": {
-                "type": "string",
-                "format": "uuid"
-            },
-            "description": "Array of user IDs who liked this post"
+        "likeCount": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "Number of likes on the post"
         },
-        "tags": {
+        "likedBy": {
             "type": "array",
             "items": {
-                "type": "string",
-                "pattern": "^#[a-zA-Z0-9_]+$"
+                "type": "string"
             },
-            "description": "Array of hashtags associated with the post"
+            "description": "Number of likes on the post"
+        },
+        "replyCount": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "Number of replies to the post"
+        },
+        "repostCount": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "Number of times the post has been reposted"
         },
         "createdAt": {
             "type": "string",
@@ -60,12 +70,24 @@
             "format": "date-time",
             "description": "When the post was last updated"
         },
-        "isDeleted": {
+        "isArchived": {
             "type": "boolean",
-            "default": false,
-            "description": "Whether the post has been deleted"
+            "description": "Whether the post is archived"
+        },
+        "visibility": {
+            "type": "string",
+            "enum": [
+                "public",
+                "private",
+                "followers"
+            ],
+            "description": "The visibility level of the post"
         }
     },
-    "required": ["id", "authorId", "content", "createdAt"],
+    "required": [
+        "id",
+        "authorId",
+        "createdAt"
+    ],
     "additionalProperties": false
 }
diff --git a/services/ontology/schemas/user.json b/services/ontology/schemas/user.json
index e9ca352d..0a0fa1ec 100644
--- a/services/ontology/schemas/user.json
+++ b/services/ontology/schemas/user.json
@@ -6,23 +6,78 @@
     "properties": {
         "id": {
             "type": "string",
+            "format": "uuid",
             "description": "The unique identifier for the user"
         },
-        "name": {
+        "username": {
             "type": "string",
-            "description": "The user's full name"
+            "description": "The user's unique username/handle across the platform"
         },
-        "email": {
+        "displayName": {
             "type": "string",
-            "format": "email",
-            "description": "The user's email address"
+            "description": "The user's display name or full name"
         },
-        "age": {
+        "bio": {
+            "type": "string",
+            "description": "The user's biography or description"
+        },
+        "avatarUrl": {
+            "type": "string",
+            "format": "uri",
+            "description": "URL to the user's profile picture"
+        },
+        "bannerUrl": {
+            "type": "string",
+            "format": "uri",
+            "description": "URL to the user's profile banner/cover photo"
+        },
+        "website": {
+            "type": "string",
+            "format": "uri",
+            "description": "The user's personal website URL"
+        },
+        "location": {
+            "type": "string",
+            "description": "The user's physical location"
+        },
+        "isVerified": {
+            "type": "boolean",
+            "description": "Whether the user's account is verified"
+        },
+        "isPrivate": {
+            "type": "boolean",
+            "description": "Whether the user's account is private"
+        },
+        "followerCount": {
             "type": "integer",
             "minimum": 0,
-            "description": "The user's age"
+            "description": "Number of followers the user has"
+        },
+        "followingCount": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "Number of users this user follows"
+        },
+        "postCount": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "Number of posts created by the user"
+        },
+        "createdAt": {
+            "type": "string",
+            "format": "date-time",
+            "description": "When the user account was created"
+        },
+        "updatedAt": {
+            "type": "string",
+            "format": "date-time",
+            "description": "When the user profile was last updated"
+        },
+        "isArchived": {
+            "type": "boolean",
+            "description": "Whether the user account is archived"
         }
     },
-    "required": ["id", "name", "email"],
+    "required": ["id", "username", "displayName", "createdAt"],
     "additionalProperties": false
 }