diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index e415d9a44..039a426f9 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -6,4 +6,24 @@ Before submitting your PR, there are a few things you can do to make sure it goe
 - [ ] Ensure the linter passes (`./codeAnalysis` to automatically apply formatting/linting)
 - [ ] Appropriate docs were updated (if necessary)
 
+## 📸 Proof of change (REQUIRED)
+
+> **Every PR must include a screen recording / video showing the change working.**
+> **UI changes must also include before/after screenshots.**
+> Just drag-and-drop the files into the boxes below — GitHub will upload them.
+> PRs without the required media will be flagged automatically and **cannot be merged**.
+
+### 🎥 Screen recording / video (always required)
+
+<!-- Drag a short screen recording (.mp4 / .mov / .webm) here, or paste a Loom/YouTube link. -->
+
+### 🖼️ Screenshots (required for any UI change)
+
+| Before | After |
+| ------ | ----- |
+|        |       |
+
+- [ ] This change has **no user-visible / UI effect** (refactor, docs, CI, etc.), so screenshots are not applicable.
+  - A maintainer may also apply the `non-ui` label. **A video is still required** even for non-UI changes.
+
 Fixes #<issue_number_goes_here> 🦕
diff --git a/.github/workflows/require-pr-media.yml b/.github/workflows/require-pr-media.yml
new file mode 100644
index 000000000..95e5ec96c
--- /dev/null
+++ b/.github/workflows/require-pr-media.yml
@@ -0,0 +1,129 @@
+name: Require PR media
+
+# Ensures every PR includes a screen recording / video, and a screenshot for UI
+# changes. Posts a friendly comment tagging the author when something is missing,
+# and fails a status check so the PR cannot be merged until it is fixed.
+#
+# Escape hatch: apply the `non-ui` label (or tick the "no user-visible / UI effect"
+# box in the PR description) to skip the screenshot requirement. A video is still
+# required even for non-UI changes.
+
+on:
+  pull_request_target:
+    types: [opened, edited, reopened, synchronize, labeled, unlabeled]
+
+# pull_request_target runs in the base-repo context so we can comment on PRs from
+# forks. We only read the PR body/labels and post a comment — no untrusted code is
+# checked out or executed.
+permissions:
+  pull-requests: write
+  issues: write
+
+concurrency:
+  group: require-pr-media-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  check-media:
+    name: Check for screenshot & video
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          script: |
+            const MARKER = '<!-- require-pr-media -->';
+            const pr = context.payload.pull_request;
+            const body = pr.body || '';
+            const author = pr.user.login;
+
+            // --- Detect a screenshot (an embedded image) --------------------
+            const hasScreenshot =
+              /!\[[^\]]*\]\([^)]+\)/.test(body) ||   // ![alt](url) markdown image
+              /<img\b[^>]*>/i.test(body);            // <img ...> html
+
+            // Strip embedded images so their URLs are not mistaken for a video.
+            const withoutImages = body
+              .replace(/!\[[^\]]*\]\([^)]*\)/g, ' ')
+              .replace(/<img\b[^>]*>/gi, ' ');
+
+            // --- Detect a video --------------------------------------------
+            const hasVideo =
+              /\.(mp4|mov|webm|m4v|avi|mkv)\b/i.test(withoutImages) ||       // file extension
+              /<video[\s>]/i.test(withoutImages) ||                          // <video> html
+              // A GitHub-hosted attachment that is NOT an embedded image is treated
+              // as a video (GitHub renders uploaded videos as a bare attachment URL).
+              /https?:\/\/(?:github\.com\/user-attachments\/assets|user-images\.githubusercontent\.com)\/\S+/i.test(withoutImages) ||
+              // Common external video hosts.
+              /https?:\/\/(?:www\.)?(?:youtube\.com|youtu\.be|loom\.com|vimeo\.com|streamable\.com|drive\.google\.com)\/\S+/i.test(withoutImages);
+
+            // --- Is this a non-UI change? ----------------------------------
+            const labels = (pr.labels || []).map(l => l.name.toLowerCase());
+            const nonUiLabel = labels.some(n =>
+              ['non-ui', 'no-ui', 'no-ui-change', 'non-ui-change'].includes(n));
+            const nonUiCheckbox =
+              /- \[x\][^\n]*no user-visible/i.test(body) ||
+              /- \[x\][^\n]*no\b[^\n]*ui\b/i.test(body);
+            const isNonUi = nonUiLabel || nonUiCheckbox;
+
+            // --- Work out what is missing ----------------------------------
+            const missing = [];
+            if (!hasVideo) {
+              missing.push('a **🎥 screen recording / video** demonstrating the change — **a video is required even when there are no UI changes**, to show that the parts of the app affected by this change still work');
+            }
+            if (!isNonUi && !hasScreenshot) {
+              missing.push('a **🖼️ screenshot** of the UI change (or mark the PR as `non-ui` if there is no UI change)');
+            }
+
+            // --- Compose the comment ---------------------------------------
+            let commentBody;
+            if (missing.length === 0) {
+              commentBody = [
+                MARKER,
+                `✅ Thanks @${author} — required media detected. Nothing more needed here!`,
+              ].join('\n');
+            } else {
+              commentBody = [
+                MARKER,
+                `👋 Hi @${author}, thanks for the contribution!`,
+                '',
+                'Before this PR can be reviewed and merged, please add:',
+                '',
+                ...missing.map(m => `- ${m}`),
+                '',
+                'Just drag-and-drop the file(s) into the PR description and GitHub will upload them. ' +
+                'This check re-runs automatically when you edit the description.',
+                '',
+                isNonUi
+                  ? '_This PR is marked as non-UI, so a screenshot is not required — **but a video is still required**, showing that the parts of the app affected by this change still work correctly._'
+                  : '_If this change has no user-visible effect, tick the "no user-visible / UI effect" box in the description (or ask a maintainer to add the `non-ui` label) to skip the screenshot requirement. **A video is still required even with no UI changes**, to show that the affected parts of the app still work._',
+              ].join('\n');
+            }
+
+            // --- Upsert the comment (avoid spamming on every edit) ---------
+            const { owner, repo } = context.repo;
+            const issue_number = pr.number;
+            const comments = await github.paginate(github.rest.issues.listComments, {
+              owner, repo, issue_number, per_page: 100,
+            });
+            const existing = comments.find(c => (c.body || '').includes(MARKER));
+
+            if (existing) {
+              await github.rest.issues.updateComment({
+                owner, repo, comment_id: existing.id, body: commentBody,
+              });
+            } else if (missing.length > 0) {
+              // Only create a brand-new comment when there is something to ask for.
+              await github.rest.issues.createComment({
+                owner, repo, issue_number, body: commentBody,
+              });
+            }
+
+            // --- Fail the check if media is missing ------------------------
+            if (missing.length > 0) {
+              core.setFailed(
+                'Missing required PR media: ' +
+                missing.map(m => m.replace(/\*\*/g, '').replace(/[🎥🖼️]/g, '').trim()).join('; '),
+              );
+            } else {
+              core.info('All required PR media present.');
+            }
diff --git a/app/google-services.json b/app/google-services.json
index e7ce62636..b22f16961 100644
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -3,30 +3,17 @@
     "project_number": "422699885542",
     "firebase_url": "https://tree-tracker-a7a13.firebaseio.com",
     "project_id": "tree-tracker-a7a13",
-    "storage_bucket": "tree-tracker-a7a13.appspot.com"
+    "storage_bucket": "tree-tracker-a7a13.firebasestorage.app"
   },
   "client": [
-{
+    {
       "client_info": {
-        "mobilesdk_app_id": "1:422699885542:android:aab16ef8fc4e5968a0ec27",
+        "mobilesdk_app_id": "1:422699885542:android:e673ea9e40b77f6aa0ec27",
         "android_client_info": {
-          "package_name": "org.greenstand.android.TreeTracker.test"
+          "package_name": "com.ftt.android.TreeTracker"
         }
       },
-      "oauth_client": [
-        {
-          "client_id": "422699885542-pfodsarvr7gifkverfg33n4icu2vqidl.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "org.greenstand.android.TreeTracker.test",
-            "certificate_hash": "c06a47237965c9690d2f571f4e1ceb09b4efe52b"
-          }
-        },
-        {
-          "client_id": "422699885542-aec38c6t8ji3n81hfq5lhfnjde1hb58s.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
+      "oauth_client": [],
       "api_key": [
         {
           "current_key": "AIzaSyC5u6w2W3zKwFRnMHxxPnje34Mc6R3jpno"
@@ -34,28 +21,18 @@
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "422699885542-aec38c6t8ji3n81hfq5lhfnjde1hb58s.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
+          "other_platform_oauth_client": []
         }
       }
     },
-      {
+    {
       "client_info": {
-        "mobilesdk_app_id": "1:422699885542:android:993c29134938ce4d",
+        "mobilesdk_app_id": "1:422699885542:android:dc800825e887261ea0ec27",
         "android_client_info": {
           "package_name": "org.greenstand.android.TreeTracker"
         }
       },
-      "oauth_client": [
-        {
-          "client_id": "422699885542-aec38c6t8ji3n81hfq5lhfnjde1hb58s.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
+      "oauth_client": [],
       "api_key": [
         {
           "current_key": "AIzaSyC5u6w2W3zKwFRnMHxxPnje34Mc6R3jpno"
@@ -63,28 +40,37 @@
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "422699885542-aec38c6t8ji3n81hfq5lhfnjde1hb58s.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
+          "other_platform_oauth_client": []
         }
       }
     },
     {
       "client_info": {
-        "mobilesdk_app_id": "1:422699885542:android:993c29134938ce4d",
+        "mobilesdk_app_id": "1:422699885542:android:dc800825e887261ea0ec27",
         "android_client_info": {
-          "package_name": "org.greenstand.android.TreeTracker.dev"
+          "package_name": "org.greenstand.android.TreeTracker.prerelease"
         }
       },
-      "oauth_client": [
+      "oauth_client": [],
+      "api_key": [
         {
-          "client_id": "422699885542-aec38c6t8ji3n81hfq5lhfnjde1hb58s.apps.googleusercontent.com",
-          "client_type": 3
+          "current_key": "AIzaSyC5u6w2W3zKwFRnMHxxPnje34Mc6R3jpno"
         }
       ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:422699885542:android:11ddac217a11a7f4a0ec27",
+        "android_client_info": {
+          "package_name": "org.greenstand.android.TreeTracker.debug"
+        }
+      },
+      "oauth_client": [],
       "api_key": [
         {
           "current_key": "AIzaSyC5u6w2W3zKwFRnMHxxPnje34Mc6R3jpno"
@@ -92,28 +78,37 @@
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "422699885542-aec38c6t8ji3n81hfq5lhfnjde1hb58s.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
+          "other_platform_oauth_client": []
         }
       }
     },
     {
       "client_info": {
-        "mobilesdk_app_id": "1:422699885542:android:993c29134938ce4d",
+        "mobilesdk_app_id": "1:422699885542:android:0d0fe64a4522d006a0ec27",
         "android_client_info": {
-          "package_name": "org.greenstand.android.TreeTracker.debug"
+          "package_name": "org.greenstand.android.TreeTracker.dev"
         }
       },
-      "oauth_client": [
+      "oauth_client": [],
+      "api_key": [
         {
-          "client_id": "422699885542-aec38c6t8ji3n81hfq5lhfnjde1hb58s.apps.googleusercontent.com",
-          "client_type": 3
+          "current_key": "AIzaSyC5u6w2W3zKwFRnMHxxPnje34Mc6R3jpno"
         }
       ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:422699885542:android:695c2cf8b13db668a0ec27",
+        "android_client_info": {
+          "package_name": "org.greenstand.android.TreeTracker.justdiggit"
+        }
+      },
+      "oauth_client": [],
       "api_key": [
         {
           "current_key": "AIzaSyC5u6w2W3zKwFRnMHxxPnje34Mc6R3jpno"
@@ -121,43 +116,35 @@
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "422699885542-aec38c6t8ji3n81hfq5lhfnjde1hb58s.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
+          "other_platform_oauth_client": []
         }
       }
     },
     {
       "client_info": {
-        "mobilesdk_app_id": "1:301103308242:android:993c29134938ce4d",
+        "mobilesdk_app_id": "1:422699885542:android:aab16ef8fc4e5968a0ec27",
         "android_client_info": {
-          "package_name": "org.greenstand.android.TreeTracker.prerelease"
+          "package_name": "org.greenstand.android.TreeTracker.test"
         }
       },
       "oauth_client": [
         {
-          "client_id": "301103308242-lrrl3ccujjvdjls8udg4oejqn57324ja.apps.googleusercontent.com",
-          "client_type": 3
+          "client_id": "422699885542-pfodsarvr7gifkverfg33n4icu2vqidl.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.greenstand.android.TreeTracker.test",
+            "certificate_hash": "c06a47237965c9690d2f571f4e1ceb09b4efe52b"
+          }
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyDjQOMe8wZ68wgzfkwsA6tq87SEDPvHBN8"
+          "current_key": "AIzaSyC5u6w2W3zKwFRnMHxxPnje34Mc6R3jpno"
         }
       ],
       "services": {
-        "analytics_service": {
-          "status": 1
-        },
         "appinvite_service": {
-          "status": 1,
           "other_platform_oauth_client": []
-        },
-        "ads_service": {
-          "status": 2
         }
       }
     }
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/activities/ImageCaptureActivity.kt b/app/src/main/java/org/greenstand/android/TreeTracker/activities/ImageCaptureActivity.kt
index 22769067a..c525acce3 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/activities/ImageCaptureActivity.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/activities/ImageCaptureActivity.kt
@@ -23,16 +23,23 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContract
+import androidx.compose.animation.togetherWith
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.rememberNavController
-import androidx.navigation.toRoute
+import androidx.compose.runtime.remember
+import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
+import androidx.navigation3.runtime.entryProvider
+import androidx.navigation3.runtime.rememberNavBackStack
+import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
+import androidx.navigation3.ui.NavDisplay
 import org.greenstand.android.TreeTracker.camera.ImageReviewScreen
 import org.greenstand.android.TreeTracker.camera.SelfieScreen
+import org.greenstand.android.TreeTracker.navigation.FastFadeIn
+import org.greenstand.android.TreeTracker.navigation.FastFadeOut
 import org.greenstand.android.TreeTracker.navigation.ImageReviewRoute
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
+import org.greenstand.android.TreeTracker.navigation.Navigator
 import org.greenstand.android.TreeTracker.navigation.SelfieRoute
-import org.greenstand.android.TreeTracker.navigation.trackedComposable
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.rememberScreenTrackingNavEntryDecorator
 import org.greenstand.android.TreeTracker.view.TreeTrackerTheme
 
 class CaptureImageContract : ActivityResultContract<Boolean, String?>() {
@@ -66,19 +73,31 @@ class ImageCaptureActivity : ComponentActivity() {
         enableEdgeToEdge()
 
         setContent {
-            val navController = rememberNavController()
+            val backStack = rememberNavBackStack(SelfieRoute)
+            val navigator = remember(backStack) { Navigator(backStack) }
 
             CompositionLocalProvider(
-                LocalNavHostController provides navController,
+                LocalNavigator provides navigator,
             ) {
                 TreeTrackerTheme {
-                    NavHost(navController, startDestination = SelfieRoute) {
-                        trackedComposable<SelfieRoute> { SelfieScreen() }
-                        trackedComposable<ImageReviewRoute> {
-                            val route = it.toRoute<ImageReviewRoute>()
-                            ImageReviewScreen(route.photoPath)
-                        }
-                    }
+                    NavDisplay(
+                        backStack = backStack,
+                        onBack = { navigator.popBackStack() },
+                        entryDecorators =
+                            listOf(
+                                rememberSaveableStateHolderNavEntryDecorator(),
+                                rememberViewModelStoreNavEntryDecorator(),
+                                rememberScreenTrackingNavEntryDecorator(),
+                            ),
+                        transitionSpec = { FastFadeIn togetherWith FastFadeOut },
+                        popTransitionSpec = { FastFadeIn togetherWith FastFadeOut },
+                        predictivePopTransitionSpec = { FastFadeIn togetherWith FastFadeOut },
+                        entryProvider =
+                            entryProvider {
+                                entry<SelfieRoute> { SelfieScreen() }
+                                entry<ImageReviewRoute> { route -> ImageReviewScreen(route.photoPath) }
+                            },
+                    )
                 }
             }
         }
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/activities/TreeTrackerActivity.kt b/app/src/main/java/org/greenstand/android/TreeTracker/activities/TreeTrackerActivity.kt
index 90b73b257..7d34fe6fd 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/activities/TreeTrackerActivity.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/activities/TreeTrackerActivity.kt
@@ -21,7 +21,9 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.runtime.ExperimentalComposeApi
+import androidx.navigationevent.setViewTreeNavigationEventDispatcherOwner
 import org.greenstand.android.TreeTracker.models.TreeTrackerViewModelFactory
+import org.greenstand.android.TreeTracker.navigation.parseStartRoute
 import org.greenstand.android.TreeTracker.root.Root
 import org.greenstand.android.TreeTracker.theme.CustomTheme
 import org.greenstand.android.TreeTracker.utilities.GpsUtils
@@ -47,14 +49,21 @@ class TreeTrackerActivity : AppCompatActivity() {
                 ),
         )
 
+        val startRoute = parseStartRoute(intent)
+
         setContent {
             CustomTheme {
                 if (gpsUtils.hasGPSDevice()) {
-                    Root(viewModelFactory)
+                    Root(viewModelFactory, startRoute)
                 } else {
                     NoGPSDeviceDialog(onPositiveClick = { finishAndRemoveTask() })
                 }
             }
         }
+
+        // AppCompatActivity's setContentView plants only the pre-navigationevent view-tree
+        // owners, so Navigation 3's NavDisplay back handling cannot find the dispatcher.
+        // Plant it ourselves; ComponentActivity (activity 1.12+) is the owner.
+        window.decorView.setViewTreeNavigationEventDispatcherOwner(this)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/camera/ImageReviewScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/camera/ImageReviewScreen.kt
index 5cd8c6862..c871deaeb 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/camera/ImageReviewScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/camera/ImageReviewScreen.kt
@@ -32,20 +32,19 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import org.greenstand.android.TreeTracker.activities.CaptureImageContract
 import org.greenstand.android.TreeTracker.navigation.SelfieRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.view.ApprovalButton
 import org.greenstand.android.TreeTracker.view.LocalImage
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
 
 @Composable
 fun ImageReviewScreen(photoPath: String) {
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val activity = LocalContext.current as Activity
 
     ImageReview(
         photoPath = photoPath,
         onRejectClicked = {
-            navController.throttledNavigate(SelfieRoute) {
+            navigator.throttledNavigate(SelfieRoute) {
                 launchSingleTop = true
                 popUpTo<SelfieRoute> { inclusive = true }
             }
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/camera/SelfieScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/camera/SelfieScreen.kt
index 17b95f8c2..5f2d95c6c 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/camera/SelfieScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/camera/SelfieScreen.kt
@@ -31,7 +31,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import org.greenstand.android.TreeTracker.navigation.ImageReviewRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.signup.SignupAction
 import org.greenstand.android.TreeTracker.signup.SignupViewModel
 import org.greenstand.android.TreeTracker.view.ActionBar
@@ -43,7 +43,7 @@ import org.koin.androidx.compose.getViewModel
 
 @Composable
 fun SelfieScreen() {
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val cameraControl = remember { CameraControl() }
     val viewModel = getViewModel<SignupViewModel>()
     val state by viewModel.state.collectAsState()
@@ -89,7 +89,7 @@ fun SelfieScreen() {
                     .padding(padding)
                     .aspectRatio(1.0f),
             onImageCaptured = {
-                navController.navigate(ImageReviewRoute(photoPath = it.path))
+                navigator.navigate(ImageReviewRoute(photoPath = it.path))
             },
         )
         Box(
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/capture/TreeCaptureScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/capture/TreeCaptureScreen.kt
index 52295d848..68b058ed9 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/capture/TreeCaptureScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/capture/TreeCaptureScreen.kt
@@ -58,7 +58,7 @@ import org.greenstand.android.TreeTracker.camera.CameraControl
 import org.greenstand.android.TreeTracker.models.FeatureFlags
 import org.greenstand.android.TreeTracker.models.PermissionRequest
 import org.greenstand.android.TreeTracker.models.captureflowdata.CaptureFlowScopeManager
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.theme.CustomTheme
 import org.greenstand.android.TreeTracker.view.ActionBar
 import org.greenstand.android.TreeTracker.view.AppButtonColors
@@ -80,7 +80,7 @@ fun TreeCaptureScreen(
 ) {
     val viewModel: TreeCaptureViewModel = viewModel(factory = TreeCaptureViewModelFactory(profilePicUrl))
     val state by viewModel.state.collectAsState()
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val cameraControl = remember { CameraControl() }
     val scope = rememberCoroutineScope()
 
@@ -93,7 +93,7 @@ fun TreeCaptureScreen(
 
     BackHandler(enabled = true) {
         scope.launch {
-            CaptureFlowScopeManager.nav.goToDashboard(navController)
+            CaptureFlowScopeManager.nav.goToDashboard(navigator)
         }
     }
 
@@ -110,7 +110,7 @@ fun TreeCaptureScreen(
                         isLeft = true,
                         onClick = {
                             scope.launch {
-                                CaptureFlowScopeManager.nav.goToDashboard(navController)
+                                CaptureFlowScopeManager.nav.goToDashboard(navigator)
                             }
                         },
                     )
@@ -147,7 +147,7 @@ fun TreeCaptureScreen(
                     viewModel.handleAction(TreeCaptureAction.UpdateBadGpsDialogState(null))
                 },
                 onNegativeClick = {
-                    CaptureFlowScopeManager.nav.goToDashboard(navController)
+                    CaptureFlowScopeManager.nav.goToDashboard(navigator)
                 },
             )
         }
@@ -176,7 +176,7 @@ fun TreeCaptureScreen(
                 UserImageButton(
                     onClick = {
                         scope.launch {
-                            CaptureFlowScopeManager.nav.goToUserSelect(navController)
+                            CaptureFlowScopeManager.nav.goToUserSelect(navigator)
                         }
                     },
                     imagePath = state.profilePicUrl,
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/dashboard/DashboardScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/dashboard/DashboardScreen.kt
index 392e3aa03..bac169055 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/dashboard/DashboardScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/dashboard/DashboardScreen.kt
@@ -66,7 +66,7 @@ import org.greenstand.android.TreeTracker.navigation.MessagesUserSelectRoute
 import org.greenstand.android.TreeTracker.navigation.OrgRoute
 import org.greenstand.android.TreeTracker.navigation.SettingsRoute
 import org.greenstand.android.TreeTracker.navigation.UserSelectRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.root.LocalViewModelFactory
 import org.greenstand.android.TreeTracker.theme.CustomTheme
 import org.greenstand.android.TreeTracker.utils.PreviewDependencies
@@ -79,14 +79,13 @@ import org.greenstand.android.TreeTracker.view.TreeTrackerButton
 import org.greenstand.android.TreeTracker.view.TreeTrackerButtonShape
 import org.greenstand.android.TreeTracker.view.dialogs.CustomDialog
 import org.greenstand.android.TreeTracker.viewmodel.HandleUIEvents
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
 
 @Composable
 fun DashboardScreen(
     viewModel: DashboardViewModel = viewModel(factory = LocalViewModelFactory.current),
 ) {
     val state by viewModel.state.collectAsState()
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     var showDialog by remember { mutableStateOf(false) }
 
     HandleUIEvents(viewModel)
@@ -95,21 +94,21 @@ fun DashboardScreen(
         state = state,
         showSyncReminderDialog = showDialog,
         onSyncClicked = { viewModel.handleAction(DashboardAction.Sync) },
-        onOrgClicked = { navController.throttledNavigate(OrgRoute) },
+        onOrgClicked = { navigator.throttledNavigate(OrgRoute) },
         onCaptureClicked = {
             if (state.showTreeSyncReminderDialog) {
                 showDialog = true
             } else {
-                navController.throttledNavigate(UserSelectRoute)
+                navigator.throttledNavigate(UserSelectRoute)
             }
         },
-        onDialogConfirm = { navController.throttledNavigate(UserSelectRoute) },
+        onDialogConfirm = { navigator.throttledNavigate(UserSelectRoute) },
         onMessagesClicked = {
             viewModel.handleAction(DashboardAction.SyncMessages)
-            navController.throttledNavigate(MessagesUserSelectRoute)
+            navigator.throttledNavigate(MessagesUserSelectRoute)
         },
         onSettingsClicked = {
-            navController.throttledNavigate(SettingsRoute)
+            navigator.throttledNavigate(SettingsRoute)
         },
     )
 }
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/database/AppDatabase.kt b/app/src/main/java/org/greenstand/android/TreeTracker/database/AppDatabase.kt
index 6fce52076..a24e10777 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/database/AppDatabase.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/database/AppDatabase.kt
@@ -77,8 +77,6 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract fun locationDao(): LocationDAO
 
-    abstract fun treeTrackerDao(): TreeTrackerDAO
-
     companion object {
         private var INSTANCE: AppDatabase? = null
 
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/database/TreeTrackerDAO.kt b/app/src/main/java/org/greenstand/android/TreeTracker/database/TreeTrackerDAO.kt
deleted file mode 100644
index a35ab7988..000000000
--- a/app/src/main/java/org/greenstand/android/TreeTracker/database/TreeTrackerDAO.kt
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * Copyright 2023 Treetracker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.greenstand.android.TreeTracker.database
-
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import androidx.room.Transaction
-import androidx.room.Update
-import kotlinx.coroutines.flow.Flow
-import org.greenstand.android.TreeTracker.database.entity.DeviceConfigEntity
-import org.greenstand.android.TreeTracker.database.entity.LocationEntity
-import org.greenstand.android.TreeTracker.database.entity.OrganizationEntity
-import org.greenstand.android.TreeTracker.database.entity.SessionEntity
-import org.greenstand.android.TreeTracker.database.entity.TreeEntity
-import org.greenstand.android.TreeTracker.database.entity.UserEntity
-import org.greenstand.android.TreeTracker.database.legacy.entity.PlanterCheckInEntity
-import org.greenstand.android.TreeTracker.database.legacy.entity.PlanterInfoEntity
-import org.greenstand.android.TreeTracker.database.legacy.entity.TreeAttributeEntity
-import org.greenstand.android.TreeTracker.database.legacy.entity.TreeCaptureEntity
-import org.greenstand.android.TreeTracker.database.legacy.views.TreeMapMarkerDbView
-
-@Dao
-interface TreeTrackerDAO {
-    @Query("SELECT _id FROM planter_info WHERE planter_identifier = :identifier")
-    suspend fun getPlanterInfoIdByIdentifier(identifier: String): Long?
-
-    @Query("SELECT * FROM planter_info")
-    fun getAllPlanterInfo(): Flow<List<PlanterInfoEntity>>
-
-    @Query("SELECT * FROM user")
-    fun getAllUsers(): Flow<List<UserEntity>>
-
-    @Query("SELECT * FROM planter_info")
-    suspend fun getAllPlanterInfoList(): List<PlanterInfoEntity>
-
-    @Query("SELECT * FROM user")
-    suspend fun getAllUsersList(): List<UserEntity>
-
-    @Query("SELECT * FROM planter_info where uploaded = 0")
-    suspend fun getAllPlanterInfoToUpload(): List<PlanterInfoEntity>
-
-    @Query("SELECT * FROM user where uploaded = 0")
-    suspend fun getAllUsersToUpload(): List<UserEntity>
-
-    @Query("SELECT * FROM planter_info WHERE _id = :id")
-    suspend fun getPlanterInfoById(id: Long): PlanterInfoEntity?
-
-    @Query("SELECT * FROM user WHERE _id = :id")
-    suspend fun getUserById(id: Long): UserEntity?
-
-    @Query("SELECT * FROM planter_info WHERE planter_identifier = :identity")
-    suspend fun getPlanterInfoByIdentifier(identity: String): PlanterInfoEntity?
-
-    @Query("SELECT * FROM user WHERE wallet = :wallet")
-    suspend fun getUserByWallet(wallet: String): UserEntity?
-
-    @Query("SELECT * FROM user WHERE power_user = 1")
-    suspend fun getPowerUser(): UserEntity?
-
-    @Query("DELETE FROM user WHERE wallet = :wallet")
-    suspend fun deleteUserByWallet(wallet: String): Int
-
-    @Query("UPDATE user SET power_user = :isPowerUser WHERE _id = :userId")
-    suspend fun updatePowerUserStatus(
-        userId: Long,
-        isPowerUser: Boolean,
-    )
-
-    @Update
-    suspend fun updatePlanterInfo(planterInfoEntity: PlanterInfoEntity)
-
-    @Update
-    suspend fun updateUser(userEntity: UserEntity)
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertPlanterInfo(planterInfoEntity: PlanterInfoEntity): Long
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertUser(userEntity: UserEntity): Long
-
-    @Delete
-    suspend fun deletePlanterInfo(planterInfoEntity: PlanterInfoEntity)
-
-    @Query("UPDATE planter_info SET bundle_id = :bundleId WHERE _id IN (:ids)")
-    suspend fun updatePlanterInfoBundleIds(
-        ids: List<Long>,
-        bundleId: String,
-    )
-
-    @Query("UPDATE user SET bundle_id = :bundleId WHERE _id IN (:ids)")
-    suspend fun updateUserBundleIds(
-        ids: List<Long>,
-        bundleId: String,
-    )
-
-    @Query("UPDATE planter_info SET uploaded = :isUploaded WHERE _id IN (:ids)")
-    suspend fun updatePlanterInfoUploadStatus(
-        ids: List<Long>,
-        isUploaded: Boolean,
-    )
-
-    @Query("UPDATE user SET uploaded = :isUploaded WHERE _id IN (:ids)")
-    suspend fun updateUserUploadStatus(
-        ids: List<Long>,
-        isUploaded: Boolean,
-    )
-
-    @Transaction
-    @Query("SELECT * FROM planter_check_in WHERE local_photo_path IS NOT NULL")
-    suspend fun getPlanterCheckInsToUpload(): List<PlanterCheckInEntity>
-
-    @Transaction
-    @Query("SELECT * FROM planter_check_in WHERE _id IN (:planterCheckInIds)")
-    suspend fun getPlanterCheckInsById(planterCheckInIds: List<Long>): List<PlanterCheckInEntity>
-
-    @Query("SELECT * FROM planter_check_in WHERE planter_info_id = (:planterInfoId)")
-    suspend fun getAllPlanterCheckInsForPlanterInfoId(planterInfoId: Long): List<PlanterCheckInEntity>
-
-    @Query("SELECT * FROM planter_check_in WHERE _id = :id")
-    suspend fun getPlanterCheckInById(id: Long): PlanterCheckInEntity?
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertPlanterCheckIn(planterCheckInEntity: PlanterCheckInEntity): Long
-
-    @Update
-    suspend fun updatePlanterCheckIn(planterCheckInEntity: PlanterCheckInEntity)
-
-    @Delete
-    suspend fun deletePlanterCheckIn(planterCheckInEntity: PlanterCheckInEntity)
-
-    @Query("UPDATE planter_check_in SET local_photo_path = null WHERE _id IN (:ids)")
-    suspend fun removePlanterCheckInLocalImagePaths(ids: List<Long>)
-
-    @Query("SELECT latitude, longitude, _id as treeCaptureId FROM tree_capture")
-    suspend fun getTreeDataForMap(): List<TreeMapMarkerDbView>
-
-    @Transaction
-    @Query("SELECT COUNT(*) FROM tree_capture WHERE uploaded = 1")
-    suspend fun getUploadedTreeCaptureCount(): Int
-
-    @Query("SELECT COUNT(*) FROM tree_capture WHERE photo_url not null")
-    suspend fun getUploadedLegacyTreeImageCount(): Int
-
-    @Query("SELECT COUNT(*) FROM tree_capture WHERE photo_url not null")
-    fun getUploadedLegacyTreeImageCountFlow(): Flow<Int>
-
-    @Query("SELECT COUNT(*) FROM tree WHERE photo_url not null")
-    suspend fun getUploadedTreeImageCount(): Int
-
-    @Query("SELECT COUNT(*) FROM tree WHERE photo_url not null")
-    fun getUploadedTreeImageCountFlow(): Flow<Int>
-
-    @Query("SELECT COUNT(*) FROM tree WHERE uploaded = 1")
-    suspend fun getUploadedTreeCount(): Int
-
-    @Transaction
-    @Query("SELECT COUNT(*) FROM tree_capture WHERE photo_url is null")
-    suspend fun getNonUploadedLegacyTreeCaptureImageCount(): Int
-
-    @Transaction
-    @Query("SELECT COUNT(*) FROM tree_capture WHERE photo_url is null")
-    fun getNonUploadedLegacyTreeCaptureImageCountFlow(): Flow<Int>
-
-    @Query("SELECT COUNT(*) FROM tree WHERE photo_url is null")
-    suspend fun getNonUploadedTreeImageCount(): Int
-
-    @Query("SELECT COUNT(*) FROM tree WHERE photo_url is null")
-    fun getNonUploadedTreeImageCountFlow(): Flow<Int>
-
-    @Transaction
-    @Query("SELECT COUNT(*) FROM tree_capture WHERE uploaded = 0")
-    suspend fun getNonUploadedTreeCaptureCount(): Int
-
-    @Transaction
-    @Query("SELECT COUNT(*) FROM tree WHERE uploaded = 0")
-    suspend fun getNonUploadedTreeCount(): Int
-
-    @Query("SELECT _id FROM tree_capture WHERE uploaded = 0")
-    suspend fun getAllTreeCaptureIdsToUpload(): List<Long>
-
-    @Query("SELECT _id FROM tree WHERE uploaded = 0")
-    suspend fun getAllTreeIdsToUpload(): List<Long>
-
-    @Query("SELECT COUNT(*) FROM tree WHERE session_id = :sessionId")
-    suspend fun getTreeCountFromSessionId(sessionId: Long): Int
-
-    @Query("SELECT * FROM tree_capture")
-    suspend fun getAllTreeCaptures(): List<TreeCaptureEntity>
-
-    @Query("SELECT * FROM tree_capture WHERE _id = :id")
-    suspend fun getTreeCaptureById(id: Long): TreeCaptureEntity
-
-    @Query("SELECT * FROM tree_capture WHERE _id IN (:ids)")
-    suspend fun getTreeCapturesByIds(ids: List<Long>): List<TreeCaptureEntity>
-
-    @Query("SELECT * FROM tree WHERE _id IN (:ids)")
-    suspend fun getTreesByIds(ids: List<Long>): List<TreeEntity>
-
-    @Query("SELECT * FROM tree")
-    suspend fun getAllTrees(): List<TreeEntity>
-
-    @Query("SELECT t.* FROM tree t INNER JOIN session s ON t.session_id = s._id WHERE s.origin_wallet = :wallet")
-    fun getTreesByUserWallet(wallet: String): Flow<List<TreeEntity>>
-
-    @Query("DELETE FROM tree WHERE _id = :treeId")
-    suspend fun deleteTreeById(treeId: Long)
-
-    @Query("UPDATE tree_capture SET bundle_id = :bundleId WHERE _id IN (:ids)")
-    suspend fun updateTreeCapturesBundleIds(
-        ids: List<Long>,
-        bundleId: String,
-    )
-
-    @Query("UPDATE tree SET bundle_id = :bundleId WHERE _id IN (:ids)")
-    suspend fun updateTreesBundleIds(
-        ids: List<Long>,
-        bundleId: String,
-    )
-
-    @Query("UPDATE tree SET uploaded = :uploaded WHERE _id IN (:ids)")
-    suspend fun updateTreesUploadStatus(
-        ids: List<Long>,
-        uploaded: Boolean,
-    )
-
-    @Query("UPDATE tree_capture SET uploaded = :isUploaded WHERE _id IN (:ids)")
-    suspend fun updateTreeCapturesUploadStatus(
-        ids: List<Long>,
-        isUploaded: Boolean,
-    )
-
-    @Query("UPDATE tree_capture SET local_photo_path = null WHERE _id IN (:ids)")
-    suspend fun removeTreeCapturesLocalImagePaths(ids: List<Long>)
-
-    @Query("UPDATE tree SET photo_path = null WHERE _id IN (:ids)")
-    suspend fun removeTreesLocalImagePaths(ids: List<Long>)
-
-    @Update
-    suspend fun updateTreeCapture(treeCaptureEntity: TreeCaptureEntity)
-
-    @Update
-    suspend fun updateTree(treeEntity: TreeEntity)
-
-    @Delete
-    suspend fun deleteTreeCapture(treeCaptureEntity: TreeCaptureEntity)
-
-    @Query("SELECT * FROM tree_attribute WHERE tree_capture_id = :treeCaptureId")
-    suspend fun getTreeAttributeByTreeCaptureId(treeCaptureId: Long): List<TreeAttributeEntity>
-
-    @Insert
-    suspend fun insertTree(treeEntity: TreeEntity): Long
-
-    @Transaction
-    suspend fun insertTreeWithAttributes(
-        tree: TreeCaptureEntity,
-        attributes: List<TreeAttributeEntity>?,
-    ): Long {
-        val treeId = insertTreeCapture(tree)
-        attributes?.forEach {
-            it.treeCaptureId = treeId
-            insertTreeAttribute(it)
-        }
-        return treeId
-    }
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertTreeCapture(treeCaptureEntity: TreeCaptureEntity): Long
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertTreeAttribute(treeAttributeEntity: TreeAttributeEntity): Long
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertLocationData(locationEntity: LocationEntity): Long
-
-    @Query("SELECT * FROM location WHERE uploaded = 0")
-    suspend fun getLocationData(): List<LocationEntity>
-
-    @Query(
-        "SELECT l.* FROM location l " +
-            "INNER JOIN session s ON l.session_id = s._id " +
-            "INNER JOIN tree t ON t.session_id = s._id " +
-            "GROUP BY l._id " +
-            "ORDER BY l._id DESC " +
-            "LIMIT :limit",
-    )
-    suspend fun getLocationsForTreeSessions(limit: Int = 5000): List<LocationEntity>
-
-    @Query("UPDATE location_data SET uploaded = :isUploaded WHERE _id IN (:ids)")
-    suspend fun updateLegacyLocationDataUploadStatus(
-        ids: List<Long>,
-        isUploaded: Boolean,
-    )
-
-    @Query("UPDATE location SET uploaded = :isUploaded WHERE _id IN (:ids)")
-    suspend fun updateLocationDataUploadStatus(
-        ids: List<Long>,
-        isUploaded: Boolean,
-    )
-
-    @Query("DELETE FROM location_data WHERE uploaded = 1")
-    suspend fun purgeUploadedTreeLocations()
-
-    @Query("DELETE FROM location WHERE uploaded = 1")
-    suspend fun purgeUploadedLocations()
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertSession(sessionEntity: SessionEntity): Long
-
-    @Update
-    suspend fun updateSession(sessionEntity: SessionEntity)
-
-    @Query("SELECT * FROM session WHERE _id = :id")
-    suspend fun getSessionById(id: Long): SessionEntity
-
-    @Query("SELECT * FROM session WHERE origin_wallet = :wallet")
-    suspend fun getSessionsByUserWallet(wallet: String): List<SessionEntity>
-
-    @Query("SELECT * FROM session WHERE uploaded = 0")
-    suspend fun getSessionsToUpload(): List<SessionEntity>
-
-    @Query("UPDATE session SET bundle_id = :bundleId WHERE _id IN (:ids)")
-    suspend fun updateSessionBundleIds(
-        ids: List<Long>,
-        bundleId: String,
-    )
-
-    @Query("UPDATE session SET uploaded = :isUploaded WHERE _id IN (:ids)")
-    suspend fun updateSessionUploadStatus(
-        ids: List<Long>,
-        isUploaded: Boolean,
-    )
-
-    @Query("SELECT * FROM device_config WHERE uploaded = 0")
-    suspend fun getDeviceConfigsToUpload(): List<DeviceConfigEntity>
-
-    @Query("SELECT * FROM device_config WHERE _id = (:id)")
-    suspend fun getDeviceConfigById(id: Long): DeviceConfigEntity?
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertDeviceConfig(deviceConfig: DeviceConfigEntity): Long
-
-    @Query("UPDATE device_config SET bundle_id = :bundleId WHERE _id IN (:ids)")
-    suspend fun updateDeviceConfigBundleIds(
-        ids: List<Long>,
-        bundleId: String,
-    )
-
-    @Query("UPDATE device_config SET uploaded = :isUploaded WHERE _id IN (:ids)")
-    suspend fun updateDeviceConfigUploadStatus(
-        ids: List<Long>,
-        isUploaded: Boolean,
-    )
-
-    @Query("SELECT * FROM device_config ORDER BY logged_at DESC LIMIT 1")
-    suspend fun getLatestDeviceConfig(): DeviceConfigEntity?
-
-    /**
-     * ORG LINK QUERIES
-     */
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertOrg(orgEntity: OrganizationEntity): Long
-
-    @Query("SELECT * FROM organization WHERE _id = :id")
-    suspend fun getOrg(id: String?): OrganizationEntity?
-
-    @Query("SELECT * FROM organization")
-    suspend fun getAllOrgs(): List<OrganizationEntity>
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/di/RoomModule.kt b/app/src/main/java/org/greenstand/android/TreeTracker/di/RoomModule.kt
index 88baed5a5..fb67dac74 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/di/RoomModule.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/di/RoomModule.kt
@@ -38,8 +38,6 @@ val roomModule =
 
         single { AppDatabase.getInstance(get()).locationDao() }
 
-        single { AppDatabase.getInstance(get()).treeTrackerDao() }
-
         single { MessageDatabase.getInstance(get()) }
 
         single { MessageDatabase.getInstance(get()).messagesDao() }
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/languagepicker/LanguageSelectScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/languagepicker/LanguageSelectScreen.kt
index 94706d15c..1f238c35a 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/languagepicker/LanguageSelectScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/languagepicker/LanguageSelectScreen.kt
@@ -35,7 +35,7 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import org.greenstand.android.TreeTracker.models.Language
 import org.greenstand.android.TreeTracker.navigation.SignupFlowRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.root.LocalViewModelFactory
 import org.greenstand.android.TreeTracker.theme.CustomTheme
 import org.greenstand.android.TreeTracker.view.ActionBar
@@ -43,8 +43,6 @@ import org.greenstand.android.TreeTracker.view.AppButtonColors
 import org.greenstand.android.TreeTracker.view.ArrowButton
 import org.greenstand.android.TreeTracker.view.TopBarTitle
 import org.greenstand.android.TreeTracker.view.TreeTrackerButton
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
-import org.greenstand.android.TreeTracker.utilities.throttledPopBackStack
 
 @Composable
 fun LanguageSelectScreen(
@@ -52,7 +50,7 @@ fun LanguageSelectScreen(
     viewModel: LanguagePickerViewModel = viewModel(factory = LocalViewModelFactory.current),
 ) {
     val state by viewModel.state.collectAsState()
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
 
     LanguageSelect(
         state = state,
@@ -61,9 +59,9 @@ fun LanguageSelectScreen(
                 is LanguagePickerAction.NavigateNext -> {
                     viewModel.handleAction(LanguagePickerAction.ConfirmLanguage)
                     if (isFromTopBar) {
-                        navController.throttledPopBackStack()
+                        navigator.throttledPopBackStack()
                     } else {
-                        navController.throttledNavigate(SignupFlowRoute)
+                        navigator.throttledNavigate(SignupFlowRoute)
                     }
                 }
                 else -> viewModel.handleAction(action)
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/map/MapScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/map/MapScreen.kt
index 29d4e1283..600e9bc1b 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/map/MapScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/map/MapScreen.kt
@@ -66,10 +66,9 @@ import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toJavaLocalDateTime
 import kotlinx.datetime.toLocalDateTime
 import org.greenstand.android.TreeTracker.R
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.root.LocalViewModelFactory
 import org.greenstand.android.TreeTracker.theme.CustomTheme
-import org.greenstand.android.TreeTracker.utilities.throttledPopBackStack
 import org.greenstand.android.TreeTracker.view.AppColors
 import org.maplibre.android.MapLibre
 import java.io.File
@@ -79,7 +78,7 @@ import java.time.format.DateTimeFormatter
 fun MapScreen(
     viewModel: MapViewModel = viewModel(factory = LocalViewModelFactory.current),
 ) {
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val context = LocalContext.current
     val state by viewModel.state.collectAsState()
 
@@ -113,7 +112,7 @@ fun MapScreen(
             color = Color.White,
         ) {
             IconButton(
-                onClick = { navController.throttledPopBackStack() },
+                onClick = { navigator.throttledPopBackStack() },
             ) {
                 Icon(
                     imageVector = Icons.AutoMirrored.Filled.ArrowBack,
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/messages/MessagesUserSelectScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/messages/MessagesUserSelectScreen.kt
index 43217fdb5..aec63ab6b 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/messages/MessagesUserSelectScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/messages/MessagesUserSelectScreen.kt
@@ -17,22 +17,21 @@ package org.greenstand.android.TreeTracker.messages
 
 import androidx.compose.runtime.Composable
 import org.greenstand.android.TreeTracker.navigation.IndividualMessageListRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.userselect.UserSelect
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
 import org.greenstand.android.TreeTracker.view.AppButtonColors
 import org.greenstand.android.TreeTracker.view.AppColors
 
 @Composable
 fun MessagesUserSelectScreen() {
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     UserSelect(
         navigationButtonColors = AppButtonColors.MessagePurple,
         isCreateUserEnabled = false,
         isNotificationEnabled = true,
         selectedColor = AppColors.Purple,
         onNavigateForward = { user ->
-            navController.throttledNavigate(IndividualMessageListRoute(planterInfoId = user.id))
+            navigator.throttledNavigate(IndividualMessageListRoute(planterInfoId = user.id))
         },
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/messages/directmessages/ChatScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/messages/directmessages/ChatScreen.kt
index b39dcfa07..60f10791a 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/messages/directmessages/ChatScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/messages/directmessages/ChatScreen.kt
@@ -56,9 +56,8 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import org.greenstand.android.TreeTracker.R
 import org.greenstand.android.TreeTracker.models.messages.DirectMessage
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.theme.CustomTheme
-import org.greenstand.android.TreeTracker.utilities.throttledPopBackStack
 import org.greenstand.android.TreeTracker.view.ActionBar
 import org.greenstand.android.TreeTracker.view.AppButtonColors
 import org.greenstand.android.TreeTracker.view.AppColors
@@ -82,11 +81,11 @@ fun ChatScreen(
         ),
 ) {
     val state by viewModel.state.collectAsState()
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
 
     Chat(
         state = state,
-        onBackClicked = { navController.throttledPopBackStack() },
+        onBackClicked = { navigator.throttledPopBackStack() },
         onDraftTextChanged = { text -> viewModel.handleAction(ChatAction.UpdateDraftText(text)) },
         onSendClicked = { viewModel.handleAction(ChatAction.SendMessage) },
         checkIsOtherUser = { index -> viewModel.checkIsOtherUser(index) },
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/messages/individualmeassagelist/IndividualMessageListScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/messages/individualmeassagelist/IndividualMessageListScreen.kt
index a46b62ae4..3bdbd0e60 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/messages/individualmeassagelist/IndividualMessageListScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/messages/individualmeassagelist/IndividualMessageListScreen.kt
@@ -39,9 +39,7 @@ import org.greenstand.android.TreeTracker.models.messages.SurveyMessage
 import org.greenstand.android.TreeTracker.navigation.AnnouncementRoute
 import org.greenstand.android.TreeTracker.navigation.ChatRoute
 import org.greenstand.android.TreeTracker.navigation.SurveyRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
-import org.greenstand.android.TreeTracker.utilities.throttledPopBackStack
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.view.ActionBar
 import org.greenstand.android.TreeTracker.view.AppButtonColors
 import org.greenstand.android.TreeTracker.view.ArrowButton
@@ -54,7 +52,7 @@ fun IndividualMessageListScreen(
     userId: Long,
     viewModel: IndividualMessageListViewModel = viewModel(factory = IndividualMessageListViewModelFactory(userId)),
 ) {
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val state by viewModel.state.collectAsState()
 
     IndividualMessageList(
@@ -62,13 +60,13 @@ fun IndividualMessageListScreen(
         onHandleAction = { action ->
             when (action) {
                 is IndividualMessageListAction.NavigateBack -> {
-                    navController.throttledPopBackStack()
+                    navigator.throttledPopBackStack()
                 }
                 is IndividualMessageListAction.NavigateToSelected -> {
                     when (val msg = state.selectedMessage) {
-                        is DirectMessage -> navController.throttledNavigate(ChatRoute(planterInfoId = userId, otherChatIdentifier = msg.from))
-                        is SurveyMessage -> navController.throttledNavigate(SurveyRoute(messageId = msg.id))
-                        is AnnouncementMessage -> navController.throttledNavigate(AnnouncementRoute(messageId = msg.id))
+                        is DirectMessage -> navigator.throttledNavigate(ChatRoute(planterInfoId = userId, otherChatIdentifier = msg.from))
+                        is SurveyMessage -> navigator.throttledNavigate(SurveyRoute(messageId = msg.id))
+                        is AnnouncementMessage -> navigator.throttledNavigate(AnnouncementRoute(messageId = msg.id))
                     }
                 }
                 else -> viewModel.handleAction(action)
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/navigation/CaptureFlowNavigationController.kt b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/CaptureFlowNavigationController.kt
index 470139119..584e9bc8e 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/navigation/CaptureFlowNavigationController.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/CaptureFlowNavigationController.kt
@@ -15,7 +15,7 @@
  */
 package org.greenstand.android.TreeTracker.navigation
 
-import androidx.navigation.NavHostController
+import androidx.navigation3.runtime.NavKey
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -28,8 +28,6 @@ import org.greenstand.android.TreeTracker.models.TreeCapturer
 import org.greenstand.android.TreeTracker.models.captureflowdata.CaptureFlowScopeManager
 import org.greenstand.android.TreeTracker.models.location.LocationDataCapturer
 import org.greenstand.android.TreeTracker.models.organization.OrgRepo
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
-import org.greenstand.android.TreeTracker.utilities.throttledPopBackStack
 import timber.log.Timber
 
 class CaptureFlowNavigationController(
@@ -46,7 +44,7 @@ class CaptureFlowNavigationController(
      * Navigate forward in the capture flow. Suspend because at the end of the flow
      * it must save the tree to the database before looping back to capture.
      */
-    suspend fun navForward(navController: NavHostController) {
+    suspend fun navForward(navigator: Navigator) {
         incrementIndex()
 
         // If navigating past last screen, save tree then loop back to capture
@@ -57,7 +55,7 @@ class CaptureFlowNavigationController(
                 Timber.tag("CaptureFlowNav").w("Tree save failed or no tree to save")
             }
             withContext(Dispatchers.Main) {
-                navController.popBackStack<TreeCaptureRoute>(inclusive = false)
+                navigator.popBackStackTo<TreeCaptureRoute>()
             }
             return
         }
@@ -65,35 +63,35 @@ class CaptureFlowNavigationController(
         val destination = navPath[currentNavPathIndex]
         val route = resolveDestinationRoute(destination)
         withContext(Dispatchers.Main) {
-            navController.throttledNavigate(route)
+            navigator.throttledNavigate(route)
         }
     }
 
-    fun navBackward(navController: NavHostController) {
+    fun navBackward(navigator: Navigator) {
         if (!decrementIndex()) {
-            goToDashboard(navController)
+            goToDashboard(navigator)
             return
         }
-        navController.throttledPopBackStack()
+        navigator.throttledPopBackStack()
     }
 
-    fun goToDashboard(navController: NavHostController) {
+    fun goToDashboard(navigator: Navigator) {
         endSession()
-        navController.throttledNavigate(DashboardRoute) {
+        navigator.throttledNavigate(DashboardRoute) {
             popUpTo<DashboardRoute> { inclusive = true }
             launchSingleTop = true
         }
     }
 
-    fun goToUserSelect(navController: NavHostController) {
+    fun goToUserSelect(navigator: Navigator) {
         endSession()
-        navController.throttledNavigate(UserSelectRoute) {
+        navigator.throttledNavigate(UserSelectRoute) {
             popUpTo<DashboardRoute> { inclusive = true }
             launchSingleTop = true
         }
     }
 
-    private fun resolveDestinationRoute(destination: org.greenstand.android.TreeTracker.models.organization.Destination): Any {
+    private fun resolveDestinationRoute(destination: org.greenstand.android.TreeTracker.models.organization.Destination): NavKey {
         resolveNoArgDestination(destination)?.let { return it }
 
         val normalized = RouteRegistry.normalize(destination.route)
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/navigation/CaptureSetupNavigationController.kt b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/CaptureSetupNavigationController.kt
index 6fcd2f5b6..97fcfcb31 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/navigation/CaptureSetupNavigationController.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/CaptureSetupNavigationController.kt
@@ -15,7 +15,6 @@
  */
 package org.greenstand.android.TreeTracker.navigation
 
-import androidx.navigation.NavHostController
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.greenstand.android.TreeTracker.models.DeviceOrientation
@@ -24,8 +23,6 @@ import org.greenstand.android.TreeTracker.models.StepCounter
 import org.greenstand.android.TreeTracker.models.location.LocationDataCapturer
 import org.greenstand.android.TreeTracker.models.organization.OrgRepo
 import org.greenstand.android.TreeTracker.models.setupflow.CaptureSetupScopeManager
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
-import org.greenstand.android.TreeTracker.utilities.throttledPopBackStack
 
 class CaptureSetupNavigationController(
     orgRepo: OrgRepo,
@@ -38,7 +35,7 @@ class CaptureSetupNavigationController(
      * Navigate forward in the setup flow. Suspend because completing setup
      * requires starting a session (DB write) before navigating to capture.
      */
-    suspend fun navForward(navController: NavHostController) {
+    suspend fun navForward(navigator: Navigator) {
         if (isAtEnd) {
             // Setup complete — start session and transition to capture flow
             stepCounter.enable()
@@ -50,7 +47,7 @@ class CaptureSetupNavigationController(
 
             val userPhotoPath = CaptureSetupScopeManager.getData().user?.photoPath ?: ""
             withContext(Dispatchers.Main) {
-                navController.throttledNavigate(TreeCaptureRoute(profilePicUrl = userPhotoPath))
+                navigator.throttledNavigate(TreeCaptureRoute(profilePicUrl = userPhotoPath))
             }
             CaptureSetupScopeManager.close()
         } else {
@@ -60,19 +57,19 @@ class CaptureSetupNavigationController(
                 resolveNoArgDestination(destination)
                     ?: error("Unknown setup flow destination: ${destination.route}")
             withContext(Dispatchers.Main) {
-                navController.throttledNavigate(route)
+                navigator.throttledNavigate(route)
             }
         }
     }
 
-    fun navBackward(navController: NavHostController) {
+    fun navBackward(navigator: Navigator) {
         decrementIndex()
-        navController.throttledPopBackStack()
+        navigator.throttledPopBackStack()
     }
 
-    fun navToUserSelect(navController: NavHostController) {
+    fun navToUserSelect(navigator: Navigator) {
         resetIndex()
-        navController.throttledNavigate(UserSelectRoute) {
+        navigator.throttledNavigate(UserSelectRoute) {
             popUpTo<DashboardRoute>()
             launchSingleTop = true
         }
@@ -82,12 +79,12 @@ class CaptureSetupNavigationController(
      * Navigate forward after a new user was created from the signup flow.
      * Includes bounds checking to prevent IndexOutOfBoundsException.
      */
-    suspend fun navFromNewUserCreation(navController: NavHostController) {
+    suspend fun navFromNewUserCreation(navigator: Navigator) {
         incrementIndex()
         if (currentNavPathIndex >= navPath.size) {
             // Signup was the last step — treat as setup complete
             currentNavPathIndex = navPath.size - 1
-            navForward(navController)
+            navForward(navigator)
             return
         }
         val destination = navPath[currentNavPathIndex]
@@ -95,7 +92,7 @@ class CaptureSetupNavigationController(
             resolveNoArgDestination(destination)
                 ?: error("Unknown setup flow destination: ${destination.route}")
         withContext(Dispatchers.Main) {
-            navController.throttledNavigate(route) {
+            navigator.throttledNavigate(route) {
                 popUpTo<SignupFlowRoute> { inclusive = true }
                 launchSingleTop = true
             }
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/navigation/FlowNavigationController.kt b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/FlowNavigationController.kt
index e14293c72..7287eac3d 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/navigation/FlowNavigationController.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/FlowNavigationController.kt
@@ -15,6 +15,7 @@
  */
 package org.greenstand.android.TreeTracker.navigation
 
+import androidx.navigation3.runtime.NavKey
 import org.greenstand.android.TreeTracker.models.organization.Destination
 
 /**
@@ -56,7 +57,7 @@ abstract class FlowNavigationController(
      * Resolves a Destination to a typed route object for no-arg routes.
      * Returns null for routes that require arguments.
      */
-    protected fun resolveNoArgDestination(destination: Destination): Any? {
+    protected fun resolveNoArgDestination(destination: Destination): NavKey? {
         val normalized = RouteRegistry.normalize(destination.route)
         return RouteRegistry.resolveNoArgRoute(normalized)
     }
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/navigation/Navigator.kt b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/Navigator.kt
new file mode 100644
index 000000000..78205c876
--- /dev/null
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/Navigator.kt
@@ -0,0 +1,208 @@
+/*
+ * Copyright 2026 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.navigation
+
+import android.os.SystemClock
+import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.runtime.snapshots.Snapshot
+import androidx.navigation3.runtime.NavKey
+
+val LocalNavigator = compositionLocalOf<Navigator> { error("No Navigator found!") }
+
+/**
+ * Navigation options mirroring the Navigation 2 `NavOptionsBuilder` surface so
+ * call sites keep the same DSL shape: `navigate(route) { popUpTo<X> { inclusive = true };
+ * launchSingleTop = true }`.
+ */
+class NavOptions {
+    /**
+     * When the top entry is already the same route class, replace it instead of
+     * pushing a duplicate. Unlike Nav2 (which kept the existing entry), a match
+     * with different arguments recreates the entry with the new arguments.
+     */
+    var launchSingleTop: Boolean = false
+
+    @PublishedApi internal var popUpToMatcher: ((NavKey) -> Boolean)? = null
+
+    @PublishedApi internal var popUpToInclusive: Boolean = false
+
+    internal var popUpToRootRequested: Boolean = false
+
+    class PopUpToBuilder {
+        var inclusive: Boolean = false
+    }
+
+    /**
+     * Pop all entries above the most recent [T] before navigating; with
+     * `inclusive = true`, pop [T] itself as well. If [T] is not on the back
+     * stack, nothing is popped (Nav2 parity) and the navigation still happens.
+     */
+    inline fun <reified T : NavKey> popUpTo(builder: PopUpToBuilder.() -> Unit = {}) {
+        popUpToMatcher = { it is T }
+        popUpToInclusive = PopUpToBuilder().apply(builder).inclusive
+    }
+
+    /** Clear the entire back stack before navigating. Replaces Nav2's `popUpTo(graph.id) { inclusive = true }`. */
+    fun popUpToRoot() {
+        popUpToRootRequested = true
+    }
+}
+
+/**
+ * App-owned navigation state and operations over a Navigation 3 back stack.
+ *
+ * Replaces `NavHostController`: the [backStack] is the single source of truth
+ * (a `NavBackStack` in production, any `MutableList` in tests) and `NavDisplay`
+ * renders whatever it contains.
+ *
+ * ## Double-tap protection
+ *
+ * The `throttled*` variants exist to stop a screen firing the same navigation twice
+ * (e.g. a rapid double-tap on a button while the screen is still fading out). How they
+ * decide to drop a call depends on whether the navigator is bound to an [origin] screen:
+ *
+ * - **Origin-scoped** (the production path — every screen gets one via
+ *   `rememberScreenTrackingNavEntryDecorator`, keyed by its entry's contentKey): a
+ *   throttled call is allowed only while [origin] is still the top of the back stack.
+ *   The first tap navigates away, so the origin is no longer on top and any further
+ *   tap from that same screen is dropped — while a first tap from *each* screen always
+ *   passes. This is what lets a user move through many screens as fast as they like yet
+ *   never double-navigate from one screen. It reimplements Nav2's "only navigate while
+ *   the current entry is RESUMED" guard without a wall-clock timer.
+ * - **Unscoped** ([origin] is null — tests, or any host not inside a `NavDisplay`
+ *   entry): falls back to a [NAVIGATION_THROTTLE_MS] time-based debounce after every
+ *   successful stack mutation.
+ *
+ * Non-throttled [navigate]/[popBackStack]/[popBackStackTo] are never gated; they are for
+ * programmatic, single-shot transitions (splash auto-advance, flow controllers, …).
+ *
+ * @param origin the contentKey of the entry this navigator is bound to, or null for an
+ *   unscoped navigator. Set indirectly via [scopedTo].
+ */
+class Navigator(
+    val backStack: MutableList<NavKey>,
+    private val clock: () -> Long = SystemClock::elapsedRealtime,
+    private val origin: Any? = null,
+) {
+    // Start outside the throttle window so the first navigation is never dropped.
+    private var lastMutationTime = clock() - NAVIGATION_THROTTLE_MS
+
+    val topKey: NavKey? get() = backStack.lastOrNull()
+
+    /**
+     * Returns a view of this navigator bound to [originContentKey] (the contentKey of the
+     * entry the caller is composed in), sharing the same [backStack]. Throttled operations
+     * on the returned navigator are dropped unless [originContentKey] is still the top of
+     * the stack — i.e. you can only navigate *away from* a screen while that screen is on
+     * top. See the class doc for the rationale.
+     */
+    fun scopedTo(originContentKey: Any?): Navigator = Navigator(backStack, clock, originContentKey)
+
+    /** Push [route], honoring [NavOptions] (popUpTo / popUpToRoot / launchSingleTop). */
+    fun navigate(
+        route: NavKey,
+        builder: NavOptions.() -> Unit = {},
+    ) {
+        val options = NavOptions().apply(builder)
+        mutate {
+            val matcher = options.popUpToMatcher
+            when {
+                options.popUpToRootRequested -> backStack.clear()
+                matcher != null -> {
+                    val index = backStack.indexOfLast(matcher)
+                    if (index >= 0) {
+                        trimTo(if (options.popUpToInclusive) index else index + 1)
+                    }
+                }
+            }
+            val top = backStack.lastOrNull()
+            if (options.launchSingleTop && top != null && top::class == route::class) {
+                backStack[backStack.lastIndex] = route
+            } else {
+                backStack.add(route)
+            }
+        }
+    }
+
+    /** Pop the top entry. Never pops the last remaining entry (Nav2 parity). */
+    fun popBackStack(): Boolean {
+        if (backStack.size <= 1) return false
+        mutate { backStack.removeAt(backStack.lastIndex) }
+        return true
+    }
+
+    /**
+     * Pop entries until the most recent [T] is on top (or removed, when [inclusive]).
+     * Returns false and leaves the stack untouched if [T] is absent or nothing would pop.
+     * Replaces Nav2's `popBackStack<T>(inclusive)`.
+     */
+    inline fun <reified T : NavKey> popBackStackTo(inclusive: Boolean = false): Boolean = popBackStackTo({ it is T }, inclusive)
+
+    fun popBackStackTo(
+        matcher: (NavKey) -> Boolean,
+        inclusive: Boolean,
+    ): Boolean {
+        val index = backStack.indexOfLast(matcher)
+        if (index < 0) return false
+        // Never pop the last remaining entry, even when inclusive.
+        val keepCount = if (inclusive) maxOf(index, 1) else index + 1
+        if (keepCount >= backStack.size) return false
+        mutate { trimTo(keepCount) }
+        return true
+    }
+
+    /** [navigate], dropped silently when this screen may not navigate (see class doc). */
+    fun throttledNavigate(
+        route: NavKey,
+        builder: NavOptions.() -> Unit = {},
+    ) {
+        if (isThrottled()) return
+        navigate(route, builder)
+    }
+
+    /** [popBackStack], dropped silently when this screen may not navigate (see class doc). */
+    fun throttledPopBackStack(): Boolean {
+        if (isThrottled()) return false
+        return popBackStack()
+    }
+
+    /**
+     * Whether a throttled call should be dropped. Origin-scoped navigators gate on
+     * "is my screen still on top?"; unscoped navigators fall back to a time debounce.
+     */
+    private fun isThrottled(): Boolean =
+        if (origin != null) {
+            origin != topKey?.toString()
+        } else {
+            clock() - lastMutationTime < NAVIGATION_THROTTLE_MS
+        }
+
+    private fun trimTo(keepCount: Int) {
+        while (backStack.size > keepCount) {
+            backStack.removeAt(backStack.lastIndex)
+        }
+    }
+
+    /** Applies multi-step stack changes atomically so they land in a single frame. */
+    private fun mutate(block: () -> Unit) {
+        Snapshot.withMutableSnapshot(block)
+        lastMutationTime = clock()
+    }
+
+    private companion object {
+        const val NAVIGATION_THROTTLE_MS = 300L
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/navigation/OrgDeepLink.kt b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/OrgDeepLink.kt
new file mode 100644
index 000000000..6768e8d14
--- /dev/null
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/OrgDeepLink.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2026 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.navigation
+
+import android.content.Intent
+
+private const val ORG_LINK_SCHEME = "app"
+private const val ORG_LINK_HOST = "mobile.treetracker.org"
+private const val ORG_LINK_PATH_PREFIX = "/org"
+
+/**
+ * Parses the org deep link (`app://mobile.treetracker.org/org?id={orgId}&name={orgName}`)
+ * from the launching intent into the start route. Navigation 3 has no built-in deep link
+ * support, so this replaces the Nav2 `navDeepLink` on the splash destination. Handled at
+ * cold start only, matching the pre-migration behavior.
+ */
+fun parseStartRoute(intent: Intent?): SplashRoute {
+    val uri = intent?.data ?: return SplashRoute()
+    val isOrgLink =
+        uri.scheme == ORG_LINK_SCHEME &&
+            uri.host == ORG_LINK_HOST &&
+            uri.path?.startsWith(ORG_LINK_PATH_PREFIX) == true
+    if (!isOrgLink) return SplashRoute()
+    return SplashRoute(
+        orgId = uri.getQueryParameter("id"),
+        orgName = uri.getQueryParameter("name"),
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/navigation/RouteRegistry.kt b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/RouteRegistry.kt
index fd9aaea3c..1d10c063c 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/navigation/RouteRegistry.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/RouteRegistry.kt
@@ -15,6 +15,8 @@
  */
 package org.greenstand.android.TreeTracker.navigation
 
+import androidx.navigation3.runtime.NavKey
+
 /**
  * Maps route identifiers (from org config JSON) to type-safe route objects.
  * Org config stores route patterns as strings in the database. This registry provides
@@ -38,7 +40,7 @@ object RouteRegistry {
     private const val ALIAS_TREE_CAPTURE = "tree-capture"
     private const val ALIAS_TREE_IMAGE_REVIEW = "image-review"
 
-    private val noArgRoutes: Map<String, Any> =
+    private val noArgRoutes: Map<String, NavKey> =
         mapOf(
             ROUTE_USER_SELECT to UserSelectRoute,
             ROUTE_WALLET_SELECT to WalletSelectRoute,
@@ -67,7 +69,7 @@ object RouteRegistry {
      * Resolves a route string to a no-arg typed route object.
      * Returns null if the route requires arguments or is unknown.
      */
-    fun resolveNoArgRoute(routeString: String): Any? {
+    fun resolveNoArgRoute(routeString: String): NavKey? {
         // Try direct match first, then alias resolution
         return noArgRoutes[routeString]
             ?: aliasMap[routeString]?.let { noArgRoutes[it] }
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/navigation/Routes.kt b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/Routes.kt
index 6fcf15f72..7cf3c48d4 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/navigation/Routes.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/Routes.kt
@@ -15,6 +15,7 @@
  */
 package org.greenstand.android.TreeTracker.navigation
 
+import androidx.navigation3.runtime.NavKey
 import kotlinx.serialization.Serializable
 
 // No-arg routes
@@ -22,86 +23,86 @@ import kotlinx.serialization.Serializable
 @Serializable data class SplashRoute(
     val orgId: String? = null,
     val orgName: String? = null,
-)
+) : NavKey
 
-@Serializable data object SignupFlowRoute
+@Serializable data object SignupFlowRoute : NavKey
 
-@Serializable data object DeleteProfileRoute
+@Serializable data object DeleteProfileRoute : NavKey
 
-@Serializable data object OrgRoute
+@Serializable data object OrgRoute : NavKey
 
-@Serializable data object DashboardRoute
+@Serializable data object DashboardRoute : NavKey
 
-@Serializable data object TreeHeightScreenRoute
+@Serializable data object TreeHeightScreenRoute : NavKey
 
-@Serializable data object UserSelectRoute
+@Serializable data object UserSelectRoute : NavKey
 
-@Serializable data object ProfileSelectRoute
+@Serializable data object ProfileSelectRoute : NavKey
 
-@Serializable data object WalletSelectRoute
+@Serializable data object WalletSelectRoute : NavKey
 
-@Serializable data object AddWalletRoute
+@Serializable data object AddWalletRoute : NavKey
 
-@Serializable data object SettingsRoute
+@Serializable data object SettingsRoute : NavKey
 
-@Serializable data object SessionNoteRoute
+@Serializable data object SessionNoteRoute : NavKey
 
-@Serializable data object AddOrgRoute
+@Serializable data object AddOrgRoute : NavKey
 
-@Serializable data object SelfieRoute
+@Serializable data object SelfieRoute : NavKey
 
-@Serializable data object MessagesUserSelectRoute
+@Serializable data object MessagesUserSelectRoute : NavKey
 
-@Serializable data object DevOptionsRoute
+@Serializable data object DevOptionsRoute : NavKey
 
-@Serializable data object MapRoute
+@Serializable data object MapRoute : NavKey
 
-@Serializable data object TreeEditUserSelectRoute
+@Serializable data object TreeEditUserSelectRoute : NavKey
 
 // Routes with arguments
 
 @Serializable data class ProfileRoute(
     val planterInfoId: Long,
-)
+) : NavKey
 
 @Serializable data class IndividualMessageListRoute(
     val planterInfoId: Long,
-)
+) : NavKey
 
 @Serializable data class SurveyRoute(
     val messageId: String,
-)
+) : NavKey
 
 @Serializable data class ImageReviewRoute(
     val photoPath: String,
-)
+) : NavKey
 
 @Serializable data class LanguageRoute(
     val isFromTopBar: Boolean = true,
-)
+) : NavKey
 
 @Serializable data class TreeCaptureRoute(
     val profilePicUrl: String,
-)
+) : NavKey
 
 @Serializable data class TreeImageReviewRoute(
     val photoPath: String,
-)
+) : NavKey
 
 @Serializable data class ChatRoute(
     val planterInfoId: Long,
     val otherChatIdentifier: String,
-)
+) : NavKey
 
 @Serializable data class AnnouncementRoute(
     val messageId: String,
-)
+) : NavKey
 
 @Serializable data class TreeListRoute(
     val userWallet: String,
     val userName: String,
-)
+) : NavKey
 
 @Serializable data class TreeDetailRoute(
     val treeId: Long,
-)
\ No newline at end of file
+) : NavKey
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/navigation/ScreenTrackingNavEntryDecorator.kt b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/ScreenTrackingNavEntryDecorator.kt
new file mode 100644
index 000000000..d5a4b5c29
--- /dev/null
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/ScreenTrackingNavEntryDecorator.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2026 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.navigation
+
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.runtime.remember
+import androidx.navigation3.runtime.NavEntryDecorator
+import androidx.navigation3.runtime.NavKey
+import org.greenstand.android.TreeTracker.analytics.ExceptionDataCollector
+import org.koin.compose.koinInject
+
+private const val TRANSITION_DURATION_MS = 300
+
+val FastFadeIn: EnterTransition = fadeIn(animationSpec = tween(TRANSITION_DURATION_MS))
+val FastFadeOut: ExitTransition = fadeOut(animationSpec = tween(TRANSITION_DURATION_MS))
+
+/**
+ * The [androidx.navigation3.runtime.NavEntry.contentKey] of the entry hosting the current
+ * composition, or null outside of a `NavDisplay` entry. `HandleUIEvents` compares it against
+ * `Navigator.topKey` to drop navigation events replayed from screens that are no longer on top.
+ */
+val LocalNavEntryContentKey = compositionLocalOf<Any?> { null }
+
+/**
+ * Decorates every entry with Crashlytics screen tracking (replacing Nav2's
+ * `trackedComposable` wrapper), provides [LocalNavEntryContentKey], and re-provides
+ * [LocalNavigator] as an [Navigator.scopedTo] view bound to this entry.
+ *
+ * The scoped navigator is what gives each screen its own double-tap protection: a
+ * throttled navigation only fires while this entry is the top of the stack, so rapid
+ * taps across different screens all succeed while a repeated tap on one screen is
+ * dropped. See [Navigator] for details.
+ *
+ * The screen name is derived from the entry's contentKey, which defaults to the
+ * route's `toString()`. All routes are `data object`s or `data class`es, so this
+ * yields `RouteName` or `RouteName(arg=...)` — matching the `T::class.simpleName`
+ * value reported before the Navigation 3 migration.
+ */
+@Composable
+fun rememberScreenTrackingNavEntryDecorator(): NavEntryDecorator<NavKey> {
+    val exceptionDataCollector = koinInject<ExceptionDataCollector>()
+    return remember(exceptionDataCollector) {
+        NavEntryDecorator<NavKey> { entry ->
+            val screenName = entry.contentKey.toString().substringBefore('(')
+            LaunchedEffect(screenName) {
+                exceptionDataCollector.setScreen(screenName)
+            }
+            val baseNavigator = LocalNavigator.current
+            val scopedNavigator =
+                remember(baseNavigator, entry.contentKey) {
+                    baseNavigator.scopedTo(entry.contentKey)
+                }
+            CompositionLocalProvider(
+                LocalNavEntryContentKey provides entry.contentKey,
+                LocalNavigator provides scopedNavigator,
+            ) {
+                entry.Content()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/navigation/TrackedComposable.kt b/app/src/main/java/org/greenstand/android/TreeTracker/navigation/TrackedComposable.kt
deleted file mode 100644
index b087d2405..000000000
--- a/app/src/main/java/org/greenstand/android/TreeTracker/navigation/TrackedComposable.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2023 Treetracker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.greenstand.android.TreeTracker.navigation
-
-import androidx.compose.animation.EnterTransition
-import androidx.compose.animation.ExitTransition
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.navigation.NavBackStackEntry
-import androidx.navigation.NavDeepLink
-import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.composable
-import org.greenstand.android.TreeTracker.analytics.ExceptionDataCollector
-import org.koin.androidx.compose.get
-
-private const val TRANSITION_DURATION_MS = 500
-
-val FastFadeIn: EnterTransition = fadeIn(animationSpec = tween(TRANSITION_DURATION_MS))
-val FastFadeOut: ExitTransition = fadeOut(animationSpec = tween(TRANSITION_DURATION_MS))
-
-inline fun <reified T : Any> NavGraphBuilder.trackedComposable(
-    deepLinks: List<NavDeepLink> = emptyList(),
-    noinline content: @Composable (NavBackStackEntry) -> Unit,
-) {
-    composable<T>(
-        deepLinks = deepLinks,
-        enterTransition = { FastFadeIn },
-        exitTransition = { FastFadeOut },
-        popEnterTransition = { FastFadeIn },
-        popExitTransition = { FastFadeOut },
-    ) { backStackEntry ->
-        val exceptionDataCollector = get<ExceptionDataCollector>()
-        val routeName = T::class.simpleName ?: "Unknown"
-        LaunchedEffect(routeName) {
-            exceptionDataCollector.setScreen(routeName)
-        }
-        content(backStackEntry)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/orgpicker/AddOrgScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/orgpicker/AddOrgScreen.kt
index 4ff1df289..5bed3251e 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/orgpicker/AddOrgScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/orgpicker/AddOrgScreen.kt
@@ -44,7 +44,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import kotlinx.coroutines.launch
 import org.greenstand.android.TreeTracker.R
 import org.greenstand.android.TreeTracker.models.setupflow.CaptureSetupScopeManager
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.root.LocalViewModelFactory
 import org.greenstand.android.TreeTracker.theme.CustomTheme
 import org.greenstand.android.TreeTracker.view.ActionBar
@@ -54,7 +54,7 @@ import org.greenstand.android.TreeTracker.view.TreeTrackerButton
 
 @Composable
 fun AddOrgScreen(viewModel: AddOrgViewModel = viewModel(factory = LocalViewModelFactory.current)) {
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val state by viewModel.state.collectAsState()
     val scope = rememberCoroutineScope()
 
@@ -62,10 +62,10 @@ fun AddOrgScreen(viewModel: AddOrgViewModel = viewModel(factory = LocalViewModel
         state = state,
         onHandleAction = { action ->
             when (action) {
-                is AddOrgAction.NavigateBack -> CaptureSetupScopeManager.nav.navBackward(navController)
+                is AddOrgAction.NavigateBack -> CaptureSetupScopeManager.nav.navBackward(navigator)
                 is AddOrgAction.NavigateNext -> {
                     viewModel.handleAction(AddOrgAction.SetDefaultOrg)
-                    scope.launch { CaptureSetupScopeManager.nav.navForward(navController) }
+                    scope.launch { CaptureSetupScopeManager.nav.navForward(navigator) }
                 }
                 else -> viewModel.handleAction(action)
             }
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/permissions/Permissions.kt b/app/src/main/java/org/greenstand/android/TreeTracker/permissions/Permissions.kt
index 3dbce0e58..b41ccc794 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/permissions/Permissions.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/permissions/Permissions.kt
@@ -33,7 +33,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavHostController
+import org.greenstand.android.TreeTracker.navigation.Navigator
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.PermissionState
 import com.google.accompanist.permissions.isGranted
@@ -42,9 +42,8 @@ import com.google.accompanist.permissions.shouldShowRationale
 import org.greenstand.android.TreeTracker.R
 import org.greenstand.android.TreeTracker.permissions.PermissionAction
 import org.greenstand.android.TreeTracker.permissions.PermissionViewModel
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.root.LocalViewModelFactory
-import org.greenstand.android.TreeTracker.utilities.throttledPopBackStack
 import org.greenstand.android.TreeTracker.view.dialogs.CustomDialog
 
 @ExperimentalPermissionsApi
@@ -52,7 +51,7 @@ import org.greenstand.android.TreeTracker.view.dialogs.CustomDialog
 fun PermissionRequest(
     viewModel: PermissionViewModel = viewModel(factory = LocalViewModelFactory.current),
 ) {
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val state by viewModel.state.collectAsState()
     val permissions =
         buildList {
@@ -94,16 +93,16 @@ fun PermissionRequest(
                             title = stringResource(R.string.accept_camera_permission_header),
                             textContent = stringResource(R.string.accept_camera_permission_message),
                             onNegativeClick = {
-                                navController.throttledPopBackStack()
+                                navigator.throttledPopBackStack()
                             },
                             onPositiveClick = {
                                 perm.launchPermissionRequest()
-                                navController.throttledPopBackStack()
+                                navigator.throttledPopBackStack()
                             },
                         )
                     }
                     else -> {
-                        PermissionDeniedPermanentlyDialog(navController)
+                        PermissionDeniedPermanentlyDialog(navigator)
                     }
                 }
             }
@@ -116,10 +115,10 @@ fun PermissionRequest(
                         }
                     }
                     perm.status.shouldShowRationale -> {
-                        LocationRationaleDialog(navController = navController, perm = perm)
+                        LocationRationaleDialog(navigator = navigator, perm = perm)
                     }
                     else -> {
-                        PermissionDeniedPermanentlyDialog(navController)
+                        PermissionDeniedPermanentlyDialog(navigator)
                     }
                 }
             }
@@ -132,10 +131,10 @@ fun PermissionRequest(
                         }
                     }
                     perm.status.shouldShowRationale -> {
-                        LocationRationaleDialog(navController = navController, perm = perm)
+                        LocationRationaleDialog(navigator = navigator, perm = perm)
                     }
                     else -> {
-                        PermissionDeniedPermanentlyDialog(navController)
+                        PermissionDeniedPermanentlyDialog(navigator)
                     }
                 }
             }
@@ -146,18 +145,18 @@ fun PermissionRequest(
 @ExperimentalPermissionsApi
 @Composable
 fun LocationRationaleDialog(
-    navController: NavHostController,
+    navigator: Navigator,
     perm: PermissionState,
 ) {
     CustomDialog(
         title = stringResource(R.string.accept_location_permission_header),
         textContent = stringResource(R.string.accept_location_permission_message),
         onNegativeClick = {
-            navController.throttledPopBackStack()
+            navigator.throttledPopBackStack()
         },
         onPositiveClick = {
             perm.launchPermissionRequest()
-            navController.throttledPopBackStack()
+            navigator.throttledPopBackStack()
         },
     )
 }
@@ -170,14 +169,14 @@ fun enableLocation() {
 }
 
 @Composable
-fun PermissionDeniedPermanentlyDialog(navController: NavHostController) {
+fun PermissionDeniedPermanentlyDialog(navigator: Navigator) {
     val activity: Context = LocalContext.current as Activity
 
     CustomDialog(
         title = stringResource(R.string.open_settings_header),
         textContent = stringResource(R.string.open_settings_message),
         onNegativeClick = {
-            navController.throttledPopBackStack()
+            navigator.throttledPopBackStack()
         },
         onPositiveClick = {
             val intent =
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/profile/DeleteProfileScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/profile/DeleteProfileScreen.kt
index 6f998e5d2..bb0743b37 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/profile/DeleteProfileScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/profile/DeleteProfileScreen.kt
@@ -26,13 +26,12 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import org.greenstand.android.TreeTracker.R
 import org.greenstand.android.TreeTracker.navigation.SettingsRoute
 import org.greenstand.android.TreeTracker.navigation.SignupFlowRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.root.LocalViewModelFactory
 import org.greenstand.android.TreeTracker.userselect.DeleteProfileState
 import org.greenstand.android.TreeTracker.userselect.UserSelect
 import org.greenstand.android.TreeTracker.userselect.UserSelectAction
 import org.greenstand.android.TreeTracker.userselect.UserSelectViewModel
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
 import org.greenstand.android.TreeTracker.view.AppButtonColors
 import org.greenstand.android.TreeTracker.view.AppColors.Red
 import org.greenstand.android.TreeTracker.view.UserButton
@@ -40,7 +39,7 @@ import org.greenstand.android.TreeTracker.view.dialogs.CustomDialog
 
 @Composable
 fun DeleteProfileScreen() {
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val viewModel: UserSelectViewModel = viewModel(factory = LocalViewModelFactory.current)
     val state by viewModel.state.collectAsState()
     Box(
@@ -89,14 +88,12 @@ fun DeleteProfileScreen() {
                 onPositiveClick = {
                     viewModel.handleAction(UserSelectAction.DeleteUser)
                     if (state.selectedUser?.isPowerUser == true) {
-                        navController.throttledNavigate(SignupFlowRoute) {
-                            popUpTo(navController.graph.id) {
-                                inclusive = true
-                            }
+                        navigator.throttledNavigate(SignupFlowRoute) {
+                            popUpToRoot()
                             launchSingleTop = true
                         }
                     } else {
-                        navController.throttledNavigate(SettingsRoute) {
+                        navigator.throttledNavigate(SettingsRoute) {
                             popUpTo<SettingsRoute> { inclusive = true }
                             launchSingleTop = true
                         }
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/profile/ProfileScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/profile/ProfileScreen.kt
index 2f644a704..b7c62401b 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/profile/ProfileScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/profile/ProfileScreen.kt
@@ -52,13 +52,12 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import org.greenstand.android.TreeTracker.R
 import org.greenstand.android.TreeTracker.activities.CaptureImageContract
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.theme.CustomTheme
 import org.greenstand.android.TreeTracker.userselect.UserSelectAction
 import org.greenstand.android.TreeTracker.userselect.UserSelectState
 import org.greenstand.android.TreeTracker.userselect.UserSelectViewModel
 import org.greenstand.android.TreeTracker.userselect.UserSelectViewModelFactory
-import org.greenstand.android.TreeTracker.utilities.throttledPopBackStack
 import org.greenstand.android.TreeTracker.utils.ValidationUtils
 import org.greenstand.android.TreeTracker.view.ActionBar
 import org.greenstand.android.TreeTracker.view.AppButtonColors
@@ -73,7 +72,7 @@ fun ProfileScreen(
     userId: Long,
 ) {
     val viewModel: UserSelectViewModel = viewModel(factory = UserSelectViewModelFactory(userId = userId))
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val state by viewModel.state.collectAsState()
 
     val cameraLauncher =
@@ -88,7 +87,7 @@ fun ProfileScreen(
         state = state,
         onHandleAction = { action ->
             when (action) {
-                is UserSelectAction.NavigateBack -> navController.throttledPopBackStack()
+                is UserSelectAction.NavigateBack -> navigator.throttledPopBackStack()
                 is UserSelectAction.NavigateToPhoto -> cameraLauncher.launch(true)
                 is UserSelectAction.SaveUserToDatabase -> {
                     viewModel.handleAction(action)
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/profile/ProfileSelectScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/profile/ProfileSelectScreen.kt
index ef8293346..6220c1ccc 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/profile/ProfileSelectScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/profile/ProfileSelectScreen.kt
@@ -17,20 +17,19 @@ package org.greenstand.android.TreeTracker.profile
 
 import androidx.compose.runtime.Composable
 import org.greenstand.android.TreeTracker.navigation.ProfileRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.userselect.UserSelect
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
 import org.greenstand.android.TreeTracker.view.AppButtonColors
 
 @Composable
 fun ProfileSelectScreen() {
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     UserSelect(
         navigationButtonColors = AppButtonColors.ProgressGreen,
         isCreateUserEnabled = true,
         isNotificationEnabled = true,
         onNavigateForward = { user ->
-            navController.throttledNavigate(ProfileRoute(planterInfoId = user.id))
+            navigator.throttledNavigate(ProfileRoute(planterInfoId = user.id))
         },
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/root/Host.kt b/app/src/main/java/org/greenstand/android/TreeTracker/root/Host.kt
index f3457865a..794eef162 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/root/Host.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/root/Host.kt
@@ -15,15 +15,20 @@
  */
 package org.greenstand.android.TreeTracker.root
 
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.ExperimentalComposeApi
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.navigation.compose.NavHost
-import androidx.navigation.navDeepLink
-import androidx.navigation.toRoute
+import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
+import androidx.navigation3.runtime.entryProvider
+import androidx.navigation3.runtime.rememberNavBackStack
+import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
+import androidx.navigation3.ui.NavDisplay
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import org.greenstand.android.TreeTracker.camera.ImageReviewScreen
 import org.greenstand.android.TreeTracker.camera.SelfieScreen
@@ -46,11 +51,15 @@ import org.greenstand.android.TreeTracker.navigation.ChatRoute
 import org.greenstand.android.TreeTracker.navigation.DashboardRoute
 import org.greenstand.android.TreeTracker.navigation.DeleteProfileRoute
 import org.greenstand.android.TreeTracker.navigation.DevOptionsRoute
+import org.greenstand.android.TreeTracker.navigation.FastFadeIn
+import org.greenstand.android.TreeTracker.navigation.FastFadeOut
 import org.greenstand.android.TreeTracker.navigation.ImageReviewRoute
 import org.greenstand.android.TreeTracker.navigation.IndividualMessageListRoute
 import org.greenstand.android.TreeTracker.navigation.LanguageRoute
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.navigation.MapRoute
 import org.greenstand.android.TreeTracker.navigation.MessagesUserSelectRoute
+import org.greenstand.android.TreeTracker.navigation.Navigator
 import org.greenstand.android.TreeTracker.navigation.OrgRoute
 import org.greenstand.android.TreeTracker.navigation.ProfileRoute
 import org.greenstand.android.TreeTracker.navigation.ProfileSelectRoute
@@ -68,7 +77,7 @@ import org.greenstand.android.TreeTracker.navigation.TreeImageReviewRoute
 import org.greenstand.android.TreeTracker.navigation.TreeListRoute
 import org.greenstand.android.TreeTracker.navigation.UserSelectRoute
 import org.greenstand.android.TreeTracker.navigation.WalletSelectRoute
-import org.greenstand.android.TreeTracker.navigation.trackedComposable
+import org.greenstand.android.TreeTracker.navigation.rememberScreenTrackingNavEntryDecorator
 import org.greenstand.android.TreeTracker.orgpicker.AddOrgScreen
 import org.greenstand.android.TreeTracker.orgpicker.OrgPickerScreen
 import org.greenstand.android.TreeTracker.overlay.DebugOverlayHost
@@ -95,107 +104,96 @@ import org.koin.compose.koinInject
 @OptIn(ExperimentalFoundationApi::class, ExperimentalPermissionsApi::class)
 @ExperimentalComposeApi
 @Composable
-fun Host() {
-    val navController = LocalNavHostController.current
+fun Host(startRoute: SplashRoute = SplashRoute()) {
+    // Persists across configuration changes and process death; on restore, the
+    // saved stack wins over startRoute — same as Nav2's restored NavController state.
+    val backStack = rememberNavBackStack(startRoute)
+    val navigator = remember(backStack) { Navigator(backStack) }
     TreeTrackerTheme {
-        Box(modifier = Modifier.fillMaxSize()) {
-            NavHost(navController, startDestination = SplashRoute()) {
-                trackedComposable<SplashRoute>(
-                    deepLinks =
+        CompositionLocalProvider(LocalNavigator provides navigator) {
+            Box(modifier = Modifier.fillMaxSize()) {
+                NavDisplay(
+                    backStack = backStack,
+                    onBack = { navigator.popBackStack() },
+                    entryDecorators =
                         listOf(
-                            navDeepLink { uriPattern = "app://mobile.treetracker.org/org?id={orgId}&name={orgName}" },
+                            rememberSaveableStateHolderNavEntryDecorator(),
+                            rememberViewModelStoreNavEntryDecorator(),
+                            rememberScreenTrackingNavEntryDecorator(),
                         ),
-                ) {
-                    val route = it.toRoute<SplashRoute>()
-                    SplashScreen(
-                        orgId = route.orgId,
-                        orgName = route.orgName,
-                    )
-                }
-
-                trackedComposable<LanguageRoute> {
-                    val route = it.toRoute<LanguageRoute>()
-                    LanguageSelectScreen(route.isFromTopBar)
-                }
-
-                trackedComposable<SignupFlowRoute> { SignUpScreen() }
-                trackedComposable<DashboardRoute> { DashboardScreen() }
-                trackedComposable<OrgRoute> { OrgPickerScreen() }
-                trackedComposable<UserSelectRoute> { UserSelectScreen() }
-                trackedComposable<WalletSelectRoute> { WalletSelectScreen() }
-                trackedComposable<AddWalletRoute> { AddWalletScreen() }
-                trackedComposable<AddOrgRoute> { AddOrgScreen() }
-                trackedComposable<SelfieRoute> { SelfieScreen() }
-                trackedComposable<TreeHeightScreenRoute> { TreeHeightScreen() }
-                trackedComposable<SessionNoteRoute> { SessionNoteScreen() }
-                trackedComposable<SettingsRoute> { SettingsScreen() }
-                trackedComposable<ProfileSelectRoute> { ProfileSelectScreen() }
-                trackedComposable<DeleteProfileRoute> { DeleteProfileScreen() }
-                trackedComposable<MessagesUserSelectRoute> { MessagesUserSelectScreen() }
-                trackedComposable<DevOptionsRoute> { DevOptionsRoot() }
-                trackedComposable<MapRoute> { MapScreen() }
-
-                trackedComposable<TreeEditUserSelectRoute> { TreeEditUserSelectScreen() }
-
-                trackedComposable<TreeListRoute> {
-                    val route = it.toRoute<TreeListRoute>()
-                    TreeListScreen(userWallet = route.userWallet, userName = route.userName)
-                }
-
-                trackedComposable<TreeDetailRoute> {
-                    val route = it.toRoute<TreeDetailRoute>()
-                    TreeDetailScreen(treeId = route.treeId)
-                }
-
-                trackedComposable<ProfileRoute> {
-                    val route = it.toRoute<ProfileRoute>()
-                    ProfileScreen(route.planterInfoId)
-                }
-
-                trackedComposable<IndividualMessageListRoute> {
-                    val route = it.toRoute<IndividualMessageListRoute>()
-                    IndividualMessageListScreen(route.planterInfoId)
-                }
-
-                trackedComposable<SurveyRoute> {
-                    val route = it.toRoute<SurveyRoute>()
-                    SurveyScreen(route.messageId)
-                }
-
-                trackedComposable<ImageReviewRoute> {
-                    val route = it.toRoute<ImageReviewRoute>()
-                    ImageReviewScreen(route.photoPath)
-                }
-
-                trackedComposable<TreeCaptureRoute> {
-                    val route = it.toRoute<TreeCaptureRoute>()
-                    TreeCaptureScreen(route.profilePicUrl)
-                }
+                    transitionSpec = { FastFadeIn togetherWith FastFadeOut },
+                    popTransitionSpec = { FastFadeIn togetherWith FastFadeOut },
+                    predictivePopTransitionSpec = { FastFadeIn togetherWith FastFadeOut },
+                    entryProvider =
+                        entryProvider {
+                            entry<SplashRoute> { route ->
+                                SplashScreen(
+                                    orgId = route.orgId,
+                                    orgName = route.orgName,
+                                )
+                            }
+
+                            entry<LanguageRoute> { route -> LanguageSelectScreen(route.isFromTopBar) }
+
+                            entry<SignupFlowRoute> { SignUpScreen() }
+                            entry<DashboardRoute> { DashboardScreen() }
+                            entry<OrgRoute> { OrgPickerScreen() }
+                            entry<UserSelectRoute> { UserSelectScreen() }
+                            entry<WalletSelectRoute> { WalletSelectScreen() }
+                            entry<AddWalletRoute> { AddWalletScreen() }
+                            entry<AddOrgRoute> { AddOrgScreen() }
+                            entry<SelfieRoute> { SelfieScreen() }
+                            entry<TreeHeightScreenRoute> { TreeHeightScreen() }
+                            entry<SessionNoteRoute> { SessionNoteScreen() }
+                            entry<SettingsRoute> { SettingsScreen() }
+                            entry<ProfileSelectRoute> { ProfileSelectScreen() }
+                            entry<DeleteProfileRoute> { DeleteProfileScreen() }
+                            entry<MessagesUserSelectRoute> { MessagesUserSelectScreen() }
+                            entry<DevOptionsRoute> { DevOptionsRoot() }
+                            entry<MapRoute> { MapScreen() }
+
+                            entry<TreeEditUserSelectRoute> { TreeEditUserSelectScreen() }
+
+                            entry<TreeListRoute> { route ->
+                                TreeListScreen(userWallet = route.userWallet, userName = route.userName)
+                            }
+
+                            entry<TreeDetailRoute> { route -> TreeDetailScreen(treeId = route.treeId) }
+
+                            entry<ProfileRoute> { route -> ProfileScreen(route.planterInfoId) }
+
+                            entry<IndividualMessageListRoute> { route ->
+                                IndividualMessageListScreen(route.planterInfoId)
+                            }
+
+                            entry<SurveyRoute> { route -> SurveyScreen(route.messageId) }
+
+                            entry<ImageReviewRoute> { route -> ImageReviewScreen(route.photoPath) }
+
+                            entry<TreeCaptureRoute> { route -> TreeCaptureScreen(route.profilePicUrl) }
+
+                            entry<TreeImageReviewRoute> { TreeImageReviewScreen() }
+
+                            entry<ChatRoute> { route ->
+                                ChatScreen(route.planterInfoId, route.otherChatIdentifier)
+                            }
+
+                            entry<AnnouncementRoute> { route -> AnnouncementScreen(route.messageId) }
+                        },
+                )
 
-                trackedComposable<TreeImageReviewRoute> { TreeImageReviewScreen() }
+                if (FeatureFlags.DEBUG_ENABLED) {
+                    val overlayManager: DebugOverlayManager = koinInject()
+                    val syncProgressTracker: SyncProgressTracker = koinInject()
+                    val sensorDiagnosticsTracker: SensorDiagnosticsTracker = koinInject()
 
-                trackedComposable<ChatRoute> {
-                    val route = it.toRoute<ChatRoute>()
-                    ChatScreen(route.planterInfoId, route.otherChatIdentifier)
-                }
-
-                trackedComposable<AnnouncementRoute> {
-                    val route = it.toRoute<AnnouncementRoute>()
-                    AnnouncementScreen(route.messageId)
+                    DebugOverlayHost(
+                        overlayManager = overlayManager,
+                        syncProgressTracker = syncProgressTracker,
+                        sensorDiagnosticsTracker = sensorDiagnosticsTracker,
+                    )
                 }
             }
-
-            if (FeatureFlags.DEBUG_ENABLED) {
-                val overlayManager: DebugOverlayManager = koinInject()
-                val syncProgressTracker: SyncProgressTracker = koinInject()
-                val sensorDiagnosticsTracker: SensorDiagnosticsTracker = koinInject()
-
-                DebugOverlayHost(
-                    overlayManager = overlayManager,
-                    syncProgressTracker = syncProgressTracker,
-                    sensorDiagnosticsTracker = sensorDiagnosticsTracker,
-                )
-            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/root/Root.kt b/app/src/main/java/org/greenstand/android/TreeTracker/root/Root.kt
index 8f8af9d34..16e926a51 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/root/Root.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/root/Root.kt
@@ -38,10 +38,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.rememberNavController
 import org.greenstand.android.TreeTracker.models.TreeTrackerViewModelFactory
 import org.greenstand.android.TreeTracker.models.organization.OrgRepo
+import org.greenstand.android.TreeTracker.navigation.SplashRoute
 import org.greenstand.android.TreeTracker.splash.Splash
 import org.greenstand.android.TreeTracker.theme.CustomTheme
 import org.greenstand.android.TreeTracker.view.AppColors
@@ -51,12 +50,13 @@ import org.greenstand.android.TreeTracker.viewmodel.resolve
 import org.koin.compose.koinInject
 
 val LocalViewModelFactory = compositionLocalOf<TreeTrackerViewModelFactory> { error { "No active ViewModel factory found!" } }
-val LocalNavHostController = compositionLocalOf<NavHostController> { error { "No NavHostController found!" } }
 
 @ExperimentalComposeApi
 @Composable
-fun Root(viewModelFactory: TreeTrackerViewModelFactory) {
-    val navController = rememberNavController()
+fun Root(
+    viewModelFactory: TreeTrackerViewModelFactory,
+    startRoute: SplashRoute = SplashRoute(),
+) {
     val snackbarController = remember { SnackbarController() }
     val snackbarHostState = remember { SnackbarHostState() }
     val context = LocalContext.current
@@ -89,12 +89,11 @@ fun Root(viewModelFactory: TreeTrackerViewModelFactory) {
 
     CompositionLocalProvider(
         LocalViewModelFactory provides viewModelFactory,
-        LocalNavHostController provides navController,
         LocalSnackbarController provides snackbarController,
     ) {
         Box(modifier = Modifier.fillMaxSize()) {
             if (isOrgReady) {
-                Host()
+                Host(startRoute)
             } else {
                 Splash()
             }
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/sessionnote/SessionNoteScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/sessionnote/SessionNoteScreen.kt
index 7918093fe..7119c98c2 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/sessionnote/SessionNoteScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/sessionnote/SessionNoteScreen.kt
@@ -41,7 +41,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import kotlinx.coroutines.launch
 import org.greenstand.android.TreeTracker.R
 import org.greenstand.android.TreeTracker.models.setupflow.CaptureSetupScopeManager
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.root.LocalViewModelFactory
 import org.greenstand.android.TreeTracker.view.ActionBar
 import org.greenstand.android.TreeTracker.view.ArrowButton
@@ -49,7 +49,7 @@ import org.greenstand.android.TreeTracker.view.BorderedTextField
 
 @Composable
 fun SessionNoteScreen(viewModel: SessionNoteViewModel = viewModel(factory = LocalViewModelFactory.current)) {
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val state by viewModel.state.collectAsState()
     val scope = rememberCoroutineScope()
 
@@ -57,8 +57,8 @@ fun SessionNoteScreen(viewModel: SessionNoteViewModel = viewModel(factory = Loca
         state = state,
         onHandleAction = { action ->
             when (action) {
-                is SessionNoteAction.NavigateBack -> CaptureSetupScopeManager.nav.navBackward(navController)
-                is SessionNoteAction.NavigateNext -> scope.launch { CaptureSetupScopeManager.nav.navForward(navController) }
+                is SessionNoteAction.NavigateBack -> CaptureSetupScopeManager.nav.navBackward(navigator)
+                is SessionNoteAction.NavigateNext -> scope.launch { CaptureSetupScopeManager.nav.navForward(navigator) }
                 else -> viewModel.handleAction(action)
             }
         },
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/settings/SettingsViewmodel.kt b/app/src/main/java/org/greenstand/android/TreeTracker/settings/SettingsViewmodel.kt
index eab378ba0..ef405b6d1 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/settings/SettingsViewmodel.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/settings/SettingsViewmodel.kt
@@ -24,10 +24,8 @@ import org.greenstand.android.TreeTracker.navigation.MapRoute
 import org.greenstand.android.TreeTracker.navigation.ProfileSelectRoute
 import org.greenstand.android.TreeTracker.navigation.SignupFlowRoute
 import org.greenstand.android.TreeTracker.navigation.TreeEditUserSelectRoute
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
 import org.greenstand.android.TreeTracker.viewmodel.Action
 import org.greenstand.android.TreeTracker.viewmodel.BaseViewModel
-import org.greenstand.android.TreeTracker.viewmodel.NavigationEvent
 
 data class SettingsState(
     val showPrivacyPolicyDialog: Boolean? = null,
@@ -93,14 +91,10 @@ class SettingsViewModel(
             is SettingsAction.NavigateBack -> popBackStack()
             is SettingsAction.LogoutConfirmed -> {
                 handleAction(SettingsAction.Logout)
-                sendEvent(
-                    NavigationEvent {
-                        throttledNavigate(SignupFlowRoute) {
-                            popUpTo(graph.id) { inclusive = true }
-                            launchSingleTop = true
-                        }
-                    },
-                )
+                navigate(SignupFlowRoute) {
+                    popUpToRoot()
+                    launchSingleTop = true
+                }
             }
         }
     }
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/signup/SignUpScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/signup/SignUpScreen.kt
index 8a8a0c288..a65258080 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/signup/SignUpScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/signup/SignUpScreen.kt
@@ -26,13 +26,13 @@ import org.greenstand.android.TreeTracker.activities.CaptureImageContract
 import org.greenstand.android.TreeTracker.models.setupflow.CaptureSetupScopeManager
 import org.greenstand.android.TreeTracker.navigation.DashboardRoute
 import org.greenstand.android.TreeTracker.navigation.LanguageRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.root.LocalViewModelFactory
 
 @Composable
 fun SignUpScreen(viewModel: SignupViewModel = viewModel(factory = LocalViewModelFactory.current)) {
     val state by viewModel.state.collectAsState()
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val scope = rememberCoroutineScope()
 
     val cameraLauncher =
@@ -40,13 +40,13 @@ fun SignUpScreen(viewModel: SignupViewModel = viewModel(factory = LocalViewModel
             scope.launch {
                 viewModel.createUser(photoPath)?.let { user ->
                     if (user.isPowerUser) {
-                        navController.navigate(DashboardRoute) {
+                        navigator.navigate(DashboardRoute) {
                             popUpTo<LanguageRoute> { inclusive = true }
                             launchSingleTop = true
                         }
                     } else {
                         CaptureSetupScopeManager.getData().user = user
-                        scope.launch { CaptureSetupScopeManager.nav.navFromNewUserCreation(navController) }
+                        scope.launch { CaptureSetupScopeManager.nav.navFromNewUserCreation(navigator) }
                     }
                 }
             }
@@ -56,19 +56,19 @@ fun SignUpScreen(viewModel: SignupViewModel = viewModel(factory = LocalViewModel
         state = state,
         onHandleAction = { action ->
             when (action) {
-                is SignupAction.NavigateBack -> navController.popBackStack()
+                is SignupAction.NavigateBack -> navigator.popBackStack()
                 is SignupAction.LaunchCamera -> cameraLauncher.launch(true)
                 is SignupAction.ExistingUserSelected -> {
                     val user = action.user
                     if (state.isTherePowerUser == false) {
                         viewModel.handleAction(SignupAction.SetExistingUserAsPowerUser(user.id))
-                        navController.navigate(DashboardRoute) {
+                        navigator.navigate(DashboardRoute) {
                             popUpTo<LanguageRoute> { inclusive = true }
                             launchSingleTop = true
                         }
                     } else {
                         CaptureSetupScopeManager.getData().user = user
-                        scope.launch { CaptureSetupScopeManager.nav.navFromNewUserCreation(navController) }
+                        scope.launch { CaptureSetupScopeManager.nav.navFromNewUserCreation(navigator) }
                     }
                 }
                 else -> viewModel.handleAction(action)
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/splash/SplashScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/splash/SplashScreen.kt
index bf71eb3d8..98703ac25 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/splash/SplashScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/splash/SplashScreen.kt
@@ -33,7 +33,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavHostController
+import org.greenstand.android.TreeTracker.navigation.Navigator
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.greenstand.android.TreeTracker.BuildConfig
@@ -41,7 +41,7 @@ import org.greenstand.android.TreeTracker.R
 import org.greenstand.android.TreeTracker.navigation.DashboardRoute
 import org.greenstand.android.TreeTracker.navigation.LanguageRoute
 import org.greenstand.android.TreeTracker.navigation.SplashRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.view.AppColors
 import timber.log.Timber
 
@@ -50,7 +50,7 @@ fun SplashScreen(
     orgId: String?,
     orgName: String? = null,
     viewModel: SplashScreenViewModel = viewModel(factory = SplashScreenViewModelFactory(orgId, orgName)),
-    navController: NavHostController = LocalNavHostController.current,
+    navigator: Navigator = LocalNavigator.current,
 ) {
     val permissions =
         mutableListOf(
@@ -83,9 +83,9 @@ fun SplashScreen(
 
                         if (viewModel.isInitialSetupRequired()) {
                             viewModel.handleAction(SplashAction.StartGPSUpdatesForSignup)
-                            navigateToLanguageScreen(navController)
+                            navigateToLanguageScreen(navigator)
                         } else {
-                            navigateToDashboardScreen(navController)
+                            navigateToDashboardScreen(navigator)
                         }
                     }
                 }
@@ -129,15 +129,15 @@ private fun isLocationPermissionGranted(result: Map<String, Boolean>): Boolean =
     result[Manifest.permission.ACCESS_FINE_LOCATION] == true &&
         result[Manifest.permission.ACCESS_COARSE_LOCATION] == true
 
-private fun navigateToLanguageScreen(navController: NavHostController) {
-    navController.navigate(LanguageRoute(isFromTopBar = false)) {
+private fun navigateToLanguageScreen(navigator: Navigator) {
+    navigator.navigate(LanguageRoute(isFromTopBar = false)) {
         popUpTo<SplashRoute> { inclusive = true }
         launchSingleTop = true
     }
 }
 
-private fun navigateToDashboardScreen(navController: NavHostController) {
-    navController.navigate(DashboardRoute) {
+private fun navigateToDashboardScreen(navigator: Navigator) {
+    navigator.navigate(DashboardRoute) {
         popUpTo<SplashRoute> { inclusive = true }
         launchSingleTop = true
     }
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/treeedit/TreeEditUserSelectScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/treeedit/TreeEditUserSelectScreen.kt
index d432174ad..d88a99a67 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/treeedit/TreeEditUserSelectScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/treeedit/TreeEditUserSelectScreen.kt
@@ -17,15 +17,14 @@ package org.greenstand.android.TreeTracker.treeedit
 
 import androidx.compose.runtime.Composable
 import org.greenstand.android.TreeTracker.navigation.TreeListRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.userselect.UserSelect
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
 import org.greenstand.android.TreeTracker.view.AppButtonColors
 import org.greenstand.android.TreeTracker.view.AppColors
 
 @Composable
 fun TreeEditUserSelectScreen() {
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     UserSelect(
         navigationButtonColors = AppButtonColors.ProgressGreen,
         isCreateUserEnabled = false,
@@ -33,7 +32,7 @@ fun TreeEditUserSelectScreen() {
         isFromSettings = true,
         selectedColor = AppColors.Green,
         onNavigateForward = { user ->
-            navController.throttledNavigate(TreeListRoute(userWallet = user.wallet, userName = "${user.firstName} ${user.lastName}"))
+            navigator.throttledNavigate(TreeListRoute(userWallet = user.wallet, userName = "${user.firstName} ${user.lastName}"))
         },
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/treeedit/TreeListScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/treeedit/TreeListScreen.kt
index 8b8fb080b..6c34af281 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/treeedit/TreeListScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/treeedit/TreeListScreen.kt
@@ -43,10 +43,8 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import org.greenstand.android.TreeTracker.R
 import org.greenstand.android.TreeTracker.database.entity.TreeEntity
 import org.greenstand.android.TreeTracker.navigation.TreeDetailRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.theme.CustomTheme
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
-import org.greenstand.android.TreeTracker.utilities.throttledPopBackStack
 import org.greenstand.android.TreeTracker.view.ActionBar
 import org.greenstand.android.TreeTracker.view.AppButtonColors
 import org.greenstand.android.TreeTracker.view.AppColors
@@ -59,7 +57,7 @@ fun TreeListScreen(
     userName: String,
 ) {
     val viewModel: TreeListViewModel = viewModel(factory = TreeListViewModelFactory(userWallet))
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val state by viewModel.state.collectAsState(TreeListState())
 
     TreeList(
@@ -70,8 +68,8 @@ fun TreeListScreen(
                 is TreeListAction.SelectTree -> viewModel.handleAction(action)
             }
         },
-        onNavigateBack = { navController.throttledPopBackStack() },
-        onNavigateToDetail = { treeId -> navController.throttledNavigate(TreeDetailRoute(treeId = treeId)) },
+        onNavigateBack = { navigator.throttledPopBackStack() },
+        onNavigateToDetail = { treeId -> navigator.throttledNavigate(TreeDetailRoute(treeId = treeId)) },
     )
 }
 
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/treeheight/TreeHeightColourSelection.kt b/app/src/main/java/org/greenstand/android/TreeTracker/treeheight/TreeHeightColourSelection.kt
index b89facb1e..d9845161f 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/treeheight/TreeHeightColourSelection.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/treeheight/TreeHeightColourSelection.kt
@@ -43,7 +43,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import kotlinx.coroutines.launch
 import org.greenstand.android.TreeTracker.R
 import org.greenstand.android.TreeTracker.models.captureflowdata.CaptureFlowScopeManager
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.root.LocalViewModelFactory
 import org.greenstand.android.TreeTracker.theme.CustomTheme
 import org.greenstand.android.TreeTracker.view.ActionBar
@@ -54,7 +54,7 @@ import org.greenstand.android.TreeTracker.view.TreeTrackerButton
 @Composable
 fun TreeHeightScreen() {
     val viewModel: TreeHeightSelectionViewModel = viewModel(factory = LocalViewModelFactory.current)
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val state by viewModel.state.collectAsState()
     val scope = rememberCoroutineScope()
 
@@ -92,7 +92,7 @@ fun TreeHeightScreen() {
                         onClick = {
                             state.selectedColor?.let {
                                 scope.launch {
-                                    CaptureFlowScopeManager.nav.navForward(navController)
+                                    CaptureFlowScopeManager.nav.navForward(navigator)
                                 }
                             }
                         },
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/userselect/UserSelect.kt b/app/src/main/java/org/greenstand/android/TreeTracker/userselect/UserSelect.kt
index 3f9a787a3..c9c397284 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/userselect/UserSelect.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/userselect/UserSelect.kt
@@ -34,10 +34,8 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import org.greenstand.android.TreeTracker.models.user.User
 import org.greenstand.android.TreeTracker.navigation.DashboardRoute
 import org.greenstand.android.TreeTracker.navigation.SignupFlowRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.root.LocalViewModelFactory
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
-import org.greenstand.android.TreeTracker.utilities.throttledPopBackStack
 import org.greenstand.android.TreeTracker.view.ActionBar
 import org.greenstand.android.TreeTracker.view.AppButtonColors
 import org.greenstand.android.TreeTracker.view.AppColors
@@ -57,7 +55,7 @@ fun UserSelect(
     onNavigateForward: (User) -> Unit,
 ) {
     val viewModel: UserSelectViewModel = viewModel(factory = LocalViewModelFactory.current)
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val state by viewModel.state.collectAsState(UserSelectState())
 
     Scaffold(
@@ -68,7 +66,7 @@ fun UserSelect(
                     if (isCreateUserEnabled) {
                         OrangeAddButton(
                             modifier = Modifier.align(Alignment.Center),
-                            onClick = { navController.throttledNavigate(SignupFlowRoute) },
+                            onClick = { navigator.throttledNavigate(SignupFlowRoute) },
                         )
                     }
                 },
@@ -90,12 +88,12 @@ fun UserSelect(
                         colors = navigationButtonColors,
                         onClick = {
                             if (!isFromSettings) {
-                                navController.throttledNavigate(DashboardRoute) {
+                                navigator.throttledNavigate(DashboardRoute) {
                                     popUpTo<DashboardRoute> { inclusive = true }
                                     launchSingleTop = true
                                 }
                             } else {
-                                navController.throttledPopBackStack()
+                                navigator.throttledPopBackStack()
                             }
                         },
                     )
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/userselect/UserSelectScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/userselect/UserSelectScreen.kt
index 13b48a630..e8b4b89a6 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/userselect/UserSelectScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/userselect/UserSelectScreen.kt
@@ -19,19 +19,19 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import kotlinx.coroutines.launch
 import org.greenstand.android.TreeTracker.models.setupflow.CaptureSetupScopeManager
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.view.AppButtonColors
 
 @Composable
 fun UserSelectScreen() {
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val scope = rememberCoroutineScope()
     UserSelect(
         navigationButtonColors = AppButtonColors.ProgressGreen,
         isCreateUserEnabled = true,
         isNotificationEnabled = true,
         onNavigateForward = {
-            scope.launch { CaptureSetupScopeManager.nav.navForward(navController) }
+            scope.launch { CaptureSetupScopeManager.nav.navForward(navigator) }
         },
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/utilities/NavigationUtils.kt b/app/src/main/java/org/greenstand/android/TreeTracker/utilities/NavigationUtils.kt
deleted file mode 100644
index a2e35bce4..000000000
--- a/app/src/main/java/org/greenstand/android/TreeTracker/utilities/NavigationUtils.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2023 Treetracker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.greenstand.android.TreeTracker.utilities
-
-import androidx.lifecycle.Lifecycle
-import androidx.navigation.NavController
-import androidx.navigation.NavOptionsBuilder
-
-private const val NAVIGATION_THROTTLE_MS = 300L
-
-@Volatile
-private var lastNavigationTime = 0L
-
-fun NavController.throttledNavigate(
-    route: Any,
-    builder: NavOptionsBuilder.() -> Unit = {},
-) {
-    val now = System.currentTimeMillis()
-    if (now - lastNavigationTime >= NAVIGATION_THROTTLE_MS && currentBackStackEntry?.lifecycle?.currentState == Lifecycle.State.RESUMED) {
-        lastNavigationTime = now
-        navigate(route, builder)
-    }
-}
-
-fun NavController.throttledPopBackStack(): Boolean {
-    val now = System.currentTimeMillis()
-    if (now - lastNavigationTime >= NAVIGATION_THROTTLE_MS && currentBackStackEntry?.lifecycle?.currentState == Lifecycle.State.RESUMED) {
-        lastNavigationTime = now
-        return popBackStack()
-    }
-    return false
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/utils/PreviewDependencies.kt b/app/src/main/java/org/greenstand/android/TreeTracker/utils/PreviewDependencies.kt
index 55f573a8e..afb47372f 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/utils/PreviewDependencies.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/utils/PreviewDependencies.kt
@@ -17,17 +17,21 @@ package org.greenstand.android.TreeTracker.utils
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.navigation.compose.rememberNavController
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.remember
+import androidx.navigation3.runtime.NavKey
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
+import org.greenstand.android.TreeTracker.navigation.Navigator
+import org.greenstand.android.TreeTracker.navigation.SplashRoute
 import org.greenstand.android.TreeTracker.theme.CustomTheme
 import org.greenstand.android.TreeTracker.view.TreeTrackerTheme
 
 @Composable
 fun PreviewDependencies(content: @Composable () -> Unit) {
-    val navController = rememberNavController()
+    val navigator = remember { Navigator(mutableStateListOf<NavKey>(SplashRoute())) }
 
     CompositionLocalProvider(
-        LocalNavHostController provides navController,
+        LocalNavigator provides navigator,
     ) {
         CustomTheme {
             TreeTrackerTheme {
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/view/ActionButtons.kt b/app/src/main/java/org/greenstand/android/TreeTracker/view/ActionButtons.kt
new file mode 100644
index 000000000..7ef3cde74
--- /dev/null
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/view/ActionButtons.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2023 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.view
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import org.greenstand.android.TreeTracker.R
+
+/**
+ * @param onClick The callback function for click event.
+ * @param modifier The modifier to be applied to the layout.
+ * @param approval Set the type of button to display(if approval is true, shows green thumps up button )
+ */
+@Composable
+fun ApprovalButton(
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+    approval: Boolean,
+) {
+    val color = if (approval) AppButtonColors.ProgressGreen else AppButtonColors.DeclineRed
+    val image =
+        if (approval) painterResource(id = R.drawable.check) else painterResource(id = R.drawable.close)
+    TreeTrackerButton(
+        colors = color,
+        modifier =
+            modifier
+                .size(height = 60.dp, width = 60.dp),
+        onClick = onClick,
+    ) {
+        Image(
+            painter = image,
+            contentDescription = null,
+        )
+    }
+}
+
+@Suppress("UnusedParameter")
+@Composable
+fun InfoButton(
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+    shape: TreeTrackerButtonShape = TreeTrackerButtonShape.Circle,
+) {
+    TreeTrackerButton(
+        modifier = modifier.size(60.dp),
+        colors = AppButtonColors.WhiteLight,
+        onClick = onClick,
+        shape = TreeTrackerButtonShape.Circle,
+        depth = 6f,
+    ) {
+        Image(
+            painter = painterResource(id = R.drawable.info_icon),
+            modifier =
+                Modifier
+                    .size(80.dp),
+            contentDescription = null,
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/view/CaptureButtons.kt b/app/src/main/java/org/greenstand/android/TreeTracker/view/CaptureButtons.kt
new file mode 100644
index 000000000..0f826c701
--- /dev/null
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/view/CaptureButtons.kt
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2023 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.view
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import org.greenstand.android.TreeTracker.R
+
+@Composable
+fun OrangeAddButton(
+    modifier: Modifier,
+    onClick: () -> Unit,
+) {
+    TreeTrackerButton(
+        onClick = onClick,
+        shape = TreeTrackerButtonShape.Circle,
+        colors = AppButtonColors.UploadOrange,
+        modifier =
+            modifier
+                .size(70.dp),
+    ) {
+        Image(
+            painter = painterResource(id = R.drawable.add),
+            contentDescription = "",
+            modifier =
+                Modifier
+                    .size(55.dp)
+                    .padding(top = 5.dp),
+        )
+    }
+}
+
+@Composable
+fun CaptureButton(
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+    isEnabled: Boolean,
+) {
+    TreeTrackerButton(
+        modifier = modifier.size(70.dp),
+        isEnabled = isEnabled,
+        colors = AppButtonColors.ProgressGreen,
+        onClick = onClick,
+        shape = TreeTrackerButtonShape.Circle,
+        depth = 10f,
+    ) {
+        ImageCaptureCircle(
+            modifier =
+                Modifier
+                    .size(60.dp),
+            color = AppColors.Green,
+            shadowColor = AppColors.Gray,
+        )
+    }
+}
+
+@Composable
+fun ImageCaptureCircle(
+    modifier: Modifier,
+    color: Color,
+    shadowColor: Color,
+) {
+    Canvas(
+        modifier = modifier.background(shape = CircleShape, color = color),
+    ) {
+        drawCircle(
+            color = shadowColor,
+            radius = 50f,
+            center =
+                Offset(
+                    x = size.width / 2,
+                    y = size.height / 2,
+                ),
+            style =
+                Stroke(
+                    width = 5.dp.toPx(),
+                ),
+        )
+        drawCircle(
+            color = shadowColor,
+            radius = 30f,
+            center =
+                Offset(
+                    x = size.width / 2,
+                    y = size.height / 2,
+                ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/view/DepthButtonColors.kt b/app/src/main/java/org/greenstand/android/TreeTracker/view/DepthButtonColors.kt
new file mode 100644
index 000000000..73f65f2e1
--- /dev/null
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/view/DepthButtonColors.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2023 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.view
+
+import androidx.compose.material.ButtonColors
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.graphics.Color
+
+@Immutable
+class DepthButtonColors(
+    val shadowColor: Color,
+    val color: Color,
+    val disabledShadowColor: Color,
+    val disabledColor: Color,
+) : ButtonColors {
+    @Composable
+    override fun backgroundColor(enabled: Boolean): State<Color> = rememberUpdatedState(if (enabled) shadowColor else disabledShadowColor)
+
+    @Composable
+    override fun contentColor(enabled: Boolean): State<Color> = rememberUpdatedState(if (enabled) color else disabledColor)
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other == null || this::class != other::class) return false
+
+        other as DepthButtonColors
+
+        if (shadowColor != other.shadowColor) return false
+        if (color != other.color) return false
+        if (disabledShadowColor != other.disabledShadowColor) return false
+        if (disabledColor != other.disabledColor) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = shadowColor.hashCode()
+        result = 31 * result + color.hashCode()
+        result = 31 * result + disabledShadowColor.hashCode()
+        result = 31 * result + disabledColor.hashCode()
+        return result
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/view/LanguageButton.kt b/app/src/main/java/org/greenstand/android/TreeTracker/view/LanguageButton.kt
new file mode 100644
index 000000000..81263ea5b
--- /dev/null
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/view/LanguageButton.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2023 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.view
+
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import org.greenstand.android.TreeTracker.languagepicker.LanguagePickerViewModel
+import org.greenstand.android.TreeTracker.navigation.LanguageRoute
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
+import org.greenstand.android.TreeTracker.root.LocalViewModelFactory
+import org.greenstand.android.TreeTracker.theme.CustomTheme
+
+@Composable
+fun BoxScope.LanguageButton() {
+    val navigator = LocalNavigator.current
+    // Avoid creating a viewmodel if we're in Preview Mode.
+    // Viewmodels are large, we do not want to load them in the preview
+    val languageViewModel: LanguagePickerViewModel? =
+        if (!LocalInspectionMode.current) {
+            viewModel(factory = LocalViewModelFactory.current)
+        } else {
+            null
+        }
+    val languageState = languageViewModel?.state?.collectAsState()
+    val language: String = languageState?.value?.currentLanguage?.toString() ?: "EN"
+
+    TreeTrackerButton(
+        colors = AppButtonColors.ProgressGreen,
+        modifier =
+            Modifier
+                .align(Alignment.Center)
+                .size(width = 100.dp, 60.dp),
+        onClick = {
+            navigator.throttledNavigate(LanguageRoute())
+        },
+    ) {
+        Text(
+            text = language,
+            fontWeight = FontWeight.Bold,
+            color = CustomTheme.textColors.darkText,
+            style = CustomTheme.typography.regular,
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/view/NavigationButtons.kt b/app/src/main/java/org/greenstand/android/TreeTracker/view/NavigationButtons.kt
new file mode 100644
index 000000000..015af468e
--- /dev/null
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/view/NavigationButtons.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2023 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.view
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.ButtonColors
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import org.greenstand.android.TreeTracker.R
+
+@Composable
+fun BoxScope.ArrowButton(
+    isEnabled: Boolean = true,
+    colors: ButtonColors = AppButtonColors.ProgressGreen,
+    isLeft: Boolean,
+    onClick: () -> Unit,
+) {
+    TreeTrackerButton(
+        isEnabled = isEnabled,
+        colors = colors,
+        modifier =
+            Modifier
+                .align(Alignment.Center)
+                .size(height = 62.dp, width = 62.dp),
+        onClick = onClick,
+    ) {
+        Image(
+            modifier =
+                Modifier
+                    .size(height = 45.dp, width = 45.dp),
+            painter = arrowPainter(isLeft = isLeft),
+            contentDescription = null,
+        )
+    }
+}
+
+@Composable
+private fun arrowPainter(isLeft: Boolean): Painter =
+    if (isLeft) {
+        painterResource(id = R.drawable.arrow_backward)
+    } else {
+        painterResource(id = R.drawable.arrow_forward)
+    }
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/view/Text.kt b/app/src/main/java/org/greenstand/android/TreeTracker/view/Text.kt
index d0bb6b77c..7cdf65bcc 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/view/Text.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/view/Text.kt
@@ -35,7 +35,7 @@ import androidx.compose.ui.unit.dp
 import org.greenstand.android.TreeTracker.R
 import org.greenstand.android.TreeTracker.models.FeatureFlags
 import org.greenstand.android.TreeTracker.navigation.DevOptionsRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 
 @OptIn(ExperimentalUnitApi::class)
 object TextStyles {
@@ -49,7 +49,7 @@ object TextStyles {
 
 @Composable
 fun BoxScope.TopBarTitle() {
-    val nav = LocalNavHostController.current
+    val nav = LocalNavigator.current
     Image(
         painter = painterResource(id = R.drawable.greenstand_logo),
         contentDescription = "Treetracker icon",
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/view/TextButton.kt b/app/src/main/java/org/greenstand/android/TreeTracker/view/TextButton.kt
index eb0690b98..807e2db2a 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/view/TextButton.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/view/TextButton.kt
@@ -17,8 +17,6 @@ package org.greenstand.android.TreeTracker.view
 
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
-import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.gestures.detectTapGestures
@@ -29,22 +27,16 @@ import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.ButtonColors
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -53,206 +45,13 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.graphics.drawscope.Stroke
-import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalHapticFeedback
-import androidx.compose.ui.platform.LocalInspectionMode
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import org.greenstand.android.TreeTracker.R
-import org.greenstand.android.TreeTracker.languagepicker.LanguagePickerViewModel
-import org.greenstand.android.TreeTracker.navigation.LanguageRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
-import org.greenstand.android.TreeTracker.root.LocalViewModelFactory
-import org.greenstand.android.TreeTracker.theme.CustomTheme
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
-
-@Composable
-fun BoxScope.ArrowButton(
-    isEnabled: Boolean = true,
-    colors: ButtonColors = AppButtonColors.ProgressGreen,
-    isLeft: Boolean,
-    onClick: () -> Unit,
-) {
-    TreeTrackerButton(
-        isEnabled = isEnabled,
-        colors = colors,
-        modifier =
-            Modifier
-                .align(Alignment.Center)
-                .size(height = 62.dp, width = 62.dp),
-        onClick = onClick,
-    ) {
-        Image(
-            modifier =
-                Modifier
-                    .size(height = 45.dp, width = 45.dp),
-            painter = getPainter(colors = colors, isLeft = isLeft),
-            contentDescription = null,
-        )
-    }
-}
-
-@Composable
-private fun getPainter(
-    colors: ButtonColors,
-    isLeft: Boolean,
-): Painter {
-    val painter: Painter
-    return when (colors) {
-        AppButtonColors.MessagePurple -> {
-            painter =
-                if (isLeft) {
-                    painterResource(id = R.drawable.arrow_backward)
-                } else {
-                    painterResource(
-                        id = R.drawable.arrow_forward,
-                    )
-                }
-            painter
-        }
-        else -> {
-            painter =
-                if (isLeft) {
-                    painterResource(id = R.drawable.arrow_backward)
-                } else {
-                    painterResource(
-                        id = R.drawable.arrow_forward,
-                    )
-                }
-            painter
-        }
-    }
-}
-
-/**
- * @param onClick The callback function for click event.
- * @param modifier The modifier to be applied to the layout.
- * @param approval Set the type of button to display(if approval is true, shows green thumps up button )
- */
-@Composable
-fun ApprovalButton(
-    modifier: Modifier = Modifier,
-    onClick: () -> Unit,
-    approval: Boolean,
-) {
-    val color = if (approval) AppButtonColors.ProgressGreen else AppButtonColors.DeclineRed
-    val image =
-        if (approval) painterResource(id = R.drawable.check) else painterResource(id = R.drawable.close)
-    TreeTrackerButton(
-        colors = color,
-        modifier =
-            modifier
-                .size(height = 60.dp, width = 60.dp),
-        onClick = onClick,
-    ) {
-        Image(
-            painter = image,
-            contentDescription = null,
-        )
-    }
-}
-
-@Suppress("UnusedParameter")
-@Composable
-fun InfoButton(
-    modifier: Modifier = Modifier,
-    onClick: () -> Unit,
-    shape: TreeTrackerButtonShape = TreeTrackerButtonShape.Circle,
-) {
-    TreeTrackerButton(
-        modifier = modifier.size(60.dp),
-        colors = AppButtonColors.WhiteLight,
-        onClick = onClick,
-        shape = TreeTrackerButtonShape.Circle,
-        depth = 6f,
-    ) {
-        Image(
-            painter = painterResource(id = R.drawable.info_icon),
-            modifier =
-                Modifier
-                    .size(80.dp),
-            contentDescription = null,
-        )
-    }
-}
-
-@Composable
-fun BoxScope.LanguageButton() {
-    val navController = LocalNavHostController.current
-    // Avoid creating a viewmodel if we're in Preview Mode.
-    // Viewmodels are large, we do not want to load them in the preview
-    val languageViewModel: LanguagePickerViewModel? =
-        if (!LocalInspectionMode.current) {
-            viewModel(factory = LocalViewModelFactory.current)
-        } else {
-            null
-        }
-    val languageState = languageViewModel?.state?.collectAsState()
-    val language: String = languageState?.value?.currentLanguage?.toString() ?: "EN"
-
-    TreeTrackerButton(
-        colors = AppButtonColors.ProgressGreen,
-        modifier =
-            Modifier
-                .align(Alignment.Center)
-                .size(width = 100.dp, 60.dp),
-        onClick = {
-            navController.throttledNavigate(LanguageRoute())
-        },
-    ) {
-        Text(
-            text = language,
-            fontWeight = FontWeight.Bold,
-            color = CustomTheme.textColors.darkText,
-            style = CustomTheme.typography.regular,
-        )
-    }
-}
-
-@Composable
-fun BoxScope.UserImageButton(
-    modifier: Modifier = Modifier,
-    onClick: () -> Unit,
-    imagePath: String,
-) {
-    TreeTrackerButton(
-        modifier =
-            modifier
-                .align(Alignment.Center)
-                .width(100.dp)
-                .height(100.dp)
-                .padding(
-                    start = 15.dp,
-                    top = 10.dp,
-                    end = 10.dp,
-                    bottom = 10.dp,
-                ).aspectRatio(1.0f)
-                .clip(RoundedCornerShape(10.dp)),
-        onClick = onClick,
-    ) {
-        LocalImage(
-            modifier =
-                Modifier
-                    .padding(bottom = 12.dp, end = 1.dp)
-                    .fillMaxSize()
-                    .aspectRatio(1.0f)
-                    .clip(RoundedCornerShape(10.dp)),
-            imagePath = imagePath,
-            contentScale = ContentScale.Crop,
-        )
-    }
-}
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
@@ -305,12 +104,12 @@ fun TreeTrackerButton(
         val contentColor by colors.contentColor(isEnabled)
         val shadowColor by colors.backgroundColor(isEnabled)
 
-        var width = maxWidth
+        var width = this@BoxWithConstraints.maxWidth
         var clipShape = MaterialTheme.shapes.small
         var circleStartOffset = 0.dp
         if (shape == TreeTrackerButtonShape.Circle) {
             clipShape = CircleShape
-            width = maxWidth - depth.dp
+            width = this@BoxWithConstraints.maxWidth - depth.dp
             circleStartOffset = depth.dp
         }
 
@@ -356,124 +155,6 @@ enum class TreeTrackerButtonShape {
     Circle,
 }
 
-@Composable
-fun OrangeAddButton(
-    modifier: Modifier,
-    onClick: () -> Unit,
-) {
-    TreeTrackerButton(
-        onClick = onClick,
-        shape = TreeTrackerButtonShape.Circle,
-        colors = AppButtonColors.UploadOrange,
-        modifier =
-            modifier
-                .size(70.dp),
-    ) {
-        Image(
-            painter = painterResource(id = R.drawable.add),
-            contentDescription = "",
-            modifier =
-                Modifier
-                    .size(55.dp)
-                    .padding(top = 5.dp),
-        )
-    }
-}
-
-@Composable
-fun CaptureButton(
-    modifier: Modifier = Modifier,
-    onClick: () -> Unit,
-    isEnabled: Boolean,
-) {
-    TreeTrackerButton(
-        modifier = modifier.size(70.dp),
-        isEnabled = isEnabled,
-        colors = AppButtonColors.ProgressGreen,
-        onClick = onClick,
-        shape = TreeTrackerButtonShape.Circle,
-        depth = 10f,
-    ) {
-        ImageCaptureCircle(
-            modifier =
-                Modifier
-                    .size(60.dp),
-            color = AppColors.Green,
-            shadowColor = AppColors.Gray,
-        )
-    }
-}
-
-@Composable
-fun ImageCaptureCircle(
-    modifier: Modifier,
-    color: Color,
-    shadowColor: Color,
-) {
-    Canvas(
-        modifier = modifier.background(shape = CircleShape, color = color),
-    ) {
-        drawCircle(
-            color = shadowColor,
-            radius = 50f,
-            center =
-                Offset(
-                    x = size.width / 2,
-                    y = size.height / 2,
-                ),
-            style =
-                Stroke(
-                    width = 5.dp.toPx(),
-                ),
-        )
-        drawCircle(
-            color = shadowColor,
-            radius = 30f,
-            center =
-                Offset(
-                    x = size.width / 2,
-                    y = size.height / 2,
-                ),
-        )
-    }
-}
-
-@Immutable
-class DepthButtonColors(
-    val shadowColor: Color,
-    val color: Color,
-    val disabledShadowColor: Color,
-    val disabledColor: Color,
-) : ButtonColors {
-    @Composable
-    override fun backgroundColor(enabled: Boolean): State<Color> = rememberUpdatedState(if (enabled) shadowColor else disabledShadowColor)
-
-    @Composable
-    override fun contentColor(enabled: Boolean): State<Color> = rememberUpdatedState(if (enabled) color else disabledColor)
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other == null || this::class != other::class) return false
-
-        other as DepthButtonColors
-
-        if (shadowColor != other.shadowColor) return false
-        if (color != other.color) return false
-        if (disabledShadowColor != other.disabledShadowColor) return false
-        if (disabledColor != other.disabledColor) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = shadowColor.hashCode()
-        result = 31 * result + color.hashCode()
-        result = 31 * result + disabledShadowColor.hashCode()
-        result = 31 * result + disabledColor.hashCode()
-        return result
-    }
-}
-
 @Preview("TreeTrackerButton")
 @Composable
 fun TreeTrackerButtonPreview() {
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/view/UserImageButton.kt b/app/src/main/java/org/greenstand/android/TreeTracker/view/UserImageButton.kt
new file mode 100644
index 000000000..581753bbe
--- /dev/null
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/view/UserImageButton.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2023 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.view
+
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun BoxScope.UserImageButton(
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+    imagePath: String,
+) {
+    TreeTrackerButton(
+        modifier =
+            modifier
+                .align(Alignment.Center)
+                .width(100.dp)
+                .height(100.dp)
+                .padding(
+                    start = 15.dp,
+                    top = 10.dp,
+                    end = 10.dp,
+                    bottom = 10.dp,
+                ).aspectRatio(1.0f)
+                .clip(RoundedCornerShape(10.dp)),
+        onClick = onClick,
+    ) {
+        LocalImage(
+            modifier =
+                Modifier
+                    .padding(bottom = 12.dp, end = 1.dp)
+                    .fillMaxSize()
+                    .aspectRatio(1.0f)
+                    .clip(RoundedCornerShape(10.dp)),
+            imagePath = imagePath,
+            contentScale = ContentScale.Crop,
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/viewmodel/BaseViewModel.kt b/app/src/main/java/org/greenstand/android/TreeTracker/viewmodel/BaseViewModel.kt
index 1b304f220..7c242af74 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/viewmodel/BaseViewModel.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/viewmodel/BaseViewModel.kt
@@ -16,14 +16,14 @@
 package org.greenstand.android.TreeTracker.viewmodel
 
 import androidx.lifecycle.ViewModel
-import androidx.navigation.NavOptionsBuilder
+import androidx.navigation3.runtime.NavKey
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
+import org.greenstand.android.TreeTracker.navigation.NavOptions
 
 /**
  * Base ViewModel that exposes:
@@ -64,17 +64,17 @@ abstract class BaseViewModel<S, A : Action>(
     protected fun triggerEvent(event: UiEvent) = sendEvent(event)
 
     /** Emit a navigation event to [route], debounced via `throttledNavigate`. */
-    protected fun navigate(route: Any) {
+    protected fun navigate(route: NavKey) {
         sendEvent(NavigationEvent { throttledNavigate(route) })
     }
 
     /**
-     * Emit a navigation event to [route] with [NavOptionsBuilder] (popUpTo, launchSingleTop, …),
+     * Emit a navigation event to [route] with [NavOptions] (popUpTo, launchSingleTop, …),
      * debounced via `throttledNavigate`.
      */
     protected fun navigate(
-        route: Any,
-        builder: NavOptionsBuilder.() -> Unit,
+        route: NavKey,
+        builder: NavOptions.() -> Unit,
     ) {
         sendEvent(NavigationEvent { throttledNavigate(route, builder) })
     }
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/viewmodel/HandleUIEvents.kt b/app/src/main/java/org/greenstand/android/TreeTracker/viewmodel/HandleUIEvents.kt
index 08a7bfc05..303a52dcc 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/viewmodel/HandleUIEvents.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/viewmodel/HandleUIEvents.kt
@@ -17,18 +17,23 @@ package org.greenstand.android.TreeTracker.viewmodel
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
-import org.greenstand.android.TreeTracker.utilities.throttledPopBackStack
+import org.greenstand.android.TreeTracker.navigation.LocalNavEntryContentKey
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
+import org.greenstand.android.TreeTracker.navigation.Navigator
 import timber.log.Timber
 
 /**
  * Subscribes to one-shot [UiEvent]s from a [BaseViewModel] and dispatches them.
  *
  * Built-in handling:
- * - [NavigationEvent] → invokes the lambda with the current [NavHostController].
- * - [PopBackStackEvent] → `navController.throttledPopBackStack()`.
+ * - [NavigationEvent] → invokes the lambda with the current [Navigator].
+ * - [PopBackStackEvent] → `navigator.throttledPopBackStack()`.
  * - [ShowSnackbar]    → forwarded to the app-wide [SnackbarController].
  *
+ * Navigation events are only executed while the hosting entry is the top of the back
+ * stack — the Navigation 3 equivalent of Nav2's "current entry is RESUMED" guard. This
+ * drops events replayed from screens the user has already left.
+ *
  * Custom handling: pass [onEvent] to intercept any event. Return `true` to mark the event
  * as handled and skip the default handler; return `false` to fall through to the
  * built-in dispatch.
@@ -40,7 +45,8 @@ fun <S, A : Action> HandleUIEvents(
     viewModel: BaseViewModel<S, A>,
     onEvent: ((UiEvent) -> Boolean)? = null,
 ) {
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
+    val entryContentKey = LocalNavEntryContentKey.current
     val snackbarController = LocalSnackbarController.current
     LaunchedEffect(Unit) {
         viewModel.events.collect { consumable ->
@@ -50,11 +56,28 @@ fun <S, A : Action> HandleUIEvents(
             if (handled) return@collect
 
             when (event) {
-                is NavigationEvent -> event.navigate(navController)
-                is PopBackStackEvent -> navController.throttledPopBackStack()
+                is NavigationEvent ->
+                    if (isHostingEntryOnTop(entryContentKey, navigator)) {
+                        event.navigate(navigator)
+                    }
+                is PopBackStackEvent ->
+                    if (isHostingEntryOnTop(entryContentKey, navigator)) {
+                        navigator.throttledPopBackStack()
+                    }
                 is ShowSnackbar -> snackbarController.show(event)
                 else -> Timber.w("Unhandled UiEvent: $event")
             }
         }
     }
-}
\ No newline at end of file
+}
+
+/**
+ * True when the entry hosting this composition is the current top of the back stack,
+ * or when the composition is not hosted inside a nav entry at all (contentKey == null).
+ * Entry contentKeys default to the route's `toString()`, so compare against the top
+ * key's string form.
+ */
+private fun isHostingEntryOnTop(
+    entryContentKey: Any?,
+    navigator: Navigator,
+): Boolean = entryContentKey == null || entryContentKey == navigator.topKey?.toString()
\ No newline at end of file
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/viewmodel/UiEvents.kt b/app/src/main/java/org/greenstand/android/TreeTracker/viewmodel/UiEvents.kt
index acd96cbec..0d7a5ee49 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/viewmodel/UiEvents.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/viewmodel/UiEvents.kt
@@ -16,8 +16,8 @@
 package org.greenstand.android.TreeTracker.viewmodel
 
 import androidx.compose.material.SnackbarDuration
-import androidx.navigation.NavHostController
 import java.util.concurrent.atomic.AtomicBoolean
+import org.greenstand.android.TreeTracker.navigation.Navigator
 
 /**
  * Base interface for one-shot UI events emitted by ViewModels.
@@ -34,14 +34,14 @@ import java.util.concurrent.atomic.AtomicBoolean
 interface UiEvent
 
 /**
- * A navigation event carrying a suspend lambda that receives the [NavHostController].
+ * A navigation event carrying a suspend lambda that receives the [Navigator].
  * Allows any navigation operation (navigate, popBackStack, deep navigation flows) and
  * supports suspend calls like `CaptureFlowNavigationController.navForward`.
  *
  * Not a `data class` because lambda fields produce meaningless equals/hashCode.
  */
 class NavigationEvent(
-    val navigate: suspend NavHostController.() -> Unit,
+    val navigate: suspend Navigator.() -> Unit,
 ) : UiEvent
 
 /** Pop the back stack one step. Dispatched via `throttledPopBackStack` for debouncing. */
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/walletselect/WalletSelectScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/walletselect/WalletSelectScreen.kt
index ddefebb2f..08e2c3bde 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/walletselect/WalletSelectScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/walletselect/WalletSelectScreen.kt
@@ -43,9 +43,8 @@ import org.greenstand.android.TreeTracker.R
 import org.greenstand.android.TreeTracker.models.setupflow.CaptureSetupScopeManager
 import org.greenstand.android.TreeTracker.models.user.User
 import org.greenstand.android.TreeTracker.navigation.AddWalletRoute
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.root.LocalViewModelFactory
-import org.greenstand.android.TreeTracker.utilities.throttledNavigate
 import org.greenstand.android.TreeTracker.view.ActionBar
 import org.greenstand.android.TreeTracker.view.AppButtonColors
 import org.greenstand.android.TreeTracker.view.AppColors
@@ -59,7 +58,7 @@ fun WalletSelectScreen(
     viewModel: WalletSelectViewModel = viewModel(factory = LocalViewModelFactory.current),
 ) {
     val state by viewModel.state.collectAsState()
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val scope = rememberCoroutineScope()
 
     WalletSelect(
@@ -67,20 +66,20 @@ fun WalletSelectScreen(
         onHandleAction = { action ->
             when (action) {
                 is WalletSelectAction.NavigateToUserSelect -> {
-                    CaptureSetupScopeManager.nav.navToUserSelect(navController)
+                    CaptureSetupScopeManager.nav.navToUserSelect(navigator)
                 }
                 is WalletSelectAction.NavigateForward -> {
                     scope.launch {
                         state.currentUser?.let {
-                            CaptureSetupScopeManager.nav.navForward(navController)
+                            CaptureSetupScopeManager.nav.navForward(navigator)
                         }
                     }
                 }
                 is WalletSelectAction.NavigateToAddWallet -> {
-                    navController.throttledNavigate(AddWalletRoute)
+                    navigator.throttledNavigate(AddWalletRoute)
                 }
                 is WalletSelectAction.NavigateBack -> {
-                    CaptureSetupScopeManager.nav.navBackward(navController)
+                    CaptureSetupScopeManager.nav.navBackward(navigator)
                 }
                 else -> viewModel.handleAction(action)
             }
diff --git a/app/src/main/java/org/greenstand/android/TreeTracker/walletselect/addwallet/AddWalletScreen.kt b/app/src/main/java/org/greenstand/android/TreeTracker/walletselect/addwallet/AddWalletScreen.kt
index 306a0e709..24db1b22b 100644
--- a/app/src/main/java/org/greenstand/android/TreeTracker/walletselect/addwallet/AddWalletScreen.kt
+++ b/app/src/main/java/org/greenstand/android/TreeTracker/walletselect/addwallet/AddWalletScreen.kt
@@ -40,7 +40,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import kotlinx.coroutines.launch
 import org.greenstand.android.TreeTracker.R
 import org.greenstand.android.TreeTracker.models.setupflow.CaptureSetupScopeManager
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
 import org.greenstand.android.TreeTracker.root.LocalViewModelFactory
 import org.greenstand.android.TreeTracker.view.ActionBar
 import org.greenstand.android.TreeTracker.view.ArrowButton
@@ -50,7 +50,7 @@ import org.greenstand.android.TreeTracker.view.BorderedTextField
 fun AddWalletScreen(
     viewModel: AddWalletViewModel = viewModel(factory = LocalViewModelFactory.current),
 ) {
-    val navController = LocalNavHostController.current
+    val navigator = LocalNavigator.current
     val scope = rememberCoroutineScope()
     val state by viewModel.state.collectAsState()
 
@@ -58,8 +58,8 @@ fun AddWalletScreen(
         state = state,
         onHandleAction = { action ->
             when (action) {
-                is AddWalletAction.NavigateBack -> CaptureSetupScopeManager.nav.navBackward(navController)
-                is AddWalletAction.NavigateNext -> scope.launch { CaptureSetupScopeManager.nav.navForward(navController) }
+                is AddWalletAction.NavigateBack -> CaptureSetupScopeManager.nav.navBackward(navigator)
+                is AddWalletAction.NavigateNext -> scope.launch { CaptureSetupScopeManager.nav.navForward(navigator) }
                 else -> viewModel.handleAction(action)
             }
         },
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 642b38130..7416124f7 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -182,7 +182,7 @@ Política de Privacidade
     <string name="loading_user_profile">Carregando perfil do usuário...</string>
     <string name="profile_description">Clique aqui para visualizar ou editar os detalhes do seu perfil.</string>
     <string name="privacy_title">Visualizar Política de Privacidade</string>
-    <string name="privacy_description">Clique aqui para visualizar a política de privacidade do Greenstand sobre seus dados.</string>
+    <string name="privacy_description">Clique aqui para visualizar a política de privacidade do GreenStand sobre seus dados.</string>
     <string name="logout_title">Sair</string>
     <string name="logout_description">Sair de sua conta.</string>
     <string name="delete_account_title">Deletar Conta</string>
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
index 4ad986478..d45f08758 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -178,7 +178,7 @@
     <string name="loading_user_profile">Inapakia wasifu wa mtumiaji.....</string>
     <string name="profile_description">Bofya hapa kutazama au kuhariri maelezo ya wasifu wako</string>
     <string name="privacy_title">Tazama sera ya faragha.</string>
-    <string name="privacy_description">Bofya hapa kutazama sera ya faragha ya Greenstand kuhusu taarifa zako.</string>
+    <string name="privacy_description">Bofya hapa kutazama sera ya faragha ya GreenStand kuhusu taarifa zako.</string>
     <string name="logout_title">Toka kwenye akaunti</string>
     <string name="logout_description">Toka kwenye akaunti yako</string>
     <string name="delete_account_title">Futa akaunti</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 95a232580..8be180735 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -176,7 +176,7 @@ Privacy Policy
     <string name="loading_user_profile">Loading user profile...</string>
     <string name="profile_description">Click here to view or edit your profile details.</string>
     <string name="privacy_title">View Privacy Policy</string>
-    <string name="privacy_description">Click here to view Greensand\'s privacy policy on your data.</string>
+    <string name="privacy_description">Click here to view GreenStand\'s privacy policy on your data.</string>
     <string name="logout_title">Log out</string>
     <string name="logout_description">Log out from your account.</string>
     <string name="delete_account_title">Delete Account</string>
diff --git a/app/src/test/java/org/greenstand/android/TreeTracker/database/TreeTrackerDaoTest.kt b/app/src/test/java/org/greenstand/android/TreeTracker/database/TreeTrackerDaoTest.kt
deleted file mode 100644
index 79bc4d114..000000000
--- a/app/src/test/java/org/greenstand/android/TreeTracker/database/TreeTrackerDaoTest.kt
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright 2023 Treetracker
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.greenstand.android.TreeTracker.database
-
-import android.content.Context
-import androidx.room.Room
-import androidx.test.core.app.ApplicationProvider
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.test.runTest
-import org.greenstand.android.TreeTracker.utils.*
-import org.junit.After
-import org.junit.Assert.*
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-import java.io.IOException
-
-@ExperimentalCoroutinesApi
-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE)
-class TreeTrackerDaoTest {
-    private lateinit var treeTrackerDAO: TreeTrackerDAO
-    private lateinit var database: AppDatabase
-
-    @Before
-    fun createDb() {
-        val context = ApplicationProvider.getApplicationContext<Context>()
-        database =
-            Room
-                .inMemoryDatabaseBuilder(
-                    context,
-                    AppDatabase::class.java,
-                ).build()
-        treeTrackerDAO = database.treeTrackerDao()
-    }
-
-    @Test
-    @Throws(Exception::class)
-    fun `insert planterInfo to App Database, assert valid planter Info`() =
-        runTest {
-            treeTrackerDAO.insertPlanterInfo(FakeFileGenerator.fakePlanterInfo)
-            val planterInfo = treeTrackerDAO.getAllPlanterInfo().first().first()
-            assertEquals(FakeFileGenerator.fakePlanterInfo, planterInfo)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `insert userInfo to App Database, assert valid User`() =
-        runTest {
-            treeTrackerDAO.insertUser(FakeFileGenerator.fakeUser)
-            val userInfo = treeTrackerDAO.getAllUsers().first().first()
-            assertEquals(FakeFileGenerator.fakeUser, userInfo)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `update user UUID, assert fake UUID not equal to updated user,`() =
-        runTest {
-            treeTrackerDAO.insertUser(FakeFileGenerator.fakeUser)
-            val userUpdate = treeTrackerDAO.updateUser(FakeFileGenerator.fakeUser.copy(uuid = "newStringUpdate"))
-            assertNotEquals(FakeFileGenerator.fakeUser.uuid, userUpdate)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `update user Bundle Id, assert fake Bundle, different from Updated,`() =
-        runTest {
-            treeTrackerDAO.insertUser(FakeFileGenerator.fakeUser)
-            val userUpdate = treeTrackerDAO.updateUserBundleIds(listOf(12, 344), bundleId = "newString")
-            assertNotEquals(FakeFileGenerator.fakeUser.bundleId, userUpdate)
-        }
-
-    @Test
-    fun `insert org to App Database, returns valid org when querying id and name`() =
-        runTest {
-            treeTrackerDAO.insertOrg(FakeFileGenerator.fakeOrg.first())
-            val organization = treeTrackerDAO.getOrg("new")
-            assertEquals(organization?.id, FakeFileGenerator.fakeOrg.first().id)
-            assertEquals(FakeFileGenerator.fakeOrg.first().name, organization?.name)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `saving org to App Database, returns valid data querying name`() =
-        runTest {
-            treeTrackerDAO.insertOrg(FakeFileGenerator.fakeOrg.first())
-            val organization = treeTrackerDAO.getOrg("new")
-            assertEquals("GreenStand", organization?.name)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `insert fake Device Config to App Database, returns valid data querying uuid`() =
-        runTest {
-            treeTrackerDAO.insertDeviceConfig(FakeFileGenerator.fakeDeviceConfig)
-            val deviceConfig = treeTrackerDAO.getLatestDeviceConfig()
-            assertNotNull(deviceConfig)
-            assertEquals(FakeFileGenerator.fakeDeviceConfig.uuid, deviceConfig?.uuid)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `updated device config upload status, assert fake upload status not same as updated status`() =
-        runTest {
-            treeTrackerDAO.insertDeviceConfig(FakeFileGenerator.fakeDeviceConfig)
-            val deviceConfig = treeTrackerDAO.updateDeviceConfigUploadStatus(ids = listOf(12, 12), isUploaded = true)
-            assertNotEquals(FakeFileGenerator.fakeDeviceConfig.isUploaded, deviceConfig)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `updated device config bundle ID, assert fake bundleId not same as updated bundleID,`() =
-        runTest {
-            treeTrackerDAO.insertDeviceConfig(FakeFileGenerator.fakeDeviceConfig)
-            val deviceConfig =
-                treeTrackerDAO.updateDeviceConfigBundleIds(
-                    ids = listOf(15, 16),
-                    bundleId = "newRandomString",
-                )
-            assertNotEquals(FakeFileGenerator.fakeDeviceConfig.bundleId, deviceConfig)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `insert Session, returns valid querying UUID `() =
-        runTest {
-            val deviceConfigId = treeTrackerDAO.insertDeviceConfig(FakeFileGenerator.fakeDeviceConfig)
-            FakeFileGenerator.fakeDeviceConfig.id = deviceConfigId
-            assertEquals(deviceConfigId, FakeFileGenerator.fakeDeviceConfig.id)
-            val newSession = FakeFileGenerator.fakeSession.copy(deviceConfigId = deviceConfigId)
-
-            val id = treeTrackerDAO.insertSession(newSession)
-            val getSession = treeTrackerDAO.getSessionById(id)
-            assertEquals("uuid", getSession.uuid)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `insert Tree Entity, returns valid data, querying bundle Id`() =
-        runTest {
-            val deviceConfigId = treeTrackerDAO.insertDeviceConfig(FakeFileGenerator.fakeDeviceConfig)
-            FakeFileGenerator.fakeDeviceConfig.id = deviceConfigId
-
-            val newSession = FakeFileGenerator.fakeSession.copy(deviceConfigId = deviceConfigId)
-            val newSessionId = treeTrackerDAO.insertSession(newSession)
-            newSession.id = newSessionId
-
-            assertEquals(newSessionId, newSession.id)
-            val newTree = FakeFileGenerator.fakeTree.first().copy(sessionId = newSessionId)
-            val id = treeTrackerDAO.insertTree(newTree)
-            val getTreeEntity = treeTrackerDAO.getTreesByIds(listOf(id))
-            assertEquals("bundled", getTreeEntity.first().bundleId)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `update Tree Entity, assert fake tree not same as updated `() =
-        runTest {
-            val deviceConfigId = treeTrackerDAO.insertDeviceConfig(FakeFileGenerator.fakeDeviceConfig)
-            FakeFileGenerator.fakeDeviceConfig.id = deviceConfigId
-
-            val newSession = FakeFileGenerator.fakeSession.copy(deviceConfigId = deviceConfigId)
-            val newSessionId = treeTrackerDAO.insertSession(newSession)
-            newSession.id = newSessionId
-
-            assertEquals(newSessionId, newSession.id)
-            val newTree = FakeFileGenerator.fakeTree.first().copy(sessionId = newSessionId)
-            val fakeTree = treeTrackerDAO.insertTree(newTree)
-            val updated = newTree.copy(uuid = "testing")
-            assertNotEquals(fakeTree, updated)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `insert Planter CheckIn Entity, returns valid data, querying local photo path `() =
-        runTest {
-            val planterInfoId = treeTrackerDAO.insertPlanterInfo(FakeFileGenerator.fakePlanterInfo)
-            FakeFileGenerator.fakePlanterInfo.id = planterInfoId
-            val newPlanterCheckIn = FakeFileGenerator.fakePlanterCheckInEntity.copy(planterInfoId = planterInfoId)
-            val id = treeTrackerDAO.insertPlanterCheckIn(newPlanterCheckIn)
-            val getPlanterCheck = treeTrackerDAO.getPlanterCheckInById(id)
-            assertEquals("new", getPlanterCheck?.localPhotoPath)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `update Planter CheckIn Entity, assert fake planter checkIn not same as updated`() =
-        runTest {
-            val planterInfoId = treeTrackerDAO.insertPlanterInfo(FakeFileGenerator.fakePlanterInfo)
-            FakeFileGenerator.fakePlanterInfo.id = planterInfoId
-            val newPlanterCheckIn = FakeFileGenerator.fakePlanterCheckInEntity.copy(planterInfoId = planterInfoId)
-            val fakePlanter = treeTrackerDAO.insertPlanterCheckIn(newPlanterCheckIn)
-            val updated = newPlanterCheckIn.copy(latitude = 9888.11)
-            assertNotEquals(fakePlanter, updated)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `delete Planter CheckIn Entity, assert null`() =
-        runTest {
-            val planterInfoId = treeTrackerDAO.insertPlanterInfo(FakeFileGenerator.fakePlanterInfo)
-            FakeFileGenerator.fakePlanterInfo.id = planterInfoId
-            val newPlanterCheckIn = FakeFileGenerator.fakePlanterCheckInEntity.copy(planterInfoId = planterInfoId)
-            treeTrackerDAO.deletePlanterCheckIn(newPlanterCheckIn)
-            val planter = treeTrackerDAO.getPlanterCheckInById(newPlanterCheckIn.id)
-            assertNull(planter)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `insert Location Entity, returns valid with non null data `() =
-        runTest {
-            val deviceConfigId = treeTrackerDAO.insertDeviceConfig(FakeFileGenerator.fakeDeviceConfig)
-            FakeFileGenerator.fakeDeviceConfig.id = deviceConfigId
-
-            val newSession = FakeFileGenerator.fakeSession.copy(deviceConfigId = deviceConfigId)
-            val newSessionId = treeTrackerDAO.insertSession(newSession)
-            newSession.id = newSessionId
-
-            assertEquals(newSessionId, newSession.id)
-            val newLocation = FakeFileGenerator.fakeLocation.copy(sessionId = newSessionId)
-            treeTrackerDAO.insertLocationData(newLocation)
-            val getLocationEntity = treeTrackerDAO.getLocationData()
-            assertEquals("location", getLocationEntity.first().locationDataJson)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `insert Tree Capture Entity, returns valid data querying UUID`() =
-        runTest {
-            val planterInfoId = treeTrackerDAO.insertPlanterInfo(FakeFileGenerator.fakePlanterInfo)
-            FakeFileGenerator.fakePlanterInfo.id = planterInfoId
-            val newPlanterCheckIn = FakeFileGenerator.fakePlanterCheckInEntity.copy(planterInfoId = planterInfoId)
-            val planterCheckId = treeTrackerDAO.insertPlanterCheckIn(newPlanterCheckIn)
-            newPlanterCheckIn.id = planterCheckId
-            val newTreeCapture = FakeFileGenerator.fakeTreeCapture.copy(planterCheckInId = planterCheckId)
-            val id = treeTrackerDAO.insertTreeCapture(newTreeCapture)
-            val getTreeCapture = treeTrackerDAO.getTreeCaptureById(id)
-            assertEquals("uuid", getTreeCapture.uuid)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `update Tree Capture Entity, assert fake tree capture not same as updated `() =
-        runTest {
-            val planterInfoId = treeTrackerDAO.insertPlanterInfo(FakeFileGenerator.fakePlanterInfo)
-            FakeFileGenerator.fakePlanterInfo.id = planterInfoId
-            val newPlanterCheckIn = FakeFileGenerator.fakePlanterCheckInEntity.copy(planterInfoId = planterInfoId)
-            val planterCheckId = treeTrackerDAO.insertPlanterCheckIn(newPlanterCheckIn)
-            newPlanterCheckIn.id = planterCheckId
-            val newTreeCapture = FakeFileGenerator.fakeTreeCapture.copy(planterCheckInId = planterCheckId)
-            val fakeCapture = treeTrackerDAO.insertTreeCapture(newTreeCapture)
-            val updated = newTreeCapture.copy(uuid = "testing")
-            assertNotEquals(fakeCapture, updated)
-        }
-
-    @Test
-    @Throws(Exception::class)
-    fun `insert Tree Attribute Entity, returns valid with data `() =
-        runTest {
-            val planterInfoId = treeTrackerDAO.insertPlanterInfo(FakeFileGenerator.fakePlanterInfo)
-            FakeFileGenerator.fakePlanterInfo.id = planterInfoId
-            val newPlanterCheckIn = FakeFileGenerator.fakePlanterCheckInEntity.copy(planterInfoId = planterInfoId)
-            val planterCheckId = treeTrackerDAO.insertPlanterCheckIn(newPlanterCheckIn)
-            newPlanterCheckIn.id = planterCheckId
-            val newTreeCapture = FakeFileGenerator.fakeTreeCapture.copy(planterCheckInId = planterCheckId)
-            val newTreeCaptureId = treeTrackerDAO.insertTreeCapture(newTreeCapture)
-            newTreeCapture.id = newTreeCaptureId
-            val newTreeAttribute = FakeFileGenerator.fakeTreeAttribute.copy(treeCaptureId = newTreeCaptureId)
-            treeTrackerDAO.insertTreeAttribute(newTreeAttribute)
-            val size = treeTrackerDAO.getTreeAttributeByTreeCaptureId(newTreeCaptureId).size
-            assertEquals(1, size)
-        }
-
-    @After
-    @Throws(IOException::class)
-    fun tearDown() {
-        database.close()
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/DeviceConfigDaoTest.kt b/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/DeviceConfigDaoTest.kt
new file mode 100644
index 000000000..f45b4abd6
--- /dev/null
+++ b/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/DeviceConfigDaoTest.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2023 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.database.dao
+
+import android.content.Context
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.greenstand.android.TreeTracker.database.AppDatabase
+import org.greenstand.android.TreeTracker.utils.FakeFileGenerator
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import java.io.IOException
+
+@ExperimentalCoroutinesApi
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE)
+class DeviceConfigDaoTest {
+    private lateinit var deviceConfigDao: DeviceConfigDAO
+    private lateinit var database: AppDatabase
+
+    @Before
+    fun createDb() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        database =
+            Room
+                .inMemoryDatabaseBuilder(
+                    context,
+                    AppDatabase::class.java,
+                ).build()
+        deviceConfigDao = database.deviceConfigDao()
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun `insert fake Device Config to App Database, returns valid data querying uuid`() =
+        runTest {
+            deviceConfigDao.insertDeviceConfig(FakeFileGenerator.fakeDeviceConfig)
+            val deviceConfig = deviceConfigDao.getLatestDeviceConfig()
+            assertNotNull(deviceConfig)
+            assertEquals(FakeFileGenerator.fakeDeviceConfig.uuid, deviceConfig?.uuid)
+        }
+
+    @Test
+    @Throws(Exception::class)
+    fun `updated device config upload status, assert fake upload status not same as updated status`() =
+        runTest {
+            deviceConfigDao.insertDeviceConfig(FakeFileGenerator.fakeDeviceConfig)
+            val deviceConfig = deviceConfigDao.updateDeviceConfigUploadStatus(ids = listOf(12, 12), isUploaded = true)
+            assertNotEquals(FakeFileGenerator.fakeDeviceConfig.isUploaded, deviceConfig)
+        }
+
+    @Test
+    @Throws(Exception::class)
+    fun `updated device config bundle ID, assert fake bundleId not same as updated bundleID,`() =
+        runTest {
+            deviceConfigDao.insertDeviceConfig(FakeFileGenerator.fakeDeviceConfig)
+            val deviceConfig =
+                deviceConfigDao.updateDeviceConfigBundleIds(
+                    ids = listOf(15, 16),
+                    bundleId = "newRandomString",
+                )
+            assertNotEquals(FakeFileGenerator.fakeDeviceConfig.bundleId, deviceConfig)
+        }
+
+    @After
+    @Throws(IOException::class)
+    fun tearDown() {
+        database.close()
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/LocationDaoTest.kt b/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/LocationDaoTest.kt
new file mode 100644
index 000000000..ef565866b
--- /dev/null
+++ b/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/LocationDaoTest.kt
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2023 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.database.dao
+
+import android.content.Context
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runTest
+import org.greenstand.android.TreeTracker.database.AppDatabase
+import org.greenstand.android.TreeTracker.utils.FakeFileGenerator
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import java.io.IOException
+
+@ExperimentalCoroutinesApi
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE)
+class LocationDaoTest {
+    private lateinit var deviceConfigDao: DeviceConfigDAO
+    private lateinit var locationDao: LocationDAO
+    private lateinit var sessionDao: SessionDAO
+    private lateinit var database: AppDatabase
+
+    @Before
+    fun createDb() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        database =
+            Room
+                .inMemoryDatabaseBuilder(
+                    context,
+                    AppDatabase::class.java,
+                ).build()
+        locationDao = database.locationDao()
+        deviceConfigDao = database.deviceConfigDao()
+        sessionDao = database.sessionDao()
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun `insert Location Entity, returns valid with non null data `() =
+        runTest {
+            val deviceConfigId = deviceConfigDao.insertDeviceConfig(FakeFileGenerator.fakeDeviceConfig)
+            FakeFileGenerator.fakeDeviceConfig.id = deviceConfigId
+
+            val newSession = FakeFileGenerator.fakeSession.copy(deviceConfigId = deviceConfigId)
+            val newSessionId = sessionDao.insertSession(newSession)
+            newSession.id = newSessionId
+
+            assertEquals(newSessionId, newSession.id)
+            val newLocation = FakeFileGenerator.fakeLocation.copy(sessionId = newSessionId)
+            locationDao.insertLocationData(newLocation)
+            val getLocationEntity = locationDao.getLocationData()
+            assertEquals("location", getLocationEntity.first().locationDataJson)
+        }
+
+    @After
+    @Throws(IOException::class)
+    fun tearDown() {
+        database.close()
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/OrganizationDaoTest.kt b/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/OrganizationDaoTest.kt
new file mode 100644
index 000000000..214c0556b
--- /dev/null
+++ b/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/OrganizationDaoTest.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2023 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.database.dao
+
+import android.content.Context
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.greenstand.android.TreeTracker.database.AppDatabase
+import org.greenstand.android.TreeTracker.utils.FakeFileGenerator
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import java.io.IOException
+
+@ExperimentalCoroutinesApi
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE)
+public class OrganizationDaoTest {
+    private lateinit var organizationDao: OrganizationDAO
+    private lateinit var database: AppDatabase
+
+    @Before
+    fun createDb() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        database =
+            Room
+                .inMemoryDatabaseBuilder(
+                    context,
+                    AppDatabase::class.java,
+                ).build()
+        organizationDao = database.organizationDao()
+    }
+
+    @Test
+    fun `insert org to App Database, returns valid org when querying id and name`() =
+        runTest {
+            organizationDao.insertOrg(FakeFileGenerator.fakeOrg.first())
+            val organization = organizationDao.getOrg("new")
+            assertEquals(organization?.id, FakeFileGenerator.fakeOrg.first().id)
+            assertEquals(FakeFileGenerator.fakeOrg.first().name, organization?.name)
+        }
+
+    @Test
+    @Throws(Exception::class)
+    fun `saving org to App Database, returns valid data querying name`() =
+        runTest {
+            organizationDao.insertOrg(FakeFileGenerator.fakeOrg.first())
+            val organization = organizationDao.getOrg("new")
+            assertEquals("GreenStand", organization?.name)
+        }
+
+    @After
+    @Throws(IOException::class)
+    fun tearDown() {
+        database.close()
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/PlanterDaoTest.kt b/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/PlanterDaoTest.kt
new file mode 100644
index 000000000..f7834b9a5
--- /dev/null
+++ b/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/PlanterDaoTest.kt
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2023 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.database.dao
+
+import android.content.Context
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runTest
+import org.greenstand.android.TreeTracker.database.AppDatabase
+import org.greenstand.android.TreeTracker.utils.FakeFileGenerator
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Assert.assertNull
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import java.io.IOException
+
+@ExperimentalCoroutinesApi
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE)
+class PlanterDaoTest {
+    private lateinit var planterDao: PlanterDAO
+    private lateinit var database: AppDatabase
+
+    @Before
+    fun createDb() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        database =
+            Room
+                .inMemoryDatabaseBuilder(
+                    context,
+                    AppDatabase::class.java,
+                ).build()
+        planterDao = database.planterDao()
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun `insert planterInfo to App Database, assert valid planter Info`() =
+        runTest {
+            planterDao.insertPlanterInfo(FakeFileGenerator.fakePlanterInfo)
+            val planterInfo = planterDao.getAllPlanterInfo().first().first()
+            assertEquals(FakeFileGenerator.fakePlanterInfo, planterInfo)
+        }
+
+    @Test
+    @Throws(Exception::class)
+    fun `insert Planter CheckIn Entity, returns valid data, querying local photo path `() =
+        runTest {
+            val planterInfoId = planterDao.insertPlanterInfo(FakeFileGenerator.fakePlanterInfo)
+            FakeFileGenerator.fakePlanterInfo.id = planterInfoId
+            val newPlanterCheckIn = FakeFileGenerator.fakePlanterCheckInEntity.copy(planterInfoId = planterInfoId)
+            val id = planterDao.insertPlanterCheckIn(newPlanterCheckIn)
+            val getPlanterCheck = planterDao.getPlanterCheckInById(id)
+            assertEquals("new", getPlanterCheck?.localPhotoPath)
+        }
+
+    @Test
+    @Throws(Exception::class)
+    fun `update Planter CheckIn Entity, assert fake planter checkIn not same as updated`() =
+        runTest {
+            val planterInfoId = planterDao.insertPlanterInfo(FakeFileGenerator.fakePlanterInfo)
+            FakeFileGenerator.fakePlanterInfo.id = planterInfoId
+            val newPlanterCheckIn = FakeFileGenerator.fakePlanterCheckInEntity.copy(planterInfoId = planterInfoId)
+            val fakePlanter = planterDao.insertPlanterCheckIn(newPlanterCheckIn)
+            val updated = newPlanterCheckIn.copy(latitude = 9888.11)
+            assertNotEquals(fakePlanter, updated)
+        }
+
+    @Test
+    @Throws(Exception::class)
+    fun `delete Planter CheckIn Entity, assert null`() =
+        runTest {
+            val planterInfoId = planterDao.insertPlanterInfo(FakeFileGenerator.fakePlanterInfo)
+            FakeFileGenerator.fakePlanterInfo.id = planterInfoId
+            val newPlanterCheckIn = FakeFileGenerator.fakePlanterCheckInEntity.copy(planterInfoId = planterInfoId)
+            planterDao.deletePlanterCheckIn(newPlanterCheckIn)
+            val planter = planterDao.getPlanterCheckInById(newPlanterCheckIn.id)
+            assertNull(planter)
+        }
+
+    @After
+    @Throws(IOException::class)
+    fun tearDown() {
+        database.close()
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/SessionDaoTest.kt b/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/SessionDaoTest.kt
new file mode 100644
index 000000000..3af2d30ca
--- /dev/null
+++ b/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/SessionDaoTest.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2023 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.database.dao
+
+import android.content.Context
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.greenstand.android.TreeTracker.database.AppDatabase
+import org.greenstand.android.TreeTracker.utils.FakeFileGenerator
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import java.io.IOException
+
+@ExperimentalCoroutinesApi
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE)
+class SessionDaoTest {
+    private lateinit var deviceConfigDao: DeviceConfigDAO
+    private lateinit var sessionDao: SessionDAO
+    private lateinit var database: AppDatabase
+
+    @Before
+    fun createDb() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        database =
+            Room
+                .inMemoryDatabaseBuilder(
+                    context,
+                    AppDatabase::class.java,
+                ).build()
+        sessionDao = database.sessionDao()
+        deviceConfigDao = database.deviceConfigDao()
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun `insert Session, returns valid querying UUID `() =
+        runTest {
+            val deviceConfigId = deviceConfigDao.insertDeviceConfig(FakeFileGenerator.fakeDeviceConfig)
+            FakeFileGenerator.fakeDeviceConfig.id = deviceConfigId
+            assertEquals(deviceConfigId, FakeFileGenerator.fakeDeviceConfig.id)
+            val newSession = FakeFileGenerator.fakeSession.copy(deviceConfigId = deviceConfigId)
+
+            val id = sessionDao.insertSession(newSession)
+            val getSession = sessionDao.getSessionById(id)
+            assertEquals("uuid", getSession.uuid)
+        }
+
+    @After
+    @Throws(IOException::class)
+    fun tearDown() {
+        database.close()
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/TreeDaoTest.kt b/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/TreeDaoTest.kt
new file mode 100644
index 000000000..dfb121090
--- /dev/null
+++ b/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/TreeDaoTest.kt
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2023 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.database.dao
+
+import android.content.Context
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.greenstand.android.TreeTracker.database.AppDatabase
+import org.greenstand.android.TreeTracker.utils.*
+import org.junit.After
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import java.io.IOException
+
+@ExperimentalCoroutinesApi
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE)
+class TreeDaoTest {
+    private lateinit var treeDao: TreeDAO
+    private lateinit var deviceConfigDao: DeviceConfigDAO
+    private lateinit var sessionDao: SessionDAO
+    private lateinit var planterDao: PlanterDAO
+    private lateinit var database: AppDatabase
+
+    @Before
+    fun createDb() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        database =
+            Room
+                .inMemoryDatabaseBuilder(
+                    context,
+                    AppDatabase::class.java,
+                ).build()
+        treeDao = database.treeDao()
+        deviceConfigDao = database.deviceConfigDao()
+        sessionDao = database.sessionDao()
+        planterDao = database.planterDao()
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun `insert Tree Entity, returns valid data, querying bundle Id`() =
+        runTest {
+            val deviceConfigId = deviceConfigDao.insertDeviceConfig(FakeFileGenerator.fakeDeviceConfig)
+            FakeFileGenerator.fakeDeviceConfig.id = deviceConfigId
+
+            val newSession = FakeFileGenerator.fakeSession.copy(deviceConfigId = deviceConfigId)
+            val newSessionId = sessionDao.insertSession(newSession)
+            newSession.id = newSessionId
+
+            assertEquals(newSessionId, newSession.id)
+            val newTree = FakeFileGenerator.fakeTree.first().copy(sessionId = newSessionId)
+            val id = treeDao.insertTree(newTree)
+            val getTreeEntity = treeDao.getTreesByIds(listOf(id))
+            assertEquals("bundled", getTreeEntity.first().bundleId)
+        }
+
+    @Test
+    @Throws(Exception::class)
+    fun `update Tree Entity, assert fake tree not same as updated `() =
+        runTest {
+            val deviceConfigId = deviceConfigDao.insertDeviceConfig(FakeFileGenerator.fakeDeviceConfig)
+            FakeFileGenerator.fakeDeviceConfig.id = deviceConfigId
+
+            val newSession = FakeFileGenerator.fakeSession.copy(deviceConfigId = deviceConfigId)
+            val newSessionId = sessionDao.insertSession(newSession)
+            newSession.id = newSessionId
+
+            assertEquals(newSessionId, newSession.id)
+            val newTree = FakeFileGenerator.fakeTree.first().copy(sessionId = newSessionId)
+            val fakeTree = treeDao.insertTree(newTree)
+            val updated = newTree.copy(uuid = "testing")
+            assertNotEquals(fakeTree, updated)
+        }
+
+    @Test
+    @Throws(Exception::class)
+    fun `insert Tree Capture Entity, returns valid data querying UUID`() =
+        runTest {
+            val planterInfoId = planterDao.insertPlanterInfo(FakeFileGenerator.fakePlanterInfo)
+            FakeFileGenerator.fakePlanterInfo.id = planterInfoId
+            val newPlanterCheckIn = FakeFileGenerator.fakePlanterCheckInEntity.copy(planterInfoId = planterInfoId)
+            val planterCheckId = planterDao.insertPlanterCheckIn(newPlanterCheckIn)
+            newPlanterCheckIn.id = planterCheckId
+            val newTreeCapture = FakeFileGenerator.fakeTreeCapture.copy(planterCheckInId = planterCheckId)
+            val id = treeDao.insertTreeCapture(newTreeCapture)
+            val getTreeCapture = treeDao.getTreeCaptureById(id)
+            assertEquals("uuid", getTreeCapture.uuid)
+        }
+
+    @Test
+    @Throws(Exception::class)
+    fun `update Tree Capture Entity, assert fake tree capture not same as updated `() =
+        runTest {
+            val planterInfoId = planterDao.insertPlanterInfo(FakeFileGenerator.fakePlanterInfo)
+            FakeFileGenerator.fakePlanterInfo.id = planterInfoId
+            val newPlanterCheckIn = FakeFileGenerator.fakePlanterCheckInEntity.copy(planterInfoId = planterInfoId)
+            val planterCheckId = planterDao.insertPlanterCheckIn(newPlanterCheckIn)
+            newPlanterCheckIn.id = planterCheckId
+            val newTreeCapture = FakeFileGenerator.fakeTreeCapture.copy(planterCheckInId = planterCheckId)
+            val fakeCapture = treeDao.insertTreeCapture(newTreeCapture)
+            val updated = newTreeCapture.copy(uuid = "testing")
+            assertNotEquals(fakeCapture, updated)
+        }
+
+    @Test
+    @Throws(Exception::class)
+    fun `insert Tree Attribute Entity, returns valid with data `() =
+        runTest {
+            val planterInfoId = planterDao.insertPlanterInfo(FakeFileGenerator.fakePlanterInfo)
+            FakeFileGenerator.fakePlanterInfo.id = planterInfoId
+            val newPlanterCheckIn = FakeFileGenerator.fakePlanterCheckInEntity.copy(planterInfoId = planterInfoId)
+            val planterCheckId = planterDao.insertPlanterCheckIn(newPlanterCheckIn)
+            newPlanterCheckIn.id = planterCheckId
+            val newTreeCapture = FakeFileGenerator.fakeTreeCapture.copy(planterCheckInId = planterCheckId)
+            val newTreeCaptureId = treeDao.insertTreeCapture(newTreeCapture)
+            newTreeCapture.id = newTreeCaptureId
+            val newTreeAttribute = FakeFileGenerator.fakeTreeAttribute.copy(treeCaptureId = newTreeCaptureId)
+            treeDao.insertTreeAttribute(newTreeAttribute)
+            val size = treeDao.getTreeAttributeByTreeCaptureId(newTreeCaptureId).size
+            assertEquals(1, size)
+        }
+
+    @After
+    @Throws(IOException::class)
+    fun tearDown() {
+        database.close()
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/UserDaoTest.kt b/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/UserDaoTest.kt
new file mode 100644
index 000000000..98535ca4d
--- /dev/null
+++ b/app/src/test/java/org/greenstand/android/TreeTracker/database/dao/UserDaoTest.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2023 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.database.dao
+
+import android.content.Context
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runTest
+import org.greenstand.android.TreeTracker.database.AppDatabase
+import org.greenstand.android.TreeTracker.utils.FakeFileGenerator
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import java.io.IOException
+
+@ExperimentalCoroutinesApi
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE)
+class UserDaoTest {
+    private lateinit var userDao: UserDAO
+    private lateinit var database: AppDatabase
+
+    @Before
+    fun createDb() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        database =
+            Room
+                .inMemoryDatabaseBuilder(
+                    context,
+                    AppDatabase::class.java,
+                ).build()
+        userDao = database.userDao()
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun `insert userInfo to App Database, assert valid User`() =
+        runTest {
+            userDao.insertUser(FakeFileGenerator.fakeUser)
+            val userInfo = userDao.getAllUsers().first().first()
+            assertEquals(FakeFileGenerator.fakeUser, userInfo)
+        }
+
+    @Test
+    @Throws(Exception::class)
+    fun `update user UUID, assert fake UUID not equal to updated user,`() =
+        runTest {
+            userDao.insertUser(FakeFileGenerator.fakeUser)
+            val userUpdate = userDao.updateUser(FakeFileGenerator.fakeUser.copy(uuid = "newStringUpdate"))
+            assertNotEquals(FakeFileGenerator.fakeUser.uuid, userUpdate)
+        }
+
+    @Test
+    @Throws(Exception::class)
+    fun `update user Bundle Id, assert fake Bundle, different from Updated,`() =
+        runTest {
+            userDao.insertUser(FakeFileGenerator.fakeUser)
+            val userUpdate = userDao.updateUserBundleIds(listOf(12, 344), bundleId = "newString")
+            assertNotEquals(FakeFileGenerator.fakeUser.bundleId, userUpdate)
+        }
+
+    @After
+    @Throws(IOException::class)
+    fun tearDown() {
+        database.close()
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/org/greenstand/android/TreeTracker/navigation/NavigatorTest.kt b/app/src/test/java/org/greenstand/android/TreeTracker/navigation/NavigatorTest.kt
new file mode 100644
index 000000000..0a9daeb15
--- /dev/null
+++ b/app/src/test/java/org/greenstand/android/TreeTracker/navigation/NavigatorTest.kt
@@ -0,0 +1,263 @@
+/*
+ * Copyright 2026 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.navigation
+
+import org.greenstand.android.TreeTracker.utils.FakeClock
+import org.greenstand.android.TreeTracker.utils.fakeNavigator
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class NavigatorTest {
+    private val clock = FakeClock()
+    private val navigator = fakeNavigator(SplashRoute(), clock = clock)
+
+    private fun navigateSettled(
+        route: androidx.navigation3.runtime.NavKey,
+        builder: NavOptions.() -> Unit = {},
+    ) {
+        clock.advance(300)
+        navigator.navigate(route, builder)
+    }
+
+    @Test
+    fun `navigate pushes onto the back stack`() {
+        navigateSettled(DashboardRoute)
+        navigateSettled(SettingsRoute)
+
+        assertEquals(listOf(SplashRoute(), DashboardRoute, SettingsRoute), navigator.backStack)
+    }
+
+    @Test
+    fun `popUpTo non-inclusive pops above target`() {
+        navigateSettled(DashboardRoute)
+        navigateSettled(UserSelectRoute)
+        navigateSettled(WalletSelectRoute)
+
+        navigateSettled(TreeCaptureRoute("pic")) { popUpTo<DashboardRoute>() }
+
+        assertEquals(listOf(SplashRoute(), DashboardRoute, TreeCaptureRoute("pic")), navigator.backStack)
+    }
+
+    @Test
+    fun `popUpTo inclusive pops target as well`() {
+        navigateSettled(LanguageRoute(isFromTopBar = false))
+
+        navigateSettled(DashboardRoute) {
+            popUpTo<SplashRoute> { inclusive = true }
+            launchSingleTop = true
+        }
+
+        assertEquals(listOf(DashboardRoute), navigator.backStack)
+    }
+
+    @Test
+    fun `popUpTo with absent target pops nothing but still navigates`() {
+        navigateSettled(DashboardRoute)
+
+        navigateSettled(SettingsRoute) { popUpTo<MapRoute> { inclusive = true } }
+
+        assertEquals(listOf(SplashRoute(), DashboardRoute, SettingsRoute), navigator.backStack)
+    }
+
+    @Test
+    fun `popUpToRoot clears the stack before navigating`() {
+        navigateSettled(DashboardRoute)
+        navigateSettled(SettingsRoute)
+
+        navigateSettled(SignupFlowRoute) {
+            popUpToRoot()
+            launchSingleTop = true
+        }
+
+        assertEquals(listOf<Any>(SignupFlowRoute), navigator.backStack)
+    }
+
+    @Test
+    fun `launchSingleTop replaces top of same route class`() {
+        navigateSettled(DashboardRoute)
+        navigateSettled(TreeCaptureRoute("old"))
+
+        navigateSettled(TreeCaptureRoute("new")) { launchSingleTop = true }
+
+        assertEquals(listOf(SplashRoute(), DashboardRoute, TreeCaptureRoute("new")), navigator.backStack)
+    }
+
+    @Test
+    fun `launchSingleTop pushes when top differs`() {
+        navigateSettled(DashboardRoute)
+
+        navigateSettled(SettingsRoute) { launchSingleTop = true }
+
+        assertEquals(listOf(SplashRoute(), DashboardRoute, SettingsRoute), navigator.backStack)
+    }
+
+    @Test
+    fun `popBackStack pops the top entry`() {
+        navigateSettled(DashboardRoute)
+
+        assertTrue(navigator.popBackStack())
+
+        assertEquals(listOf<Any>(SplashRoute()), navigator.backStack)
+    }
+
+    @Test
+    fun `popBackStack refuses to pop the last entry`() {
+        assertFalse(navigator.popBackStack())
+
+        assertEquals(listOf<Any>(SplashRoute()), navigator.backStack)
+    }
+
+    @Test
+    fun `popBackStackTo non-inclusive pops above target`() {
+        navigateSettled(DashboardRoute)
+        navigateSettled(TreeCaptureRoute("pic"))
+        navigateSettled(TreeImageReviewRoute("photo"))
+
+        assertTrue(navigator.popBackStackTo<TreeCaptureRoute>())
+
+        assertEquals(listOf(SplashRoute(), DashboardRoute, TreeCaptureRoute("pic")), navigator.backStack)
+    }
+
+    @Test
+    fun `popBackStackTo inclusive pops target as well`() {
+        navigateSettled(DashboardRoute)
+        navigateSettled(SettingsRoute)
+
+        assertTrue(navigator.popBackStackTo<DashboardRoute>(inclusive = true))
+
+        assertEquals(listOf<Any>(SplashRoute()), navigator.backStack)
+    }
+
+    @Test
+    fun `popBackStackTo with absent target leaves stack untouched`() {
+        navigateSettled(DashboardRoute)
+
+        assertFalse(navigator.popBackStackTo<MapRoute>())
+
+        assertEquals(listOf(SplashRoute(), DashboardRoute), navigator.backStack)
+    }
+
+    @Test
+    fun `popBackStackTo when target is already top is a no-op`() {
+        navigateSettled(DashboardRoute)
+
+        assertFalse(navigator.popBackStackTo<DashboardRoute>())
+
+        assertEquals(listOf(SplashRoute(), DashboardRoute), navigator.backStack)
+    }
+
+    @Test
+    fun `throttledNavigate drops calls inside the throttle window`() {
+        navigator.throttledNavigate(DashboardRoute)
+        clock.advance(100)
+        navigator.throttledNavigate(SettingsRoute)
+
+        assertEquals(listOf(SplashRoute(), DashboardRoute), navigator.backStack)
+    }
+
+    @Test
+    fun `throttledNavigate allows calls after the throttle window`() {
+        navigator.throttledNavigate(DashboardRoute)
+        clock.advance(300)
+        navigator.throttledNavigate(SettingsRoute)
+
+        assertEquals(listOf(SplashRoute(), DashboardRoute, SettingsRoute), navigator.backStack)
+    }
+
+    @Test
+    fun `throttledPopBackStack is debounced after a navigation`() {
+        navigator.throttledNavigate(DashboardRoute)
+        clock.advance(100)
+
+        assertFalse(navigator.throttledPopBackStack())
+        clock.advance(200)
+        assertTrue(navigator.throttledPopBackStack())
+
+        assertEquals(listOf<Any>(SplashRoute()), navigator.backStack)
+    }
+
+    @Test
+    fun `topKey reflects the top of the stack`() {
+        assertEquals(SplashRoute(), navigator.topKey)
+        navigateSettled(DashboardRoute)
+        assertEquals(DashboardRoute, navigator.topKey)
+    }
+
+    // --- Origin-scoped throttling (per-screen, no wall-clock gate) ---
+
+    @Test
+    fun `scoped navigator navigates while its origin is on top`() {
+        val nav = fakeNavigator(DashboardRoute)
+        val dashboard = nav.scopedTo(DashboardRoute.toString())
+
+        dashboard.throttledNavigate(SettingsRoute)
+
+        assertEquals(listOf(DashboardRoute, SettingsRoute), nav.backStack)
+    }
+
+    @Test
+    fun `scoped navigator drops a second navigation from the same screen (double-tap)`() {
+        val nav = fakeNavigator(DashboardRoute)
+        val dashboard = nav.scopedTo(DashboardRoute.toString())
+
+        // Both taps come from Dashboard's button. The first navigates away; by the second
+        // tap Dashboard is no longer on top, so it is dropped — no duplicate destination.
+        dashboard.throttledNavigate(SettingsRoute)
+        dashboard.throttledNavigate(MapRoute)
+
+        assertEquals(listOf(DashboardRoute, SettingsRoute), nav.backStack)
+    }
+
+    @Test
+    fun `scoped navigators from different screens all navigate with no time gap`() {
+        val nav = fakeNavigator(DashboardRoute)
+
+        // Rapidly stepping through a flow: each screen fires its own scoped navigator once.
+        // No clock is advanced anywhere — cross-screen navigation is never time-throttled.
+        nav.scopedTo(DashboardRoute.toString()).throttledNavigate(UserSelectRoute)
+        nav.scopedTo(UserSelectRoute.toString()).throttledNavigate(WalletSelectRoute)
+        nav.scopedTo(WalletSelectRoute.toString()).throttledNavigate(AddWalletRoute)
+
+        assertEquals(
+            listOf(DashboardRoute, UserSelectRoute, WalletSelectRoute, AddWalletRoute),
+            nav.backStack,
+        )
+    }
+
+    @Test
+    fun `scoped throttledPopBackStack drops a second back from the same screen`() {
+        val nav = fakeNavigator(DashboardRoute, SettingsRoute)
+        val settings = nav.scopedTo(SettingsRoute.toString())
+
+        assertTrue(settings.throttledPopBackStack())
+        assertFalse(settings.throttledPopBackStack())
+
+        assertEquals(listOf<Any>(DashboardRoute), nav.backStack)
+    }
+
+    @Test
+    fun `scoped navigator with an arg route matches on the full contentKey`() {
+        val capture = TreeCaptureRoute("pic")
+        val nav = fakeNavigator(DashboardRoute, capture)
+        val scoped = nav.scopedTo(capture.toString())
+
+        scoped.throttledNavigate(TreeHeightScreenRoute)
+
+        assertEquals(listOf(DashboardRoute, capture, TreeHeightScreenRoute), nav.backStack)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/org/greenstand/android/TreeTracker/navigation/OrgDeepLinkTest.kt b/app/src/test/java/org/greenstand/android/TreeTracker/navigation/OrgDeepLinkTest.kt
new file mode 100644
index 000000000..f138ab122
--- /dev/null
+++ b/app/src/test/java/org/greenstand/android/TreeTracker/navigation/OrgDeepLinkTest.kt
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2026 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.navigation
+
+import android.content.Intent
+import android.net.Uri
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(manifest = Config.NONE)
+class OrgDeepLinkTest {
+    private fun viewIntent(uri: String) = Intent(Intent.ACTION_VIEW, Uri.parse(uri))
+
+    @Test
+    fun `null intent yields empty splash route`() {
+        assertEquals(SplashRoute(), parseStartRoute(null))
+    }
+
+    @Test
+    fun `intent without data yields empty splash route`() {
+        assertEquals(SplashRoute(), parseStartRoute(Intent(Intent.ACTION_VIEW)))
+    }
+
+    @Test
+    fun `valid org link maps id and name`() {
+        val route = parseStartRoute(viewIntent("app://mobile.treetracker.org/org?id=abc&name=Acme"))
+
+        assertEquals(SplashRoute(orgId = "abc", orgName = "Acme"), route)
+    }
+
+    @Test
+    fun `org link with only id leaves name null`() {
+        val route = parseStartRoute(viewIntent("app://mobile.treetracker.org/org?id=abc"))
+
+        assertEquals("abc", route.orgId)
+        assertNull(route.orgName)
+    }
+
+    @Test
+    fun `org link without query params yields null args`() {
+        val route = parseStartRoute(viewIntent("app://mobile.treetracker.org/org"))
+
+        assertNull(route.orgId)
+        assertNull(route.orgName)
+    }
+
+    @Test
+    fun `name with url-encoded spaces is decoded`() {
+        val route = parseStartRoute(viewIntent("app://mobile.treetracker.org/org?id=abc&name=Green%20Trees"))
+
+        assertEquals("Green Trees", route.orgName)
+    }
+
+    @Test
+    fun `wrong host is ignored`() {
+        val route = parseStartRoute(viewIntent("app://evil.example.com/org?id=abc&name=Acme"))
+
+        assertEquals(SplashRoute(), route)
+    }
+
+    @Test
+    fun `wrong scheme is ignored`() {
+        val route = parseStartRoute(viewIntent("https://mobile.treetracker.org/org?id=abc&name=Acme"))
+
+        assertEquals(SplashRoute(), route)
+    }
+
+    @Test
+    fun `wrong path is ignored`() {
+        val route = parseStartRoute(viewIntent("app://mobile.treetracker.org/other?id=abc&name=Acme"))
+
+        assertEquals(SplashRoute(), route)
+    }
+
+    @Test
+    fun `path prefixed with org still matches`() {
+        val route = parseStartRoute(viewIntent("app://mobile.treetracker.org/organization?id=abc"))
+
+        assertEquals("abc", route.orgId)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/org/greenstand/android/TreeTracker/navigation/RouteRegistryTest.kt b/app/src/test/java/org/greenstand/android/TreeTracker/navigation/RouteRegistryTest.kt
new file mode 100644
index 000000000..d428378f4
--- /dev/null
+++ b/app/src/test/java/org/greenstand/android/TreeTracker/navigation/RouteRegistryTest.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2026 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.navigation
+
+import androidx.navigation3.runtime.NavKey
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class RouteRegistryTest {
+    @Test
+    fun `resolves no-arg routes to NavKey objects`() {
+        assertEquals(UserSelectRoute, RouteRegistry.resolveNoArgRoute("user-select"))
+        assertEquals(WalletSelectRoute, RouteRegistry.resolveNoArgRoute("wallet-select"))
+        assertEquals(AddOrgRoute, RouteRegistry.resolveNoArgRoute("add-org"))
+        assertEquals(SessionNoteRoute, RouteRegistry.resolveNoArgRoute("session-note"))
+        assertEquals(TreeHeightScreenRoute, RouteRegistry.resolveNoArgRoute("tree-height-selection"))
+    }
+
+    @Test
+    fun `resolved routes are NavKeys`() {
+        val route: NavKey? = RouteRegistry.resolveNoArgRoute("user-select")
+        assertTrue(route is NavKey)
+    }
+
+    @Test
+    fun `arg-requiring routes do not resolve to no-arg route`() {
+        assertNull(RouteRegistry.resolveNoArgRoute("capture/{profilePicUrl}"))
+        assertNull(RouteRegistry.resolveNoArgRoute("tree-image-review/{photoPath}"))
+    }
+
+    @Test
+    fun `unknown route resolves to null`() {
+        assertNull(RouteRegistry.resolveNoArgRoute("does-not-exist"))
+    }
+
+    @Test
+    fun `aliases normalize to canonical route strings`() {
+        assertEquals("capture/{profilePicUrl}", RouteRegistry.normalize("tree-capture"))
+        assertEquals("tree-image-review/{photoPath}", RouteRegistry.normalize("image-review"))
+    }
+
+    @Test
+    fun `normalize passes through non-alias strings unchanged`() {
+        assertEquals("user-select", RouteRegistry.normalize("user-select"))
+        assertEquals("unknown", RouteRegistry.normalize("unknown"))
+    }
+
+    @Test
+    fun `isValidRoute recognizes no-arg, arg, and alias routes`() {
+        assertTrue(RouteRegistry.isValidRoute("user-select"))
+        assertTrue(RouteRegistry.isValidRoute("capture/{profilePicUrl}"))
+        assertTrue(RouteRegistry.isValidRoute("tree-capture"))
+    }
+
+    @Test
+    fun `isValidRoute rejects unknown routes`() {
+        assertFalse(RouteRegistry.isValidRoute("nope"))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/org/greenstand/android/TreeTracker/screenshot/ScreenshotTest.kt b/app/src/test/java/org/greenstand/android/TreeTracker/screenshot/ScreenshotTest.kt
index 2fd19b1d5..3272d35c0 100644
--- a/app/src/test/java/org/greenstand/android/TreeTracker/screenshot/ScreenshotTest.kt
+++ b/app/src/test/java/org/greenstand/android/TreeTracker/screenshot/ScreenshotTest.kt
@@ -17,12 +17,16 @@ package org.greenstand.android.TreeTracker.screenshot
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onRoot
-import androidx.navigation.compose.rememberNavController
+import androidx.navigation3.runtime.NavKey
 import com.github.takahirom.roborazzi.captureRoboImage
-import org.greenstand.android.TreeTracker.root.LocalNavHostController
+import org.greenstand.android.TreeTracker.navigation.LocalNavigator
+import org.greenstand.android.TreeTracker.navigation.Navigator
+import org.greenstand.android.TreeTracker.navigation.SplashRoute
 import org.greenstand.android.TreeTracker.theme.CustomTheme
 import org.greenstand.android.TreeTracker.view.TreeTrackerTheme
 import org.junit.Rule
@@ -54,9 +58,9 @@ abstract class ScreenshotTest {
 
 @Composable
 private fun ScreenshotTestDependencies(content: @Composable () -> Unit) {
-    val navController = rememberNavController()
+    val navigator = remember { Navigator(mutableStateListOf<NavKey>(SplashRoute())) }
     CompositionLocalProvider(
-        LocalNavHostController provides navController,
+        LocalNavigator provides navigator,
         LocalInspectionMode provides true,
     ) {
         CustomTheme {
diff --git a/app/src/test/java/org/greenstand/android/TreeTracker/settings/SettingsViewModelTest.kt b/app/src/test/java/org/greenstand/android/TreeTracker/settings/SettingsViewModelTest.kt
index 520a63d5d..6083b434a 100644
--- a/app/src/test/java/org/greenstand/android/TreeTracker/settings/SettingsViewModelTest.kt
+++ b/app/src/test/java/org/greenstand/android/TreeTracker/settings/SettingsViewModelTest.kt
@@ -23,9 +23,15 @@ import io.mockk.impl.annotations.MockK
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
+import androidx.navigation3.runtime.NavKey
 import org.greenstand.android.TreeTracker.MainCoroutineRule
 import org.greenstand.android.TreeTracker.models.UserRepo
+import org.greenstand.android.TreeTracker.navigation.DashboardRoute
+import org.greenstand.android.TreeTracker.navigation.ProfileSelectRoute
+import org.greenstand.android.TreeTracker.navigation.SettingsRoute
+import org.greenstand.android.TreeTracker.navigation.SignupFlowRoute
 import org.greenstand.android.TreeTracker.utils.FakeFileGenerator
+import org.greenstand.android.TreeTracker.utils.fakeNavigator
 import org.greenstand.android.TreeTracker.viewmodel.NavigationEvent
 import org.greenstand.android.TreeTracker.viewmodel.PopBackStackEvent
 import org.junit.Before
@@ -201,4 +207,39 @@ class SettingsViewModelTest {
             val event = viewModel.events.first().getContentIfNotConsumed()
             assertTrue(event is NavigationEvent, "Expected NavigationEvent but got $event")
         }
+
+    @Test
+    fun `WHEN NavigateToProfile action THEN navigator lands on ProfileSelectRoute`() =
+        runTest {
+            coEvery { userRepo.getPowerUser() } returns FakeFileGenerator.emptyUser
+            val viewModel = SettingsViewModel(userRepo)
+            val navigator = fakeNavigator(DashboardRoute, SettingsRoute)
+
+            viewModel.handleAction(SettingsAction.NavigateToProfile)
+
+            val event = viewModel.events.first().getContentIfNotConsumed() as NavigationEvent
+            event.navigate(navigator)
+
+            assertEquals(
+                listOf(DashboardRoute, SettingsRoute, ProfileSelectRoute),
+                navigator.backStack,
+            )
+        }
+
+    @Test
+    fun `WHEN LogoutConfirmed action THEN navigator clears stack to SignupFlowRoute`() =
+        runTest {
+            val powerUser = FakeFileGenerator.fakeUsers.first()
+            coEvery { userRepo.getPowerUser() } returns powerUser
+            val viewModel = SettingsViewModel(userRepo)
+            val navigator = fakeNavigator(DashboardRoute, SettingsRoute)
+
+            viewModel.handleAction(SettingsAction.LogoutConfirmed)
+
+            val event = viewModel.events.first().getContentIfNotConsumed() as NavigationEvent
+            event.navigate(navigator)
+
+            // popUpToRoot() + launchSingleTop leaves SignupFlowRoute as the only entry.
+            assertEquals(listOf<NavKey>(SignupFlowRoute), navigator.backStack)
+        }
 }
\ No newline at end of file
diff --git a/app/src/test/java/org/greenstand/android/TreeTracker/utils/FakeNavigator.kt b/app/src/test/java/org/greenstand/android/TreeTracker/utils/FakeNavigator.kt
new file mode 100644
index 000000000..666c0e690
--- /dev/null
+++ b/app/src/test/java/org/greenstand/android/TreeTracker/utils/FakeNavigator.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2026 Treetracker
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.greenstand.android.TreeTracker.utils
+
+import androidx.navigation3.runtime.NavKey
+import org.greenstand.android.TreeTracker.navigation.Navigator
+
+/** Manually advanced clock for deterministic navigation throttle tests. */
+class FakeClock(
+    var now: Long = 0L,
+) {
+    fun advance(ms: Long) {
+        now += ms
+    }
+}
+
+/**
+ * A [Navigator] over a plain in-memory back stack with a controllable clock.
+ * Lets ViewModel tests execute a captured `NavigationEvent` lambda and assert
+ * the resulting back stack, e.g. `event.navigate(navigator)`.
+ */
+fun fakeNavigator(
+    vararg initialStack: NavKey,
+    clock: FakeClock = FakeClock(),
+): Navigator = Navigator(mutableListOf(*initialStack), clock = { clock.now })
\ No newline at end of file
diff --git a/app/src/test/snapshots/org.greenstand.android.TreeTracker.screenshot.SettingsScreenshotTest.settings_default.png b/app/src/test/snapshots/org.greenstand.android.TreeTracker.screenshot.SettingsScreenshotTest.settings_default.png
index 00d0fa58d..7afe667ed 100644
Binary files a/app/src/test/snapshots/org.greenstand.android.TreeTracker.screenshot.SettingsScreenshotTest.settings_default.png and b/app/src/test/snapshots/org.greenstand.android.TreeTracker.screenshot.SettingsScreenshotTest.settings_default.png differ
diff --git a/docs/tasks/task_22/README.md b/docs/tasks/task_22/README.md
index dd93d2413..d820ec94a 100644
--- a/docs/tasks/task_22/README.md
+++ b/docs/tasks/task_22/README.md
@@ -1,58 +1,18 @@
-# Task 22 — Split monolithic TreeTrackerDAO into entity-specific DAOs (#1235)
-
-Branch: `refactor/split-tree-tracker-dao` · PR #TBD
+# Task 22 - Standardize GreenStand privacy policy capitalization
 
 ## Goal
 
-`TreeTrackerDAO` is a single Room interface covering 10 entity groups and is injected
-into ~25 production classes. Splitting it into entity-specific DAOs improves testability,
-narrows change impact, and matches the existing `entity/` and `legacy/entity/` layout.
-
-Split `TreeTrackerDAO` (~385 lines) into focused Room DAOs:
-
-1. `TreeDAO` — current `tree` table
-2. `UserDAO` — `user`
-3. `SessionDAO` — `session`
-4. `OrganizationDAO` — `organization`
-5. `DeviceConfigDAO` — `device_config`
-6. `PlanterDAO` — legacy `planter_info` and `planter_check_in`
-7. `LocationDAO` — `location` and legacy `location_data`
-
-Update AppDatabase and RoomModule to expose and wire the new DAOs.
-
-## PR plan
-| PR | Scope |
-|---|---|
-| 1 | Add DAO interfaces + `AppDatabase`/`RoomModule` wiring; keep `TreeTrackerDAO` |
-| 2 | Migrate org, device config, user |
-| 3 | Migrate session + tree |
-| 4 | Migrate legacy planter + tree capture |
-| 5 | Migrate location + sync/dashboard |
-| 6 | Remove `TreeTrackerDAO`, split tests |
+Fix issue #1272, where Privacy Policy related copy used inconsistent
+capitalization for the GreenStand brand.
 
 ## Changes
 
-### Infrastructure
-
-- Add `database/dao/` (and `database/dao/legacy/` for legacy aggregates).
-- Register each DAO on `AppDatabase`.
-- Wire each DAO in `RoomModule` (Koin).
-- Keep `TreeTrackerDAO` temporarily during migration, then remove it.
-
-### Tests
-
-- Split `TreeTrackerDaoTest` into per-DAO tests.
-- Update ~17 test files that mock `TreeTrackerDAO` to mock the relevant DAO(s).
-
-## Out of scope (next stacks)
-
-- Room schema changes (DB stays at version 9).
-- Repository layer introduction — this task is DAO + wiring + caller migration only.
-- Merging `UserDAO` with `PlanterDAO` — different domain eras (v2 vs legacy).
+- Updated the English Privacy Policy settings description from `Greensand` to
+  `GreenStand`.
+- Updated Portuguese and Swahili Privacy Policy settings descriptions to use
+  `GreenStand` consistently.
 
 ## Verification
 
-- `./gradlew :app:compileDebugKotlin :app:compileDebugUnitTestKotlin`
-- `./gradlew :app:testDebugUnitTest`
-- `./codeAnalysis.sh`
-- No remaining references to `TreeTrackerDAO` after final PR in the stack.
+- `./gradlew.bat :app:mergeDebugResources` passes.
+- `./gradlew.bat :app:verifyRoborazziDebug --tests "org.greenstand.android.TreeTracker.screenshot.SettingsScreenshotTest"` passes.
diff --git a/docs/tasks/task_23/README.md b/docs/tasks/task_23/README.md
new file mode 100644
index 000000000..407148911
--- /dev/null
+++ b/docs/tasks/task_23/README.md
@@ -0,0 +1,21 @@
+# Task 18 - Split `TextButton.kt`
+
+## Goal
+
+Reduce the size of `app/src/main/java/org/greenstand/android/TreeTracker/view/TextButton.kt` by extracting
+distinct button variants and support classes into focused files.
+
+## Changes
+
+- Kept the shared `TreeTrackerButton` composable and `TreeTrackerButtonShape` enum in `TextButton.kt`.
+- Moved navigation buttons into `NavigationButtons.kt`.
+- Moved approval and info buttons into `ActionButtons.kt`.
+- Moved camera/add controls into `CaptureButtons.kt`.
+- Moved language and user image buttons into their own files.
+- Moved `DepthButtonColors` into `DepthButtonColors.kt` so shared styling remains reusable.
+
+## Verification
+
+- `git diff --check` - passes.
+- Touched Kotlin/docs files checked for lines over the configured 120-character limit - passes.
+- `./gradlew :app:compileDebugKotlin` - blocked because no Java Runtime is available in this environment.
diff --git a/docs/tasks/task_24/README.md b/docs/tasks/task_24/README.md
new file mode 100644
index 000000000..2f1465af7
--- /dev/null
+++ b/docs/tasks/task_24/README.md
@@ -0,0 +1,76 @@
+# Task 24 - Migrate from Navigation 2 to Navigation 3
+
+## Goal
+
+Replace Jetpack Navigation 2 (`androidx.navigation:navigation-compose`) with
+Navigation 3 (`androidx.navigation3`) across the whole app, preserving every
+existing navigation behavior.
+
+## Changes
+
+- Bumped Compose 1.7.5 → 1.10.5 and compileSdk 35 → 36 (required by
+  navigation3-ui 1.1.1); `material-icons-extended` pinned to 1.7.8 (its last
+  published version). Landed as an isolated first commit.
+- All 29 routes in `navigation/Routes.kt` now implement `NavKey` (still
+  `@Serializable`).
+- New `navigation/Navigator.kt`: app-owned back stack operations replacing
+  `NavHostController` — `navigate` with a `NavOptions` DSL (`popUpTo<T>`,
+  `popUpToRoot()` replacing `popUpTo(graph.id)`, `launchSingleTop`),
+  `popBackStack`, `popBackStackTo<T>(inclusive)`, and throttled variants
+  keeping the 300 ms debounce from the deleted `utilities/NavigationUtils.kt`.
+  Exposed via `LocalNavigator` (replacing `LocalNavHostController`).
+- Nav2's "only navigate while RESUMED" guard is replaced by the debounce plus
+  an origin-is-top check in `HandleUIEvents`: ViewModel navigation events only
+  execute when the emitting entry is the top of the back stack (via
+  `LocalNavEntryContentKey`).
+- `root/Host.kt`: `NavHost` → `NavDisplay` with `rememberNavBackStack`,
+  saveable-state + ViewModel-store decorators (per-entry ViewModel scoping),
+  and explicit 500 ms fade transition specs matching the previous look.
+- `trackedComposable` replaced by a custom
+  `rememberScreenTrackingNavEntryDecorator()` (`NavEntryDecorator`) that keeps
+  Crashlytics screen breadcrumbs and provides `LocalNavEntryContentKey`.
+- Deep link (`app://mobile.treetracker.org/org?...`) reimplemented manually
+  (Nav3 has no deep link support): `navigation/OrgDeepLink.kt` parses the
+  launch intent in `TreeTrackerActivity` into the `SplashRoute` start key.
+  Cold-start-only, matching pre-migration behavior.
+- `ImageCaptureActivity`'s standalone selfie NavHost migrated to its own
+  `NavDisplay`.
+- `CaptureFlowNavigationController` / `CaptureSetupNavigationController` and
+  ~25 screens switched from `NavHostController` to `Navigator`; route
+  resolution (`RouteRegistry`, `FlowNavigationController`) tightened from
+  `Any` to `NavKey`.
+- `NavigationEvent` now carries a `suspend Navigator.() -> Unit`; existing
+  ViewModel tests pass unchanged. New `NavigatorTest` covers popUpTo
+  (inclusive/exclusive/absent), singleTop replace, popUpToRoot, popBackStackTo,
+  root-pop refusal, and the throttle window via a fake clock.
+- Removed `androidx-navigation-compose` from the version catalog; zero
+  `androidx.navigation.` imports remain.
+
+## Emulator smoke test findings
+
+- `NavDisplay` crashed on launch with "No NavigationEventDispatcher was
+  provided": Navigation 3's back handling needs a `NavigationEventDispatcherOwner`.
+  Fixed by bumping `androidx.activity` to 1.12.0 (where `ComponentActivity`
+  implements the owner) and planting the view-tree owner manually in
+  `TreeTrackerActivity` — `AppCompatActivity.setContentView` (appcompat 1.7.x)
+  predates navigationevent and only plants the four older view-tree owners.
+- Verified on a Pixel 7 API 35 emulator: cold start, splash auto-navigation,
+  signup-flow back handling, and deep-link cold start
+  (`OrgLink: Deeplink received: orgId=..., orgName=...`) all work; no crashes.
+
+## Behavior notes
+
+- `launchSingleTop` is implemented as replace-top: a match with different
+  arguments recreates the entry (unobservable for current call sites).
+- A navigation issued 300–500 ms after the previous one (mid-fade) now
+  succeeds where the old RESUMED check would drop it.
+- Predictive back gesture previews now animate with the same 500 ms fade.
+
+## Verification
+
+- `./gradlew :app:assembleDebug :app:testDebugUnitTest :app:verifyRoborazziDebug :app:ktlintCheck :app:detekt :app:lintDebug` all pass.
+- Manual QA checklist: fresh-install signup flow (incl. selfie capture
+  activity), existing-user splash → dashboard, capture loop (no stack growth),
+  settings logout / delete-profile stack clears, deep link cold start via
+  `adb shell am start -a android.intent.action.VIEW -d "app://mobile.treetracker.org/org?id=X&name=Y"`,
+  rotation + process-death restore on a deep screen, double-tap nav buttons.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 55f956f83..dd33ae383 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 # Android SDK
-compileSdk = "35"
+compileSdk = "36"
 minSdk = "23"
 targetSdk = "35"
 
@@ -19,13 +19,17 @@ androidxCore = "1.13.1"
 androidxAppcompat = "1.7.0"
 androidxMultidex = "2.0.1"
 androidxExifInterface = "1.3.2"
-androidxLifecycle = "2.8.7"
+androidxLifecycle = "2.10.0"
 androidxWork = "2.9.1"
 
 # Compose
-compose = "1.7.5"
-composeActivity = "1.9.0"
-composeNavigation = "2.8.5"
+compose = "1.10.5"
+# material-icons-extended stopped shipping with the main Compose version at 1.7.8
+composeIconsExtended = "1.7.8"
+# 1.12+ required: ComponentActivity provides the NavigationEventDispatcherOwner that Navigation 3's back handling needs
+composeActivity = "1.12.0"
+navigation3 = "1.1.1"
+lifecycleNavigation3 = "2.10.0"
 accompanist = "0.36.0"
 
 # Kotlin
@@ -97,10 +101,12 @@ androidx-compose-foundation-layout = { module = "androidx.compose.foundation:fou
 androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
 androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
-androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" }
+androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "composeIconsExtended" }
 androidx-compose-animation = { module = "androidx.compose.animation:animation", version.ref = "compose" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "composeActivity" }
-androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "composeNavigation" }
+androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "navigation3" }
+androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "navigation3" }
+androidx-lifecycle-viewmodel-navigation3 = { module = "androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "lifecycleNavigation3" }
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
 
 # Kotlin
@@ -212,7 +218,9 @@ compose = [
     "androidx-compose-material",
     "androidx-compose-animation",
     "androidx-activity-compose",
-    "androidx-navigation-compose"
+    "androidx-navigation3-runtime",
+    "androidx-navigation3-ui",
+    "androidx-lifecycle-viewmodel-navigation3"
 ]
 
 camerax = [